From e62518865b312816211086c6a0d080e7258dae5b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 13 Aug 2015 09:41:43 -0400 Subject: Decouple routerlist_retry_directory_downloads() from the blob Instead of having it call update_all_descriptor_downloads and update_networkstatus_downloads directly, we can have it cause them to get rescheduled and called from run_scheduled_events. Closes ticket 16789. --- src/or/routerlist.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/or/routerlist.c') diff --git a/src/or/routerlist.c b/src/or/routerlist.c index aebbd480d2..8bd80391bc 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4013,12 +4013,10 @@ update_all_descriptor_downloads(time_t now) void routerlist_retry_directory_downloads(time_t now) { + (void)now; router_reset_status_download_failures(); router_reset_descriptor_download_failures(); - if (get_options()->DisableNetwork) - return; - update_networkstatus_downloads(now); - update_all_descriptor_downloads(now); + reschedule_directory_downloads(); } /** Return true iff router does not permit exit streams. -- cgit v1.2.3-54-g00ecf