X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=1e49241890d6252664522f06177a88a3d956e49a;hb=36601a5de5f90e16188deadd271b70595b4cc237;hp=fc489fd392e7e1eba7fe4ef011327b2331f5d25c;hpb=dc46deeb538be794a3cf368d5494731925f66fda;p=umurmur.git diff --git a/src/messagehandler.c b/src/messagehandler.c index fc489fd..1e49241 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2012, Martin Johansson - Copyright (C) 2005-2012, Thorvald Natvig +/* Copyright (C) 2009-2013, Martin Johansson + Copyright (C) 2005-2013, Thorvald Natvig All rights reserved. @@ -45,9 +45,14 @@ #define MAX_TEXT 512 #define MAX_USERNAME 128 +#define NO_CELT_MESSAGE "WARNING: 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) { @@ -224,18 +229,27 @@ void Mh_handle_message(client_t *client, message_t *msg) 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; } + if (msg->payload.authenticate->opus) + client->bOpus = true; - recheckCodecVersions(); + 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) { @@ -249,6 +263,10 @@ 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); } @@ -447,6 +465,10 @@ void Mh_handle_message(client_t *client, message_t *msg) } 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; @@ -485,16 +507,19 @@ void Mh_handle_message(client_t *client, message_t *msg) channelJoinResult_t chjoin_rc = Chan_userJoin_id_test(msg->payload.userState->channel_id, target); if (chjoin_rc != CHJOIN_OK) { - if (chjoin_rc == CHJOIN_WRONGPW && target == client && !client->isAdmin) { - sendPermissionDenied(client, "Wrong channel password"); - break; + if (chjoin_rc == 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; } - /* 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 pchannel password. - * Take no action on other errors. - */ - else if (!(chjoin_rc == CHJOIN_WRONGPW && (target != client || client->isAdmin))) - break; + else break; } leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, target); @@ -550,7 +575,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); @@ -568,7 +593,7 @@ void Mh_handle_message(client_t *client, message_t *msg) if (!IS_AUTH(itr)) continue; if (itr->sessionId == msg->payload.textMessage->session[i]) { - if (!itr->deaf) { + if (!itr->deaf && !itr->self_deaf) { Msg_inc_ref(msg); Client_send_message(itr, msg); Log_debug("Text message to session ID %d", itr->sessionId); @@ -707,6 +732,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; @@ -796,9 +823,12 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userStats->version->has_version = true; sendmsg->payload.userStats->version->version = target->version; - sendmsg->payload.userStats->version->release = strdup(target->release); - sendmsg->payload.userStats->version->os = strdup(target->os); - sendmsg->payload.userStats->version->os_version = strdup(target->os_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 = malloc(sizeof(int32_t) * target->codec_count); @@ -808,6 +838,9 @@ void Mh_handle_message(client_t *client, message_t *msg) 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 */ sendmsg->payload.userStats->has_address = true; sendmsg->payload.userStats->address.data = malloc(sizeof(uint8_t) * 16);