Fix opus reporting in UserStats.

[umurmur.git] / src / messagehandler.c

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 504c66b0e40b0e258ce8ff4b079f533c403ac2eb..6b77ad445373e5e9d6a4eb7e0a0a7881a26ea500 100644 (file)
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -45,10 +45,15 @@
 #define MAX_TEXT 512
 #define MAX_USERNAME 128
 
+#define NO_CELT_MESSAGE "<strong>WARNING:</strong> Your client doesn't support the CELT codec, you won't be able to talk to or hear most clients. Please make sure your client was built with CELT support."
+
+
 extern channel_t *defaultChan;
 extern int iCodecAlpha, iCodecBeta;
 extern bool_t bPreferAlpha, bOpus;
 
+static bool_t fake_celt_support;
+
 static void sendServerReject(client_t *client, const char *reason, MumbleProto__Reject__RejectType type)
 {
        message_t *msg = Msg_create(Reject);
@@ -224,8 +229,9 @@ void Mh_handle_message(client_t *client, message_t *msg)
                                Log_debug("Client %d CELT codec ver 0x%x", client->sessionId, codec_itr->codec);
                                
                } else {
-                       Client_codec_add(client, (int32_t)0x8000000a);
+                       Client_codec_add(client, (int32_t)0x8000000b);
                        client->codec_count = 1;
+                       fake_celt_support = true;
                }
                if (msg->payload.authenticate->opus)
                        client->bOpus = true;
@@ -236,8 +242,14 @@ void Mh_handle_message(client_t *client, message_t *msg)
                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 = bOpus;
                Client_send_message(client, sendmsg);
-               
+
+               if (!bOpus && client->bOpus && fake_celt_support) {
+                       Client_textmessage(client, NO_CELT_MESSAGE);
+               }
+
                /* Iterate channels and send channel info */
                ch_itr = NULL;
                while (Chan_iterate(&ch_itr) != NULL) {
@@ -805,9 +817,12 @@ void Mh_handle_message(client_t *client, message_t *msg)
 
                        sendmsg->payload.userStats->version->has_version = true;
                        sendmsg->payload.userStats->version->version = target->version;
-                       sendmsg->payload.userStats->version->release = strdup(target->release);
-                       sendmsg->payload.userStats->version->os = strdup(target->os);
-                       sendmsg->payload.userStats->version->os_version = strdup(target->os_version);
+                       if (target->release)
+                               sendmsg->payload.userStats->version->release = strdup(target->release);
+                       if (target->os)
+                               sendmsg->payload.userStats->version->os = strdup(target->os);
+                       if (target->os_version)
+                               sendmsg->payload.userStats->version->os_version = strdup(target->os_version);
                        
                        sendmsg->payload.userStats->n_celt_versions = target->codec_count;
                        sendmsg->payload.userStats->celt_versions = malloc(sizeof(int32_t) * target->codec_count);
@@ -817,6 +832,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        while (Client_codec_iterate(target, &codec_itr) != NULL)
                                sendmsg->payload.userStats->celt_versions[i++] = codec_itr->codec;
 
+                       sendmsg->payload.userStats->has_opus = true;
                        sendmsg->payload.userStats->opus = target->bOpus;
 
                        /* Address */