X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmessages.c;h=f7526c11e82b1dc324e8a0ee013cde0f2c94b374;hb=32f0f4fb277694410b1afdaeebb4c9ec95d7ed09;hp=8b4c497e8679c638277e47ec8452f32d601b5161;hpb=8f46c2a3cb1e906c68cd658469974d1ab3761d4d;p=umurmur.git

diff --git a/src/messages.c b/src/messages.c
index 8b4c497..f7526c1 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -41,6 +41,7 @@
 
 
 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)
 {
@@ -79,14 +80,13 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
 				  msg->payload.version->release, msg->payload.version->os);
 		mumble_proto__version__pack(msg->payload.version, bufptr);
 		break;
-	case UDPTunnel:
-		len = mumble_proto__udptunnel__get_packed_size(msg->payload.UDPTunnel);
-		if (len > MAX_MSGSIZE) {
+	case UDPTunnel: /* Non-standard handling of tunneled voice traffic. */
+		if (msg->payload.UDPTunnel->packet.len > MAX_MSGSIZE) {
 			Log_warn("Too big tx message. Discarding");
 			break;
 		}
-		Msg_addPreamble(buffer, msg->messageType, len);
-		mumble_proto__udptunnel__pack(msg->payload.UDPTunnel, bufptr);		
+		Msg_addPreamble(buffer, msg->messageType, msg->payload.UDPTunnel->packet.len);
+		memcpy(bufptr, msg->payload.UDPTunnel->packet.data, msg->payload.UDPTunnel->packet.len);
 		break;
 	case Authenticate:
 		len = mumble_proto__authenticate__get_packed_size(msg->payload.authenticate);
@@ -196,6 +196,15 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
 		Msg_addPreamble(buffer, msg->messageType, len);
 		mumble_proto__codec_version__pack(msg->payload.codecVersion, bufptr);
 		break;
+	case PermissionQuery:
+		len = mumble_proto__permission_query__get_packed_size(msg->payload.permissionQuery);
+		if (len > MAX_MSGSIZE) {
+			Log_warn("Too big tx message. Discarding");
+			break;
+			}
+		Msg_addPreamble(buffer, msg->messageType, len);
+		mumble_proto__permission_query__pack(msg->payload.permissionQuery, bufptr);
+		break;
 
 	default:
 		Log_warn("Unsupported message %d", msg->messageType);
@@ -204,7 +213,7 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
 	return len + 6;
 }
 
-message_t *Msg_create(messageType_t messageType)
+message_t *Msg_create_nopayload(messageType_t messageType)
 {
 	message_t *msg = malloc(sizeof(message_t));
 
@@ -214,6 +223,12 @@ message_t *Msg_create(messageType_t messageType)
 	msg->refcount = 1;
 	msg->messageType = messageType;
 	init_list_entry(&msg->node);
+	return msg;
+}
+
+message_t *Msg_create(messageType_t messageType)
+{
+	message_t *msg = Msg_create_nopayload(messageType);
 	
 	switch (messageType) {
 	case Version:
@@ -276,6 +291,10 @@ message_t *Msg_create(messageType_t messageType)
 		msg->payload.channelState = malloc(sizeof(MumbleProto__ChannelState));
 		mumble_proto__channel_state__init(msg->payload.channelState);
 		break;
+	case PermissionQuery:
+		msg->payload.permissionQuery = malloc(sizeof(MumbleProto__PermissionQuery));
+		mumble_proto__permission_query__init(msg->payload.permissionQuery);
+		break;
 
 	default:
 		Log_warn("Msg_create: Unsupported message %d", msg->messageType);
@@ -321,6 +340,8 @@ void Msg_free(message_t *msg)
 	case Authenticate:
 		if (msg->unpacked)
 			mumble_proto__authenticate__free_unpacked(msg->payload.authenticate, NULL);
+		else
+			free(msg->payload.authenticate);
 		break;
 	case Ping:
 		if (msg->unpacked)
@@ -413,6 +434,13 @@ void Msg_free(message_t *msg)
 			free(msg->payload.channelState);
 		}
 		break;
+	case PermissionQuery:
+		if (msg->unpacked)
+			mumble_proto__permission_query__free_unpacked(msg->payload.permissionQuery, NULL);
+		else {
+			free(msg->payload.permissionQuery);
+		}
+		break;
 
 	default:
 		Log_warn("Msg_free: Unsupported message %d", msg->messageType);
@@ -447,100 +475,114 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
 	Msg_getPreamble(data, &messageType, &msgLen);
 
 	Log_debug("Message type %d size %d", messageType, msgLen);
-	dumpmsg(data, size);
+	//dumpmsg(data, size);
 	
 	switch (messageType) {
 	case Version:
 	{
-		msg = Msg_create(Version);
+		msg = Msg_create_nopayload(Version);
 		msg->unpacked = true;
 		msg->payload.version = mumble_proto__version__unpack(NULL, msgLen, msgData);
 		break;
 	}
-	case UDPTunnel:
+	case UDPTunnel: /* Non-standard handling of tunneled voice data */
 	{
-		msg = Msg_create(UDPTunnel);
-		msg->unpacked = true;
-		msg->payload.UDPTunnel = mumble_proto__udptunnel__unpack(NULL, msgLen, msgData);
+		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;
 		break;
 	}
 	case Authenticate:
 	{
-		msg = Msg_create(Authenticate);
+		msg = Msg_create_nopayload(Authenticate);
 		msg->unpacked = true;
 		msg->payload.authenticate = mumble_proto__authenticate__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case Ping:
 	{
-		msg = Msg_create(Ping);
+		msg = Msg_create_nopayload(Ping);
 		msg->unpacked = true;
 		msg->payload.ping = mumble_proto__ping__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case Reject:
 	{
-		msg = Msg_create(Reject);
+		msg = Msg_create_nopayload(Reject);
 		msg->unpacked = true;
 		msg->payload.reject = mumble_proto__reject__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case ServerSync:
 	{
-		msg = Msg_create(ServerSync);
+		msg = Msg_create_nopayload(ServerSync);
 		msg->unpacked = true;
 		msg->payload.serverSync = mumble_proto__server_sync__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case TextMessage:
 	{
-		msg = Msg_create(TextMessage);
+		msg = Msg_create_nopayload(TextMessage);
 		msg->unpacked = true;
 		msg->payload.textMessage = mumble_proto__text_message__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case PermissionDenied:
 	{
-		msg = Msg_create(PermissionDenied);
+		msg = Msg_create_nopayload(PermissionDenied);
 		msg->unpacked = true;
 		msg->payload.permissionDenied = mumble_proto__permission_denied__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case CryptSetup:
 	{
-		msg = Msg_create(CryptSetup);
+		msg = Msg_create_nopayload(CryptSetup);
 		msg->unpacked = true;
 		msg->payload.cryptSetup = mumble_proto__crypt_setup__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case UserList:
 	{
-		msg = Msg_create(UserList);
+		msg = Msg_create_nopayload(UserList);
 		msg->unpacked = true;
 		msg->payload.userList = mumble_proto__user_list__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case UserState:
 	{
-		msg = Msg_create(UserState);
+		msg = Msg_create_nopayload(UserState);
 		msg->unpacked = true;
 		msg->payload.userState = mumble_proto__user_state__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case VoiceTarget:
 	{
-		msg = Msg_create(VoiceTarget);
+		msg = Msg_create_nopayload(VoiceTarget);
 		msg->unpacked = true;
 		msg->payload.voiceTarget = mumble_proto__voice_target__unpack(NULL, msgLen, msgData);
 		break;
 	}
 	case CodecVersion:
 	{
-		msg = Msg_create(CodecVersion);
+		msg = Msg_create_nopayload(CodecVersion);
 		msg->unpacked = true;
 		msg->payload.codecVersion = mumble_proto__codec_version__unpack(NULL, msgLen, msgData);
 		break;
 	}
+	case PermissionQuery:
+	{
+		msg = Msg_create_nopayload(PermissionQuery);
+		msg->unpacked = true;
+		msg->payload.permissionQuery = mumble_proto__permission_query__unpack(NULL, msgLen, msgData);
+		break;
+	}
 
 	default:
 		Log_warn("Unsupported message %d", messageType);