Browse Source

Hide consensus download interval, depending on TestingTorNetwork, in a macro.

Linus Nordberg 11 years ago
parent
commit
c132427db4
1 changed files with 2 additions and 3 deletions
  1. 2 3
      src/or/main.c

+ 2 - 3
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);
   }