X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=4b6c39659dc75a75477b2ae8cf53d43c553a8f5b;hb=454ad122eb158b4391e2690fe6a7e127d24c525b;hp=d20ccba1504cb08f598ced4eadd4299767cf1904;hpb=8257d7bc7490052bf9d9265e16a3d43769c701e3;p=umurmur.git diff --git a/src/messagehandler.c b/src/messagehandler.c index d20ccba..4b6c396 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -42,6 +42,7 @@ #include "voicetarget.h" #define MAX_TEXT 512 +#define MAX_USERNAME 128 extern channel_t *defaultChan; extern int iCodecAlpha, iCodecBeta; @@ -76,7 +77,20 @@ void Mh_handle_message(client_t *client, message_t *msg) if (!client->authenticated && !(msg->messageType == Authenticate || msg->messageType == Version)) { goto out; - } + } + + switch (msg->messageType) { + case UDPTunnel: + case Ping: + case CryptSetup: + case VoiceTarget: + case UserStats: + case PermissionQuery: + break; + default: + Timer_restart(&client->idleTime); + } + switch (msg->messageType) { case Authenticate: Log_debug("Authenticate message received"); @@ -95,7 +109,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->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_TEXT) == 0) { + if (client_itr->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_USERNAME) == 0) { char buf[64]; sprintf(buf, "Username already in use"); Log_debug("Username already in use"); @@ -104,16 +118,19 @@ void Mh_handle_message(client_t *client, message_t *msg) } } if (strlen(getStrConf(PASSPHRASE)) > 0) { - if (!msg->payload.authenticate->password || strncmp(getStrConf(PASSPHRASE), msg->payload.authenticate->password, MAX_TEXT) != 0) { + if (!msg->payload.authenticate->password || + (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); + Log_debug("Wrong server password: '%s'", msg->payload.authenticate->password != NULL ? + msg->payload.authenticate->password : "(null)"); goto disconnect; } } if (strlen(msg->payload.authenticate->username) == 0 || - strlen(msg->payload.authenticate->username) >= MAX_TEXT) { /* XXX - other invalid names? */ + strlen(msg->payload.authenticate->username) >= MAX_USERNAME) { /* XXX - other invalid names? */ char buf[64]; sprintf(buf, "Invalid username"); Log_debug("Invalid username"); @@ -123,7 +140,7 @@ void Mh_handle_message(client_t *client, message_t *msg) if (Client_count() >= getIntConf(MAX_CLIENTS)) { char buf[64]; - sprintf(buf, "Server is full (max %d users)", getIntConf(MAX_CLIENTS)); + snprintf(buf, 64, "Server is full (max %d users)", getIntConf(MAX_CLIENTS)); sendServerReject(client, buf, MUMBLE_PROTO__REJECT__REJECT_TYPE__ServerFull); goto disconnect; } @@ -224,7 +241,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->name = strdup(client->username); sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id; - + Client_send_message_except(client, sendmsg); client_itr = NULL; @@ -247,6 +264,10 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->has_self_mute = true; sendmsg->payload.userState->self_mute = true; } + if (client_itr->recording) { + sendmsg->payload.userState->has_recording = true; + sendmsg->payload.userState->recording = true; + } Client_send_message(client, sendmsg); } @@ -257,10 +278,18 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.serverSync->welcome_text = strdup(getStrConf(WELCOMETEXT)); 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 = true; /* Support this? */ Client_send_message(client, sendmsg); - + + /* Server config message */ + sendmsg = Msg_create(ServerConfig); + sendmsg->payload.serverConfig->has_allow_html = true; + sendmsg->payload.serverConfig->allow_html = true; /* Support this? */ + sendmsg->payload.serverConfig->has_message_length = true; + sendmsg->payload.serverConfig->message_length = MAX_TEXT; /* Hardcoded */ + sendmsg->payload.serverConfig->has_image_message_length = true; + sendmsg->payload.serverConfig->image_message_length = 0; /* XXX */ + Client_send_message(client, sendmsg); + Log_info_client(client, "User %s authenticated", client->username); break; @@ -279,7 +308,12 @@ void Mh_handle_message(client_t *client, message_t *msg) client->cryptState.uiRemoteLost, client->cryptState.uiRemoteResync ); - /* Ignoring the double values since they don't seem to be used */ + client->UDPPingAvg = msg->payload.ping->udp_ping_avg; + client->UDPPingVar = msg->payload.ping->udp_ping_var; + client->TCPPingAvg = msg->payload.ping->tcp_ping_avg; + client->TCPPingVar = msg->payload.ping->tcp_ping_var; + client->UDPPackets = msg->payload.ping->udp_packets; + client->TCPPackets = msg->payload.ping->tcp_packets; sendmsg = Msg_create(Ping); @@ -344,6 +378,30 @@ void Mh_handle_message(client_t *client, message_t *msg) client->deaf = false; } } + if (msg->payload.userState->has_recording && + msg->payload.userState->recording != client->recording) { + client->recording = msg->payload.userState->recording; + char *message; + uint32_t *tree_id; + + message = malloc(strlen(client->username) + 32); + if (!message) + Log_fatal("Out of memory"); + tree_id = malloc(sizeof(uint32_t)); + if (!tree_id) + Log_fatal("Out of memory"); + *tree_id = 0; + sendmsg = Msg_create(TextMessage); + sendmsg->payload.textMessage->message = message; + sendmsg->payload.textMessage->n_tree_id = 1; + sendmsg->payload.textMessage->tree_id = tree_id; + if (client->recording) + sprintf(message, "User %s started recording", client->username); + else + sprintf(message, "User %s stopped recording", client->username); + Client_send_message_except_ver(NULL, sendmsg, ~0x010203); + sendmsg = NULL; + } if (msg->payload.userState->has_channel_id) { int leave_id; if (!Chan_userJoin_id_test(msg->payload.userState->channel_id)) @@ -355,16 +413,17 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.channelRemove->channel_id = leave_id; } } - if (msg->payload.userState->plugin_context != NULL) { + if (msg->payload.userState->has_plugin_context) { if (client->context) free(client->context); - client->context = strdup(msg->payload.userState->plugin_context); + client->context = malloc(msg->payload.userState->plugin_context.len); if (client->context == NULL) Log_fatal("Out of memory"); + memcpy(client->context, msg->payload.userState->plugin_context.data, + msg->payload.userState->plugin_context.len); break; /* Don't inform other users about this state */ } - /* Re-use message */ Msg_inc_ref(msg); @@ -472,6 +531,11 @@ void Mh_handle_message(client_t *client, message_t *msg) client->os = strdup(msg->payload.version->os); Log_debug("Client OS %s", client->os); } + if (msg->payload.version->os_version) { + if (client->os_version) free(client->os_version); + client->os_version = strdup(msg->payload.version->os_version); + Log_debug("Client OS version %s", client->os_version); + } break; case PermissionQuery: Msg_inc_ref(msg); /* Re-use message */ @@ -565,6 +629,106 @@ void Mh_handle_message(client_t *client, message_t *msg) } break; + case UserStats: + { + client_t *target = NULL; + codec_t *codec_itr = NULL; + int i; + bool_t details = true; + + if (msg->payload.userStats->has_stats_only) + details = !msg->payload.userStats->stats_only; + + if (!msg->payload.userStats->has_session) + sendPermissionDenied(client, "Not supported by uMurmur"); + while (Client_iterate(&target) != NULL) { + if (!IS_AUTH(target)) + continue; + if (target->sessionId == msg->payload.userStats->session) + break; + } + if (!target) /* Not found */ + break; + + /* + * Differences from Murmur: + * o Ignoring certificates intentionally + * o Ignoring channel local determining + */ + + sendmsg = Msg_create(UserStats); + sendmsg->payload.userStats->session = msg->payload.userStats->session; + sendmsg->payload.userStats->from_client->has_good = true; + sendmsg->payload.userStats->from_client->good = target->cryptState.uiGood; + sendmsg->payload.userStats->from_client->has_late = true; + sendmsg->payload.userStats->from_client->late = target->cryptState.uiLate; + sendmsg->payload.userStats->from_client->has_lost = true; + sendmsg->payload.userStats->from_client->lost = target->cryptState.uiLost; + sendmsg->payload.userStats->from_client->has_resync = true; + sendmsg->payload.userStats->from_client->resync = target->cryptState.uiResync; + + sendmsg->payload.userStats->from_server->has_good = true; + sendmsg->payload.userStats->from_server->good = target->cryptState.uiRemoteGood; + sendmsg->payload.userStats->from_server->has_late = true; + sendmsg->payload.userStats->from_server->late = target->cryptState.uiRemoteLate; + sendmsg->payload.userStats->from_server->has_lost = true; + sendmsg->payload.userStats->from_server->lost = target->cryptState.uiRemoteLost; + sendmsg->payload.userStats->from_server->has_resync = true; + sendmsg->payload.userStats->from_server->resync = target->cryptState.uiRemoteResync; + + sendmsg->payload.userStats->has_udp_packets = true; + sendmsg->payload.userStats->udp_packets = target->UDPPackets; + sendmsg->payload.userStats->has_udp_ping_avg = true; + sendmsg->payload.userStats->udp_ping_avg = target->UDPPingAvg; + sendmsg->payload.userStats->has_udp_ping_var = true; + sendmsg->payload.userStats->udp_ping_var = target->UDPPingVar; + + sendmsg->payload.userStats->has_tcp_ping_avg = true; + sendmsg->payload.userStats->tcp_ping_avg = target->TCPPingAvg; + sendmsg->payload.userStats->has_tcp_ping_var = true; + sendmsg->payload.userStats->tcp_ping_var = target->TCPPingVar; + sendmsg->payload.userStats->has_tcp_packets = true; + sendmsg->payload.userStats->tcp_packets = target->TCPPackets; + + if (details) { + + 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); + + sendmsg->payload.userStats->n_celt_versions = target->codec_count; + sendmsg->payload.userStats->celt_versions = malloc(sizeof(int32_t) * target->codec_count); + if (!sendmsg->payload.userStats->celt_versions) + Log_fatal("Out of memory"); + i = 0; + while (Client_codec_iterate(target, &codec_itr) != NULL) + sendmsg->payload.userStats->celt_versions[i++] = codec_itr->codec; + + /* Address */ + sendmsg->payload.userStats->has_address = true; + sendmsg->payload.userStats->address.data = malloc(sizeof(uint8_t) * 16); + if (!sendmsg->payload.userStats->address.data) + Log_fatal("Out of memory"); + memset(sendmsg->payload.userStats->address.data, 0, 16); + /* ipv4 representation as ipv6 address. Supposedly correct. */ + memcpy(&sendmsg->payload.userStats->address.data[12], &target->remote_tcp.sin_addr, 4); + sendmsg->payload.userStats->address.len = 16; + } + /* BW */ + sendmsg->payload.userStats->has_bandwidth = true; + sendmsg->payload.userStats->bandwidth = target->availableBandwidth; + + /* Onlinesecs */ + sendmsg->payload.userStats->has_onlinesecs = true; + sendmsg->payload.userStats->onlinesecs = Timer_elapsed(&target->connectTime) / 1000000LL; + /* Idlesecs */ + sendmsg->payload.userStats->has_idlesecs = true; + sendmsg->payload.userStats->idlesecs = Timer_elapsed(&target->idleTime) / 1000000LL; + Client_send_message(client, sendmsg); + } + break; /* Permission denied for all these messages. Not implemented. */ case ChannelRemove: case ContextAction: