From d01cf18ecbb02bca7e4168b28f28d8b84f03da70 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 14 Mar 2014 10:42:49 -0400 Subject: should_disable_dir_fetches() now returns 1 if DisableNetwork==1 This change prevents LD_BUG warnings and bootstrap failure messages when we try to do directory fetches when starting with DisableNetwork == 1, a consensus present, but no descriptors (or insufficient descriptors) yet. Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha. Thanks to mcs for walking me through the repro instructions! --- src/or/networkstatus.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49478a734..1819c4ef7 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -898,6 +898,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) *msg_out = NULL; } + if (options->DisableNetwork) { + if (msg_out) { + *msg_out = "DisableNetwork is set."; + } + log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)"); + return 1; + } + if (options->UseBridges) { if (!any_bridge_descriptors_known()) { if (msg_out) { -- cgit v1.2.3