X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=ba76ed68520befedf1c9e0088055a80e2938b5c4;hb=2ae1e3a1e414732354074d163ee074c24ec9d3bb;hp=c69f65ed20ae90a6411034192aadd5bf4344736e;hpb=01e804f06e00c36c5680ebde07cbe17e6b256dc4;p=umurmur.git diff --git a/src/messagehandler.c b/src/messagehandler.c index c69f65e..ba76ed6 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -29,17 +29,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -#include +#include #include "log.h" #include "list.h" #include "client.h" #include "messages.h" +#include "messagehandler.h" #include "crypt.h" #include "channel.h" #include "conf.h" #include "voicetarget.h" +#define MAX_TEXT 512 + 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) @@ -82,21 +79,15 @@ void Mh_handle_message(client_t *client, message_t *msg) } switch (msg->messageType) { case Authenticate: - /* - * 1. Check stuff, Serverreject if not ok - * 2. Setup UDP encryption -> MessageCryptSetup - * 3. (Enter channel) - * 4. MessageChannelAdd + MessageChannelDescUpdate for all channels - * 5. (MessageChannelLink) - * 6. MessageServerJoin - * 7. MessagePlayerMove - * 8. MessageServerJoin for all connected users - * 9. PlayerDeaf/PlayerMute/PlayerSelfMuteDeaf for all users it applies to - * 10. MessageServerSync - */ - Log_debug("Authenticate message received"); - Log_debug("Username: %s", msg->payload.authenticate->username); + + if (IS_AUTH(client) || !msg->payload.authenticate->username) { + /* Authenticate message might be sent when a token is set by the user.*/ + if (msg->payload.authenticate->n_tokens > 0) { + Log_debug("Tokens in auth message from %s", client->username); + } + break; + } client->authenticated = true; @@ -104,7 +95,7 @@ void Mh_handle_message(client_t *client, message_t *msg) while (Client_iterate(&client_itr) != NULL) { if (!IS_AUTH(client_itr)) continue; - if (client_itr->playerName && strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) { + if (client_itr->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_TEXT) == 0) { char buf[64]; sprintf(buf, "Username already in use"); Log_debug("Username already in use"); @@ -112,12 +103,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? */ @@ -136,7 +129,7 @@ void Mh_handle_message(client_t *client, message_t *msg) } /* Name & password */ - client->playerName = strdup(msg->payload.authenticate->username); + client->username = strdup(msg->payload.authenticate->username); /* Setup UDP encryption */ CryptState_init(&client->cryptState); @@ -154,24 +147,24 @@ void Mh_handle_message(client_t *client, message_t *msg) Client_send_message(client, sendmsg); /* Channel stuff */ - Chan_playerJoin(defaultChan, client); /* Join default channel */ + Chan_userJoin(defaultChan, client); /* Join default channel */ - /* Codec version */ - if (msg->payload.authenticate->n_celt_versions > MAX_CODECS) - Log_warn("Client has more than %d CELT codecs. Ignoring %d codecs", - MAX_CODECS, msg->payload.authenticate->n_celt_versions - MAX_CODECS); - - Log_debug("Client %d has %d CELT codecs", client->sessionId, msg->payload.authenticate->n_celt_versions); + /* Codec version */ + Log_debug("Client %d has %d CELT codecs", client->sessionId, + msg->payload.authenticate->n_celt_versions); if (msg->payload.authenticate->n_celt_versions > 0) { int i; - client->codec_count = msg->payload.authenticate->n_celt_versions > MAX_CODECS ? - MAX_CODECS : msg->payload.authenticate->n_celt_versions; - for (i = 0; i < client->codec_count; i++) { - client->codecs[i] = msg->payload.authenticate->celt_versions[i]; - Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, client->codecs[i]); - } + codec_t *codec_itr; + client->codec_count = msg->payload.authenticate->n_celt_versions; + + for (i = 0; i < client->codec_count; i++) + Client_codec_add(client, msg->payload.authenticate->celt_versions[i]); + codec_itr = NULL; + while (Client_codec_iterate(client, &codec_itr) != NULL) + Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, codec_itr->codec); + } else { - client->codecs[0] = (int32_t)0x8000000a; + Client_codec_add(client, (int32_t)0x8000000a); client->codec_count = 1; } @@ -185,8 +178,7 @@ void Mh_handle_message(client_t *client, message_t *msg) /* Iterate channels and send channel info */ ch_itr = NULL; - Chan_iterate(&ch_itr); - do { + while (Chan_iterate(&ch_itr) != NULL) { sendmsg = Msg_create(ChannelState); sendmsg->payload.channelState->has_channel_id = true; sendmsg->payload.channelState->channel_id = ch_itr->id; @@ -195,16 +187,35 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.channelState->parent = ch_itr->parent->id; } sendmsg->payload.channelState->name = strdup(ch_itr->name); - if (strlen(ch_itr->desc) > 0) { + if (ch_itr->desc) sendmsg->payload.channelState->description = strdup(ch_itr->desc); - } Log_debug("Send channel info: %s", sendmsg->payload.channelState->name); - Client_send_message(client, sendmsg); - - Chan_iterate(&ch_itr); - } while (ch_itr != NULL); + Client_send_message(client, sendmsg); + } - /* Not supporting channel links yet */ + /* Iterate channels and send channel links info */ + ch_itr = NULL; + while (Chan_iterate(&ch_itr) != NULL) { + if (ch_itr->linkcount > 0) { /* Has links */ + uint32_t *links; + int i = 0; + struct dlist *itr; + + sendmsg = Msg_create(ChannelState); + sendmsg->payload.channelState->has_channel_id = true; + sendmsg->payload.channelState->channel_id = ch_itr->id; + sendmsg->payload.channelState->n_links = ch_itr->linkcount; + + links = (uint32_t *)malloc(ch_itr->linkcount * sizeof(uint32_t)); + list_iterate(itr, &ch_itr->channel_links) { /* Iterate links */ + channel_t *ch; + ch = list_get_entry(itr, channel_t, link_node); + links[i++] = ch->id; + } + sendmsg->payload.channelState->links = links; + Client_send_message(client, sendmsg); + } + } /* Send user state for connecting user to other users */ sendmsg = Msg_create(UserState); @@ -212,7 +223,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->session = client->sessionId; sendmsg->payload.userState->has_user_id = true; sendmsg->payload.userState->user_id = client->sessionId; - sendmsg->payload.userState->name = strdup(client->playerName); + sendmsg->payload.userState->name = strdup(client->username); sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id; @@ -225,7 +236,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg = Msg_create(UserState); sendmsg->payload.userState->has_session = true; sendmsg->payload.userState->session = client_itr->sessionId; - sendmsg->payload.userState->name = strdup(client_itr->playerName); + sendmsg->payload.userState->name = strdup(client_itr->username); sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id; @@ -252,7 +263,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->username); break; case Ping: @@ -326,9 +337,9 @@ 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)) + if (!Chan_userJoin_id_test(msg->payload.userState->channel_id)) break; - leave_id = Chan_playerJoin_id(msg->payload.userState->channel_id, client); + leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, client); if (leave_id > 0) { Log_debug("Removing channel ID %d", leave_id); sendmsg = Msg_create(ChannelRemove); @@ -374,9 +385,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; @@ -429,9 +438,12 @@ void Mh_handle_message(client_t *client, message_t *msg) for (j = 0; j < target->n_session; j++) Voicetarget_add_session(client, targetId, target->session[j]); if (target->has_channel_id) { - if (target->has_links || target->has_children) - Log_warn("Whisper to children or linked channels not implemented. Ignoring."); - Voicetarget_add_channel(client, targetId, target->channel_id); + bool_t linked = false, children = false; + if (target->has_links) + linked = target->links; + if (target->has_children) + children = target->children; + Voicetarget_add_channel(client, targetId, target->channel_id, linked, children); } } break; @@ -461,6 +473,7 @@ void Mh_handle_message(client_t *client, message_t *msg) Client_send_message(client, msg); break; case UDPTunnel: + client->bUDP = false; Client_voiceMsg(client, msg->payload.UDPTunnel->packet.data, msg->payload.UDPTunnel->packet.len); break; case ChannelState: @@ -534,7 +547,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->channel_id = newchan->id; Client_send_message_except(NULL, sendmsg); - leave_id = Chan_playerJoin(newchan, client); + leave_id = Chan_userJoin(newchan, client); if (leave_id > 0) { Log_debug("Removing channel ID %d", leave_id); sendmsg = Msg_create(ChannelRemove);