Use Client_find_by_session() instead of a few open-coded loops.
[umurmur.git] / src / messagehandler.c
index b2f5670e90d6c0c1f08fdd67b531a465bde7fefb..882409ae75e8d25503bec0c98c3a179d2af268e4 100644 (file)
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <string.h>
-#include <openssl/aes.h>
+#include <stdlib.h>
 
 #include "log.h"
+#include "memory.h"
 #include "list.h"
 #include "client.h"
 #include "messages.h"
 #include "channel.h"
 #include "conf.h"
 #include "voicetarget.h"
+#include "ban.h"
 
 #define MAX_TEXT 512
+#define MAX_USERNAME 128
+
+#define NO_CELT_MESSAGE "<strong>WARNING:</strong> Your client doesn't support the CELT codec, you won't be able to talk to or hear most clients. Please make sure your client was built with CELT support."
+
 
 extern channel_t *defaultChan;
 extern int iCodecAlpha, iCodecBeta;
-extern bool_t bPreferAlpha;
+extern bool_t bPreferAlpha, bOpus;
+
+static bool_t fake_celt_support;
 
 static void sendServerReject(client_t *client, const char *reason, MumbleProto__Reject__RejectType type)
 {
@@ -54,7 +62,7 @@ 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);
 }
 
@@ -67,64 +75,128 @@ static void sendPermissionDenied(client_t *client, const char *reason)
        Client_send_message(client, msg);
 }
 
+static void addTokens(client_t *client, message_t *msg)
+{
+       int i;
+       if (client->tokencount + msg->payload.authenticate->n_tokens < MAX_TOKENS) {
+               /* Check lengths first */
+               for (i = 0; i < msg->payload.authenticate->n_tokens; i++) {
+                       if (strlen(msg->payload.authenticate->tokens[i]) > MAX_TOKENSIZE - 1) {
+                               sendPermissionDenied(client, "Too long token");
+                               return;
+                       }
+               }
+
+               for (i = 0; i < msg->payload.authenticate->n_tokens; i++) {
+                       Log_debug("Adding token '%s' to client '%s'", msg->payload.authenticate->tokens[i], client->username);
+                       Client_token_add(client, msg->payload.authenticate->tokens[i]);
+               }
+       }
+       else
+               sendPermissionDenied(client, "Too many tokens");
+}
+
 void Mh_handle_message(client_t *client, message_t *msg)
 {
        message_t *sendmsg = NULL;
        channel_t *ch_itr = NULL;
-       client_t *client_itr;
+       client_t *client_itr, *target;
 
        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:
-                               
                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 tokens are changed by the user.*/
+                       Client_token_free(client); /* Clear the token list */
+                       if (msg->payload.authenticate->n_tokens > 0) {
+                               Log_debug("Tokens in auth message from '%s'. n_tokens = %d", client->username,
+                                         msg->payload.authenticate->n_tokens);
+                               addTokens(client, msg);
+                       }
+                       break;
+               }
+
+               if (SSLi_getSHA1Hash(client->ssl, client->hash) && Ban_isBanned(client)) {
+                       char hexhash[41];
+                       SSLi_hash2hex(client->hash, hexhash);
+                       Log_info("Client with hash '%s' is banned. Disconnecting", hexhash);
+                       goto disconnect;
+               }
+
                client->authenticated = true;
-               
+
                client_itr = NULL;
                while (Client_iterate(&client_itr) != NULL) {
                        if (!IS_AUTH(client_itr))
                                continue;
-                       if (client_itr->username && strncmp(client_itr->username, 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");
                                sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__UsernameInUse);
                                goto disconnect;
-                       }                               
+                       }
                }
                if (strlen(getStrConf(PASSPHRASE)) > 0) {
-                       if (!msg->payload.authenticate->password || strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 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);
+                               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");
                        sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__InvalidUsername);
                        goto disconnect;
-               }                               
+               }
 
                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->username = strdup(msg->payload.authenticate->username);                         
-               
+
+               /* Name */
+               client->username = strdup(msg->payload.authenticate->username);
+
+               /* Tokens */
+               if (msg->payload.authenticate->n_tokens > 0)
+                       addTokens(client, msg);
+
+               /* Check if admin PW among tokens */
+               if (strlen(getStrConf(ADMIN_PASSPHRASE)) > 0 &&
+                   Client_token_match(client, getStrConf(ADMIN_PASSPHRASE))) {
+                       client->isAdmin = true;
+                       Log_info_client(client, "User provided admin password");
+               }
+
                /* Setup UDP encryption */
                CryptState_init(&client->cryptState);
                CryptState_genKey(&client->cryptState);
@@ -143,33 +215,42 @@ void Mh_handle_message(client_t *client, message_t *msg)
                /* Channel stuff */
                Chan_userJoin(defaultChan, client); /* Join default channel */
 
-               /* Codec version */             
+               /* 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;
                        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_codec_add(client, (int32_t)0x8000000a);
+                       Client_codec_add(client, (int32_t)0x8000000b);
                        client->codec_count = 1;
+                       fake_celt_support = true;
                }
-               
-               recheckCodecVersions();
-               
+               if (msg->payload.authenticate->opus)
+                       client->bOpus = true;
+
+               recheckCodecVersions(client);
+
                sendmsg = Msg_create(CodecVersion);
                sendmsg->payload.codecVersion->alpha = iCodecAlpha;
                sendmsg->payload.codecVersion->beta = iCodecBeta;
                sendmsg->payload.codecVersion->prefer_alpha = bPreferAlpha;
+               sendmsg->payload.codecVersion->has_opus = true;
+               sendmsg->payload.codecVersion->opus = bOpus;
                Client_send_message(client, sendmsg);
-               
+
+               if (!bOpus && client->bOpus && fake_celt_support) {
+                       Client_textmessage(client, NO_CELT_MESSAGE);
+               }
+
                /* Iterate channels and send channel info */
                ch_itr = NULL;
                while (Chan_iterate(&ch_itr) != NULL) {
@@ -183,8 +264,12 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        sendmsg->payload.channelState->name = strdup(ch_itr->name);
                        if (ch_itr->desc)
                                sendmsg->payload.channelState->description = strdup(ch_itr->desc);
+                       if (ch_itr->position != 0) {
+                               sendmsg->payload.channelState->has_position = true;
+                               sendmsg->payload.channelState->position = ch_itr->position;
+                       }
                        Log_debug("Send channel info: %s", sendmsg->payload.channelState->name);
-                       Client_send_message(client, sendmsg);                   
+                       Client_send_message(client, sendmsg);
                }
 
                /* Iterate channels and send channel links info */
@@ -194,33 +279,40 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                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));
+
+                               links = (uint32_t*)Memory_safeMalloc(
+                                       ch_itr->linkcount,
+                                       sizeof(uint32_t));
                                list_iterate(itr, &ch_itr->channel_links) { /* Iterate links */
+                                       channellist_t *chl;
                                        channel_t *ch;
-                                       ch = list_get_entry(itr, channel_t, link_node);
+                                       chl = list_get_entry(itr, channellist_t, node);
+                                       ch = chl->chan;
                                        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->username);
                sendmsg->payload.userState->has_channel_id = true;
-               sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id;
-               
+               sendmsg->payload.userState->channel_id = client->channel->id;
+
+               if (defaultChan->silent) {
+                       sendmsg->payload.userState->has_suppress = true;
+                       sendmsg->payload.userState->suppress = true;
+               }
+
                Client_send_message_except(client, sendmsg);
 
                client_itr = NULL;
@@ -232,17 +324,32 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        sendmsg->payload.userState->session = client_itr->sessionId;
                        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;
+                       sendmsg->payload.userState->channel_id = client_itr->channel->id;
+                       sendmsg->payload.userState->has_suppress = client_itr->channel->silent;
+                       sendmsg->payload.userState->suppress = client_itr->channel->silent;
 
-                       /* Only self_mute/deaf supported */
-                       if (client_itr->deaf) {
+                       client_itr->isSuppressed = client_itr->channel->silent;
+
+                       if (client_itr->self_deaf) {
                                sendmsg->payload.userState->has_self_deaf = true;
                                sendmsg->payload.userState->self_deaf = true;
                        }
-                       if (client_itr->mute) {
+                       if (client_itr->self_mute) {
                                sendmsg->payload.userState->has_self_mute = true;
                                sendmsg->payload.userState->self_mute = true;
                        }
+                       if (client_itr->deaf) {
+                               sendmsg->payload.userState->has_deaf = true;
+                               sendmsg->payload.userState->deaf = true;
+                       }
+                       if (client_itr->mute) {
+                               sendmsg->payload.userState->has_mute = true;
+                               sendmsg->payload.userState->mute = true;
+                       }
+                       if (client_itr->recording) {
+                               sendmsg->payload.userState->has_recording = true;
+                               sendmsg->payload.userState->recording = true;
+                       }
                        Client_send_message(client, sendmsg);
                }
 
@@ -253,13 +360,21 @@ 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);
-               
+
+               /* 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:
                if (msg->payload.ping->has_good)
                        client->cryptState.uiRemoteGood = msg->payload.ping->good;
@@ -274,9 +389,14 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                  client->cryptState.uiRemoteGood, client->cryptState.uiRemoteLate,
                                  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);
 
                sendmsg->payload.ping->timestamp = msg->payload.ping->timestamp;
@@ -310,58 +430,148 @@ void Mh_handle_message(client_t *client, message_t *msg)
                }
                break;
        case UserState:
-               /* Only allow state changes for for the self user */
+               target = NULL;
+               /* Only allow state changes for for the self user unless an admin is issuing */
                if (msg->payload.userState->has_session &&
-                       msg->payload.userState->session != client->sessionId) {
+                   msg->payload.userState->session != client->sessionId && !client->isAdmin) {
                        sendPermissionDenied(client, "Permission denied");
                        break;
                }
-               if (msg->payload.userState->has_user_id || msg->payload.userState->has_mute ||
-                       msg->payload.userState->has_deaf || msg->payload.userState->has_suppress ||
-                       msg->payload.userState->has_texture) {
-                       
+               if (msg->payload.userState->has_session && msg->payload.userState->session != client->sessionId) {
+                       target = Client_find_by_session(msg->payload.userState->session);
+
+                       if (target == NULL) {
+                               Log_warn("Client with sessionID %d not found", msg->payload.userState->session);
+                               break;
+                       }
+               }
+
+               if (msg->payload.userState->has_user_id || msg->payload.userState->has_suppress ||
+                   msg->payload.userState->has_priority_speaker || msg->payload.userState->has_texture) {
                        sendPermissionDenied(client, "Not supported by uMurmur");
                        break;
                }
+
+               if (target == NULL)
+                       target = client;
+
+               msg->payload.userState->has_session = true;
+               msg->payload.userState->session = target->sessionId;
+               msg->payload.userState->has_actor = true;
+               msg->payload.userState->actor = client->sessionId;
+
+               if (msg->payload.userState->has_deaf) {
+                       target->deaf = msg->payload.userState->deaf;
+                       if (target->deaf) {
+                               msg->payload.userState->has_mute = true;
+                               msg->payload.userState->mute = true;
+                       }
+               }
+               if (msg->payload.userState->has_mute) {
+                       target->mute = msg->payload.userState->mute;
+                       if (!target->mute) {
+                               msg->payload.userState->has_deaf = true;
+                               msg->payload.userState->deaf = false;
+                               target->deaf = false;
+                       }
+               }
                if (msg->payload.userState->has_self_deaf) {
-                       client->deaf = msg->payload.userState->self_deaf;
+                       client->self_deaf = msg->payload.userState->self_deaf;
+                       if (client->self_deaf) {
+                               msg->payload.userState->has_self_mute = true;
+                               msg->payload.userState->self_mute = true;
+                       }
                }
                if (msg->payload.userState->has_self_mute) {
-                       client->mute = msg->payload.userState->self_mute;                       
+                       client->self_mute = msg->payload.userState->self_mute;
+                       if (!client->self_mute) {
+                               msg->payload.userState->has_self_deaf = true;
+                               msg->payload.userState->self_deaf = false;
+                               client->self_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 = Memory_safeMalloc(1, strlen(client->username) + 32);
+                       tree_id = Memory_safeMalloc(1, sizeof(uint32_t));
+                       *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) {
                        int leave_id;
-                       if (!Chan_userJoin_id_test(msg->payload.userState->channel_id))
+
+                       channelJoinResult_t result = Chan_userJoin_id_test(msg->payload.userState->channel_id, target);
+
+                       if (result.CHJOIN_NOENTER || result.CHJOIN_NOTFOUND)
                                break;
-                       leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, client);
+
+                       if (result.CHJOIN_WRONGPW) {
+                               if (target == client && !client->isAdmin) {
+                                       sendPermissionDenied(client, "Wrong channel password");
+                                       break;
+                               }
+                               /* Tricky one: if user hasn't the password, but is moved to the channel by admin then let
+                                * the user in. Also let admin user in regardless of channel password.
+                                * Take no action on other errors.
+                                */
+                               else if (!client->isAdmin)
+                                       break;
+                       }
+
+                       leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, target);
                        if (leave_id > 0) {
                                Log_debug("Removing channel ID %d", leave_id);
                                sendmsg = Msg_create(ChannelRemove);
                                sendmsg->payload.channelRemove->channel_id = leave_id;
                        }
+
+                       if (result.CHJOIN_SILENT) {
+                               if (!target->isSuppressed) {
+                               msg->payload.userState->has_suppress = true;
+                               msg->payload.userState->suppress = true;
+                               target->isSuppressed = true;
+                               }
+                       }
+                       else if (target->isSuppressed) {
+                               msg->payload.userState->has_suppress = true;
+                               msg->payload.userState->suppress = false;
+                               target->isSuppressed = false;
+                       }
                }
-               if (msg->payload.userState->plugin_context != NULL) {
-                       if (client->context)
-                               free(client->context);
-                       client->context = strdup(msg->payload.userState->plugin_context);
-                       if (client->context == NULL)
-                               Log_fatal("Out of memory");
-                       
+               if (msg->payload.userState->has_plugin_context) {
+                       free(client->context);
+                       client->context = Memory_safeMalloc(1, msg->payload.userState->plugin_context.len);
+                       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:
+               if (!getBoolConf(ALLOW_TEXTMESSAGE))
+                       break;
                msg->payload.textMessage->has_actor = true;
                msg->payload.textMessage->actor = client->sessionId;
 
@@ -370,7 +580,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        sendPermissionDenied(client, "Tree message not supported");
                        break;
                }
-                       
+
                if (msg->payload.textMessage->n_channel_id > 0) { /* To channel */
                        int i;
                        channel_t *ch_itr;
@@ -384,7 +594,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                        list_iterate(itr, &ch_itr->clients) {
                                                client_t *c;
                                                c = list_get_entry(itr, client_t, chan_node);
-                                               if (c != client && !c->deaf) {
+                                               if (c != client && !c->deaf && !c->self_deaf) {
                                                        Msg_inc_ref(msg);
                                                        Client_send_message(c, msg);
                                                        Log_debug("Text message to session ID %d", c->sessionId);
@@ -397,21 +607,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        int i;
                        client_t *itr;
                        for (i = 0; i < msg->payload.textMessage->n_session; i++) {
-                               itr = NULL;
-                               while (Client_iterate(&itr) != NULL) {
-                                       if (!IS_AUTH(itr))
-                                               continue;
-                                       if (itr->sessionId == msg->payload.textMessage->session[i]) {
-                                               if (!itr->deaf) {
-                                                       Msg_inc_ref(msg);
-                                                       Client_send_message(itr, msg);
-                                                       Log_debug("Text message to session ID %d", itr->sessionId);
-                                               }
-                                               break;
-                                       }
-                               }
+                               itr = Client_find_by_session(msg->payload.textMessage->session[i]);
+
                                if (itr == NULL)
                                        Log_warn("TextMessage: Session ID %d not found", msg->payload.textMessage->session[i]);
+                               else if (IS_AUTH(itr) && !itr->deaf && !itr->self_deaf) {
+                                       Msg_inc_ref(msg);
+                                       Client_send_message(itr, msg);
+                                       Log_debug("Text message to session ID %d", itr->sessionId);
+                               }
                        } /* for */
                }
                break;
@@ -449,21 +653,35 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        Log_debug("Client version 0x%x", client->version);
                }
                if (msg->payload.version->release) {
-                       if (client->release) free(client->release);
+                       free(client->release);
                        client->release = strdup(msg->payload.version->release);
                        Log_debug("Client release %s", client->release);
                }
                if (msg->payload.version->os) {
-                       if (client->os) free(client->os);                       
+                       free(client->os);
                        client->os = strdup(msg->payload.version->os);
                        Log_debug("Client OS %s", client->os);
                }
+               if (msg->payload.version->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 */
                msg->payload.permissionQuery->has_permissions = true;
-               msg->payload.permissionQuery->permissions = PERM_DEFAULT;
-               
+
+               if (client->isAdmin)
+                       msg->payload.permissionQuery->permissions = PERM_ADMIN;
+               else
+                       msg->payload.permissionQuery->permissions = PERM_DEFAULT;
+
+               if (!getBoolConf(ALLOW_TEXTMESSAGE))
+                       msg->payload.permissionQuery->permissions &= ~PERM_TEXTMESSAGE;
+               if (!getBoolConf(ENABLE_BAN))
+                       msg->payload.permissionQuery->permissions &= ~PERM_BAN;
+
                Client_send_message(client, msg);
                break;
        case UDPTunnel:
@@ -473,7 +691,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
        case ChannelState:
        {
                channel_t *ch_itr, *parent, *newchan;
-               int leave_id;           
+               int leave_id;
                /* Don't allow any changes to existing channels */
                if (msg->payload.channelState->has_channel_id) {
                        sendPermissionDenied(client, "Not supported by uMurmur");
@@ -499,7 +717,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        sendPermissionDenied(client, "Channel name too long");
                        break;
                }
-                       
+
                parent = Chan_fromId(msg->payload.channelState->parent);
                if (parent == NULL)
                        break;
@@ -512,13 +730,13 @@ void Mh_handle_message(client_t *client, message_t *msg)
                }
                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...
                 */
@@ -527,6 +745,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
                newchan = Chan_createChannel(msg->payload.channelState->name,
                                                                         msg->payload.channelState->description);
                newchan->temporary = true;
+               if (msg->payload.channelState->has_position)
+                       newchan->position = msg->payload.channelState->position;
                Chan_addChannel(parent, newchan);
                msg->payload.channelState->has_channel_id = true;
                msg->payload.channelState->channel_id = newchan->id;
@@ -539,8 +759,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.userState->session = client->sessionId;
                sendmsg->payload.userState->has_channel_id = true;
                sendmsg->payload.userState->channel_id = newchan->id;
+
+               if (client->isSuppressed) {
+                       sendmsg->payload.userState->has_suppress = true;
+                       sendmsg->payload.userState->suppress = false;
+                       client->isSuppressed = false;
+               }
+
                Client_send_message_except(NULL, sendmsg);
-               
+
                leave_id = Chan_userJoin(newchan, client);
                if (leave_id > 0) {
                        Log_debug("Removing channel ID %d", leave_id);
@@ -548,20 +775,185 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        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");
+
+               target = Client_find_by_session(msg->payload.userStats->session);
+
+               if (!target) /* Not found */
+                       break;
+
+               if (!IS_AUTH(target)) /* Not authenticated. */
+                       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;
+                       if (target->release)
+                               sendmsg->payload.userStats->version->release = strdup(target->release);
+                       if (target->os)
+                               sendmsg->payload.userStats->version->os = strdup(target->os);
+                       if (target->os_version)
+                               sendmsg->payload.userStats->version->os_version = strdup(target->os_version);
+
+                       sendmsg->payload.userStats->n_celt_versions = target->codec_count;
+                       sendmsg->payload.userStats->celt_versions
+                               = Memory_safeMalloc(target->codec_count, sizeof(int32_t));
+                       i = 0;
+                       while (Client_codec_iterate(target, &codec_itr) != NULL)
+                               sendmsg->payload.userStats->celt_versions[i++] = codec_itr->codec;
+
+                       sendmsg->payload.userStats->has_opus = true;
+                       sendmsg->payload.userStats->opus = target->bOpus;
+
+                       /* Address */
+                       if (getBoolConf(SHOW_ADDRESSES)) {
+                               sendmsg->payload.userStats->has_address = true;
+                               sendmsg->payload.userStats->address.data
+                                       = Memory_safeMalloc(16, sizeof(uint8_t));
+                               memset(sendmsg->payload.userStats->address.data, 0, 16);
+                               /* ipv4 representation as ipv6 address. Supposedly correct. */
+                               memset(&sendmsg->payload.userStats->address.data[10], 0xff, 2); /* IPv4 */
+                               if(target->remote_tcp.ss_family == AF_INET)
+                                       memcpy(&sendmsg->payload.userStats->address.data[12], &((struct sockaddr_in*)&target->remote_tcp)->sin_addr, 4);
+                               else
+                                       memcpy(&sendmsg->payload.userStats->address.data[0], &((struct sockaddr_in6*)&target->remote_tcp)->sin6_addr, 16);
+                               sendmsg->payload.userStats->address.len = 16;
+                       } else {
+                               sendmsg->payload.userStats->has_address = false;
+                       }
+               }
+               /* 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;
+       case UserRemove:
+               target = NULL;
+               /* Only admin can issue this */
+               if (!client->isAdmin) {
+                       sendPermissionDenied(client, "Permission denied");
+                       break;
+               }
+
+               target = Client_find_by_session(msg->payload.userRemove->session);
+
+               if (target == NULL) {
+                       Log_warn("Client with sessionId %d not found", msg->payload.userRemove->session);
+                       break;
+               }
+               msg->payload.userRemove->session = target->sessionId;
+               msg->payload.userRemove->has_actor = true;
+               msg->payload.userRemove->actor = client->sessionId;
+
+               if (msg->payload.userRemove->has_ban && msg->payload.userRemove->ban) {
+                       if (!getBoolConf(ENABLE_BAN))
+                               sendPermissionDenied(client, "Permission denied");
+                       else
+                               Ban_UserBan(target, msg->payload.userRemove->reason);
+               } else {
+                       Log_info_client(target, "User kicked. Reason: '%s'",
+                                       strlen(msg->payload.userRemove->reason) == 0 ? "N/A" : msg->payload.userRemove->reason);
+               }
+               /* Re-use message */
+               Msg_inc_ref(msg);
+
+               Client_send_message_except(NULL, msg);
+               Client_close(target);
+               break;
+       case BanList:
+               /* Only admin can issue this */
+               if (!client->isAdmin) {
+                       sendPermissionDenied(client, "Permission denied");
+                       break;
+               }
+               if (!getBoolConf(ENABLE_BAN)) {
+                       sendPermissionDenied(client, "Permission denied");
+                       break;
+               }
+               if (msg->payload.banList->has_query && msg->payload.banList->query) {
+                       /* Create banlist message and add banentrys */
+                       sendmsg = Ban_getBanList();
+                       Client_send_message(client, sendmsg);
+               } else {
+                       /* Clear banlist and set the new one */
+                       Ban_clearBanList();
+                       Ban_putBanList(msg, msg->payload.banList->n_bans);
+               }
+               break;
+
                /* Permission denied for all these messages. Not implemented. */
        case ChannelRemove:
        case ContextAction:
        case ContextActionAdd:
        case ACL:
-       case BanList:
        case UserList:
        case QueryUsers:
                sendPermissionDenied(client, "Not supported by uMurmur");
                break;
-                               
+
        default:
                Log_warn("Message %d not handled", msg->messageType);
                break;
@@ -569,7 +961,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 out:
        Msg_free(msg);
        return;
-       
+
 disconnect:
        Msg_free(msg);
        Client_close(client);