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

Fixed group bugs.

Browse Source 
Connections should now die when appropriate instead of lingering
endlessly.
This commit is contained in:
irungentoo 2014-10-03 16:54:03 -04:00
parent b969f1b2d8
commit 45ca02f5a2
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
toxcore/group.c
View File

@ -212,7 +212,7 @@ enum {
}; };
static int friend_in_close(Group_c *g, int friendcon_id); static int friend_in_close(Group_c *g, int friendcon_id);
static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnumber, uint8_t closest); static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnumber, uint8_t closest, uint8_t lock);
static int add_to_closest(Group_Chats *g_c, int groupnumber, const uint8_t *real_pk, const uint8_t *temp_pk) static int add_to_closest(Group_Chats *g_c, int groupnumber, const uint8_t *real_pk, const uint8_t *temp_pk)
{ {
@ -327,8 +327,11 @@ static int connect_to_closest(Group_Chats *g_c, int groupnumber)
int friendcon_id = getfriend_conn_id_pk(g_c->fr_c, g->closest_peers[i].real_pk); int friendcon_id = getfriend_conn_id_pk(g_c->fr_c, g->closest_peers[i].real_pk);
uint8_t lock = 1;
if (friendcon_id == -1) { if (friendcon_id == -1) {
friendcon_id = new_friend_connection(g_c->fr_c, g->closest_peers[i].real_pk); friendcon_id = new_friend_connection(g_c->fr_c, g->closest_peers[i].real_pk);
lock = 0;
if (friendcon_id == -1) { if (friendcon_id == -1) {
continue; continue;
@ -337,7 +340,7 @@ static int connect_to_closest(Group_Chats *g_c, int groupnumber)
set_dht_temp_pk(g_c->fr_c, friendcon_id, g->closest_peers[i].temp_pk); set_dht_temp_pk(g_c->fr_c, friendcon_id, g->closest_peers[i].temp_pk);
} }
add_conn_to_groupchat(g_c, friendcon_id, groupnumber, 1); add_conn_to_groupchat(g_c, friendcon_id, groupnumber, 1, lock);
if (friend_con_connected(g_c->fr_c, friendcon_id) == FRIENDCONN_STATUS_CONNECTED) { if (friend_con_connected(g_c->fr_c, friendcon_id) == FRIENDCONN_STATUS_CONNECTED) {
send_packet_online(g_c->fr_c, friendcon_id, groupnumber, g->identifier); send_packet_online(g_c->fr_c, friendcon_id, groupnumber, g->identifier);
@ -555,7 +558,7 @@ static int handle_packet(void *object, int friendcon_id, uint8_t *data, uint16_t
* return close index on success * return close index on success
* return -1 on failure. * return -1 on failure.
*/ */
static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnumber, uint8_t closest) static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnumber, uint8_t closest, uint8_t lock)
{ {
Group_c *g = get_group_c(g_c, groupnumber); Group_c *g = get_group_c(g_c, groupnumber);
@ -579,7 +582,9 @@ static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, int groupnu
if (ind == MAX_GROUP_CONNECTIONS) if (ind == MAX_GROUP_CONNECTIONS)
return -1; return -1;
friend_connection_lock(g_c->fr_c, friendcon_id); if (lock)
friend_connection_lock(g_c->fr_c, friendcon_id);
g->close[ind].type = GROUPCHAT_CLOSE_CONNECTION; g->close[ind].type = GROUPCHAT_CLOSE_CONNECTION;
g->close[ind].number = friendcon_id; g->close[ind].number = friendcon_id;
g->close[ind].closest = closest; g->close[ind].closest = closest;
@ -777,7 +782,7 @@ int join_groupchat(Group_Chats *g_c, int32_t friendnumber, const uint8_t *data,
memcpy(&other_groupnum, data, sizeof(other_groupnum)); memcpy(&other_groupnum, data, sizeof(other_groupnum));
other_groupnum = ntohs(other_groupnum); other_groupnum = ntohs(other_groupnum);
memcpy(g->identifier, data + sizeof(uint16_t), GROUP_IDENTIFIER_LENGTH); memcpy(g->identifier, data + sizeof(uint16_t), GROUP_IDENTIFIER_LENGTH);
int close_index = add_conn_to_groupchat(g_c, friendcon_id, groupnumber, 0); int close_index = add_conn_to_groupchat(g_c, friendcon_id, groupnumber, 0, 1);
if (close_index != -1) { if (close_index != -1) {
g->close[close_index].group_number = other_groupnum; g->close[close_index].group_number = other_groupnum;
@ -957,7 +962,7 @@ static void handle_friend_invite_packet(Messenger *m, int32_t friendnumber, cons
uint16_t peer_number = rand(); /* TODO: make it not random. */ uint16_t peer_number = rand(); /* TODO: make it not random. */
addpeer(g_c, groupnum, real_pk, temp_pk, peer_number); addpeer(g_c, groupnum, real_pk, temp_pk, peer_number);
int close_index = add_conn_to_groupchat(g_c, friendcon_id, groupnum, 0); int close_index = add_conn_to_groupchat(g_c, friendcon_id, groupnum, 0, 1);
if (close_index != -1) { if (close_index != -1) {
g->close[close_index].group_number = other_groupnum; g->close[close_index].group_number = other_groupnum;
@ -1033,14 +1038,24 @@ static int handle_packet_online(Group_Chats *g_c, int friendcon_id, uint8_t *dat
g->close[index].group_number = other_groupnum; g->close[index].group_number = other_groupnum;
g->close[index].type = GROUPCHAT_CLOSE_ONLINE; g->close[index].type = GROUPCHAT_CLOSE_ONLINE;
if (g->number_joined != -1) { if (g->number_joined != -1 && g->number_joined != friendcon_id) {
int index = friend_in_close(g, g->number_joined); int fr_close_index = friend_in_close(g, g->number_joined);
uint8_t real_pk[crypto_box_PUBLICKEYBYTES];
uint8_t dht_temp_pk[crypto_box_PUBLICKEYBYTES];
get_friendcon_public_keys(real_pk, dht_temp_pk, g_c->fr_c, g->number_joined);
g->number_joined = -1; g->number_joined = -1;
if (!g->close[index].closest) { if (fr_close_index == -1)
g->close[index].type = GROUPCHAT_CLOSE_NONE; return -1;
send_peer_kill(g_c, g->close[index].number, g->close[index].group_number);
kill_friend_connection(g_c->fr_c, g->close[index].number); if (!g->close[fr_close_index].closest && pk_in_closest_peers(g, real_pk)) {
g->close[fr_close_index].closest = 1;
}
if (!g->close[fr_close_index].closest) {
g->close[fr_close_index].type = GROUPCHAT_CLOSE_NONE;
send_peer_kill(g_c, g->close[fr_close_index].number, g->close[fr_close_index].group_number);
kill_friend_connection(g_c->fr_c, g->close[fr_close_index].number);
} }
} }
@ -1167,8 +1182,10 @@ static void handle_direct_packet(Group_Chats *g_c, int groupnumber, const uint8_
if (!g) if (!g)
return; return;
g->close[close_index].type = GROUPCHAT_CLOSE_NONE; if (!g->close[close_index].closest) {
kill_friend_connection(g_c->fr_c, g->close[close_index].number); g->close[close_index].type = GROUPCHAT_CLOSE_NONE;
kill_friend_connection(g_c->fr_c, g->close[close_index].number);
}
} }
case PEER_QUERY_ID: { case PEER_QUERY_ID: {