X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=367f18dee165e383f892b9c4ae3f2e979a8a4759;hb=454ad122eb158b4391e2690fe6a7e127d24c525b;hp=0808253460ec311d1a2a64a2f0d60d5d7b0c2f89;hpb=88a639c1188067d8e488721fe5f05f058ecc6d4d;p=umurmur.git diff --git a/src/client.c b/src/client.c index 0808253..367f18d 100644 --- a/src/client.c +++ b/src/client.c @@ -30,8 +30,11 @@ */ #include #include +#include #include #include +#include +#include #include "log.h" #include "list.h" #include "client.h" @@ -197,7 +200,7 @@ void recheckCodecVersions() // it as alpha and announce it. If another codec now got the // majority set it as the opposite of the currently valid bPreferAlpha // and announce it. - if (version == (uint32_t)0x8000000a) + if (version == (uint32_t)0x8000000b) bPreferAlpha = true; else bPreferAlpha = ! bPreferAlpha; @@ -247,7 +250,7 @@ int Client_add(int fd, struct sockaddr_in *remote) newclient->tcpfd = fd; memcpy(&newclient->remote_tcp, remote, sizeof(struct sockaddr_in)); - newclient->ssl = SSL_newconnection(newclient->tcpfd, &newclient->SSLready); + newclient->ssl = SSLi_newconnection(&newclient->tcpfd, &newclient->SSLready); if (newclient->ssl == NULL) { Log_warn("SSL negotiation failed with %s:%d", inet_ntoa(remote->sin_addr), ntohs(remote->sin_port)); @@ -256,6 +259,8 @@ int Client_add(int fd, struct sockaddr_in *remote) } newclient->availableBandwidth = maxBandwidth; Timer_init(&newclient->lastActivity); + Timer_init(&newclient->connectTime); + Timer_init(&newclient->idleTime); newclient->sessionId = findFreeSessionId(); if (newclient->sessionId < 0) Log_fatal("Could not find a free session ID"); @@ -307,13 +312,15 @@ void Client_free(client_t *client) list_del(&client->node); if (client->ssl) - SSL_free(client->ssl); + SSLi_free(client->ssl); close(client->tcpfd); clientcount--; if (client->release) free(client->release); if (client->os) free(client->os); + if (client->os_version) + free(client->os_version); if (client->username) free(client->username); if (client->context) @@ -323,7 +330,7 @@ void Client_free(client_t *client) void Client_close(client_t *client) { - SSL_shutdown(client->ssl); + SSLi_shutdown(client->ssl); client->shutdown_wait = true; } @@ -371,7 +378,7 @@ int Client_read(client_t *client) } if (!client->SSLready) { int rc; - rc = SSL_nonblockaccept(client->ssl, &client->SSLready); + rc = SSLi_nonblockaccept(client->ssl, &client->SSLready); if (rc < 0) { Client_free(client); return -1; @@ -381,64 +388,62 @@ int Client_read(client_t *client) do { errno = 0; if (!client->msgsize) - 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); + rc = SSLi_read(client->ssl, &client->rxbuf[client->rxcount], 6 - client->rxcount); else - rc = SSL_read(client->ssl, &client->rxbuf[client->rxcount], client->msgsize); + rc = SSLi_read(client->ssl, &client->rxbuf[client->rxcount], client->msgsize); if (rc > 0) { message_t *msg; - if (client->drainleft > 0) - client->drainleft -= rc; - else { - client->rxcount += rc; - if (!client->msgsize && client->rxcount >= 6) { - uint32_t msgLen; - memcpy(&msgLen, &client->rxbuf[2], sizeof(uint32_t)); - client->msgsize = ntohl(msgLen); - } - if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) { - Log_info_client(client, "Too big message received (%d bytes). Discarding.", client->msgsize); - client->rxcount = client->msgsize = 0; - client->drainleft = client->msgsize; - } - else if (client->rxcount == client->msgsize + 6) { /* Got all of the message */ - msg = Msg_networkToMessage(client->rxbuf, client->msgsize + 6); - /* pass messsage to handler */ - if (msg) - Mh_handle_message(client, msg); - client->rxcount = client->msgsize = 0; - } + client->rxcount += rc; + if (!client->msgsize && client->rxcount >= 6) { + uint32_t msgLen; + memcpy(&msgLen, &client->rxbuf[2], sizeof(uint32_t)); + client->msgsize = ntohl(msgLen); + } + if (client->msgsize > BUFSIZE - 6) { + /* XXX - figure out how to handle this. A large size here can represent two cases: + * 1. A valid size. The only message that is this big is UserState message with a big texture + * 2. An invalid size = protocol error, e.g. connecting with a 1.1.x client + */ + Log_warn("Too big message received (%d bytes). Playing safe and disconnecting client %s:%d", + client->msgsize, inet_ntoa(client->remote_tcp.sin_addr), ntohs(client->remote_tcp.sin_port)); + Client_free(client); + return -1; + /* client->rxcount = client->msgsize = 0; */ + } + else if (client->rxcount == client->msgsize + 6) { /* Got all of the message */ + msg = Msg_networkToMessage(client->rxbuf, client->msgsize + 6); + /* pass messsage to handler */ + if (msg) + Mh_handle_message(client, msg); + client->rxcount = client->msgsize = 0; } } else /* rc <= 0 */ { - if (SSL_get_error(client->ssl, rc) == SSL_ERROR_WANT_READ) { + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_WANT_READ) { return 0; } - else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_WANT_WRITE) { + else if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_WANT_WRITE) { client->readBlockedOnWrite = true; return 0; } - else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_ZERO_RETURN) { + else if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_ZERO_RETURN) { Log_info_client(client, "Connection closed by peer"); if (!client->shutdown_wait) Client_close(client); } else { - if (SSL_get_error(client->ssl, rc) == SSL_ERROR_SYSCALL) { - /* Hmm. This is where we end up when the client closes its connection. - * Kind of strange... - */ + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_SYSCALL) { Log_info_client(client, "Connection closed by peer"); } else { - Log_info_client(client, "SSL error: %d - Closing connection", SSL_get_error(client->ssl, rc)); + Log_info_client(client, "SSL error: %d - Closing connection", SSLi_get_error(client->ssl, rc)); } Client_free(client); return -1; } } - } while (SSL_pending(client->ssl)); - return 0; + } while (SSLi_data_pending(client->ssl)); + + return 0; } int Client_write_fd(int fd) @@ -467,25 +472,25 @@ int Client_write(client_t *client) Log_debug("Client_write: readBlockedOnWrite == true"); return Client_read(client); } - rc = SSL_write(client->ssl, &client->txbuf[client->txcount], client->txsize - client->txcount); + rc = SSLi_write(client->ssl, &client->txbuf[client->txcount], client->txsize - client->txcount); if (rc > 0) { client->txcount += rc; if (client->txcount == client->txsize) client->txsize = client->txcount = 0; } else if (rc < 0) { - if (SSL_get_error(client->ssl, rc) == SSL_ERROR_WANT_READ) { + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_WANT_READ) { client->writeBlockedOnRead = true; return 0; } - else if (SSL_get_error(client->ssl, rc) == SSL_ERROR_WANT_WRITE) { + else if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_WANT_WRITE) { return 0; } else { - if (SSL_get_error(client->ssl, rc) == SSL_ERROR_SYSCALL) + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_SYSCALL) Log_warn("Client_write: Error: %s - Closing connection", strerror(errno)); else - Log_warn("Client_write: SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc)); + Log_warn("Client_write: SSL error: %d - Closing connection.", SSLi_get_error(client->ssl, rc)); Client_free(client); return -1; } @@ -500,6 +505,15 @@ int Client_write(client_t *client) return 0; } +int Client_send_message_ver(client_t *client, message_t *msg, uint32_t version) +{ + if ((version == 0) || (client->version >= version) || + ((version & 0x80000000) && (client->version < (~version)))) + return Client_send_message(client, msg); + else + Msg_free(msg); +} + int Client_send_message(client_t *client, message_t *msg) { if (!client->authenticated && msg->messageType != Version) { @@ -572,6 +586,29 @@ int Client_send_message_except(client_t *client, message_t *msg) return 0; } +int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t version) +{ + client_t *itr = NULL; + int count = 0; + + Msg_inc_ref(msg); /* Make sure a reference is held during the whole iteration. */ + while (Client_iterate(&itr) != NULL) { + 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->username, msg->refcount); + Client_send_message_ver(itr, msg, version); + } + } + Msg_free(msg); /* Free our reference to the message */ + + if (count == 0) + Msg_free(msg); /* If only 1 client is connected then no message is passed + * to Client_send_message(). Free it here. */ + + return 0; +} + static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t *plain, unsigned int len) { if (CryptState_isValid(&client->cryptState) && @@ -657,16 +694,17 @@ int Client_read_udp() } } /* while */ } - if (itr == NULL) { + if (itr == NULL) { /* Couldn't find this peer among connected clients */ goto out; } + itr->bUDP = true; + len -= 4; /* Adjust for crypt header */ msgType = (UDPMessageType_t)((buffer[0] >> 5) & 0x7); switch (msgType) { case UDPVoiceSpeex: case UDPVoiceCELTAlpha: case UDPVoiceCELTBeta: - // u->bUdp = true; Client_voiceMsg(itr, buffer, len); break; case UDPPing: @@ -677,6 +715,7 @@ int Client_read_udp() Log_debug("Unknown UDP message type from %s port %d", inet_ntoa(from.sin_addr), ntohs(from.sin_port)); break; } + out: return 0; } @@ -688,7 +727,7 @@ static inline void Client_send_voice(client_t *src, client_t *dst, uint8_t *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 + else Client_send_udp(dst, data, len - poslen); } } @@ -716,6 +755,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) goto out; /* Discard */ client->availableBandwidth -= packetsize; + Timer_restart(&client->idleTime); + counter = Pds_get_numval(pdi); /* step past session id */ do { counter = Pds_next8(pdi); @@ -742,27 +783,14 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) c = list_get_entry(itr, client_t, chan_node); 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++) { + for (i = 0; i < TARGET_MAX_CHANNELS && vt->channels[i].channel != -1; i++) { + buffer[0] = (uint8_t) (type | 1); Log_debug("Whisper channel %d", vt->channels[i]); - ch = Chan_fromId(vt->channels[i]); + ch = Chan_fromId(vt->channels[i].channel); if (ch == NULL) continue; list_iterate(itr, &ch->clients) { @@ -770,10 +798,42 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) c = list_get_entry(itr, client_t, chan_node); Client_send_voice(client, c, buffer, pds->offset + 1, poslen); } + /* Channel links */ + if (vt->channels[i].linked && !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); + } + } + } + /* children */ + if (vt->channels[i].children) { + struct dlist chanlist, *ch_itr; + init_list_entry(&chanlist); + Chan_buildTreeList(ch, &chanlist); + list_iterate(ch_itr, &chanlist) { + channel_t *sub; + sub = list_get_entry(ch_itr, channellist_t, node)->chan; + list_iterate(itr, &sub->clients) { + client_t *c; + c = list_get_entry(itr, client_t, chan_node); + Log_debug("Child voice from %s -> %s", ch->name, sub->name); + Client_send_voice(client, c, buffer, pds->offset + 1, poslen); + } + } + Chan_freeTreeList(&chanlist); + } } /* Sessions */ for (i = 0; i < TARGET_MAX_SESSIONS && vt->sessions[i] != -1; i++) { client_t *c; + buffer[0] = (uint8_t) (type | 2); Log_debug("Whisper session %d", vt->sessions[i]); while (Client_iterate(&c) != NULL) { if (c->sessionId == vt->sessions[i]) { @@ -795,7 +855,8 @@ static int Client_send_udp(client_t *client, uint8_t *data, int len) { uint8_t *buf, *mbuf; - if (client->remote_udp.sin_port != 0 && CryptState_isValid(&client->cryptState)) { + if (client->remote_udp.sin_port != 0 && CryptState_isValid(&client->cryptState) && + client->bUDP) { #if defined(__LP64__) buf = mbuf = malloc(len + 4 + 16); buf += 4; @@ -812,12 +873,7 @@ static int Client_send_udp(client_t *client, uint8_t *data, int len) free(mbuf); } else { message_t *msg; - buf = malloc(len); - memcpy(buf, data, len); - msg = Msg_create(UDPTunnel); - - msg->payload.UDPTunnel->packet.data = buf; - msg->payload.UDPTunnel->packet.len = len; + msg = Msg_CreateVoiceMsg(data, len); Client_send_message(client, msg); } return 0;