nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor bridge download statuses to increment on attempt

Browse Source 
We were always incrementing bridge download statuses on each attempt,
but we were using the "increment on failure" functions to do it.
And we never incremented them on failure.

No behaviour change.
This commit is contained in:
teor 2017-08-29 15:25:33 +10:00 committed by Nick Mathewson
parent 97249c4f5e
commit 6370fb77c5
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/or/bridges.c
View File

@ -454,6 +454,7 @@ bridge_add_from_config(bridge_line_t *bridge_line)
b->transport_name = bridge_line->transport_name;
b->fetch_status.schedule = DL_SCHED_BRIDGE;
b->fetch_status.backoff = DL_SCHED_RANDOM_EXPONENTIAL;
b->fetch_status.increment_on = DL_SCHED_INCREMENT_ATTEMPT;
b->socks_args = bridge_line->socks_args;
if (!bridge_list)
bridge_list = smartlist_new();
@ -632,10 +633,13 @@ fetch_bridge_descriptors(const or_options_t *options, time_t now)
continue;
}
/* schedule another fetch as if this one will fail, in case it does
* (we can't increment after a failure, because sometimes we use the
* bridge authority, and sometimes we use the bridge direct) */
download_status_failed(&bridge->fetch_status, 0);
/* schedule the next attempt
* we can't increment after a failure, because sometimes we use the
* bridge authority, and sometimes we use the bridge direct */
download_status_increment_attempt(
&bridge->fetch_status,
safe_str_client(fmt_and_decorate_addr(&bridge->addr)),
now);
can_use_bridge_authority = !tor_digest_is_zero(bridge->identity) &&
num_bridge_auths;
@ -793,8 +797,14 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
download_status_reset(&bridge->fetch_status);
/* We have two quick attempts in the bridge schedule, and then slow
* ones */
download_status_failed(&bridge->fetch_status, 0);
download_status_failed(&bridge->fetch_status, 0);
download_status_increment_attempt(
&bridge->fetch_status,
safe_str_client(fmt_and_decorate_addr(&bridge->addr)),
now);
download_status_increment_attempt(
&bridge->fetch_status,
safe_str_client(fmt_and_decorate_addr(&bridge->addr)),
now);
}
node = node_get_mutable_by_id(ri->cache_info.identity_digest);