aboutsummaryrefslogtreecommitdiff
path: root/src/or/nodelist.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2014-03-08 13:13:12 +0000
committerNick Mathewson <nickm@torproject.org>2014-03-10 14:07:56 -0400
commit6606e676eeafd8ff848dfb247e2b675eed190698 (patch)
treef88b50015a34bc55d4ed48c787675f564f349a7f /src/or/nodelist.c
parent0b7a66fac76445087651a1dd2d171bf043c9f345 (diff)
downloadtor-6606e676eeafd8ff848dfb247e2b675eed190698.tar.gz
tor-6606e676eeafd8ff848dfb247e2b675eed190698.zip
Don't do directory fetches before all PTs have been configured.
Diffstat (limited to 'src/or/nodelist.c')
-rw-r--r--src/or/nodelist.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 03fa836d4e..c8e04f4117 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1477,6 +1477,7 @@ update_router_have_minimum_dir_info(void)
const networkstatus_t *consensus =
networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor());
int using_md;
+ const char *delay_fetches_msg = NULL;
if (!consensus) {
if (!networkstatus_get_latest_consensus())
@@ -1489,10 +1490,9 @@ update_router_have_minimum_dir_info(void)
goto done;
}
- if (should_delay_dir_fetches(get_options())) {
- log_notice(LD_DIR, "no known bridge descriptors running yet; stalling");
- strlcpy(dir_info_status, "No live bridge descriptors.",
- sizeof(dir_info_status));
+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
+ log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg);
+ strlcpy(dir_info_status, "%s", sizeof(dir_info_status));
res = 0;
goto done;
}