X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=4b6c39659dc75a75477b2ae8cf53d43c553a8f5b;hb=454ad122eb158b4391e2690fe6a7e127d24c525b;hp=089aec0a56ae6b890ee26ba51cd5b0b68b625613;hpb=c7df54e693e34de4037a8cc8b7a28828302c7fa5;p=umurmur.git

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 089aec0..4b6c396 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
    Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
@@ -29,17 +29,21 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <string.h>
-#include <openssl/aes.h>
+#include <stdlib.h>
 
 #include "log.h"
 #include "list.h"
 #include "client.h"
 #include "messages.h"
+#include "messagehandler.h"
 #include "crypt.h"
 #include "channel.h"
 #include "conf.h"
 #include "voicetarget.h"
 
+#define MAX_TEXT 512
+#define MAX_USERNAME 128
+
 extern channel_t *defaultChan;
 extern int iCodecAlpha, iCodecBeta;
 extern bool_t bPreferAlpha;
@@ -51,6 +55,8 @@ static void sendServerReject(client_t *client, const char *reason, MumbleProto__
 	msg->payload.reject->type = type;
 	msg->payload.reject->has_type = true;
 	Client_send_message(client, msg);
+	
+	Log_info_client(client, "Server reject reason: %s", reason);
 }
 
 static void sendPermissionDenied(client_t *client, const char *reason)
@@ -64,27 +70,38 @@ static void sendPermissionDenied(client_t *client, const char *reason)
 
 void Mh_handle_message(client_t *client, message_t *msg)
 {
-	message_t *sendmsg;
+	message_t *sendmsg = NULL;
 	channel_t *ch_itr = NULL;
 	client_t *client_itr;
+
+	if (!client->authenticated && !(msg->messageType == Authenticate ||
+									msg->messageType == Version)) {
+		goto out;
+	}
+	
+	switch (msg->messageType) {
+	case UDPTunnel:
+	case Ping:
+	case CryptSetup:
+	case VoiceTarget:
+	case UserStats:
+	case PermissionQuery:
+		break;
+	default:
+		Timer_restart(&client->idleTime);
+	}
 	
 	switch (msg->messageType) {
 	case Authenticate:
-		/*
-		 * 1. Check stuff, Serverreject if not ok
-		 * 2. Setup UDP encryption -> MessageCryptSetup
-		 * 3. (Enter channel)
-		 * 4. MessageChannelAdd + MessageChannelDescUpdate for all channels
-		 * 5. (MessageChannelLink)
-		 * 6. MessageServerJoin
-		 * 7. MessagePlayerMove
-		 * 8. MessageServerJoin for all connected users
-		 * 9. PlayerDeaf/PlayerMute/PlayerSelfMuteDeaf for all users it applies to
-		 * 10. MessageServerSync
-		 */
-				
 		Log_debug("Authenticate message received");
-		Log_debug("Username: %s", msg->payload.authenticate->username);
+		
+		if (IS_AUTH(client) || !msg->payload.authenticate->username) {
+			/* Authenticate message might be sent when a token is set by the user.*/
+			if (msg->payload.authenticate->n_tokens > 0) {
+				Log_debug("Tokens in auth message from %s", client->username);
+			}
+			break;
+		}
 		
 		client->authenticated = true;
 		
@@ -92,7 +109,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		while (Client_iterate(&client_itr) != NULL) {
 			if (!IS_AUTH(client_itr))
 				continue;
-			if (client_itr->playerName && strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) {
+			if (client_itr->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_USERNAME) == 0) {
 				char buf[64];
 				sprintf(buf, "Username already in use");
 				Log_debug("Username already in use");
@@ -100,15 +117,20 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				goto disconnect;
 			}				
 		}
-		if (msg->payload.authenticate->password && strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0) {
-			char buf[64];
-			sprintf(buf, "Wrong server password");
-			Log_debug("Wrong server password: %s", msg->payload.authenticate->password);
-			sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__WrongServerPW);
-			goto disconnect;
+		if (strlen(getStrConf(PASSPHRASE)) > 0) {
+			if (!msg->payload.authenticate->password ||
+				(msg->payload.authenticate->password &&
+				 strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0)) {
+				char buf[64];
+				sprintf(buf, "Wrong server password");
+				sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__WrongServerPW);
+				Log_debug("Wrong server password: '%s'", msg->payload.authenticate->password != NULL ?
+						  msg->payload.authenticate->password : "(null)");
+				goto disconnect;
+			}
 		}				
 		if (strlen(msg->payload.authenticate->username) == 0 ||
-			strlen(msg->payload.authenticate->username) >= MAX_TEXT) { /* XXX - other invalid names? */
+			strlen(msg->payload.authenticate->username) >= MAX_USERNAME) { /* XXX - other invalid names? */
 			char buf[64];
 			sprintf(buf, "Invalid username");
 			Log_debug("Invalid username");
@@ -118,13 +140,13 @@ void Mh_handle_message(client_t *client, message_t *msg)
 
 		if (Client_count() >= getIntConf(MAX_CLIENTS)) {
 			char buf[64];
-			sprintf(buf, "Server is full (max %d users)", getIntConf(MAX_CLIENTS));
+			snprintf(buf, 64, "Server is full (max %d users)", getIntConf(MAX_CLIENTS));
 			sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__ServerFull);
 			goto disconnect;
 		}
 		
 		/* Name & password */
-		client->playerName = strdup(msg->payload.authenticate->username);				
+		client->username = strdup(msg->payload.authenticate->username);				
 		
 		/* Setup UDP encryption */
 		CryptState_init(&client->cryptState);
@@ -142,24 +164,24 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		Client_send_message(client, sendmsg);
 
 		/* Channel stuff */
-		Chan_playerJoin(defaultChan, client); /* Join default channel */
+		Chan_userJoin(defaultChan, client); /* Join default channel */
 
-		/* Codec version */
-		if (msg->payload.authenticate->n_celt_versions > MAX_CODECS)
-			Log_warn("Client has more than %d CELT codecs. Ignoring %d codecs",
-					 MAX_CODECS, msg->payload.authenticate->n_celt_versions - MAX_CODECS);
-		
-		Log_debug("Client %d has %d CELT codecs", client->sessionId, msg->payload.authenticate->n_celt_versions);
+		/* Codec version */		
+		Log_debug("Client %d has %d CELT codecs", client->sessionId,
+				  msg->payload.authenticate->n_celt_versions);
 		if (msg->payload.authenticate->n_celt_versions > 0) {
 			int i;
-			client->codec_count = msg->payload.authenticate->n_celt_versions > MAX_CODECS ?
-				MAX_CODECS : msg->payload.authenticate->n_celt_versions;
-			for (i = 0; i < client->codec_count; i++) {
-				client->codecs[i] = msg->payload.authenticate->celt_versions[i];
-				Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, client->codecs[i]);
-			}
+			codec_t *codec_itr;
+			client->codec_count = msg->payload.authenticate->n_celt_versions;
+			
+			for (i = 0; i < client->codec_count; i++)
+			Client_codec_add(client, msg->payload.authenticate->celt_versions[i]);
+			codec_itr = NULL;
+			while (Client_codec_iterate(client, &codec_itr) != NULL)
+				Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, codec_itr->codec);
+				
 		} else {
-			client->codecs[0] = (int32_t)0x8000000a;
+			Client_codec_add(client, (int32_t)0x8000000a);
 			client->codec_count = 1;
 		}
 		
@@ -173,8 +195,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		
 		/* Iterate channels and send channel info */
 		ch_itr = NULL;
-		Chan_iterate(&ch_itr);
-		do {
+		while (Chan_iterate(&ch_itr) != NULL) {
 			sendmsg = Msg_create(ChannelState);
 			sendmsg->payload.channelState->has_channel_id = true;
 			sendmsg->payload.channelState->channel_id = ch_itr->id;
@@ -183,27 +204,44 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				sendmsg->payload.channelState->parent = ch_itr->parent->id;
 			}
 			sendmsg->payload.channelState->name = strdup(ch_itr->name);
-			if (strlen(ch_itr->desc) > 0) {
+			if (ch_itr->desc)
 				sendmsg->payload.channelState->description = strdup(ch_itr->desc);
-			}
 			Log_debug("Send channel info: %s", sendmsg->payload.channelState->name);
-			Client_send_message(client, sendmsg);
-			
-			Chan_iterate(&ch_itr);
-		} while (ch_itr != NULL);
+			Client_send_message(client, sendmsg);			
+		}
 
-		/* Not supporting channel links yet */
+		/* Iterate channels and send channel links info */
+		ch_itr = NULL;
+		while (Chan_iterate(&ch_itr) != NULL) {
+			if (ch_itr->linkcount > 0) { /* Has links */
+				uint32_t *links;
+				int i = 0;
+				struct dlist *itr;
+				
+				sendmsg = Msg_create(ChannelState);
+				sendmsg->payload.channelState->has_channel_id = true;
+				sendmsg->payload.channelState->channel_id = ch_itr->id;
+				sendmsg->payload.channelState->n_links = ch_itr->linkcount;
+				
+				links = (uint32_t *)malloc(ch_itr->linkcount * sizeof(uint32_t));
+				list_iterate(itr, &ch_itr->channel_links) { /* Iterate links */
+					channel_t *ch;
+					ch = list_get_entry(itr, channel_t, link_node);
+					links[i++] = ch->id;
+				}
+				sendmsg->payload.channelState->links = links;
+				Client_send_message(client, sendmsg);
+			}
+		}
 		
 		/* Send user state for connecting user to other users */
 		sendmsg = Msg_create(UserState);
 		sendmsg->payload.userState->has_session = true;
 		sendmsg->payload.userState->session = client->sessionId;
-		sendmsg->payload.userState->has_user_id = true;
-		sendmsg->payload.userState->user_id = client->sessionId;
-		sendmsg->payload.userState->name = strdup(client->playerName);
+		sendmsg->payload.userState->name = strdup(client->username);
 		sendmsg->payload.userState->has_channel_id = true;
 		sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id;
-		
+
 		Client_send_message_except(client, sendmsg);
 
 		client_itr = NULL;
@@ -213,11 +251,11 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			sendmsg = Msg_create(UserState);
 			sendmsg->payload.userState->has_session = true;
 			sendmsg->payload.userState->session = client_itr->sessionId;
-			sendmsg->payload.userState->name = strdup(client_itr->playerName);
+			sendmsg->payload.userState->name = strdup(client_itr->username);
 			sendmsg->payload.userState->has_channel_id = true;
 			sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id;
 
-			/* XXX - check if self_* is correct */
+			/* Only self_mute/deaf supported */
 			if (client_itr->deaf) {
 				sendmsg->payload.userState->has_self_deaf = true;
 				sendmsg->payload.userState->self_deaf = true;
@@ -226,6 +264,10 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				sendmsg->payload.userState->has_self_mute = true;
 				sendmsg->payload.userState->self_mute = true;
 			}
+			if (client_itr->recording) {
+				sendmsg->payload.userState->has_recording = true;
+				sendmsg->payload.userState->recording = true;
+			}
 			Client_send_message(client, sendmsg);
 		}
 
@@ -236,11 +278,19 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		sendmsg->payload.serverSync->welcome_text = strdup(getStrConf(WELCOMETEXT));
 		sendmsg->payload.serverSync->has_max_bandwidth = true;
 		sendmsg->payload.serverSync->max_bandwidth = getIntConf(MAX_BANDWIDTH);
-		sendmsg->payload.serverSync->has_allow_html = true;
-		sendmsg->payload.serverSync->allow_html = true; /* Support this? */
 		Client_send_message(client, sendmsg);
-		
-		Log_info("User %s authenticated", client->playerName);
+
+		/* Server config message */
+		sendmsg = Msg_create(ServerConfig);		
+		sendmsg->payload.serverConfig->has_allow_html = true;
+		sendmsg->payload.serverConfig->allow_html = true; /* Support this? */
+		sendmsg->payload.serverConfig->has_message_length = true;
+		sendmsg->payload.serverConfig->message_length = MAX_TEXT; /* Hardcoded */
+		sendmsg->payload.serverConfig->has_image_message_length = true;
+		sendmsg->payload.serverConfig->image_message_length = 0; /* XXX */
+		Client_send_message(client, sendmsg);
+
+		Log_info_client(client, "User %s authenticated", client->username);
 		break;
 		
 	case Ping:
@@ -258,7 +308,12 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				  client->cryptState.uiRemoteLost, client->cryptState.uiRemoteResync
 			);
 		
-		/* Ignoring the double values since they don't seem to be used */
+		client->UDPPingAvg = msg->payload.ping->udp_ping_avg;
+		client->UDPPingVar = msg->payload.ping->udp_ping_var;
+		client->TCPPingAvg = msg->payload.ping->tcp_ping_avg;
+		client->TCPPingVar = msg->payload.ping->tcp_ping_var;
+		client->UDPPackets = msg->payload.ping->udp_packets;
+		client->TCPPackets = msg->payload.ping->tcp_packets;
 		
 		sendmsg = Msg_create(Ping);
 
@@ -306,37 +361,84 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			sendPermissionDenied(client, "Not supported by uMurmur");
 			break;
 		}
+		
+		msg->payload.userState->has_session = true;
+		msg->payload.userState->session = client->sessionId;
+		msg->payload.userState->has_actor = true;
+		msg->payload.userState->actor = client->sessionId;
+
 		if (msg->payload.userState->has_self_deaf) {
 			client->deaf = msg->payload.userState->self_deaf;
 		}
 		if (msg->payload.userState->has_self_mute) {
-			client->mute = msg->payload.userState->self_mute;			
+			client->mute = msg->payload.userState->self_mute;
+			if (!client->mute) {
+				msg->payload.userState->has_self_deaf = true;
+				msg->payload.userState->self_deaf = false;
+				client->deaf = false;
+			}
+		}
+		if (msg->payload.userState->has_recording &&
+			msg->payload.userState->recording != client->recording) {
+			client->recording = msg->payload.userState->recording;
+			char *message;
+			uint32_t *tree_id;
+			
+			message = malloc(strlen(client->username) + 32);
+			if (!message)
+				Log_fatal("Out of memory");
+			tree_id = malloc(sizeof(uint32_t));
+			if (!tree_id)
+				Log_fatal("Out of memory");
+			*tree_id = 0;
+			sendmsg = Msg_create(TextMessage);
+			sendmsg->payload.textMessage->message = message;
+			sendmsg->payload.textMessage->n_tree_id = 1;
+			sendmsg->payload.textMessage->tree_id = tree_id;
+			if (client->recording)
+				sprintf(message, "User %s started recording", client->username);
+			else
+				sprintf(message, "User %s stopped recording", client->username);
+			Client_send_message_except_ver(NULL, sendmsg, ~0x010203);
+			sendmsg = NULL;
 		}
 		if (msg->payload.userState->has_channel_id) {
-			Chan_playerJoin_id(msg->payload.userState->channel_id, client);
+			int leave_id;
+			if (!Chan_userJoin_id_test(msg->payload.userState->channel_id))
+				break;
+			leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, client);
+			if (leave_id > 0) {
+				Log_debug("Removing channel ID %d", leave_id);
+				sendmsg = Msg_create(ChannelRemove);
+				sendmsg->payload.channelRemove->channel_id = leave_id;
+			}
 		}
-		if (msg->payload.userState->plugin_context != NULL) {
+		if (msg->payload.userState->has_plugin_context) {
 			if (client->context)
 				free(client->context);
-			client->context = strdup(msg->payload.userState->plugin_context);
+			client->context = malloc(msg->payload.userState->plugin_context.len);
 			if (client->context == NULL)
 				Log_fatal("Out of memory");
+			memcpy(client->context, msg->payload.userState->plugin_context.data,
+				   msg->payload.userState->plugin_context.len);
 			
 			break; /* Don't inform other users about this state */
 		}
-		
 		/* Re-use message */
 		Msg_inc_ref(msg);
-		msg->payload.userState->has_actor = true;
-		msg->payload.userState->actor = client->sessionId;
+				
 		Client_send_message_except(NULL, msg);
+
+		/* Need to send remove channel message _after_ UserState message */
+		if (sendmsg != NULL)
+			Client_send_message_except(NULL, sendmsg);
 		break;
+		
 	case TextMessage:
 		msg->payload.textMessage->has_actor = true;
 		msg->payload.textMessage->actor = client->sessionId;
 
-		/* XXX - Allow HTML stuff? */
-		
+		/* XXX - HTML is allowed and can't be turned off */
 		if (msg->payload.textMessage->n_tree_id > 0) {
 			sendPermissionDenied(client, "Tree message not supported");
 			break;
@@ -350,9 +452,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				do {
 					Chan_iterate(&ch_itr);
 				} while (ch_itr != NULL && ch_itr->id != msg->payload.textMessage->channel_id[i]);
-				if (ch_itr == NULL)
-					Log_warn("Channel id %d not found - ignoring.", msg->payload.textMessage->channel_id[i]);
-				else {
+				if (ch_itr != NULL) {
 					struct dlist *itr;
 					list_iterate(itr, &ch_itr->clients) {
 						client_t *c;
@@ -405,9 +505,12 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			for (j = 0; j < target->n_session; j++)
 				Voicetarget_add_session(client, targetId, target->session[j]);
 			if (target->has_channel_id) {
-				if (target->has_links || target->has_children)
-					Log_warn("Whisper to children or linked channels not implemented. Ignoring.");
-				Voicetarget_add_channel(client, targetId, target->channel_id);
+				bool_t linked = false, children = false;
+				if (target->has_links)
+					linked = target->links;
+				if (target->has_children)
+					children = target->children;
+				Voicetarget_add_channel(client, targetId, target->channel_id, linked, children);
 			}
 		}
 		break;
@@ -428,6 +531,11 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			client->os = strdup(msg->payload.version->os);
 			Log_debug("Client OS %s", client->os);
 		}
+		if (msg->payload.version->os_version) {
+			if (client->os_version) free(client->os_version);			
+			client->os_version = strdup(msg->payload.version->os_version);
+			Log_debug("Client OS version %s", client->os_version);
+		}
 		break;
 	case PermissionQuery:
 		Msg_inc_ref(msg); /* Re-use message */
@@ -437,11 +545,192 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		Client_send_message(client, msg);
 		break;
 	case UDPTunnel:
+		client->bUDP = false;
 		Client_voiceMsg(client, msg->payload.UDPTunnel->packet.data, msg->payload.UDPTunnel->packet.len);
 	    break;
+	case ChannelState:
+	{
+		channel_t *ch_itr, *parent, *newchan;
+		int leave_id;		
+		/* Don't allow any changes to existing channels */
+		if (msg->payload.channelState->has_channel_id) {
+			sendPermissionDenied(client, "Not supported by uMurmur");
+			break;
+		}
+		/* Must have parent */
+		if (!msg->payload.channelState->has_parent) {
+			sendPermissionDenied(client, "Not supported by uMurmur");
+			break;
+		}
+		/* Must have name */
+		if (msg->payload.channelState->name == NULL) {
+			sendPermissionDenied(client, "Not supported by uMurmur");
+			break;
+		}
+		/* Must be temporary channel */
+		if (msg->payload.channelState->temporary != true) {
+			sendPermissionDenied(client, "Only temporary channels are supported by uMurmur");
+			break;
+		}
+		/* Check channel name is OK */
+		if (strlen(msg->payload.channelState->name) > MAX_TEXT) {
+			sendPermissionDenied(client, "Channel name too long");
+			break;
+		}
+			
+		parent = Chan_fromId(msg->payload.channelState->parent);
+		if (parent == NULL)
+			break;
+		ch_itr = NULL;
+		while (Chan_iterate_siblings(parent, &ch_itr) != NULL) {
+			if (strcmp(ch_itr->name, msg->payload.channelState->name) == 0) {
+				sendPermissionDenied(client, "Channel already exists");
+				break;
+			}
+		}
+		if (ch_itr != NULL)
+			break;
+		
+		/* Disallow temporary channels as siblings to temporary channels */
+		if (parent->temporary) {
+			sendPermissionDenied(client, "Parent channel is temporary channel");
+			break;
+		}
+			
+		/* XXX - Murmur looks for "\\w" and sends perm denied if not found.
+		 * I don't know why so I don't do that here...
+		 */
+
+		/* Create the channel */
+		newchan = Chan_createChannel(msg->payload.channelState->name,
+									 msg->payload.channelState->description);
+		newchan->temporary = true;
+		Chan_addChannel(parent, newchan);
+		msg->payload.channelState->has_channel_id = true;
+		msg->payload.channelState->channel_id = newchan->id;
+		Msg_inc_ref(msg);
+		Client_send_message_except(NULL, msg);
+
+		/* Join the creating user */
+		sendmsg = Msg_create(UserState);
+		sendmsg->payload.userState->has_session = true;
+		sendmsg->payload.userState->session = client->sessionId;
+		sendmsg->payload.userState->has_channel_id = true;
+		sendmsg->payload.userState->channel_id = newchan->id;
+		Client_send_message_except(NULL, sendmsg);
+		
+		leave_id = Chan_userJoin(newchan, client);
+		if (leave_id > 0) {
+			Log_debug("Removing channel ID %d", leave_id);
+			sendmsg = Msg_create(ChannelRemove);
+			sendmsg->payload.channelRemove->channel_id = leave_id;
+			Client_send_message_except(NULL, sendmsg);
+		}
+	}		
+	break;
+
+	case UserStats:
+	{
+		client_t *target = NULL;
+		codec_t *codec_itr = NULL;
+		int i;
+		bool_t details = true;
+		
+		if (msg->payload.userStats->has_stats_only)
+			details = !msg->payload.userStats->stats_only;
+		
+		if (!msg->payload.userStats->has_session)
+			sendPermissionDenied(client, "Not supported by uMurmur");
+		while (Client_iterate(&target) != NULL) {
+			if (!IS_AUTH(target))
+				continue;
+			if (target->sessionId == msg->payload.userStats->session)
+				break;
+		}
+		if (!target) /* Not found */
+			break;
+		
+		/*
+		 * Differences from Murmur:
+		 * o Ignoring certificates intentionally
+		 * o Ignoring channel local determining
+		 */
+		
+		sendmsg = Msg_create(UserStats);
+		sendmsg->payload.userStats->session = msg->payload.userStats->session;
+		sendmsg->payload.userStats->from_client->has_good = true;
+		sendmsg->payload.userStats->from_client->good = target->cryptState.uiGood;
+		sendmsg->payload.userStats->from_client->has_late = true;
+		sendmsg->payload.userStats->from_client->late = target->cryptState.uiLate;
+		sendmsg->payload.userStats->from_client->has_lost = true;
+		sendmsg->payload.userStats->from_client->lost = target->cryptState.uiLost;
+		sendmsg->payload.userStats->from_client->has_resync = true;
+		sendmsg->payload.userStats->from_client->resync = target->cryptState.uiResync;
+		
+		sendmsg->payload.userStats->from_server->has_good = true;
+		sendmsg->payload.userStats->from_server->good = target->cryptState.uiRemoteGood;
+		sendmsg->payload.userStats->from_server->has_late = true;
+		sendmsg->payload.userStats->from_server->late = target->cryptState.uiRemoteLate;
+		sendmsg->payload.userStats->from_server->has_lost = true;
+		sendmsg->payload.userStats->from_server->lost = target->cryptState.uiRemoteLost;
+		sendmsg->payload.userStats->from_server->has_resync = true;
+		sendmsg->payload.userStats->from_server->resync = target->cryptState.uiRemoteResync;
+
+		sendmsg->payload.userStats->has_udp_packets = true;
+		sendmsg->payload.userStats->udp_packets = target->UDPPackets;
+		sendmsg->payload.userStats->has_udp_ping_avg = true;
+		sendmsg->payload.userStats->udp_ping_avg = target->UDPPingAvg;
+		sendmsg->payload.userStats->has_udp_ping_var = true;
+		sendmsg->payload.userStats->udp_ping_var = target->UDPPingVar;
+		
+		sendmsg->payload.userStats->has_tcp_ping_avg = true;
+		sendmsg->payload.userStats->tcp_ping_avg = target->TCPPingAvg;
+		sendmsg->payload.userStats->has_tcp_ping_var = true;
+		sendmsg->payload.userStats->tcp_ping_var = target->TCPPingVar;
+		sendmsg->payload.userStats->has_tcp_packets = true;
+		sendmsg->payload.userStats->tcp_packets = target->TCPPackets;
+		
+		if (details) {
+
+			sendmsg->payload.userStats->version->has_version = true;
+			sendmsg->payload.userStats->version->version = target->version;
+			sendmsg->payload.userStats->version->release = strdup(target->release);
+			sendmsg->payload.userStats->version->os = strdup(target->os);
+			sendmsg->payload.userStats->version->os_version = strdup(target->os_version);
+			
+			sendmsg->payload.userStats->n_celt_versions = target->codec_count;
+			sendmsg->payload.userStats->celt_versions = malloc(sizeof(int32_t) * target->codec_count);
+			if (!sendmsg->payload.userStats->celt_versions)
+				Log_fatal("Out of memory");
+			i = 0;
+			while (Client_codec_iterate(target, &codec_itr) != NULL)
+				sendmsg->payload.userStats->celt_versions[i++] = codec_itr->codec;
+
+			/* Address */
+			sendmsg->payload.userStats->has_address = true;
+			sendmsg->payload.userStats->address.data = malloc(sizeof(uint8_t) * 16);
+			if (!sendmsg->payload.userStats->address.data)
+				Log_fatal("Out of memory");
+			memset(sendmsg->payload.userStats->address.data, 0, 16);
+			/* ipv4 representation as ipv6 address. Supposedly correct. */
+			memcpy(&sendmsg->payload.userStats->address.data[12], &target->remote_tcp.sin_addr, 4);
+			sendmsg->payload.userStats->address.len = 16;
+		}
+		/* BW */
+		sendmsg->payload.userStats->has_bandwidth = true;
+		sendmsg->payload.userStats->bandwidth = target->availableBandwidth;
+		
+		/* Onlinesecs */
+		sendmsg->payload.userStats->has_onlinesecs = true;
+		sendmsg->payload.userStats->onlinesecs = Timer_elapsed(&target->connectTime) / 1000000LL;		
+		/* Idlesecs */
+		sendmsg->payload.userStats->has_idlesecs = true;
+		sendmsg->payload.userStats->idlesecs = Timer_elapsed(&target->idleTime) / 1000000LL;		
+		Client_send_message(client, sendmsg);
+	}
+	break;
 		/* Permission denied for all these messages. Not implemented. */
 	case ChannelRemove:
-	case ChannelState:
 	case ContextAction:
 	case ContextActionAdd:
 	case ACL:
@@ -455,8 +744,10 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		Log_warn("Message %d not handled", msg->messageType);
 		break;
 	}
+out:
 	Msg_free(msg);
 	return;
+	
 disconnect:
 	Msg_free(msg);
 	Client_close(client);