X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=baf6247d6ad1f644c16bf9e16fa59cc0e76b9650;hb=a72efcd9b1c000c47bbe363f51c9123528e41d84;hp=2b8934594f68240068e80591df19931a26ff3548;hpb=401bf05f273f514ae3bbf0f16d19dd8eb471255e;p=umurmur.git diff --git a/src/client.c b/src/client.c index 2b89345..baf6247 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. @@ -40,6 +40,9 @@ #include "conf.h" #include "channel.h" #include "version.h" +#include "voicetarget.h" + +extern char system_string[], version_string[]; static int Client_read(client_t *client); static int Client_write(client_t *client); @@ -48,7 +51,6 @@ void Client_free(client_t *client); declare_list(clients); static int clientcount; /* = 0 */ -static int session = 1; static int maxBandwidth; int iCodecAlpha, iCodecBeta; @@ -89,14 +91,14 @@ void Client_janitor() list_iterate(itr, &clients) { client_t *c; c = list_get_entry(itr, client_t, node); - Log_debug("Client %s BW available %d", c->playerName, c->availableBandwidth); + Log_debug("Client %s BW available %d", c->username, c->availableBandwidth); c->availableBandwidth += maxBandwidth; if (c->availableBandwidth > bwTop) c->availableBandwidth = bwTop; 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_client(c, "Timeout, closing."); Client_free(c); } } @@ -105,7 +107,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; @@ -113,15 +115,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; @@ -158,6 +161,23 @@ void recheckCodecVersions() } +static int findFreeSessionId() +{ + int id; + client_t *itr = NULL; + + for (id = 1; id < INT_MAX; id++) { + itr = NULL; + while ((itr = Client_iterate(&itr)) != NULL) { + if (itr->sessionId == id) + break; + } + if (itr == NULL) /* Found free id */ + return id; + } + return -1; +} + int Client_add(int fd, struct sockaddr_in *remote) { client_t *newclient; @@ -172,17 +192,21 @@ int Client_add(int fd, struct sockaddr_in *remote) memcpy(&newclient->remote_tcp, remote, sizeof(struct sockaddr_in)); newclient->ssl = SSL_newconnection(newclient->tcpfd, &newclient->SSLready); if (newclient->ssl == NULL) { - Log_warn("SSL negotiation failed"); + Log_warn("SSL negotiation failed with %s:%d", inet_ntoa(remote->sin_addr), + ntohs(remote->sin_port)); free(newclient); return -1; } newclient->availableBandwidth = maxBandwidth; Timer_init(&newclient->lastActivity); - newclient->sessionId = session++; /* XXX - more elaborate? */ + newclient->sessionId = findFreeSessionId(); + if (newclient->sessionId < 0) + Log_fatal("Could not find a free session ID"); 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++; @@ -192,9 +216,8 @@ int Client_add(int fd, struct sockaddr_in *remote) sendmsg->payload.version->has_version = true; sendmsg->payload.version->version = PROTOCOL_VERSION; sendmsg->payload.version->release = strdup(UMURMUR_VERSION); - /* XXX - set OS to something relevant? */ - /* sendmsg->payload.version->os = strdup("Linux/OpenWRT"); */ - + sendmsg->payload.version->os = strdup(system_string); + sendmsg->payload.version->os_version = strdup(version_string); Client_send_message(newclient, sendmsg); return 0; @@ -205,11 +228,14 @@ 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, - inet_ntoa(client->remote_tcp.sin_addr), - ntohs(client->remote_tcp.sin_port)); - if (client->authenticated) { + int leave_id; + leave_id = Chan_userLeave(client); + if (leave_id > 0) { /* Remove temp channel */ + sendmsg = Msg_create(ChannelRemove); + sendmsg->payload.channelRemove->channel_id = leave_id; + Client_send_message_except(client, sendmsg); + } sendmsg = Msg_create(UserRemove); sendmsg->payload.userRemove->session = client->sessionId; Client_send_message_except(client, sendmsg); @@ -218,9 +244,9 @@ 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); @@ -229,8 +255,10 @@ void Client_free(client_t *client) free(client->release); if (client->os) free(client->os); - if (client->playerName) - free(client->playerName); + if (client->username) + free(client->username); + if (client->context) + free(client->context); free(client); } @@ -255,7 +283,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; } @@ -294,7 +322,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 @@ -306,11 +334,12 @@ 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); + Log_info_client(client, "Too big message received (%d bytes). Discarding.", client->msgsize); client->rxcount = client->msgsize = 0; client->drainleft = client->msgsize; } @@ -331,7 +360,7 @@ int Client_read(client_t *client) return 0; } else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_ZERO_RETURN) { - Log_warn("Error: Zero return - closing"); + Log_info_client(client, "Connection closed by peer"); if (!client->shutdown_wait) Client_close(client); } @@ -340,10 +369,10 @@ 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_client(client, "Connection closed by peer"); } else { - Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc)); + Log_info_client(client, "SSL error: %d - Closing connection", SSL_get_error(client->ssl, rc)); } Client_free(client); return -1; @@ -472,7 +501,7 @@ int Client_send_message_except(client_t *client, message_t *msg) if (itr != client) { if (count++ > 0) Msg_inc_ref(msg); /* One extra reference for each new copy */ - Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->playerName, msg->refcount); + Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->username, msg->refcount); Client_send_message(itr, msg); } } @@ -497,7 +526,7 @@ 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_client(client, "Requesting voice channel crypt resync"); Client_send_message(client, sendmsg); } } @@ -562,7 +591,7 @@ 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_client(itr, "New UDP connection port %d", ntohs(from.sin_port)); memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in)); break; } @@ -583,6 +612,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: @@ -593,6 +623,18 @@ 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 && /* Has positional data */ + src->context != NULL && dst->context != NULL && /* ...both source and destination has context */ + strcmp(src->context, dst->context) == 0) /* ...and the contexts match */ + 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) { @@ -603,7 +645,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; @@ -621,12 +664,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); } @@ -639,12 +682,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);