aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@torproject.org>2013-06-05 15:48:57 +0200
committerLinus Nordberg <linus@torproject.org>2013-06-10 23:04:20 +0200
commitc132427db4f207a32e4abaae0e070840e5e2b808 (patch)
tree28d81236ea9caf20012746e87fe21a1a88b9a140
parent4d54b9774d11f47c6a670ab9b380e027a524f5f9 (diff)
downloadtor-c132427db4f207a32e4abaae0e070840e5e2b808.tar
tor-c132427db4f207a32e4abaae0e070840e5e2b808.tar.gz
Hide consensus download interval, depending on TestingTorNetwork, in a macro.
-rw-r--r--src/or/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 9e4efefdb..b2ff62879 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1450,11 +1450,10 @@ run_scheduled_events(time_t now)
/* How often do we check whether we should download network status
* documents? */
-#define CHECK_NETWORKSTATUS_DOWNLOAD_INTERVAL (60)
+#define networkstatus_dl_interval(o) ((o)->TestingTorNetwork ? 1 : 60)
if (time_to_download_networkstatus < now && !options->DisableNetwork) {
- time_to_download_networkstatus = now +
- options->TestingTorNetwork ? 1 : CHECK_NETWORKSTATUS_DOWNLOAD_INTERVAL;
+ time_to_download_networkstatus = now + networkstatus_dl_interval(options);
update_networkstatus_downloads(now);
}