X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=f7d2b709d35255a996d21541f20620f16ea6a7f7;hb=27da14ea2abe5680ddfcffbf2a59be5f5a67cecd;hp=b72e46f06443952139d1588bb3763486b67f8c78;hpb=477a4a1b836a9693338dd2ef76782013f3fb0a16;p=umurmur.git diff --git a/src/client.c b/src/client.c index b72e46f..f7d2b70 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2010, Martin Johansson - Copyright (C) 2005-2010, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -30,8 +30,11 @@ */ #include #include +#include #include #include +#include +#include #include "log.h" #include "list.h" #include "client.h" @@ -42,6 +45,7 @@ #include "channel.h" #include "version.h" #include "voicetarget.h" +#include "ban.h" extern char system_string[], version_string[]; @@ -53,6 +57,7 @@ void Client_free(client_t *client); declare_list(clients); static int clientcount; /* = 0 */ static int maxBandwidth; +bool_t bOpus = true; int iCodecAlpha, iCodecBeta; bool_t bPreferAlpha; @@ -87,22 +92,23 @@ int Client_getfds(struct pollfd *pollfds) void Client_janitor() { - struct dlist *itr; + struct dlist *itr, *save; int bwTop = maxBandwidth + maxBandwidth / 4; - list_iterate(itr, &clients) { + list_iterate_safe(itr, save, &clients) { client_t *c; c = list_get_entry(itr, client_t, node); 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)) { + + if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTIVITY_TIMEOUT)) { /* No activity from client - assume it is lost and close. */ Log_info_client(c, "Timeout, closing."); Client_free(c); } } + Ban_pruneBanned(); } void Client_codec_add(client_t *client, int codec) @@ -130,7 +136,7 @@ codec_t *Client_codec_iterate(client_t *client, codec_t **codec_itr) if (list_empty(&client->codecs)) return NULL; - + if (cd == NULL) { cd = list_get_entry(list_get_first(&client->codecs), codec_t, node); } else { @@ -143,19 +149,72 @@ codec_t *Client_codec_iterate(client_t *client, codec_t **codec_itr) return cd; } -void recheckCodecVersions() +void Client_token_add(client_t *client, char *token_string) +{ + token_t *token; + + if (client->tokencount >= MAX_TOKENS) + return; + token = malloc(sizeof(token_t)); + if (token == NULL) + Log_fatal("Out of memory"); + init_list_entry(&token->node); + token->token = strdup(token_string); + if (token->token == NULL) + Log_fatal("Out of memory"); + list_add_tail(&token->node, &client->tokens); + client->tokencount++; +} + +bool_t Client_token_match(client_t *client, char *str) +{ + token_t *token; + struct dlist *itr; + + if (list_empty(&client->tokens)) + return false; + list_iterate(itr, &client->tokens) { + token = list_get_entry(itr, token_t, node); + if (strncasecmp(token->token, str, MAX_TOKENSIZE) == 0) + return true; + } + return false; +} + +void Client_token_free(client_t *client) +{ + struct dlist *itr, *save; + token_t *token; + + list_iterate_safe(itr, save, &client->tokens) { + token = list_get_entry(itr, token_t, node); + list_del(&token->node); + free(token->token); + free(token); + } + client->tokencount = 0; +} + + +#define OPUS_WARN_USING "WARNING: Your client doesn't support the Opus codec the server is using, you won't be able to talk or hear anyone. Please upgrade your Mumble client." +#define OPUS_WARN_SWITCHING "WARNING: Your client doesn't support the Opus codec the server is switching to, you won't be able to talk or hear anyone. Please upgrade your Mumble client." +void recheckCodecVersions(client_t *connectingClient) { client_t *client_itr = NULL; int max = 0, version, current_version; + int users = 0, opus = 0; message_t *sendmsg; struct dlist codec_list, *itr, *save; codec_t *codec_itr, *cd; bool_t found; - + bool_t enableOpus; + init_list_entry(&codec_list); - + while (Client_iterate(&client_itr) != NULL) { codec_itr = NULL; + if (client_itr->codec_count == 0 && !client_itr->bOpus) + continue; while (Client_codec_iterate(client_itr, &codec_itr) != NULL) { found = false; list_iterate(itr, &codec_list) { @@ -176,8 +235,15 @@ void recheckCodecVersions() list_add_tail(&cd->node, &codec_list); } } + users++; + if (client_itr->bOpus) + opus++; } - + if (users == 0) + return; + + enableOpus = ((opus * 100 / users) >= getIntConf(OPUS_THRESHOLD)); + list_iterate(itr, &codec_list) { cd = list_get_entry(itr, codec_t, node); if (cd->count > max) { @@ -189,33 +255,49 @@ void recheckCodecVersions() list_del(&list_get_entry(itr, codec_t, node)->node); free(list_get_entry(itr, codec_t, node)); } - + current_version = bPreferAlpha ? iCodecAlpha : iCodecBeta; - if (current_version == version) + if (current_version != version) { + // If we don't already use the compat bitstream version set + // 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)0x8000000b) + bPreferAlpha = true; + else + bPreferAlpha = !bPreferAlpha; + + if (bPreferAlpha) + iCodecAlpha = version; + else + iCodecBeta = version; + } else if (bOpus && enableOpus) { + if (connectingClient && !connectingClient->bOpus) + Client_textmessage(connectingClient, OPUS_WARN_USING); return; - // If we don't already use the compat bitstream version set - // 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) - bPreferAlpha = true; - else - bPreferAlpha = ! bPreferAlpha; + } - if (bPreferAlpha) - iCodecAlpha = version; - else - iCodecBeta = version; - sendmsg = Msg_create(CodecVersion); - sendmsg->payload.codecVersion->alpha = version; - sendmsg->payload.codecVersion->beta = version; + sendmsg->payload.codecVersion->alpha = iCodecAlpha; + sendmsg->payload.codecVersion->beta = iCodecBeta; sendmsg->payload.codecVersion->prefer_alpha = bPreferAlpha; + sendmsg->payload.codecVersion->has_opus = true; + sendmsg->payload.codecVersion->opus = enableOpus; + Client_send_message_except(NULL, sendmsg); - - Log_info("CELT codec switch 0x%x 0x%x (prefer 0x%x)", iCodecAlpha, iCodecBeta, - bPreferAlpha ? iCodecAlpha : iCodecBeta); - + + if (enableOpus && !bOpus) { + client_itr = NULL; + while (Client_iterate(&client_itr) != NULL) { + if ((client_itr->authenticated || client_itr == connectingClient) && + !client_itr->bOpus) { + Client_textmessage(client_itr, OPUS_WARN_SWITCHING); + } + } + Log_info("OPUS codec %s", bOpus ? "enabled" : "disabled"); + } + + bOpus = enableOpus; } static int findFreeSessionId() @@ -239,7 +321,11 @@ int Client_add(int fd, struct sockaddr_in *remote) { client_t *newclient; message_t *sendmsg; - + + if (Ban_isBannedAddr((in_addr_t *)&remote->sin_addr)) { + Log_info("Address %s banned. Disconnecting", inet_ntoa(remote->sin_addr)); + return -1; + } newclient = malloc(sizeof(client_t)); if (newclient == NULL) Log_fatal("Out of memory"); @@ -247,7 +333,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,19 +342,22 @@ 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"); - + init_list_entry(&newclient->txMsgQueue); init_list_entry(&newclient->chan_node); init_list_entry(&newclient->node); init_list_entry(&newclient->voicetargets); init_list_entry(&newclient->codecs); - + init_list_entry(&newclient->tokens); + list_add_tail(&newclient->node, &clients); clientcount++; - + /* Send version message to client */ sendmsg = Msg_create(Version); sendmsg->payload.version->has_version = true; @@ -285,6 +374,7 @@ void Client_free(client_t *client) { struct dlist *itr, *save; message_t *sendmsg; + bool_t authenticatedLeft = client->authenticated; if (client->authenticated) { int leave_id; @@ -304,33 +394,39 @@ void Client_free(client_t *client) } Client_codec_free(client); Voicetarget_free_all(client); - + Client_token_free(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); + free(client->os); + if (client->os_version) + free(client->os_version); if (client->username) free(client->username); if (client->context) free(client->context); free(client); + + if (authenticatedLeft) + recheckCodecVersions(NULL); /* Can use better codec now? */ } void Client_close(client_t *client) { - SSL_shutdown(client->ssl); + SSLi_shutdown(client->ssl); client->shutdown_wait = true; } void Client_disconnect_all() { struct dlist *itr, *save; - + list_iterate_safe(itr, save, &clients) { Client_free(list_get_entry(itr, client_t, node)); } @@ -340,17 +436,17 @@ int Client_read_fd(int fd) { struct dlist *itr; client_t *client = NULL; - + list_iterate(itr, &clients) { if (fd == list_get_entry(itr, client_t, node)->tcpfd) { client = list_get_entry(itr, client_t, node); break; } } - if (client == NULL) - Log_fatal("No client found for fd %d", fd); - - return Client_read(client); + if (client != NULL) + return Client_read(client); + else + return -1; } int Client_read(client_t *client) @@ -358,20 +454,20 @@ int Client_read(client_t *client) int rc; Timer_restart(&client->lastActivity); - + if (client->writeBlockedOnRead) { client->writeBlockedOnRead = false; Log_debug("Client_read: writeBlockedOnRead == true"); return Client_write(client); } - + if (client->shutdown_wait) { Client_free(client); return 0; } 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; @@ -380,10 +476,10 @@ int Client_read(client_t *client) do { errno = 0; - if (!client->msgsize) - rc = SSL_read(client->ssl, &client->rxbuf[client->rxcount], 6 - client->rxcount); + if (!client->msgsize) + 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; client->rxcount += rc; @@ -411,34 +507,38 @@ int Client_read(client_t *client) 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 || + SSLi_get_error(client->ssl, rc) == 0) { Log_info_client(client, "Connection closed by peer"); - if (!client->shutdown_wait) - Client_close(client); + 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... - */ - Log_info_client(client, "Connection closed by peer"); + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_SYSCALL) { + if (errno == 0) + Log_info_client(client, "Connection closed by peer"); + else + Log_info_client(client,"Error: %s - Closing connection (code %d)", + strerror(errno)); + } + else if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_CONNRESET) { + Log_info_client(client, "Connection reset 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)); - + } while (SSLi_data_pending(client->ssl)); + return 0; } @@ -446,47 +546,52 @@ int Client_write_fd(int fd) { struct dlist *itr; client_t *client = NULL; - + list_iterate(itr, &clients) { if(fd == list_get_entry(itr, client_t, node)->tcpfd) { client = list_get_entry(itr, client_t, node); break; } } - if (client == NULL) - Log_fatal("No client found for fd %d", fd); - Client_write(client); - return 0; + if (client != NULL) + return Client_write(client); + else + return -1; } int Client_write(client_t *client) { int rc; - + if (client->readBlockedOnWrite) { client->readBlockedOnWrite = false; 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) - 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)); + if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_SYSCALL) { + Log_info_client(client, "Error: %s - Closing connection", strerror(errno)); + } + else if (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_CONNRESET) { + Log_info_client(client, "Connection reset by peer"); + } + else { + Log_info_client(client, "SSL error: %d - Closing connection.", SSLi_get_error(client->ssl, rc)); + } Client_free(client); return -1; } @@ -501,6 +606,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) { @@ -536,7 +650,7 @@ client_t *Client_iterate(client_t **client_itr) if (list_empty(&clients)) return NULL; - + if (c == NULL) { c = list_get_entry(list_get_first(&clients), client_t, node); } else { @@ -549,12 +663,33 @@ client_t *Client_iterate(client_t **client_itr) return c; } +void Client_textmessage(client_t *client, char *text) +{ + char *message; + uint32_t *tree_id; + message_t *sendmsg = NULL; + + message = malloc(strlen(text) + 1); + 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; + strcpy(message, text); + Client_send_message(client, sendmsg); +} + int Client_send_message_except(client_t *client, message_t *msg) { 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) { @@ -565,11 +700,34 @@ int Client_send_message_except(client_t *client, message_t *msg) } } 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; +} + +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; } @@ -583,9 +741,9 @@ static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t * if (Timer_elapsed(&client->cryptState.tLastRequest) > 5000000ULL) { message_t *sendmsg; Timer_restart(&client->cryptState.tLastRequest); - + sendmsg = Msg_create(CryptSetup); - Log_info_client(client, "Requesting voice channel crypt resync"); + Log_info_client(client, "Requesting voice channel crypt resync"); Client_send_message(client, sendmsg); } } @@ -601,7 +759,7 @@ int Client_read_udp() uint64_t key; client_t *itr; UDPMessageType_t msgType; - + #if defined(__LP64__) uint8_t encbuff[UDP_PACKET_SIZE + 8]; uint8_t *encrypted = encbuff + 4; @@ -609,7 +767,7 @@ int Client_read_udp() uint8_t encrypted[UDP_PACKET_SIZE]; #endif uint8_t buffer[UDP_PACKET_SIZE]; - + len = recvfrom(udpsock, encrypted, UDP_PACKET_SIZE, MSG_TRUNC, (struct sockaddr *)&from, &fromlen); if (len == 0) { return -1; @@ -630,21 +788,21 @@ int Client_read_udp() 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; } - + key = (((uint64_t)from.sin_addr.s_addr) << 16) ^ from.sin_port; itr = NULL; - + while (Client_iterate(&itr) != NULL) { if (itr->key == key) { if (!checkDecrypt(itr, encrypted, buffer, len)) goto out; break; } - } + } if (itr == NULL) { /* Unknown peer */ while (Client_iterate(&itr) != NULL) { if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) { @@ -654,21 +812,23 @@ int Client_read_udp() memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in)); break; } - else Log_warn("Bad cryptstate from peer"); } } /* while */ } 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: - itr->bUDP = true; + if (bOpus) + break; + case UDPVoiceOpus: Client_voiceMsg(itr, buffer, len); break; case UDPPing: @@ -679,19 +839,19 @@ 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; } 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 (IS_AUTH(dst) && dst != src && !dst->deaf && !dst->self_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 + else Client_send_udp(dst, data, len - poslen); } } @@ -704,42 +864,50 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) pds_t *pds = Pds_create(buffer + 1, UDP_PACKET_SIZE - 1); unsigned int type = data[0] & 0xe0; unsigned int target = data[0] & 0x1f; - unsigned int poslen, counter; + unsigned int poslen, counter, size; int offset, packetsize; voicetarget_t *vt; - + channel_t *ch = (channel_t *)client->channel; struct dlist *itr; - - if (!client->authenticated || client->mute) + + if (!client->authenticated || client->mute || client->self_mute || ch->silent) goto out; - + packetsize = 20 + 8 + 4 + len; if (client->availableBandwidth - packetsize < 0) goto out; /* Discard */ client->availableBandwidth -= packetsize; - + + Timer_restart(&client->idleTime); + Timer_restart(&client->lastActivity); + counter = Pds_get_numval(pdi); /* step past session id */ - do { - counter = Pds_next8(pdi); - offset = Pds_skip(pdi, counter & 0x7f); - } while ((counter & 0x80) && offset > 0); + if ((type >> 5) != UDPVoiceOpus) { + do { + counter = Pds_next8(pdi); + offset = Pds_skip(pdi, counter & 0x7f); + } while ((counter & 0x80) && offset > 0); + } else { + size = Pds_get_numval(pdi); + Pds_skip(pdi, size & 0x1fff); + } 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 */ buffer[0] = (uint8_t) type; Client_send_udp(client, buffer, pds->offset + 1); } else if (target == 0) { /* regular channel speech */ buffer[0] = (uint8_t) type; - + if (ch == NULL) goto out; - + list_iterate(itr, &ch->clients) { client_t *c; c = list_get_entry(itr, client_t, chan_node); @@ -791,7 +959,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) } Chan_freeTreeList(&chanlist); } - } + } /* Sessions */ for (i = 0; i < TARGET_MAX_SESSIONS && vt->sessions[i] != -1; i++) { client_t *c; @@ -808,7 +976,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) out: Pds_free(pds); Pds_free(pdi); - + return 0; } @@ -827,11 +995,11 @@ static int Client_send_udp(client_t *client, uint8_t *data, int len) #endif if (mbuf == NULL) Log_fatal("Out of memory"); - + CryptState_encrypt(&client->cryptState, data, buf, len); - + sendto(udpsock, buf, len + 4, 0, (struct sockaddr *)&client->remote_udp, sizeof(struct sockaddr_in)); - + free(mbuf); } else { message_t *msg;