Use Client_find_by_session() instead of a few open-coded loops.
[umurmur.git] / src / messagehandler.c
index 8cca053e55a281f0b5326398ff7bac7e431dfef5..882409ae75e8d25503bec0c98c3a179d2af268e4 100644 (file)
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2009, 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 "messagehandler.h"
 #include "crypt.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, bOpus;
+
+static bool_t fake_celt_support;
 
-static void sendServerReject(client_t *client, const char *reason, rejectType_t type)
+static void sendServerReject(client_t *client, const char *reason, MumbleProto__Reject__RejectType type)
 {
-       message_t *msg = Msg_create(ServerReject);
-       msg->sessionId = client->sessionId;
-       strcpy(msg->payload.serverReject.reason, reason);
-       msg->payload.serverReject.type = type;
+       message_t *msg = Msg_create(Reject);
+       msg->payload.reject->reason = strdup(reason);
+       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)
 {
        message_t *msg = Msg_create(PermissionDenied);
-       msg->sessionId = client->sessionId;
-       strncpy(msg->payload.permissionDenied.reason, reason, MAX_TEXT);
+       msg->payload.permissionDenied->has_type = true;
+       msg->payload.permissionDenied->type = MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__Text;
+       msg->payload.permissionDenied->reason = strdup(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;
+       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 ServerAuthenticate:
-               /*
-                * 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
-                */
-               if (msg->payload.serverAuthenticate.version != MESSAGE_STREAM_VERSION) {
-                       char buf[64];
-                       sprintf(buf, "Wrong version of mumble protocol (client: %d, server: %d)",
-                                       msg->payload.serverAuthenticate.version, MESSAGE_STREAM_VERSION);
-                       sendServerReject(client, buf, WrongVersion);
+       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");
+
+               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 (strncmp(client_itr->playerName, msg->payload.serverAuthenticate.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");
-                               sendServerReject(client, buf, UsernameInUse);
+                               Log_debug("Username already in use");
+                               sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__UsernameInUse);
                                goto disconnect;
-                       }                               
+                       }
                }
-               
-               if (strncmp(getStrConf(PASSPHRASE), msg->payload.serverAuthenticate.password, MAX_TEXT) != 0) {
-                       char buf[64];
-                       sprintf(buf, "Wrong server password");
-                       sendServerReject(client, buf, WrongServerPW);
-                       goto disconnect;
-               }                               
-
-               if (strlen(msg->payload.serverAuthenticate.userName) == 0) { /* XXX - other invalid names? */
+               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_USERNAME) { /* XXX - other invalid names? */
                        char buf[64];
                        sprintf(buf, "Invalid username");
-                       sendServerReject(client, buf, InvalidUsername);
+                       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));
-                       sendServerReject(client, buf, ServerFull);
+                       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 */
-               strncpy(client->playerName, msg->payload.serverAuthenticate.userName, MAX_TEXT);
-               client->playerId = client->sessionId;
 
-               client->authenticated = true;
-               
-               /* XXX - Kick ghost */
-               
+               /* 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);
                sendmsg = Msg_create(CryptSetup);
-               sendmsg->sessionId = client->sessionId;
-               memcpy(sendmsg->payload.cryptSetup.key, client->cryptState.raw_key, AES_BLOCK_SIZE);
-               memcpy(sendmsg->payload.cryptSetup.serverNonce, client->cryptState.encrypt_iv, AES_BLOCK_SIZE);
-               memcpy(sendmsg->payload.cryptSetup.clientNonce, client->cryptState.decrypt_iv, AES_BLOCK_SIZE);
+               sendmsg->payload.cryptSetup->has_key = true;
+               sendmsg->payload.cryptSetup->key.data = client->cryptState.raw_key;
+               sendmsg->payload.cryptSetup->key.len = AES_BLOCK_SIZE;
+               sendmsg->payload.cryptSetup->has_server_nonce = true;
+               sendmsg->payload.cryptSetup->server_nonce.data = client->cryptState.encrypt_iv;
+               sendmsg->payload.cryptSetup->server_nonce.len = AES_BLOCK_SIZE;
+               sendmsg->payload.cryptSetup->has_client_nonce = true;
+               sendmsg->payload.cryptSetup->client_nonce.data = client->cryptState.decrypt_iv;
+               sendmsg->payload.cryptSetup->client_nonce.len = AES_BLOCK_SIZE;
                Client_send_message(client, sendmsg);
 
                /* Channel stuff */
-               Chan_playerJoin(defaultChan, client); /* Join default channel */
+               Chan_userJoin(defaultChan, client); /* Join default channel */
+
+               /* 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)0x8000000b);
+                       client->codec_count = 1;
+                       fake_celt_support = true;
+               }
+               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;
-               Chan_iterate(&ch_itr);
-               do {
-                       sendmsg = Msg_create(ChannelAdd);
-                       sendmsg->sessionId = 0;
-                       sendmsg->payload.channelAdd.id = ch_itr->id;
-                       if (ch_itr->id == 0)
-                               sendmsg->payload.channelAdd.parentId = -1;
-                       else
-                               sendmsg->payload.channelAdd.parentId = ch_itr->parent->id;
-                       strcpy(sendmsg->payload.channelAdd.name, ch_itr->name);
-                       Client_send_message(client, sendmsg);
-                       
-                       sendmsg = Msg_create(ChannelDescUpdate);
-                       sendmsg->sessionId = 0;
-                       sendmsg->payload.channelDescUpdate.id = ch_itr->id;
-                       strcpy(sendmsg->payload.channelDescUpdate.desc, ch_itr->desc);
+               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;
+                       if (ch_itr->id != 0) {
+                               sendmsg->payload.channelState->has_parent = true;
+                               sendmsg->payload.channelState->parent = ch_itr->parent->id;
+                       }
+                       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);
-                       
-                       Chan_iterate(&ch_itr);
-               } while (ch_itr != NULL);
+               }
 
-               /* Not supporting channel link for now */
+               /* 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;
 
-               /* Server join for connecting user */
-               sendmsg = Msg_create(ServerJoin);
-               sendmsg->sessionId = client->sessionId;
-               sendmsg->payload.serverJoin.id = client->playerId;
-               strcpy(sendmsg->payload.serverJoin.playerName, client->playerName);
-               Client_send_message_except(client, sendmsg);
+                               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;
 
-               /* Player move for connecting user */
-               if (((channel_t *)client->channel)->id != 0) {
-                       sendmsg = Msg_create(PlayerMove);
-                       sendmsg->sessionId = client->sessionId;
-                       sendmsg->payload.playerMove.victim = client->playerId;
-                       sendmsg->payload.playerMove.channel = ((channel_t *)client->channel)->id;
-                       Client_send_message_except(client, sendmsg);
+                               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;
+                                       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->name = strdup(client->username);
+               sendmsg->payload.userState->has_channel_id = true;
+               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;
                while (Client_iterate(&client_itr) != NULL) {
                        if (!IS_AUTH(client_itr))
                                continue;
-                       sendmsg = Msg_create(ServerJoin);
-                       sendmsg->sessionId = client_itr->sessionId;
-                       sendmsg->payload.serverJoin.id = client_itr->playerId;
-                       strncpy(sendmsg->payload.serverJoin.playerName, client_itr->playerName, MAX_TEXT);
-                       Client_send_message(client, sendmsg);
-                       
-                       sendmsg = Msg_create(PlayerMove);
-                       sendmsg->sessionId = client_itr->sessionId;
-                       sendmsg->payload.playerMove.victim = client_itr->playerId;
-                       sendmsg->payload.playerMove.channel = ((channel_t *)client_itr->channel)->id;
+                       sendmsg = Msg_create(UserState);
+                       sendmsg->payload.userState->has_session = true;
+                       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 = client_itr->channel->id;
+                       sendmsg->payload.userState->has_suppress = client_itr->channel->silent;
+                       sendmsg->payload.userState->suppress = client_itr->channel->silent;
+
+                       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->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);
                }
-               
+
+               /* Sync message */
                sendmsg = Msg_create(ServerSync);
-               sendmsg->sessionId = client->sessionId;
-               strcpy(sendmsg->payload.serverSync.welcomeText, getStrConf(WELCOMETEXT));
-               sendmsg->payload.serverSync.maxBandwidth = getIntConf(MAX_BANDWIDTH);
+               sendmsg->payload.serverSync->has_session = true;
+               sendmsg->payload.serverSync->session = client->sessionId;
+               sendmsg->payload.serverSync->welcome_text = strdup(getStrConf(WELCOMETEXT));
+               sendmsg->payload.serverSync->has_max_bandwidth = true;
+               sendmsg->payload.serverSync->max_bandwidth = getIntConf(MAX_BANDWIDTH);
                Client_send_message(client, sendmsg);
-               
-               Log_info("Player %s authenticated", client->playerName);
-               
-               break;
-               
-       case PingStats:
-               client->cryptState.uiRemoteGood = msg->payload.pingStats.good;
-               client->cryptState.uiRemoteLate = msg->payload.pingStats.late;
-               client->cryptState.uiRemoteLost = msg->payload.pingStats.lost;
-               client->cryptState.uiRemoteResync = msg->payload.pingStats.resync;
-
-               Log_debug("Pingstats <-: %d %d %d %d",
-                                 client->cryptState.uiRemoteGood, client->cryptState.uiRemoteLate,
-                                 client->cryptState.uiRemoteLost, client->cryptState.uiRemoteResync);
-               
-               /* Ignoring the double values since they don't seem to be used */
-               sendmsg = Msg_create(PingStats);
-               sendmsg->sessionId = client->sessionId;
-               sendmsg->payload.pingStats.timestamp = msg->payload.pingStats.timestamp;
-               
-               sendmsg->payload.pingStats.good = client->cryptState.uiGood;
-               sendmsg->payload.pingStats.late = client->cryptState.uiLate;
-               sendmsg->payload.pingStats.lost = client->cryptState.uiLost;
-               sendmsg->payload.pingStats.resync = client->cryptState.uiResync;
-               
+
+               /* 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_debug("Pingstats ->: %d %d %d %d",
-                                 client->cryptState.uiGood, client->cryptState.uiLate,
-                                 client->cryptState.uiLost, client->cryptState.uiResync);
 
+               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;
+               if (msg->payload.ping->has_late)
+                       client->cryptState.uiRemoteLate = msg->payload.ping->late;
+               if (msg->payload.ping->has_lost)
+                       client->cryptState.uiRemoteLost = msg->payload.ping->lost;
+               if (msg->payload.ping->has_resync)
+                       client->cryptState.uiRemoteResync = msg->payload.ping->resync;
+
+               Log_debug("Ping <-: %d %d %d %d",
+                                 client->cryptState.uiRemoteGood, client->cryptState.uiRemoteLate,
+                                 client->cryptState.uiRemoteLost, client->cryptState.uiRemoteResync
+                       );
+
+               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->sessionId = client->sessionId;
-               sendmsg->payload.ping.timestamp = msg->payload.ping.timestamp;
+
+               sendmsg->payload.ping->timestamp = msg->payload.ping->timestamp;
+               sendmsg->payload.ping->has_timestamp = true;
+               sendmsg->payload.ping->good = client->cryptState.uiGood;
+               sendmsg->payload.ping->has_good = true;
+               sendmsg->payload.ping->late = client->cryptState.uiLate;
+               sendmsg->payload.ping->has_late = true;
+               sendmsg->payload.ping->lost = client->cryptState.uiLost;
+               sendmsg->payload.ping->has_lost = true;
+               sendmsg->payload.ping->resync = client->cryptState.uiResync;
+               sendmsg->payload.ping->has_resync = true;
+
                Client_send_message(client, sendmsg);
+               Log_debug("Ping ->: %d %d %d %d",
+                                 client->cryptState.uiGood, client->cryptState.uiLate,
+                                 client->cryptState.uiLost, client->cryptState.uiResync);
+
                break;
-       case CryptSync:
+       case CryptSetup:
                Log_debug("Voice channel crypt resync requested");
-               if (msg->payload.cryptSync.empty) {
-                       sendmsg = Msg_create(CryptSync);
-                       sendmsg->sessionId = msg->sessionId;
-                       sendmsg->payload.cryptSync.empty = false;
-                       memcpy(sendmsg->payload.cryptSync.nonce, client->cryptState.decrypt_iv, AES_BLOCK_SIZE);
+               if (!msg->payload.cryptSetup->has_client_nonce) {
+                       sendmsg = Msg_create(CryptSetup);
+                       sendmsg->payload.cryptSetup->has_server_nonce = true;
+                       sendmsg->payload.cryptSetup->server_nonce.data = client->cryptState.decrypt_iv;
+                       sendmsg->payload.cryptSetup->server_nonce.len = AES_BLOCK_SIZE;
                        Client_send_message(client, sendmsg);
                } else {
-                       memcpy(client->cryptState.decrypt_iv, msg->payload.cryptSync.nonce, AES_BLOCK_SIZE);
+                       memcpy(client->cryptState.decrypt_iv, msg->payload.cryptSetup->client_nonce.data, AES_BLOCK_SIZE);
                        client->cryptState.uiResync++;
                }
                break;
-       case PlayerMute:
-               if (msg->payload.playerMute.victim != client->playerId) {
+       case UserState:
+               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 && !client->isAdmin) {
                        sendPermissionDenied(client, "Permission denied");
-               } else {
-                       Log_debug("Player ID %d muted", msg->payload.playerMute.victim);
-                       client->mute = msg->payload.playerMute.bMute;                   
+                       break;
                }
-               break;
-       case PlayerDeaf:
-               if (msg->payload.playerDeaf.victim != client->playerId) {
-                       sendPermissionDenied(client, "Permission denied");
-               } else {
-                       Log_debug("Player ID %d deaf", msg->payload.playerDeaf.victim);
-                       client->deaf = msg->payload.playerDeaf.bDeaf;
+               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->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->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;
+
+                       channelJoinResult_t result = Chan_userJoin_id_test(msg->payload.userState->channel_id, target);
+
+                       if (result.CHJOIN_NOENTER || result.CHJOIN_NOTFOUND)
+                               break;
+
+                       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->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);
+
+               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 (msg->payload.textMessage.bTree)
+               if (!getBoolConf(ALLOW_TEXTMESSAGE))
+                       break;
+               msg->payload.textMessage->has_actor = true;
+               msg->payload.textMessage->actor = client->sessionId;
+
+               /* XXX - HTML is allowed and can't be turned off */
+               if (msg->payload.textMessage->n_tree_id > 0) {
                        sendPermissionDenied(client, "Tree message not supported");
-               else if (msg->payload.textMessage.channel != -1) { /* To channel */
-                       channel_t *ch_itr = NULL;
-                       do {
-                               Chan_iterate(&ch_itr);
-                       } while (ch_itr != NULL && ch_itr->id != msg->payload.textMessage.channel);
-                       if (ch_itr == NULL)
-                               Log_warn("Channel id %d not found - ignoring.", msg->payload.textMessage.channel);
-                       else {
-                               struct dlist *itr;
-                               list_iterate(itr, &ch_itr->clients) {
-                                       client_t *c;
-                                       c = list_get_entry(itr, client_t, chan_node);
-                                       if (c != client && !c->deaf) {
-                                               Msg_inc_ref(msg);
-                                               Client_send_message(c, msg);
-                                               Log_debug("Text message to player ID %d", c->playerId);
+                       break;
+               }
+
+               if (msg->payload.textMessage->n_channel_id > 0) { /* To channel */
+                       int i;
+                       channel_t *ch_itr;
+                       for (i = 0; i < msg->payload.textMessage->n_channel_id; i++) {
+                               ch_itr = NULL;
+                               do {
+                                       Chan_iterate(&ch_itr);
+                               } while (ch_itr != NULL && ch_itr->id != msg->payload.textMessage->channel_id[i]);
+                               if (ch_itr != NULL) {
+                                       struct dlist *itr;
+                                       list_iterate(itr, &ch_itr->clients) {
+                                               client_t *c;
+                                               c = list_get_entry(itr, client_t, chan_node);
+                                               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);
+                                               }
                                        }
                                }
-                       }
-               } else { /* To player */
-                       client_t *itr = NULL;
-                       while (Client_iterate(&itr) != NULL) {
-                               if (!IS_AUTH(itr))
-                                       continue;
-                               if (itr->playerId == msg->payload.textMessage.victim) {
-                                       if (!itr->deaf) {
-                                               Msg_inc_ref(msg);
-                                               Client_send_message(itr, msg);
-                                       }
-                                       break;
+                       } /* for */
+               }
+               if (msg->payload.textMessage->n_session > 0) { /* To user */
+                       int i;
+                       client_t *itr;
+                       for (i = 0; i < msg->payload.textMessage->n_session; i++) {
+                               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;
+
+       case VoiceTarget:
+       {
+               int i, j, count, targetId = msg->payload.voiceTarget->id;
+               struct _MumbleProto__VoiceTarget__Target *target;
+
+               if (!targetId || targetId >= 0x1f)
+                       break;
+               Voicetarget_add_id(client, targetId);
+               count = msg->payload.voiceTarget->n_targets;
+               if (!count)
+                       break;
+               for (i = 0; i < count; i++) {
+                       target = msg->payload.voiceTarget->targets[i];
+                       for (j = 0; j < target->n_session; j++)
+                               Voicetarget_add_session(client, targetId, target->session[j]);
+                       if (target->has_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);
                        }
-                       if (itr == NULL)
-                               Log_warn("TextMessage: Player ID %d not found", msg->payload.textMessage.victim);
                }
                break;
-       case PlayerSelfMuteDeaf:
-               client->deaf = msg->payload.playerSelfMuteDeaf.bDeaf;
-               client->mute = msg->payload.playerSelfMuteDeaf.bMute;
-               Log_debug("Player ID %d %s and %s", client->playerId, client->deaf ? "deaf": "not deaf",
-                                 client->mute ? "mute" : "not mute");
+       }
+       case Version:
+               Log_debug("Version message received");
+               if (msg->payload.version->has_version) {
+                       client->version = msg->payload.version->version;
+                       Log_debug("Client version 0x%x", client->version);
+               }
+               if (msg->payload.version->release) {
+                       free(client->release);
+                       client->release = strdup(msg->payload.version->release);
+                       Log_debug("Client release %s", client->release);
+               }
+               if (msg->payload.version->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 PlayerMove:
+       case PermissionQuery:
                Msg_inc_ref(msg); /* Re-use message */
+               msg->payload.permissionQuery->has_permissions = true;
+
+               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:
+               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;
+               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;
+               Msg_inc_ref(msg);
                Client_send_message_except(NULL, msg);
-               Chan_playerJoin_id(msg->payload.playerMove.channel, client);            
+
+               /* 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;
+
+               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);
+                       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");
+
+               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 PlayerRename:
-       case ChannelAdd:
-       case ChannelDescUpdate:
-       case ContextAction:
-       case ContextAddAction:
-       case ServerBanList:
-       case PlayerKick:
-       case PlayerBan:
        case ChannelRemove:
-       case ChannelMove:
-       case ChannelLink:
-       case ChannelRename:
-       case EditACL:
+       case ContextAction:
+       case ContextActionAdd:
+       case ACL:
+       case UserList:
+       case QueryUsers:
                sendPermissionDenied(client, "Not supported by uMurmur");
                break;
-               
-       case PlayerTexture: /* Ignore */
-               break;
-               
+
        default:
                Log_warn("Message %d not handled", msg->messageType);
                break;
        }
+out:
        Msg_free(msg);
        return;
+
 disconnect:
        Msg_free(msg);
        Client_close(client);
 }
+