StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Some initial groupchat lossy packet code.

Browse Source
This commit is contained in:
irungentoo 2014-11-04 20:59:56 -05:00
parent 1f4b061a4c
commit 54beaa4854
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxcore/Messenger.h
View File

@ -63,7 +63,7 @@
#define PACKET_ID_ONLINE_PACKET 97 #define PACKET_ID_ONLINE_PACKET 97
#define PACKET_ID_DIRECT_GROUPCHAT 98 #define PACKET_ID_DIRECT_GROUPCHAT 98
#define PACKET_ID_MESSAGE_GROUPCHAT 99 #define PACKET_ID_MESSAGE_GROUPCHAT 99
#define PACKET_ID_LOSSY_GROUPCHAT 199
/* Max number of tcp relays sent to friends */ /* Max number of tcp relays sent to friends */
#define MAX_SHARED_RELAYS 16 #define MAX_SHARED_RELAYS 16

48
toxcore/group.c
View File

@ -577,6 +577,7 @@ static int handle_status(void *object, int friendcon_id, uint8_t status)
} }
static int handle_packet(void *object, int friendcon_id, uint8_t *data, uint16_t length); static int handle_packet(void *object, int friendcon_id, uint8_t *data, uint16_t length);
static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length);
/* Add friend to group chat. /* Add friend to group chat.
* *
@ -614,8 +615,8 @@ static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnu
g->close[ind].number = friendcon_id; g->close[ind].number = friendcon_id;
g->close[ind].closest = closest; g->close[ind].closest = closest;
//TODO //TODO
friend_connection_callbacks(g_c->m->fr_c, friendcon_id, GROUPCHAT_CALLBACK_INDEX, &handle_status, &handle_packet, 0, friend_connection_callbacks(g_c->m->fr_c, friendcon_id, GROUPCHAT_CALLBACK_INDEX, &handle_status, &handle_packet,
g_c, friendcon_id); &handle_lossy, g_c, friendcon_id);
return ind; return ind;
} }
@ -1036,7 +1037,8 @@ static void handle_friend_invite_packet(Messenger *m, int32_t friendnumber, cons
return; return;
uint16_t peer_number = rand(); /* TODO: what if two people enter the group at the same time and uint16_t peer_number = rand(); /* TODO: what if two people enter the group at the same time and
are given the same peer_number by different nodes? */ are given the same peer_number by different nodes? */
unsigned int tries = 0; unsigned int tries = 0;
while (get_peer_index(g, peer_number) != -1) { while (get_peer_index(g, peer_number) != -1) {
@ -1483,6 +1485,7 @@ static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const
if (peer_number == kill_peer_number) { if (peer_number == kill_peer_number) {
delpeer(g_c, groupnumber, index); delpeer(g_c, groupnumber, index);
} else { } else {
return;
//TODO //TODO
} }
} }
@ -1577,6 +1580,45 @@ static int handle_packet(void *object, int friendcon_id, uint8_t *data, uint16_t
return 0; return 0;
} }
static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length)
{
Group_Chats *g_c = object;
if (length < 1 + sizeof(uint16_t) + sizeof(uint16_t) + 1)
return -1;
if (data[0] != PACKET_ID_LOSSY_GROUPCHAT)
return -1;
uint16_t groupnumber, peer_number;
memcpy(&groupnumber, data + 1, sizeof(uint16_t));
memcpy(&peer_number, data + 1 + sizeof(uint16_t), sizeof(uint16_t));
groupnumber = ntohs(groupnumber);
peer_number = ntohs(peer_number);
Group_c *g = get_group_c(g_c, groupnumber);
if (!g)
return -1;
int index = friend_in_close(g, friendcon_id);
if (index == -1)
return -1;
int peer_index = get_peer_index(g, peer_number);
if (peer_index == -1)
return -1;
const uint8_t *lossy_data = data + 1 + sizeof(uint16_t) * 2;
uint16_t lossy_length = length - (1 + sizeof(uint16_t) * 2);
uint8_t message_id = lossy_data[0];
++lossy_data;
--lossy_length;
return 0;
}
/* Interval in seconds to send ping messages */ /* Interval in seconds to send ping messages */
#define GROUP_PING_INTERVAL 30 #define GROUP_PING_INTERVAL 30