X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=c69f65ed20ae90a6411034192aadd5bf4344736e;hb=01e804f06e00c36c5680ebde07cbe17e6b256dc4;hp=7da04d11b46aa64864ef7aea7d24868ed3c42607;hpb=17ff75bcd300b8523afa53be4b7058ea2a5cbdf1;p=umurmur.git diff --git a/src/messagehandler.c b/src/messagehandler.c index 7da04d1..c69f65e 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2009-2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -38,8 +38,11 @@ #include "crypt.h" #include "channel.h" #include "conf.h" +#include "voicetarget.h" extern channel_t *defaultChan; +extern int iCodecAlpha, iCodecBeta; +extern bool_t bPreferAlpha; static void sendServerReject(client_t *client, const char *reason, MumbleProto__Reject__RejectType type) { @@ -48,6 +51,14 @@ 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("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)); + } static void sendPermissionDenied(client_t *client, const char *reason) @@ -61,10 +72,14 @@ static void sendPermissionDenied(client_t *client, const char *reason) void Mh_handle_message(client_t *client, message_t *msg) { - message_t *sendmsg; + message_t *sendmsg = NULL; channel_t *ch_itr = NULL; client_t *client_itr; - + + if (!client->authenticated && !(msg->messageType == Authenticate || + msg->messageType == Version)) { + goto out; + } switch (msg->messageType) { case Authenticate: /* @@ -89,7 +104,7 @@ void Mh_handle_message(client_t *client, message_t *msg) while (Client_iterate(&client_itr) != NULL) { if (!IS_AUTH(client_itr)) continue; - if (strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) { + if (client_itr->playerName && strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) { char buf[64]; sprintf(buf, "Username already in use"); Log_debug("Username already in use"); @@ -121,9 +136,7 @@ void Mh_handle_message(client_t *client, message_t *msg) } /* Name & password */ - strncpy(client->playerName, msg->payload.authenticate->username, MAX_TEXT); - client->playerId = client->sessionId; - + client->playerName = strdup(msg->payload.authenticate->username); /* Setup UDP encryption */ CryptState_init(&client->cryptState); @@ -147,18 +160,29 @@ void Mh_handle_message(client_t *client, message_t *msg) if (msg->payload.authenticate->n_celt_versions > MAX_CODECS) Log_warn("Client has more than %d CELT codecs. Ignoring %d codecs", MAX_CODECS, msg->payload.authenticate->n_celt_versions - MAX_CODECS); + + Log_debug("Client %d has %d CELT codecs", client->sessionId, msg->payload.authenticate->n_celt_versions); if (msg->payload.authenticate->n_celt_versions > 0) { int i; client->codec_count = msg->payload.authenticate->n_celt_versions > MAX_CODECS ? MAX_CODECS : msg->payload.authenticate->n_celt_versions; - for (i = 0; i < client->codec_count; i++) + for (i = 0; i < client->codec_count; i++) { client->codecs[i] = msg->payload.authenticate->celt_versions[i]; + Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, client->codecs[i]); + } } else { client->codecs[0] = (int32_t)0x8000000a; client->codec_count = 1; } + recheckCodecVersions(); - + + sendmsg = Msg_create(CodecVersion); + sendmsg->payload.codecVersion->alpha = iCodecAlpha; + sendmsg->payload.codecVersion->beta = iCodecBeta; + sendmsg->payload.codecVersion->prefer_alpha = bPreferAlpha; + Client_send_message(client, sendmsg); + /* Iterate channels and send channel info */ ch_itr = NULL; Chan_iterate(&ch_itr); @@ -187,7 +211,7 @@ void Mh_handle_message(client_t *client, message_t *msg) 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->playerId; + sendmsg->payload.userState->user_id = client->sessionId; sendmsg->payload.userState->name = strdup(client->playerName); sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id; @@ -205,7 +229,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id; - /* XXX - check if self_* is correct */ + /* Only self_mute/deaf supported */ if (client_itr->deaf) { sendmsg->payload.userState->has_self_deaf = true; sendmsg->payload.userState->self_deaf = true; @@ -225,15 +249,13 @@ void Mh_handle_message(client_t *client, message_t *msg) 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 = false; /* Support this? */ + sendmsg->payload.serverSync->allow_html = true; /* Support this? */ Client_send_message(client, sendmsg); Log_info("User %s authenticated", client->playerName); break; case Ping: - { - uint64_t timestamp; if (msg->payload.ping->has_good) client->cryptState.uiRemoteGood = msg->payload.ping->good; if (msg->payload.ping->has_late) @@ -251,10 +273,9 @@ void Mh_handle_message(client_t *client, message_t *msg) /* Ignoring the double values since they don't seem to be used */ sendmsg = Msg_create(Ping); - timestamp = msg->payload.ping->timestamp; - sendmsg->payload.ping->timestamp = 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; @@ -270,7 +291,6 @@ void Mh_handle_message(client_t *client, message_t *msg) client->cryptState.uiLost, client->cryptState.uiResync); break; - } case CryptSetup: Log_debug("Voice channel crypt resync requested"); if (!msg->payload.cryptSetup->has_client_nonce) { @@ -305,21 +325,42 @@ void Mh_handle_message(client_t *client, message_t *msg) client->mute = msg->payload.userState->self_mute; } if (msg->payload.userState->has_channel_id) { - Chan_playerJoin_id(msg->payload.userState->channel_id, client); + 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) { + Log_debug("Removing channel ID %d", leave_id); + sendmsg = Msg_create(ChannelRemove); + sendmsg->payload.channelRemove->channel_id = leave_id; + } + } + if (msg->payload.userState->plugin_context != NULL) { + if (client->context) + free(client->context); + client->context = strdup(msg->payload.userState->plugin_context); + if (client->context == NULL) + Log_fatal("Out of memory"); + + break; /* Don't inform other users about this state */ } + /* Re-use message */ Msg_inc_ref(msg); msg->payload.userState->has_actor = true; msg->payload.userState->actor = client->sessionId; Client_send_message_except(NULL, msg); + + /* Need to send remove channel message _after_ UserState message */ + if (sendmsg != NULL) + Client_send_message_except(NULL, sendmsg); break; case TextMessage: msg->payload.textMessage->has_actor = true; msg->payload.textMessage->actor = client->sessionId; - /* XXX - Allow HTML stuff? */ - + /* XXX - HTML is allowed and can't be turned off */ if (msg->payload.textMessage->n_tree_id > 0) { sendPermissionDenied(client, "Tree message not supported"); break; @@ -357,10 +398,11 @@ void Mh_handle_message(client_t *client, message_t *msg) while (Client_iterate(&itr) != NULL) { if (!IS_AUTH(itr)) continue; - if (itr->playerId == msg->payload.textMessage->session[i]) { + 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; } @@ -372,9 +414,28 @@ void Mh_handle_message(client_t *client, message_t *msg) break; case VoiceTarget: - /* XXX -TODO */ - break; + { + 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) { + if (target->has_links || target->has_children) + Log_warn("Whisper to children or linked channels not implemented. Ignoring."); + Voicetarget_add_channel(client, targetId, target->channel_id); + } + } + break; + } case Version: Log_debug("Version message received"); if (msg->payload.version->has_version) { @@ -392,23 +453,105 @@ void Mh_handle_message(client_t *client, message_t *msg) Log_debug("Client OS %s", client->os); } break; - case CodecVersion: + case PermissionQuery: Msg_inc_ref(msg); /* Re-use message */ - - /* XXX - fill in version */ + msg->payload.permissionQuery->has_permissions = true; + msg->payload.permissionQuery->permissions = PERM_DEFAULT; Client_send_message(client, msg); break; case UDPTunnel: Client_voiceMsg(client, msg->payload.UDPTunnel->packet.data, msg->payload.UDPTunnel->packet.len); break; + case ChannelState: + { + channel_t *ch_itr, *parent, *newchan; + int leave_id; + /* Don't allow any changes to existing channels */ + if (msg->payload.channelState->has_channel_id) { + sendPermissionDenied(client, "Not supported by uMurmur"); + break; + } + /* Must have parent */ + if (!msg->payload.channelState->has_parent) { + sendPermissionDenied(client, "Not supported by uMurmur"); + break; + } + /* Must have name */ + if (msg->payload.channelState->name == NULL) { + sendPermissionDenied(client, "Not supported by uMurmur"); + break; + } + /* Must be temporary channel */ + if (msg->payload.channelState->temporary != true) { + sendPermissionDenied(client, "Only temporary channels are supported by uMurmur"); + break; + } + /* Check channel name is OK */ + if (strlen(msg->payload.channelState->name) > MAX_TEXT) { + sendPermissionDenied(client, "Channel name too long"); + break; + } + + parent = Chan_fromId(msg->payload.channelState->parent); + if (parent == NULL) + break; + ch_itr = NULL; + while (Chan_iterate_siblings(parent, &ch_itr) != NULL) { + if (strcmp(ch_itr->name, msg->payload.channelState->name) == 0) { + sendPermissionDenied(client, "Channel already exists"); + break; + } + } + if (ch_itr != NULL) + break; + + /* Disallow temporary channels as siblings to temporary channels */ + if (parent->temporary) { + sendPermissionDenied(client, "Parent channel is temporary channel"); + break; + } + + /* XXX - Murmur looks for "\\w" and sends perm denied if not found. + * I don't know why so I don't do that here... + */ + + /* Create the channel */ + newchan = Chan_createChannel(msg->payload.channelState->name, + msg->payload.channelState->description); + newchan->temporary = true; + Chan_addChannel(parent, newchan); + msg->payload.channelState->has_channel_id = true; + msg->payload.channelState->channel_id = newchan->id; + Msg_inc_ref(msg); + Client_send_message_except(NULL, msg); + + /* Join the creating user */ + sendmsg = Msg_create(UserState); + sendmsg->payload.userState->has_session = true; + sendmsg->payload.userState->session = client->sessionId; + sendmsg->payload.userState->has_channel_id = true; + sendmsg->payload.userState->channel_id = newchan->id; + Client_send_message_except(NULL, sendmsg); + + leave_id = Chan_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; + /* Permission denied for all these messages. Not implemented. */ case ChannelRemove: - case ChannelState: case ContextAction: case ContextActionAdd: case ACL: case BanList: + case UserList: + case QueryUsers: sendPermissionDenied(client, "Not supported by uMurmur"); break; @@ -416,8 +559,10 @@ void Mh_handle_message(client_t *client, message_t *msg) Log_warn("Message %d not handled", msg->messageType); break; } +out: Msg_free(msg); return; + disconnect: Msg_free(msg); Client_close(client);