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

Reannounce if path is considered dead.

Browse Source
This commit is contained in:
irungentoo 2015-06-11 19:40:37 -04:00
parent ae2caad982
commit bc5d5905d7
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toxcore/onion_client.c
View File

@ -198,6 +198,16 @@ static int is_path_used(const Onion_Client_Paths *onion_paths, const Node_format
return -1; return -1;
} }
/* is path timed out */
static _Bool path_timed_out(Onion_Client_Paths *onion_paths, uint32_t pathnum)
{
pathnum = pathnum % NUMBER_ONION_PATHS;
return ((onion_paths->last_path_success[pathnum] + ONION_PATH_TIMEOUT < onion_paths->last_path_used[pathnum]
&& onion_paths->last_path_used_times[pathnum] >= ONION_PATH_MAX_NO_RESPONSE_USES)
|| is_timeout(onion_paths->path_creation_time[pathnum], ONION_PATH_MAX_LIFETIME));
}
/* Create a new path or use an old suitable one (if pathnum is valid) /* Create a new path or use an old suitable one (if pathnum is valid)
* or a random one from onion_paths. * or a random one from onion_paths.
* *
@ -215,9 +225,7 @@ static int random_path(const Onion_Client *onion_c, Onion_Client_Paths *onion_pa
pathnum = pathnum % NUMBER_ONION_PATHS; pathnum = pathnum % NUMBER_ONION_PATHS;
} }
if ((onion_paths->last_path_success[pathnum] + ONION_PATH_TIMEOUT < onion_paths->last_path_used[pathnum] if (path_timed_out(onion_paths, pathnum)) {
&& onion_paths->last_path_used_times[pathnum] >= ONION_PATH_MAX_NO_RESPONSE_USES)
|| is_timeout(onion_paths->path_creation_time[pathnum], ONION_PATH_MAX_LIFETIME)) {
Node_format nodes[ONION_PATH_LENGTH]; Node_format nodes[ONION_PATH_LENGTH];
if (random_nodes_path_onion(onion_c, nodes, ONION_PATH_LENGTH) != ONION_PATH_LENGTH) if (random_nodes_path_onion(onion_c, nodes, ONION_PATH_LENGTH) != ONION_PATH_LENGTH)
@ -250,6 +258,15 @@ static int random_path(const Onion_Client *onion_c, Onion_Client_Paths *onion_pa
return 0; return 0;
} }
/* Does path with path_num exist. */
static _Bool path_exists(Onion_Client_Paths *onion_paths, uint32_t path_num)
{
if (path_timed_out(onion_paths, path_num))
return 0;
return onion_paths->paths[path_num % NUMBER_ONION_PATHS].path_num == path_num;
}
/* Set path timeouts, return the path number. /* Set path timeouts, return the path number.
* *
*/ */
@ -1318,7 +1335,7 @@ static void do_announce(Onion_Client *onion_c)
unsigned int interval = ANNOUNCE_INTERVAL_NOT_ANNOUNCED; unsigned int interval = ANNOUNCE_INTERVAL_NOT_ANNOUNCED;
if (list_nodes[i].is_stored) { if (list_nodes[i].is_stored && path_exists(&onion_c->onion_paths_self, list_nodes[i].path_used)) {
interval = ANNOUNCE_INTERVAL_ANNOUNCED; interval = ANNOUNCE_INTERVAL_ANNOUNCED;
} }