[tor-commits] [tor/master] Hide consensus download interval, depending on TestingTorNetwork, in a macro.

[nickm@xxxxxxxxxxxxxx]

commit c132427db4f207a32e4abaae0e070840e5e2b808
Author: Linus Nordberg <linus@xxxxxxxxxxxxxx>
Date:   Wed Jun 5 15:48:57 2013 +0200

    Hide consensus download interval, depending on TestingTorNetwork, in a macro.
---
 src/or/main.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index 9e4efef..b2ff628 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);
   }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits