X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessages.c;h=38d4ea91c832500facc4ace3047d0f7836ab6eed;hb=ed9b54bd89b704e6111acbd91b6a7b50e3c30cf5;hp=5931edd9e77d71044f3837f0975f80cc47f487dd;hpb=f1a666fa49ec318684c76148912a734a01e194a7;p=umurmur.git

diff --git a/src/messages.c b/src/messages.c
index 5931edd..38d4ea9 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -226,6 +226,26 @@ int Msg_messageToNetwork(message_t *msg, uint8_t *buffer)
 		Msg_addPreamble(buffer, msg->messageType, len);
 		mumble_proto__channel_remove__pack(msg->payload.channelRemove, bufptr);
 		break;
+	case UserStats:
+	{		
+		len = mumble_proto__user_stats__get_packed_size(msg->payload.userStats);
+		if (len > MAX_MSGSIZE) {
+			Log_warn("Too big tx message. Discarding");
+			break;
+			}
+		Msg_addPreamble(buffer, msg->messageType, len);
+		mumble_proto__user_stats__pack(msg->payload.userStats, bufptr);
+		break;
+	}
+	case ServerConfig:
+		len = mumble_proto__server_config__get_packed_size(msg->payload.serverConfig);
+		if (len > MAX_MSGSIZE) {
+			Log_warn("Too big tx message. Discarding");
+			break;
+			}
+		Msg_addPreamble(buffer, msg->messageType, len);
+		mumble_proto__server_config__pack(msg->payload.serverConfig, bufptr);
+		break;
 
 	default:
 		Log_warn("Msg_MessageToNetwork: Unsupported message %d", msg->messageType);
@@ -320,6 +340,27 @@ message_t *Msg_create(messageType_t messageType)
 		msg->payload.channelRemove = malloc(sizeof(MumbleProto__ChannelRemove));
 		mumble_proto__channel_remove__init(msg->payload.channelRemove);
 		break;
+	case UserStats:
+		msg->payload.userStats = malloc(sizeof(MumbleProto__UserStats));
+		mumble_proto__user_stats__init(msg->payload.userStats);
+		
+		msg->payload.userStats->from_client = malloc(sizeof(MumbleProto__UserStats__Stats));
+		mumble_proto__user_stats__stats__init(msg->payload.userStats->from_client);
+
+		msg->payload.userStats->from_server = malloc(sizeof(MumbleProto__UserStats__Stats));
+		mumble_proto__user_stats__stats__init(msg->payload.userStats->from_server);
+
+		msg->payload.userStats->version = malloc(sizeof(MumbleProto__Version));
+		mumble_proto__version__init(msg->payload.userStats->version);
+		
+		if (!msg->payload.userStats || !msg->payload.userStats->from_client ||
+			!msg->payload.userStats->from_server || !msg->payload.userStats->version)
+			Log_fatal("Out of memory");
+		break;
+	case ServerConfig:
+		msg->payload.serverConfig = malloc(sizeof(MumbleProto__ServerConfig));
+		mumble_proto__server_config__init(msg->payload.serverConfig);
+		break;
 
 	default:
 		Log_warn("Msg_create: Unsupported message %d", msg->messageType);
@@ -395,6 +436,14 @@ void Msg_free(message_t *msg)
 		if (msg->unpacked)
 			mumble_proto__text_message__free_unpacked(msg->payload.textMessage, NULL);
 		else {
+			if (msg->payload.textMessage->message)
+				free(msg->payload.textMessage->message);
+			if (msg->payload.textMessage->session)
+				free(msg->payload.textMessage->session);
+			if (msg->payload.textMessage->channel_id)
+				free(msg->payload.textMessage->channel_id);
+			if (msg->payload.textMessage->tree_id)
+				free(msg->payload.textMessage->tree_id);
 			free(msg->payload.textMessage);
 		}
 		break;
@@ -476,6 +525,44 @@ void Msg_free(message_t *msg)
 			free(msg->payload.channelRemove);
 		}
 		break;
+	case UserStats:
+		if (msg->unpacked)
+			mumble_proto__user_stats__free_unpacked(msg->payload.userStats, NULL);
+		else {
+			if (msg->payload.userStats->from_client)
+				free(msg->payload.userStats->from_client);
+			if (msg->payload.userStats->from_server)
+				free(msg->payload.userStats->from_server);
+			if (msg->payload.userStats->version) {
+				if (msg->payload.userStats->version->release)
+					free(msg->payload.userStats->version->release);
+				if (msg->payload.userStats->version->os)
+					free(msg->payload.userStats->version->os);
+				if (msg->payload.userStats->version->os_version)
+					free(msg->payload.userStats->version->os_version);
+
+				free(msg->payload.userStats->version);
+			}
+			if (msg->payload.userStats->celt_versions)
+				free(msg->payload.userStats->celt_versions);
+			if (msg->payload.userStats->certificates) {
+				if (msg->payload.userStats->certificates->data)
+					free(msg->payload.userStats->certificates->data);
+				free(msg->payload.userStats->certificates);
+			}
+			if (msg->payload.userStats->address.data)
+				free(msg->payload.userStats->address.data);
+
+			free(msg->payload.userStats);
+		}
+		break;
+	case ServerConfig:
+		if (msg->unpacked)
+			mumble_proto__server_config__free_unpacked(msg->payload.serverConfig, NULL);
+		else {
+			free(msg->payload.serverConfig);
+		}
+		break;
 
 	default:
 		Log_warn("Msg_free: Unsupported message %d", msg->messageType);
@@ -653,6 +740,15 @@ message_t *Msg_networkToMessage(uint8_t *data, int size)
 			goto err_out;
 		break;
 	}
+	case UserStats:
+	{
+		msg = Msg_create_nopayload(UserStats);
+		msg->unpacked = true;
+		msg->payload.userStats = mumble_proto__user_stats__unpack(NULL, msgLen, msgData);
+		if (msg->payload.userStats == NULL)
+			goto err_out;
+		break;
+	}
 
 	default:
 		Log_warn("Unsupported message %d", messageType);