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

Tolerate instable connectivity: if *all* set close nodes are in terminal timeout (KILL_NODE_TIMEOUT), reset them all to BAD_NODE_TIMEOUT.

Browse Source 
That keeps the client trying to at least ping the nodes in the hopes of the connection coming back up.
This commit is contained in:
Coren[m] 2013-11-17 19:44:17 +01:00
parent da21a8f844
commit 81b472df0d
No known key found for this signature in database
GPG Key ID: AFA6943800F5DC6D
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toxcore/DHT.c
View File

@ -1025,10 +1025,12 @@ int DHT_getfriendip(DHT *dht, uint8_t *client_id, IP_Port *ip_port)
return -1; return -1;
} }
static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8_t *client_id, /* returns number of nodes not in kill-timeout */
static uint8_t do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8_t *client_id,
Client_data *list, uint32_t list_count) Client_data *list, uint32_t list_count)
{ {
uint32_t i; uint32_t i;
uint8_t not_kill = 0;
uint64_t temp_time = unix_time(); uint64_t temp_time = unix_time();
uint32_t num_nodes = 0; uint32_t num_nodes = 0;
@ -1043,6 +1045,8 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4) for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4)
if (!is_timeout(assoc->timestamp, KILL_NODE_TIMEOUT)) { if (!is_timeout(assoc->timestamp, KILL_NODE_TIMEOUT)) {
not_kill++;
if (is_timeout(assoc->last_pinged, PING_INTERVAL)) { if (is_timeout(assoc->last_pinged, PING_INTERVAL)) {
send_ping_request(dht->ping, assoc->ip_port, client->client_id ); send_ping_request(dht->ping, assoc->ip_port, client->client_id );
assoc->last_pinged = temp_time; assoc->last_pinged = temp_time;
@ -1063,6 +1067,8 @@ static void do_ping_and_sendnode_requests(DHT *dht, uint64_t *lastgetnode, uint8
client_id); client_id);
*lastgetnode = temp_time; *lastgetnode = temp_time;
} }
return not_kill;
} }
/* Ping each client in the "friends" list every PING_INTERVAL seconds. Send a get nodes request /* Ping each client in the "friends" list every PING_INTERVAL seconds. Send a get nodes request
@ -1082,8 +1088,28 @@ static void do_DHT_friends(DHT *dht)
*/ */
static void do_Close(DHT *dht) static void do_Close(DHT *dht)
{ {
do_ping_and_sendnode_requests(dht, &dht->close_lastgetnodes, dht->c->self_public_key, uint8_t not_killed = do_ping_and_sendnode_requests(dht, &dht->close_lastgetnodes, dht->c->self_public_key,
dht->close_clientlist, LCLIENT_LIST); dht->close_clientlist, LCLIENT_LIST);
if (!not_killed) {
/* all existing nodes are at least KILL_NODE_TIMEOUT,
* which means we are mute, as we only send packets to
* nodes NOT in KILL_NODE_TIMEOUT
*
* so: reset all nodes to be BAD_NODE_TIMEOUT, but not
* KILL_NODE_TIMEOUT, so we at least keep trying pings */
uint64_t badonly = unix_time() - BAD_NODE_TIMEOUT;
size_t i, a;
for (i = 0; i < LCLIENT_LIST; i++) {
Client_data *client = &dht->close_clientlist[i];
IPPTsPng *assoc;
for (a = 0, assoc = &client->assoc4; a < 2; a++, assoc = &client->assoc6)
if (assoc->timestamp)
assoc->timestamp = badonly;
}
}
} }
void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key) void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key)