X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=58ffb2514294f3656f5567687a9e4b63fdad70f1;hb=a1013f3e2787bee84a06fbb9f6986d63bcec2846;hp=706e3f5bfa98f277e2c63b51218791e158824521;hpb=8f46c2a3cb1e906c68cd658469974d1ab3761d4d;p=umurmur.git diff --git a/src/client.c b/src/client.c index 706e3f5..58ffb25 100644 --- a/src/client.c +++ b/src/client.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. @@ -39,9 +39,10 @@ #include "messagehandler.h" #include "conf.h" #include "channel.h" +#include "version.h" +#include "voicetarget.h" -/* Version 0.2.0 XXX fixme */ -const uint32_t versionBlob = 1<<16 | 2<<8 | 0; +extern char system_string[], version_string[]; static int Client_read(client_t *client); static int Client_write(client_t *client); @@ -53,14 +54,14 @@ static int clientcount; /* = 0 */ static int session = 1; static int maxBandwidth; -static int iCodecAlpha, iCodecBeta; -static bool_t bPreferAlpha; +int iCodecAlpha, iCodecBeta; +bool_t bPreferAlpha; extern int udpsock; void Client_init() { - maxBandwidth = getIntConf(MAX_BANDWIDTH); + maxBandwidth = getIntConf(MAX_BANDWIDTH) / 8; /* From bits/s -> bytes/s */ } int Client_count() @@ -98,7 +99,11 @@ void Client_janitor() if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) { /* No activity from client - assume it is lost and close. */ - Log_info("Session ID %d timeout - closing", c->sessionId); + Log_info("Timeout, closing session %d - %s@%s:%d", + c->sessionId, + c->playerName, + inet_ntoa(c->remote_tcp.sin_addr), + ntohs(c->remote_tcp.sin_port)); Client_free(c); } } @@ -107,7 +112,7 @@ void Client_janitor() void recheckCodecVersions() { int codec_map[MAX_CODECS][2]; - client_t *itr; + client_t *itr = NULL; int i, codecindex, max = 0, version, current_version; message_t *sendmsg; @@ -115,15 +120,16 @@ void recheckCodecVersions() while (Client_iterate(&itr) != NULL) { for (i = 0; i < itr->codec_count; i++) { for (codecindex = 0; codecindex < MAX_CODECS; codecindex++) { - if (codec_map[codecindex][0] == 0) + if (codec_map[codecindex][0] == 0) { codec_map[codecindex][0] = itr->codecs[i]; + codec_map[codecindex][1] = 1; + break; + } if (itr->codecs[i] == codec_map[codecindex][0]) codec_map[codecindex][1]++; } } } - if (codec_map[codecindex][0] == 0) - return; for (codecindex = 0; codecindex < MAX_CODECS; codecindex++) { if (codec_map[codecindex][0] == 0) break; @@ -152,9 +158,12 @@ void recheckCodecVersions() sendmsg = Msg_create(CodecVersion); sendmsg->payload.codecVersion->alpha = version; sendmsg->payload.codecVersion->beta = version; - sendmsg->payload.codecVersion->beta = bPreferAlpha; + sendmsg->payload.codecVersion->prefer_alpha = bPreferAlpha; Client_send_message_except(NULL, sendmsg); - + + Log_info("CELT codec switch 0x%x 0x%x (prefer 0x%x)", iCodecAlpha, iCodecBeta, + bPreferAlpha ? iCodecAlpha : iCodecBeta); + } int Client_add(int fd, struct sockaddr_in *remote) @@ -182,6 +191,7 @@ int Client_add(int fd, struct sockaddr_in *remote) init_list_entry(&newclient->txMsgQueue); init_list_entry(&newclient->chan_node); init_list_entry(&newclient->node); + init_list_entry(&newclient->voicetargets); list_add_tail(&newclient->node, &clients); clientcount++; @@ -189,10 +199,10 @@ int Client_add(int fd, struct sockaddr_in *remote) /* Send version message to client */ sendmsg = Msg_create(Version); sendmsg->payload.version->has_version = true; - sendmsg->payload.version->version = (1 << 16) | (2 << 8) | 0; /* XXX fix */ - sendmsg->payload.version->release = strdup("1.2.0"); - sendmsg->payload.version->os = strdup("Linux/OpenWRT"); - + sendmsg->payload.version->version = PROTOCOL_VERSION; + sendmsg->payload.version->release = strdup(UMURMUR_VERSION); + sendmsg->payload.version->os = strdup(system_string); + sendmsg->payload.version->os_version = strdup(version_string); Client_send_message(newclient, sendmsg); return 0; @@ -203,7 +213,9 @@ void Client_free(client_t *client) struct dlist *itr, *save; message_t *sendmsg; - Log_info("Disconnect client ID %d addr %s port %d", client->sessionId, + Log_info("Disconnect session %d - %s@%s:%d", + client->sessionId, + client->playerName, inet_ntoa(client->remote_tcp.sin_addr), ntohs(client->remote_tcp.sin_port)); @@ -216,13 +228,22 @@ void Client_free(client_t *client) list_del(&list_get_entry(itr, message_t, node)->node); Msg_free(list_get_entry(itr, message_t, node)); } - + Voicetarget_free_all(client); + list_del(&client->node); list_del(&client->chan_node); if (client->ssl) SSL_free(client->ssl); close(client->tcpfd); clientcount--; + if (client->release) + free(client->release); + if (client->os) + free(client->os); + if (client->playerName) + free(client->playerName); + if (client->context) + free(client->context); free(client); } @@ -247,7 +268,7 @@ int Client_read_fd(int fd) client_t *client = NULL; list_iterate(itr, &clients) { - if(fd == list_get_entry(itr, client_t, node)->tcpfd) { + if (fd == list_get_entry(itr, client_t, node)->tcpfd) { client = list_get_entry(itr, client_t, node); break; } @@ -286,7 +307,7 @@ int Client_read(client_t *client) do { errno = 0; if (!client->msgsize) - rc = SSL_read(client->ssl, client->rxbuf, 6 - client->rxcount); + rc = SSL_read(client->ssl, &client->rxbuf[client->rxcount], 6 - client->rxcount); else if (client->drainleft > 0) rc = SSL_read(client->ssl, client->rxbuf, client->drainleft > BUFSIZE ? BUFSIZE : client->drainleft); else @@ -298,8 +319,9 @@ int Client_read(client_t *client) else { client->rxcount += rc; if (!client->msgsize && client->rxcount >= 6) { - uint32_t *msgLen = (uint32_t *) &client->rxbuf[2]; - client->msgsize = ntohl(*msgLen); + uint32_t msgLen; + memcpy(&msgLen, &client->rxbuf[2], sizeof(uint32_t)); + client->msgsize = ntohl(msgLen); } if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) { Log_warn("Too big message received (%d). Discarding.", client->msgsize); @@ -332,7 +354,11 @@ int Client_read(client_t *client) /* Hmm. This is where we end up when the client closes its connection. * Kind of strange... */ - Log_info("Connection closed by peer"); + Log_info("Connection closed by peer. Session %d - %s@%s:%d", + client->sessionId, + client->playerName, + inet_ntoa(client->remote_tcp.sin_addr), + ntohs(client->remote_tcp.sin_port)); } else { Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc)); @@ -489,7 +515,12 @@ static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t * Timer_restart(&client->cryptState.tLastRequest); sendmsg = Msg_create(CryptSetup); - Log_info("Requesting voice channel crypt resync"); + Log_info("Requesting voice channel crypt resync. Session %d - %s@%s:%d", + client->sessionId, + client->playerName, + inet_ntoa(client->remote_tcp.sin_addr), + ntohs(client->remote_tcp.sin_port)); + Client_send_message(client, sendmsg); } } @@ -529,11 +560,11 @@ int Client_read_udp() /* Ping packet */ if (len == 12 && *encrypted == 0) { uint32_t *ping = (uint32_t *)encrypted; - ping[0] = htons(versionBlob); + ping[0] = htonl((uint32_t)PROTOCOL_VERSION); // 1 and 2 will be the timestamp, which we return unmodified. - ping[3] = htons((uint32_t)clientcount); - ping[4] = htons((uint32_t)getIntConf(MAX_CLIENTS)); - ping[5] = htons((uint32_t)getIntConf(MAX_BANDWIDTH)); + ping[3] = htonl((uint32_t)clientcount); + ping[4] = htonl((uint32_t)getIntConf(MAX_CLIENTS)); + ping[5] = htonl((uint32_t)getIntConf(MAX_BANDWIDTH)); sendto(udpsock, encrypted, 6 * sizeof(uint32_t), 0, (struct sockaddr *)&from, fromlen); return 0; @@ -554,7 +585,11 @@ int Client_read_udp() if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) { if (checkDecrypt(itr, encrypted, buffer, len)) { itr->key = key; - Log_info("New UDP connection from %s port %d sessionId %d", inet_ntoa(from.sin_addr), ntohs(from.sin_port), itr->sessionId); + Log_info("New UDP connection from session %d - %s@%s:%d", + itr->sessionId, + itr->playerName, + inet_ntoa(from.sin_addr), + ntohs(from.sin_port)); memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in)); break; } @@ -575,6 +610,7 @@ int Client_read_udp() Client_voiceMsg(itr, buffer, len); break; case UDPPing: + Log_debug("UDP Ping reply len %d", len); Client_send_udp(itr, buffer, len); break; default: @@ -585,6 +621,16 @@ out: return 0; } +static inline void Client_send_voice(client_t *src, client_t *dst, uint8_t *data, int len, int poslen) +{ + if (IS_AUTH(dst) && dst != src && !dst->deaf) { + if (poslen > 0 && strcmp(src->context, dst->context) == 0) + Client_send_udp(dst, data, len); + else + Client_send_udp(dst, data, len - poslen); + } +} + /* Handle decrypted voice message */ int Client_voiceMsg(client_t *client, uint8_t *data, int len) { @@ -595,7 +641,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) unsigned int target = data[0] & 0x1f; unsigned int poslen, counter; int offset, packetsize; - + voicetarget_t *vt; + channel_t *ch = (channel_t *)client->channel; struct dlist *itr; @@ -613,12 +660,12 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) offset = Pds_skip(pdi, counter & 0x7f); } while ((counter & 0x80) && offset > 0); - poslen = pdi->maxsize - pdi->offset; /* XXX - Add stripping of positional audio */ + poslen = pdi->maxsize - pdi->offset; /* For stripping of positional info */ Pds_add_numval(pds, client->sessionId); Pds_append_data_nosize(pds, data + 1, len - 1); - if (target & 0x1f) { /* Loopback */ + if (target == 0x1f) { /* Loopback */ buffer[0] = (uint8_t) type; Client_send_udp(client, buffer, pds->offset + 1); } @@ -631,12 +678,49 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) list_iterate(itr, &ch->clients) { client_t *c; c = list_get_entry(itr, client_t, chan_node); - if (c != client && !c->deaf) { - Client_send_udp(c, buffer, pds->offset + 1); + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); + } + /* Channel links */ + if (!list_empty(&ch->channel_links)) { + struct dlist *ch_itr; + list_iterate(ch_itr, &ch->channel_links) { + channel_t *ch_link; + ch_link = list_get_entry(ch_itr, channel_t, link_node); + list_iterate(itr, &ch_link->clients) { + client_t *c; + c = list_get_entry(itr, client_t, chan_node); + Log_debug("Linked voice from %s -> %s", ch->name, ch_link->name); + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); + } + } + } + } else if ((vt = Voicetarget_get_id(client, target)) != NULL) { /* Targeted whisper */ + int i; + channel_t *ch; + /* Channels */ + for (i = 0; i < TARGET_MAX_CHANNELS && vt->channels[i] != -1; i++) { + Log_debug("Whisper channel %d", vt->channels[i]); + ch = Chan_fromId(vt->channels[i]); + if (ch == NULL) + continue; + list_iterate(itr, &ch->clients) { + client_t *c; + c = list_get_entry(itr, client_t, chan_node); + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); + } + } + /* Sessions */ + for (i = 0; i < TARGET_MAX_SESSIONS && vt->sessions[i] != -1; i++) { + client_t *c; + Log_debug("Whisper session %d", vt->sessions[i]); + while (Client_iterate(&c) != NULL) { + if (c->sessionId == vt->sessions[i]) { + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); + break; + } } } } - /* XXX - Add targeted whisper here */ out: Pds_free(pds); Pds_free(pdi);