From 0bcfd032e2c8dc4bc7eebf4d908d5d03c7f1dead Mon Sep 17 00:00:00 2001 From: irungentoo Date: Thu, 6 Nov 2014 20:44:31 -0500 Subject: Added some functions to send and handle lossy packets. --- toxcore/group.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- toxcore/group.h | 19 +++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/toxcore/group.c b/toxcore/group.c index 19d7ffa5..da56c572 100644 --- a/toxcore/group.c +++ b/toxcore/group.c @@ -925,6 +925,19 @@ void g_callback_group_action(Group_Chats *g_c, void (*function)(Messenger *m, in g_c->action_callback_userdata = userdata; } +/* Set handlers for custom lossy packets. + * NOTE: Handler must return 0 if packet is to be relayed, -1 if the packet should not be relayed. + * + * return -1 on failure. + * return 0 on success. + */ +void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*function)(Messenger *m, int, int, + const uint8_t *, uint16_t, void *), void *userdata) +{ + g_c->lossy_packethandlers[byte].function = function; + g_c->lossy_packethandlers[byte].userdata = userdata; +} + /* Set callback function for peer name list changes. * * It gets called every time the name list changes(new peer/name, deleted peer) @@ -1466,6 +1479,34 @@ int group_action_send(const Group_Chats *g_c, int groupnumber, const uint8_t *ac } } +/* High level function to send custom lossy packets. + * + * return -1 on failure. + * return 0 on success. + */ +int send_group_lossy_packet(const Group_Chats *g_c, int groupnumber, const uint8_t *data, uint16_t length) +{ + //TODO: length check here? + Group_c *g = get_group_c(g_c, groupnumber); + + if (!g) + return -1; + + uint8_t packet[sizeof(uint16_t) * 2 + length]; + uint16_t peer_number = htons(g->peer_number); + memcpy(packet, &peer_number, sizeof(uint16_t)); + uint16_t message_num = htons(g->lossy_message_number); + memcpy(packet + sizeof(uint16_t), &message_num, sizeof(uint16_t)); + memcpy(packet + sizeof(uint16_t) * 2, data, length); + + if (send_lossy_all_close(g_c, groupnumber, packet, sizeof(packet), -1) == 0) { + return -1; + } + + ++g->lossy_message_number; + return 0; +} + static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const uint8_t *data, uint16_t length, int close_index) { @@ -1730,9 +1771,13 @@ static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uin ++lossy_data; --lossy_length; - switch (message_id) { - - + if (g_c->lossy_packethandlers[message_id].function) { + if (g_c->lossy_packethandlers[message_id].function(g_c->m, groupnumber, index, lossy_data, lossy_length, + g_c->lossy_packethandlers[message_id].userdata) == -1) { + return -1; + } + } else { + return -1; } send_lossy_all_close(g_c, groupnumber, data + 1 + sizeof(uint16_t), length - (1 + sizeof(uint16_t)), diff --git a/toxcore/group.h b/toxcore/group.h index 5adde463..e307bec9 100644 --- a/toxcore/group.h +++ b/toxcore/group.h @@ -108,6 +108,11 @@ typedef struct { void *action_callback_userdata; void (*peer_namelistchange)(Messenger *m, int, int, uint8_t, void *); void *group_namelistchange_userdata; + + struct { + int (*function)(Messenger *m, int, int, const uint8_t *, uint16_t, void *); + void *userdata; + } lossy_packethandlers[256]; } Group_Chats; /* Set the callback for group invites. @@ -216,6 +221,20 @@ unsigned int group_peernumber_is_ours(const Group_Chats *g_c, int groupnumber, i int group_names(const Group_Chats *g_c, int groupnumber, uint8_t names[][MAX_NAME_LENGTH], uint16_t lengths[], uint16_t length); +/* Set handlers for custom lossy packets. + * + * NOTE: Handler must return 0 if packet is to be relayed, -1 if the packet should not be relayed. + */ +void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*function)(Messenger *m, int, int, + const uint8_t *, uint16_t, void *), void *userdata); + +/* High level function to send custom lossy packets. + * + * return -1 on failure. + * return 0 on success. + */ +int send_group_lossy_packet(const Group_Chats *g_c, int groupnumber, const uint8_t *data, uint16_t length); + /* Return the number of chats in the instance m. * You should use this to determine how much memory to allocate * for copy_chatlist. -- cgit v1.2.3