[tor-commits] [tor/master] Smaller RendPostPeriod on test networks

[nickm at torproject.org]

commit e136606fe8325140f26dda26d2f634961aae5448
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jan 4 20:10:53 2015 -0500

    Smaller RendPostPeriod on test networks
    
    This patch makes the minimum 5 seconds, and the default 2 minutes.
    
    Closes 13401.
---
 changes/bug13401 |    4 ++++
 src/or/config.c  |   11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/changes/bug13401 b/changes/bug13401
new file mode 100644
index 0000000..44be085
--- /dev/null
+++ b/changes/bug13401
@@ -0,0 +1,4 @@
+  o Minor features (testing networks):
+    - Drop the minimum RendPostPeriod on a testing network to 5 seconds,
+      and the default to 2 minutes. Closes ticket 13401.
+
diff --git a/src/or/config.c b/src/or/config.c
index 2fa077e..9a37484 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -496,6 +496,7 @@ static const config_var_t testing_tor_network_defaults[] = {
   V(TestingEnableCellStatsEvent, BOOL,     "1"),
   V(TestingEnableTbEmptyEvent,   BOOL,     "1"),
   VAR("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, "1"),
+  V(RendPostPeriod,              INTERVAL, "2 minutes"),
 
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };
@@ -2492,6 +2493,7 @@ compute_publishserverdescriptor(or_options_t *options)
 /** Lowest allowable value for RendPostPeriod; if this is too low, hidden
  * services can overload the directory system. */
 #define MIN_REND_POST_PERIOD (10*60)
+#define MIN_REND_POST_PERIOD_TESTING (5)
 
 /** Higest allowable value for PredictedPortsRelevanceTime; if this is
  * too high, our selection of exits will decrease for an extended
@@ -2976,10 +2978,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
     options->MinUptimeHidServDirectoryV2 = 0;
   }
 
-  if (options->RendPostPeriod < MIN_REND_POST_PERIOD) {
+  const int min_rendpostperiod =
+    options->TestingTorNetwork ?
+    MIN_REND_POST_PERIOD_TESTING : MIN_REND_POST_PERIOD;
+  if (options->RendPostPeriod < min_rendpostperiod) {
     log_warn(LD_CONFIG, "RendPostPeriod option is too short; "
-             "raising to %d seconds.", MIN_REND_POST_PERIOD);
-    options->RendPostPeriod = MIN_REND_POST_PERIOD;
+             "raising to %d seconds.", min_rendpostperiod);
+    options->RendPostPeriod = min_rendpostperiod;;
   }
 
   if (options->RendPostPeriod > MAX_DIR_PERIOD) {