Logging fixes

[umurmur.git] / src / messagehandler.c

diff --git a/src/messagehandler.c b/src/messagehandler.c
index ebd602f357a8407826b3e0239f4e6f9b9c65f546..3901eb31fa1eae0161f342e05c3a7a19afa8fb31 100644 (file)
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -35,11 +35,14 @@
 #include "list.h"
 #include "client.h"
 #include "messages.h"
+#include "messagehandler.h"
 #include "crypt.h"
 #include "channel.h"
 #include "conf.h"
 #include "voicetarget.h"
 
+#define MAX_TEXT 512
+
 extern channel_t *defaultChan;
 extern int iCodecAlpha, iCodecBeta;
 extern bool_t bPreferAlpha;
@@ -52,13 +55,7 @@ static void sendServerReject(client_t *client, const char *reason, MumbleProto__
        msg->payload.reject->has_type = true;
        Client_send_message(client, msg);
        
-       Log_info("Server reject reason: %s. Disconnecting session %d - %s@%s:%d",
-                        reason,
-                        client->sessionId,
-                        client->playerName,
-                        inet_ntoa(client->remote_tcp.sin_addr),
-                        ntohs(client->remote_tcp.sin_port));
-       
+       Log_info_client(client, "Server reject reason: %s", reason);
 }
 
 static void sendPermissionDenied(client_t *client, const char *reason)
@@ -112,12 +109,14 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                goto disconnect;
                        }                               
                }
-               if (msg->payload.authenticate->password && strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0) {
-                       char buf[64];
-                       sprintf(buf, "Wrong server password");
-                       Log_debug("Wrong server password: %s", msg->payload.authenticate->password);
-                       sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__WrongServerPW);
-                       goto disconnect;
+               if (strlen(getStrConf(PASSPHRASE)) > 0) {
+                       if (!msg->payload.authenticate->password || 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);
+                               goto disconnect;
+                       }
                }                               
                if (strlen(msg->payload.authenticate->username) == 0 ||
                        strlen(msg->payload.authenticate->username) >= MAX_TEXT) { /* XXX - other invalid names? */
@@ -195,9 +194,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                sendmsg->payload.channelState->parent = ch_itr->parent->id;
                        }
                        sendmsg->payload.channelState->name = strdup(ch_itr->name);
-                       if (strlen(ch_itr->desc) > 0) {
+                       if (ch_itr->desc)
                                sendmsg->payload.channelState->description = strdup(ch_itr->desc);
-                       }
                        Log_debug("Send channel info: %s", sendmsg->payload.channelState->name);
                        Client_send_message(client, sendmsg);
                        
@@ -252,7 +250,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.serverSync->allow_html = true; /* Support this? */
                Client_send_message(client, sendmsg);
                
-               Log_info("User %s authenticated", client->playerName);
+               Log_info_client(client, "User %s authenticated", client->playerName);
                break;
                
        case Ping:
@@ -326,9 +324,10 @@ void Mh_handle_message(client_t *client, message_t *msg)
                }
                if (msg->payload.userState->has_channel_id) {
                        int leave_id;
+                       if (!Chan_playerJoin_id_test(msg->payload.userState->channel_id))
+                               break;
                        leave_id = Chan_playerJoin_id(msg->payload.userState->channel_id, client);
                        if (leave_id > 0) {
-                               /* XXX - need to send update to remove channel if temporary */
                                Log_debug("Removing channel ID %d", leave_id);
                                sendmsg = Msg_create(ChannelRemove);
                                sendmsg->payload.channelRemove->channel_id = leave_id;
@@ -354,6 +353,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                if (sendmsg != NULL)
                        Client_send_message_except(NULL, sendmsg);
                break;
+               
        case TextMessage:
                msg->payload.textMessage->has_actor = true;
                msg->payload.textMessage->actor = client->sessionId;
@@ -372,9 +372,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                do {
                                        Chan_iterate(&ch_itr);
                                } while (ch_itr != NULL && ch_itr->id != msg->payload.textMessage->channel_id[i]);
-                               if (ch_itr == NULL)
-                                       Log_warn("Channel id %d not found - ignoring.", msg->payload.textMessage->channel_id[i]);
-                               else {
+                               if (ch_itr != NULL) {
                                        struct dlist *itr;
                                        list_iterate(itr, &ch_itr->clients) {
                                                client_t *c;
@@ -464,7 +462,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
        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");
@@ -501,6 +499,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                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...
                 */
@@ -522,7 +529,14 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.userState->has_channel_id = true;
                sendmsg->payload.userState->channel_id = newchan->id;
                Client_send_message_except(NULL, sendmsg);
-               Chan_playerJoin(newchan, client);
+               
+               leave_id = Chan_playerJoin(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;