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

DHT can now be used for group chat cons and friend cons at the same time.

Browse Source
This commit is contained in:
irungentoo 2014-09-26 15:42:56 -04:00
parent 8b35d194c0
commit bb60c28b73
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
toxcore/DHT.c
View File

@ -1091,8 +1091,12 @@ static void get_bunchnodes(DHT *dht, Client_data *list, uint16_t length, uint16_
*/
int DHT_addfriend(DHT *dht, const uint8_t *client_id)
{
if (friend_number(dht, client_id) != -1) /* Is friend already in DHT? */
return 1;
int friend_num = friend_number(dht, client_id);
if (friend_num != -1) { /* Is friend already in DHT? */
++dht->friends_list[friend_num].lock_count;
return 0;
}
DHT_Friend *temp;
temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends + 1));
@ -1145,36 +1149,43 @@ int DHT_addfriend(DHT *dht, const uint8_t *client_id)
int DHT_delfriend(DHT *dht, const uint8_t *client_id)
{
int friend_num = friend_number(dht, client_id);
if (friend_num == -1) {
return 1;
}
--dht->friends_list[friend_num].lock_count;
if (dht->friends_list[friend_num].lock_count) /* DHT friend is still in use.*/
return 0;
uint32_t i;
DHT_Friend *temp;
for (i = 0; i < dht->num_friends; ++i) {
/* Equal */
if (id_equal(dht->friends_list[i].client_id, client_id)) {
--dht->num_friends;
--dht->num_friends;
if (dht->num_friends != i) {
memcpy( &dht->friends_list[i],
&dht->friends_list[dht->num_friends],
sizeof(DHT_Friend) );
}
if (dht->num_friends == 0) {
free(dht->friends_list);
dht->friends_list = NULL;
return 0;
}
temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends));
if (temp == NULL)
return 1;
dht->friends_list = temp;
return 0;
}
if (dht->num_friends != friend_num) {
memcpy( &dht->friends_list[friend_num],
&dht->friends_list[dht->num_friends],
sizeof(DHT_Friend) );
}
if (dht->num_friends == 0) {
free(dht->friends_list);
dht->friends_list = NULL;
return 0;
}
temp = realloc(dht->friends_list, sizeof(DHT_Friend) * (dht->num_friends));
if (temp == NULL)
return 1;
dht->friends_list = temp;
return 0;
return 1;
}

2
toxcore/DHT.h
View File

@ -133,6 +133,8 @@ typedef struct {
/* Symetric NAT hole punching stuff. */
NAT nat;
uint16_t lock_count;
} DHT_Friend;
typedef struct {