summaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-21 14:34:36 -0400
committerNick Mathewson <nickm@torproject.org>2017-11-09 09:19:42 -0500
commit0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9 (patch)
tree0115299b2405fd12b0f76ab124f8433d91829521 /src/or/routerlist.c
parent6045bdd4a0542ef11dc46d98495686172015a961 (diff)
downloadtor-0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9.tar.gz
tor-0c6eabf08898e0c9f2faa397f2c2bb5fb80b78b9.zip
Audit all of the "is the network turned off" checks.
DisableNetwork is a subset of net_is_disabled(), which is (now) a subset of should_delay_dir_fetches(). Some of these changes are redundant with others higher or lower in the call stack. The ones that I think are behavior-relevant are listed in the changes file. I've also added comments in a few places where the behavior is subtle. Fixes bug 12062; bugfix on various versions.
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c7c1092539..d005df9458 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4531,7 +4531,7 @@ signed_desc_digest_is_recognized(signed_descriptor_t *desc)
void
update_all_descriptor_downloads(time_t now)
{
- if (get_options()->DisableNetwork)
+ if (should_delay_dir_fetches(get_options(), NULL))
return;
update_router_descriptor_downloads(now);
update_microdesc_downloads(now);