X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fclient.c;h=f7d2b709d35255a996d21541f20620f16ea6a7f7;hb=27da14ea2abe5680ddfcffbf2a59be5f5a67cecd;hp=189836cc80ec4a1c0c01abed8ccf67a937a446df;hpb=6087b18a630eb32df682a7fd90d88408aa99c726;p=umurmur.git diff --git a/src/client.c b/src/client.c index 189836c..f7d2b70 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2012, Martin Johansson - Copyright (C) 2005-2012, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -57,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; @@ -100,7 +101,7 @@ void Client_janitor() c->availableBandwidth += maxBandwidth; if (c->availableBandwidth > bwTop) c->availableBandwidth = bwTop; - + if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTIVITY_TIMEOUT)) { /* No activity from client - assume it is lost and close. */ Log_info_client(c, "Timeout, closing."); @@ -135,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 { @@ -169,7 +170,7 @@ 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) { @@ -184,7 +185,7 @@ 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); @@ -194,19 +195,26 @@ void Client_token_free(client_t *client) client->tokencount = 0; } -void recheckCodecVersions() + +#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) { @@ -227,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) { @@ -240,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)0x8000000b) - bPreferAlpha = true; - else - bPreferAlpha = ! bPreferAlpha; + } - if (bPreferAlpha) - iCodecAlpha = version; - else - iCodecBeta = version; - sendmsg = Msg_create(CodecVersion); 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() @@ -316,17 +347,17 @@ int Client_add(int fd, struct sockaddr_in *remote) 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; @@ -343,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; @@ -363,7 +395,7 @@ 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) SSLi_free(client->ssl); @@ -372,14 +404,17 @@ void Client_free(client_t *client) if (client->release) free(client->release); if (client->os) - free(client->os); + free(client->os); if (client->os_version) - free(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) @@ -391,7 +426,7 @@ void Client_close(client_t *client) void Client_disconnect_all() { struct dlist *itr, *save; - + list_iterate_safe(itr, save, &clients) { Client_free(list_get_entry(itr, client_t, node)); } @@ -401,7 +436,7 @@ 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); @@ -419,13 +454,13 @@ 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; @@ -441,7 +476,7 @@ int Client_read(client_t *client) do { errno = 0; - if (!client->msgsize) + if (!client->msgsize) rc = SSLi_read(client->ssl, &client->rxbuf[client->rxcount], 6 - client->rxcount); else rc = SSLi_read(client->ssl, &client->rxbuf[client->rxcount], client->msgsize); @@ -479,14 +514,18 @@ int Client_read(client_t *client) client->readBlockedOnWrite = true; return 0; } - else if (SSLi_get_error(client->ssl, rc) == SSLI_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 (SSLi_get_error(client->ssl, rc) == SSLI_ERROR_SYSCALL) { - Log_info_client(client,"Error: %s - Closing connection", strerror(errno)); + 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"); @@ -499,7 +538,7 @@ int Client_read(client_t *client) } } } while (SSLi_data_pending(client->ssl)); - + return 0; } @@ -507,7 +546,7 @@ 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); @@ -523,7 +562,7 @@ int Client_write_fd(int fd) int Client_write(client_t *client) { int rc; - + if (client->readBlockedOnWrite) { client->readBlockedOnWrite = false; Log_debug("Client_write: readBlockedOnWrite == true"); @@ -611,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 { @@ -624,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) { @@ -640,11 +700,11 @@ 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; } @@ -652,7 +712,7 @@ int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t ve { 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) { @@ -663,11 +723,11 @@ int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t ve } } 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; } @@ -681,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); } } @@ -699,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; @@ -707,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; @@ -728,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) { @@ -758,7 +818,7 @@ int Client_read_udp() 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); @@ -766,6 +826,9 @@ int Client_read_udp() case UDPVoiceSpeex: case UDPVoiceCELTAlpha: case UDPVoiceCELTBeta: + if (bOpus) + break; + case UDPVoiceOpus: Client_voiceMsg(itr, buffer, len); break; case UDPPing: @@ -776,7 +839,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; } @@ -788,7 +851,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); } } @@ -801,45 +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 || client->self_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); @@ -891,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; @@ -908,7 +976,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len) out: Pds_free(pds); Pds_free(pdi); - + return 0; } @@ -927,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;