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

Don't bootstrap to all loaded nodes at once.

Browse Source
This commit is contained in:
irungentoo 2015-06-07 20:47:40 -04:00
parent 14afb3b9b7
commit 0a38ffcbba
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
toxcore/DHT.c
View File

@ -2244,18 +2244,17 @@ DHT *new_DHT(Networking_Core *net)
void do_DHT(DHT *dht)
{
// Load friends/clients if first call to do_DHT
if (dht->has_loaded_friends_clients) {
dht->has_loaded_friends_clients = 0;
DHT_connect_after_load(dht);
}
unix_time_update();
if (dht->last_run == unix_time()) {
return;
}
// Load friends/clients if first call to do_DHT
if (dht->loaded_num_nodes) {
DHT_connect_after_load(dht);
}
do_Close(dht);
do_DHT_friends(dht);
do_NAT(dht);
@ -2287,7 +2286,7 @@ void kill_DHT(DHT *dht)
}
/* new DHT format for load/save, more robust and forward compatible */
//TODO: Move this closer to Messenger.
#define DHT_STATE_COOKIE_GLOBAL 0x159000d
#define DHT_STATE_COOKIE_TYPE 0x11ce
@ -2376,6 +2375,9 @@ void DHT_save(DHT *dht, uint8_t *data)
z_state_save_subheader(old_data, num * sizeof(Node_format), DHT_STATE_TYPE_NODES);
}
/* Bootstrap from this number of nodes every time DHT_connect_after_load() is called */
#define SAVE_BOOTSTAP_FREQUENCY 8
/* Start sending packets after DHT loaded_friends_list and loaded_clients_list are set */
int DHT_connect_after_load(DHT *dht)
{
@ -2385,16 +2387,21 @@ int DHT_connect_after_load(DHT *dht)
if (!dht->loaded_nodes_list)
return -1;
unsigned int i;
for (i = 0; i < dht->loaded_num_nodes; ++i) {
DHT_bootstrap(dht, dht->loaded_nodes_list[i].ip_port, dht->loaded_nodes_list[i].public_key);
/* DHT is connected, stop. */
if (DHT_non_lan_connected(dht)) {
free(dht->loaded_nodes_list);
dht->loaded_nodes_list = NULL;
dht->loaded_num_nodes = 0;
return 0;
}
// Loaded lists were allocd, free them
free(dht->loaded_nodes_list);
dht->loaded_nodes_list = NULL;
dht->loaded_num_nodes = 0;
unsigned int i;
for (i = 0; i < dht->loaded_num_nodes && i < SAVE_BOOTSTAP_FREQUENCY; ++i) {
unsigned int index = dht->loaded_nodes_index % dht->loaded_num_nodes;
DHT_bootstrap(dht, dht->loaded_nodes_list[index].ip_port, dht->loaded_nodes_list[index].public_key);
++dht->loaded_nodes_index;
}
return 0;
}
@ -2422,7 +2429,6 @@ static int dht_load_state_callback(void *outer, const uint8_t *data, uint32_t le
dht->loaded_num_nodes = num;
dht->has_loaded_friends_clients = 1;
} /* localize declarations */
break;

4
toxcore/DHT.h
View File

@ -211,11 +211,9 @@ typedef struct {
DHT_Friend *friends_list;
uint16_t num_friends;
// Used after loading of file (tox_load), but no longer needed after connect (tox_connect)
// Unsure if friends_list and num_friends could just be used instead?
int has_loaded_friends_clients; // Whether or not we have loaded on the first do_DHT
Node_format *loaded_nodes_list;
uint32_t loaded_num_nodes;
unsigned int loaded_nodes_index;
Shared_Keys shared_keys_recv;
Shared_Keys shared_keys_sent;