-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
static message_t *Msg_create_nopayload(messageType_t messageType);
static void Msg_addPreamble(uint8_t *buffer, uint16_t type, uint32_t len)
-{
+{
buffer[1] = (type) & 0xff;
buffer[0] = (type >> 8) & 0xff;
-
+
buffer[5] = (len) & 0xff;
buffer[4] = (len >> 8) & 0xff;
buffer[3] = (len >> 16) & 0xff;
- buffer[2] = (len >> 24) & 0xff;
+ buffer[2] = (len >> 24) & 0xff;
}
static void Msg_getPreamble(uint8_t *buffer, int *type, int *len)
{
uint16_t msgType;
uint32_t msgLen;
-
+
msgType = buffer[1] | (buffer[0] << 8);
msgLen = buffer[5] | (buffer[4] << 8) | (buffer[3] << 16) | (buffer[2] << 24);
*type = (int)msgType;
{
int len;
uint8_t *bufptr = buffer + PREAMBLE_SIZE;
-
+
Log_debug("To net: msg type %d", msg->messageType);
switch (msg->messageType) {
case Version:
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");
mumble_proto__server_config__pack(msg->payload.serverConfig, bufptr);
break;
+ case BanList:
+ len = mumble_proto__ban_list__get_packed_size(msg->payload.banList);
+ if (len > MAX_MSGSIZE) {
+ Log_warn("Too big tx message. Discarding");
+ break;
+ }
+ Msg_addPreamble(buffer, msg->messageType, len);
+ Log_debug("Msg_MessageToNetwork: BanList size %d", len);
+ mumble_proto__ban_list__pack(msg->payload.banList, bufptr);
+ break;
default:
Log_warn("Msg_MessageToNetwork: Unsupported message %d", msg->messageType);
return 0;
message_t *Msg_create(messageType_t messageType)
{
message_t *msg = Msg_create_nopayload(messageType);
-
+ int i;
+
switch (messageType) {
case Version:
msg->payload.version = malloc(sizeof(MumbleProto__Version));
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->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");
return msg;
}
+message_t *Msg_banList_create(int n_bans)
+{
+ message_t *msg = Msg_create_nopayload(BanList);
+ int i;
+
+ msg->payload.banList = malloc(sizeof(MumbleProto__BanList));
+ if (msg->payload.banList == NULL)
+ Log_fatal("Out of memory");
+ memset(msg->payload.banList, 0, sizeof(MumbleProto__BanList));
+ mumble_proto__ban_list__init(msg->payload.banList);
+ msg->payload.banList->n_bans = n_bans;
+ msg->payload.banList->bans = malloc(sizeof(MumbleProto__BanList__BanEntry *) * n_bans);
+ if (msg->payload.banList->bans == NULL)
+ Log_fatal("Out of memory");
+ for (i = 0; i < n_bans; i++) {
+ msg->payload.banList->bans[i] = malloc(sizeof(MumbleProto__BanList__BanEntry));
+ if (msg->payload.banList->bans[i] == NULL)
+ Log_fatal("Out of memory");
+ memset(msg->payload.banList->bans[i], 0, sizeof(MumbleProto__BanList__BanEntry));
+ mumble_proto__ban_list__ban_entry__init(msg->payload.banList->bans[i]);
+ }
+ return msg;
+}
+
+void Msg_banList_addEntry(message_t *msg, int index, uint8_t *address, uint32_t mask,
+ char *name, char *hash, char *reason, char *start, uint32_t duration)
+{
+ MumbleProto__BanList__BanEntry *entry = msg->payload.banList->bans[index];
+
+ entry->address.data = malloc(16);
+ if (!entry->address.data)
+ Log_fatal("Out of memory");
+ memcpy(entry->address.data, address, 16);
+ entry->address.len = 16;
+ entry->mask = mask;
+ entry->name = strdup(name);
+ entry->hash = strdup(hash);
+ entry->reason = strdup(reason);
+ entry->start = strdup(start);
+ if (!entry->name || !entry->hash || !entry->reason || !entry->start)
+ Log_fatal("Out of memory");
+
+ if (duration > 0) {
+ entry->duration = duration;
+ entry->has_duration = true;
+ }
+ Log_debug("Msg_banList_addEntry: %s %s %s %s %s", entry->name, entry->hash, entry->address.data, entry->reason, entry->start);
+}
+
+void Msg_banList_getEntry(message_t *msg, int index, uint8_t **address, uint32_t *mask,
+ char **name, char **hash, char **reason, char **start, uint32_t *duration)
+{
+ MumbleProto__BanList__BanEntry *entry = msg->payload.banList->bans[index];
+
+ *address = entry->address.data;
+ *mask = entry->mask;
+ *name = entry->name;
+ *hash = entry->hash;
+ *reason = entry->reason;
+ *start = entry->start;
+ if (entry->has_duration)
+ *duration = entry->duration;
+ else
+ *duration = 0;
+}
+
+
void Msg_inc_ref(message_t *msg)
{
msg->refcount++;
void Msg_free(message_t *msg)
{
+ int i;
+
if (msg->refcount) msg->refcount--;
if (msg->refcount > 0)
return;
free(msg->payload.serverConfig);
}
break;
+ case BanList:
+ if (msg->unpacked)
+ mumble_proto__ban_list__free_unpacked(msg->payload.banList, NULL);
+ else {
+ for (i = 0; i < msg->payload.banList->n_bans; i++) {
+ free(msg->payload.banList->bans[i]->address.data);
+ free(msg->payload.banList->bans[i]->name);
+ free(msg->payload.banList->bans[i]->hash);
+ free(msg->payload.banList->bans[i]->reason);
+ free(msg->payload.banList->bans[i]->start);
+ free(msg->payload.banList->bans[i]);
+ }
+ free(msg->payload.banList->bans);
+ free(msg->payload.banList);
+ }
+ break;
default:
Log_warn("Msg_free: Unsupported message %d", msg->messageType);
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));
Log_debug("Message type %d size %d", messageType, msgLen);
//dumpmsg(data, size);
-
+
switch (messageType) {
case Version:
{
goto err_out;
break;
}
+ case BanList:
+ {
+ msg = Msg_create_nopayload(BanList);
+ msg->unpacked = true;
+ msg->payload.banList = mumble_proto__ban_list__unpack(NULL, msgLen, msgData);
+ if (msg->payload.banList == NULL)
+ goto err_out;
+ break;
+ }
default:
- Log_warn("Unsupported message %d", messageType);
+ Log_warn("Msg_networkToMessage: Unsupported message %d", messageType);
break;
}
return msg;
-
+
err_out:
free(msg);
return NULL;