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

Improved onion connection by a bit.

Browse Source
This commit is contained in:
irungentoo 2014-01-31 18:05:49 -05:00
parent 51717825c1
commit a377c7fbf4
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
toxcore/onion_client.c
View File

@ -766,24 +766,26 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
} }
} }
if (count < MAX_ONION_CLIENTS / 2) { if (count != MAX_ONION_CLIENTS) {
Node_format nodes_list[MAX_SENT_NODES]; if (count < rand() % MAX_ONION_CLIENTS) {
uint32_t num_nodes = get_close_nodes(onion_c->dht, onion_c->friends_list[friendnum].real_client_id, nodes_list, Node_format nodes_list[MAX_SENT_NODES];
rand() % 2 ? AF_INET : AF_INET6, 1, 0); uint32_t num_nodes = get_close_nodes(onion_c->dht, onion_c->friends_list[friendnum].real_client_id, nodes_list,
rand() % 2 ? AF_INET : AF_INET6, 1, 0);
for (i = 0; i < num_nodes; ++i) for (i = 0; i < num_nodes; ++i)
client_send_announce_request(onion_c, friendnum + 1, nodes_list[i].ip_port, nodes_list[i].client_id, 0); client_send_announce_request(onion_c, friendnum + 1, nodes_list[i].ip_port, nodes_list[i].client_id, 0);
}
/* send packets to friend telling them our fake DHT id. */
if (is_timeout(onion_c->friends_list[friendnum].last_fakeid_onion_sent, ONION_FAKEID_INTERVAL))
if (send_fakeid_announce(onion_c, friendnum, 0) >= 1)
onion_c->friends_list[friendnum].last_fakeid_onion_sent = unix_time();
if (is_timeout(onion_c->friends_list[friendnum].last_fakeid_dht_sent, DHT_FAKEID_INTERVAL))
if (send_fakeid_announce(onion_c, friendnum, 1) >= 1)
onion_c->friends_list[friendnum].last_fakeid_dht_sent = unix_time();
} }
/* send packets to friend telling them our fake DHT id. */
if (is_timeout(onion_c->friends_list[friendnum].last_fakeid_onion_sent, ONION_FAKEID_INTERVAL))
if (send_fakeid_announce(onion_c, friendnum, 0) >= 1)
onion_c->friends_list[friendnum].last_fakeid_onion_sent = unix_time();
if (is_timeout(onion_c->friends_list[friendnum].last_fakeid_dht_sent, DHT_FAKEID_INTERVAL))
if (send_fakeid_announce(onion_c, friendnum, 1) >= 1)
onion_c->friends_list[friendnum].last_fakeid_dht_sent = unix_time();
} }
} }
/* Function to call when onion data packet with contents beginning with byte is received. */ /* Function to call when onion data packet with contents beginning with byte is received. */
@ -820,13 +822,15 @@ static void do_announce(Onion_Client *onion_c)
} }
} }
if (count < MAX_ONION_CLIENTS / 2) { if (count != MAX_ONION_CLIENTS) {
Node_format nodes_list[MAX_SENT_NODES]; if (count < rand() % MAX_ONION_CLIENTS) {
uint32_t num_nodes = get_close_nodes(onion_c->dht, onion_c->dht->c->self_public_key, nodes_list, Node_format nodes_list[MAX_SENT_NODES];
rand() % 2 ? AF_INET : AF_INET6, 1, 0); uint32_t num_nodes = get_close_nodes(onion_c->dht, onion_c->dht->c->self_public_key, nodes_list,
rand() % 2 ? AF_INET : AF_INET6, 1, 0);
for (i = 0; i < num_nodes; ++i) for (i = 0; i < num_nodes; ++i)
client_send_announce_request(onion_c, 0, nodes_list[i].ip_port, nodes_list[i].client_id, 0); client_send_announce_request(onion_c, 0, nodes_list[i].ip_port, nodes_list[i].client_id, 0);
}
} }
} }