X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=baf6247d6ad1f644c16bf9e16fa59cc0e76b9650;hb=a72efcd9b1c000c47bbe363f51c9123528e41d84;hp=3a7217d93924f8a40d1ac3b5376b74d98c1587d8;hpb=e86df9764efd8caa27aa0a2dec0092889aa87c91;p=umurmur.git diff --git a/src/client.c b/src/client.c index 3a7217d..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. @@ -42,6 +42,8 @@ #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); static int Client_send_udp(client_t *client, uint8_t *data, int len); @@ -49,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; @@ -90,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); } } @@ -160,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; @@ -174,13 +192,16 @@ 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); @@ -195,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; @@ -208,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); @@ -224,7 +247,6 @@ void Client_free(client_t *client) Voicetarget_free_all(client); list_del(&client->node); - list_del(&client->chan_node); if (client->ssl) SSL_free(client->ssl); close(client->tcpfd); @@ -233,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); } @@ -298,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 @@ -310,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; } @@ -335,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); } @@ -344,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; @@ -476,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); } } @@ -501,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); } } @@ -566,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; } @@ -598,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) { @@ -627,7 +664,7 @@ 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); @@ -645,9 +682,7 @@ 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)) { @@ -658,10 +693,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) list_iterate(itr, &ch_link->clients) { client_t *c; c = list_get_entry(itr, client_t, chan_node); - if (c != client && !c->deaf) { - Log_debug("Linked voice from %s -> %s", ch->name, ch_link->name); - Client_send_udp(c, buffer, pds->offset + 1); - } + Log_debug("Linked voice from %s -> %s", ch->name, ch_link->name); + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); } } } @@ -677,9 +710,7 @@ 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 && IS_AUTH(c)) { - Client_send_udp(c, buffer, pds->offset + 1); - } + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); } } /* Sessions */ @@ -687,8 +718,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) client_t *c; Log_debug("Whisper session %d", vt->sessions[i]); while (Client_iterate(&c) != NULL) { - if (c->sessionId == vt->sessions[i] && c != client && !c->deaf && IS_AUTH(c)) { - Client_send_udp(c, buffer, pds->offset + 1); + if (c->sessionId == vt->sessions[i]) { + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); break; } }