Must enable UDP when receiving ping packets too.

[umurmur.git] / src / messages.c

diff --git a/src/messages.c b/src/messages.c
index e40ae8f3b119f1dbadf88d7dc2122f818361fcd9..109f5eb22af6c8844262678e5519e676ef78f73f 100644 (file)
--- a/src/messages.c
+++ b/src/messages.c
@@ -41,10 +41,10 @@
 
 #define PREAMBLE_SIZE 6
 
-void dumpmsg(uint8_t *data, int size);
+static void dumpmsg(uint8_t *data, int size);
 static message_t *Msg_create_nopayload(messageType_t messageType);
 
-void Msg_addPreamble(uint8_t *buffer, uint16_t type, uint32_t len)
+static void Msg_addPreamble(uint8_t *buffer, uint16_t type, uint32_t len)
 {
        type = htons(type);
        len = htonl(len);
@@ -232,13 +232,13 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
                break;
 
        default:
-               Log_warn("Msg_networkToMessage: Unsupported message %d", msg->messageType);
+               Log_warn("Msg_MessageToNetwork: Unsupported message %d", msg->messageType);
                return 0;
        }
        return len + PREAMBLE_SIZE;
 }
 
-message_t *Msg_create_nopayload(messageType_t messageType)
+static message_t *Msg_create_nopayload(messageType_t messageType)
 {
        message_t *msg = malloc(sizeof(message_t));
 
@@ -501,6 +501,23 @@ void dumpmsg(uint8_t *data, int size)
        } 
 }
 
+message_t *Msg_CreateVoiceMsg(uint8_t *data, int size)
+{
+       message_t *msg = NULL;
+       
+       msg = Msg_create_nopayload(UDPTunnel);
+       msg->unpacked = false;
+       msg->payload.UDPTunnel = malloc(sizeof(struct _MumbleProto__UDPTunnel));
+       if (msg->payload.UDPTunnel == NULL)
+               Log_fatal("Out of memory");
+       msg->payload.UDPTunnel->packet.data = malloc(size);
+       if (msg->payload.UDPTunnel->packet.data == NULL)
+               Log_fatal("Out of memory");
+       memcpy(msg->payload.UDPTunnel->packet.data, data, size);
+       msg->payload.UDPTunnel->packet.len = size;
+       return msg;
+}
+
 message_t *Msg_networkToMessage(uint8_t *data, int size)
 {
        message_t *msg = NULL;
@@ -518,20 +535,13 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(Version);
                msg->unpacked = true;
                msg->payload.version = mumble_proto__version__unpack(NULL, msgLen, msgData);
+               if (msg->payload.version == NULL)
+                       goto err_out;
                break;
        }
        case UDPTunnel: /* Non-standard handling of tunneled voice data */
        {
-               msg = Msg_create_nopayload(UDPTunnel);
-               msg->unpacked = false;
-               msg->payload.UDPTunnel = malloc(sizeof(struct _MumbleProto__UDPTunnel));
-               if (msg->payload.UDPTunnel == NULL)
-                       Log_fatal("Out of memory");
-               msg->payload.UDPTunnel->packet.data = malloc(msgLen);
-               if (msg->payload.UDPTunnel->packet.data == NULL)
-                       Log_fatal("Out of memory");
-               memcpy(msg->payload.UDPTunnel->packet.data, msgData, msgLen);
-               msg->payload.UDPTunnel->packet.len = msgLen;
+               msg = Msg_CreateVoiceMsg(msgData, msgLen);
                break;
        }
        case Authenticate:
@@ -539,6 +549,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(Authenticate);
                msg->unpacked = true;
                msg->payload.authenticate = mumble_proto__authenticate__unpack(NULL, msgLen, msgData);
+               if (msg->payload.authenticate == NULL)
+                       goto err_out;
                break;
        }
        case Ping:
@@ -546,6 +558,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(Ping);
                msg->unpacked = true;
                msg->payload.ping = mumble_proto__ping__unpack(NULL, msgLen, msgData);
+               if (msg->payload.ping == NULL)
+                       goto err_out;
                break;
        }
        case Reject:
@@ -553,6 +567,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(Reject);
                msg->unpacked = true;
                msg->payload.reject = mumble_proto__reject__unpack(NULL, msgLen, msgData);
+               if (msg->payload.reject == NULL)
+                       goto err_out;
                break;
        }
        case ServerSync:
@@ -560,6 +576,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(ServerSync);
                msg->unpacked = true;
                msg->payload.serverSync = mumble_proto__server_sync__unpack(NULL, msgLen, msgData);
+               if (msg->payload.serverSync == NULL)
+                       goto err_out;
                break;
        }
        case TextMessage:
@@ -567,6 +585,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(TextMessage);
                msg->unpacked = true;
                msg->payload.textMessage = mumble_proto__text_message__unpack(NULL, msgLen, msgData);
+               if (msg->payload.textMessage == NULL)
+                       goto err_out;
                break;
        }
        case PermissionDenied:
@@ -574,6 +594,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(PermissionDenied);
                msg->unpacked = true;
                msg->payload.permissionDenied = mumble_proto__permission_denied__unpack(NULL, msgLen, msgData);
+               if (msg->payload.permissionDenied == NULL)
+                       goto err_out;
                break;
        }
        case CryptSetup:
@@ -581,6 +603,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(CryptSetup);
                msg->unpacked = true;
                msg->payload.cryptSetup = mumble_proto__crypt_setup__unpack(NULL, msgLen, msgData);
+               if (msg->payload.cryptSetup == NULL)
+                       goto err_out;
                break;
        }
        case UserList:
@@ -588,6 +612,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(UserList);
                msg->unpacked = true;
                msg->payload.userList = mumble_proto__user_list__unpack(NULL, msgLen, msgData);
+               if (msg->payload.userList == NULL)
+                       goto err_out;
                break;
        }
        case UserState:
@@ -595,6 +621,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(UserState);
                msg->unpacked = true;
                msg->payload.userState = mumble_proto__user_state__unpack(NULL, msgLen, msgData);
+               if (msg->payload.userState == NULL)
+                       goto err_out;
                break;
        }
        case ChannelState:
@@ -602,6 +630,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(ChannelState);
                msg->unpacked = true;
                msg->payload.channelState = mumble_proto__channel_state__unpack(NULL, msgLen, msgData);
+               if (msg->payload.channelState == NULL)
+                       goto err_out;
                break;
        }
        case VoiceTarget:
@@ -609,6 +639,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(VoiceTarget);
                msg->unpacked = true;
                msg->payload.voiceTarget = mumble_proto__voice_target__unpack(NULL, msgLen, msgData);
+               if (msg->payload.voiceTarget == NULL)
+                       goto err_out;
                break;
        }
        case CodecVersion:
@@ -616,6 +648,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(CodecVersion);
                msg->unpacked = true;
                msg->payload.codecVersion = mumble_proto__codec_version__unpack(NULL, msgLen, msgData);
+               if (msg->payload.codecVersion == NULL)
+                       goto err_out;
                break;
        }
        case PermissionQuery:
@@ -623,6 +657,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(PermissionQuery);
                msg->unpacked = true;
                msg->payload.permissionQuery = mumble_proto__permission_query__unpack(NULL, msgLen, msgData);
+               if (msg->payload.permissionQuery == NULL)
+                       goto err_out;
                break;
        }
        case ChannelRemove:
@@ -630,6 +666,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                msg = Msg_create_nopayload(ChannelRemove);
                msg->unpacked = true;
                msg->payload.channelRemove = mumble_proto__channel_remove__unpack(NULL, msgLen, msgData);
+               if (msg->payload.channelRemove == NULL)
+                       goto err_out;
                break;
        }
 
@@ -638,4 +676,8 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
                break;
        }
        return msg;
+       
+err_out:
+       free(msg);
+       return NULL;
 }