-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#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;
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)
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:
/*
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? */
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);
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;
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:
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)
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;
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;
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:
Log_warn("Message %d not handled", msg->messageType);
break;
}
+out:
Msg_free(msg);
return;
+
disconnect:
Msg_free(msg);
Client_close(client);
projects / umurmur.git / blobdiff