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 cleanups to last PR.

Browse Source
This commit is contained in:
irungentoo 2014-09-12 17:40:09 -04:00
parent 269fd6814e
commit 9527d28b70
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toxcore/DHT.c
View File

@ -2336,6 +2336,9 @@ void DHT_save(DHT *dht, uint8_t *data)
static void DHT_bootstrap_loaded_clients(DHT *dht) static void DHT_bootstrap_loaded_clients(DHT *dht)
{ {
if (!dht->loaded_clients_list)
return;
uint32_t i; uint32_t i;
Client_data *client_list = dht->loaded_clients_list; Client_data *client_list = dht->loaded_clients_list;
@ -2352,6 +2355,9 @@ static void DHT_bootstrap_loaded_clients(DHT *dht)
static void getnodes_of_loaded_friend_clients(DHT *dht) static void getnodes_of_loaded_friend_clients(DHT *dht)
{ {
if (!dht->loaded_friends_list)
return;
uint32_t i, j; uint32_t i, j;
DHT_Friend *friend_list = dht->loaded_friends_list; DHT_Friend *friend_list = dht->loaded_friends_list;
@ -2373,7 +2379,7 @@ static void getnodes_of_loaded_friend_clients(DHT *dht)
/* Start sending packets after DHT loaded_friends_list and loaded_clients_list are set */ /* Start sending packets after DHT loaded_friends_list and loaded_clients_list are set */
int DHT_connect_after_load(DHT *dht) int DHT_connect_after_load(DHT *dht)
{ {
if (dht == NULL || dht->loaded_friends_list == NULL || dht->loaded_clients_list == NULL) if (dht == NULL)
return -1; return -1;
getnodes_of_loaded_friend_clients(dht); getnodes_of_loaded_friend_clients(dht);
@ -2381,7 +2387,12 @@ int DHT_connect_after_load(DHT *dht)
// Loaded lists were allocd, free them // Loaded lists were allocd, free them
free(dht->loaded_friends_list); free(dht->loaded_friends_list);
dht->loaded_friends_list = NULL;
dht->loaded_num_friends = 0;
free(dht->loaded_clients_list); free(dht->loaded_clients_list);
dht->loaded_clients_list = NULL;
dht->loaded_num_clients = 0;
return 0; return 0;
} }
@ -2400,6 +2411,7 @@ static int dht_load_state_callback(void *outer, const uint8_t *data, uint32_t le
DHT_Friend *friend_list = (DHT_Friend *)data; DHT_Friend *friend_list = (DHT_Friend *)data;
num = length / sizeof(DHT_Friend); num = length / sizeof(DHT_Friend);
free(dht->loaded_friends_list);
// Copy to loaded_friends_list // Copy to loaded_friends_list
dht->loaded_friends_list = calloc(num, sizeof(DHT_Friend)); dht->loaded_friends_list = calloc(num, sizeof(DHT_Friend));
@ -2408,6 +2420,7 @@ static int dht_load_state_callback(void *outer, const uint8_t *data, uint32_t le
dht->loaded_num_friends = num; dht->loaded_num_friends = num;
dht->has_loaded_friends_clients = 1;
} /* localize declarations */ } /* localize declarations */
break; break;
@ -2420,6 +2433,7 @@ static int dht_load_state_callback(void *outer, const uint8_t *data, uint32_t le
num = length / sizeof(Client_data); num = length / sizeof(Client_data);
Client_data *client_list = (Client_data *)data; Client_data *client_list = (Client_data *)data;
free(dht->loaded_clients_list);
// Copy to loaded_clients_list // Copy to loaded_clients_list
dht->loaded_clients_list = calloc(num, sizeof(Client_data)); dht->loaded_clients_list = calloc(num, sizeof(Client_data));
@ -2428,6 +2442,7 @@ static int dht_load_state_callback(void *outer, const uint8_t *data, uint32_t le
dht->loaded_num_clients = num; dht->loaded_num_clients = num;
dht->has_loaded_friends_clients = 1;
} /* localize declarations */ } /* localize declarations */
break; break;

1
toxcore/Messenger.c
View File

@ -2818,6 +2818,7 @@ static int messenger_load_state_callback(void *outer, const uint8_t *data, uint3
} }
memcpy(m->loaded_relays, data, length); memcpy(m->loaded_relays, data, length);
m->has_added_relays = 0;
break; break;
} }