Added prefixes to testing-network-only configuration options.

svn:r15375

5 files changed, 55 insertions, 56 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 7373d1e8b9..1483746403 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -175,7 +175,7 @@ static config_var_t _option_vars[] = {
   V(DataDirectory,               FILENAME, NULL),
   OBSOLETE("DebugLogFile"),
   V(DirAllowPrivateAddresses,    BOOL,     NULL),
-  V(DirTimeToLearnReachability,  INTERVAL, "30 minutes"),
+  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"),
   V(DirListenAddress,            LINELIST, NULL),
   OBSOLETE("DirFetchPeriod"),
   V(DirPolicy,                   LINELIST, NULL),
@@ -193,7 +193,7 @@ static config_var_t _option_vars[] = {
   V(DownloadExtraInfo,           BOOL,     "0"),
   V(EnforceDistinctSubnets,      BOOL,     "1"),
   V(EntryNodes,                  STRING,   NULL),
-  V(EstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
+  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
   V(ExcludeNodes,                STRING,   NULL),
   V(ExitNodes,                   STRING,   NULL),
   V(ExitPolicy,                  LINELIST, NULL),
@@ -312,9 +312,9 @@ static config_var_t _option_vars[] = {
   VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir,   "0"),
   VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir,   "0"),
   VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir,   "0"),
-  V(V3AuthInitialVotingInterval, INTERVAL, "30 minutes"),
-  V(V3AuthInitialVoteDelay,      INTERVAL, "5 minutes"),
-  V(V3AuthInitialDistDelay,      INTERVAL, "5 minutes"),
+  V(TestingV3AuthInitialVotingInterval, INTERVAL, "30 minutes"),
+  V(TestingV3AuthInitialVoteDelay, INTERVAL, "5 minutes"),
+  V(TestingV3AuthInitialDistDelay, INTERVAL, "5 minutes"),
   V(V3AuthVotingInterval,        INTERVAL, "1 hour"),
   V(V3AuthVoteDelay,             INTERVAL, "5 minutes"),
   V(V3AuthDistDelay,             INTERVAL, "5 minutes"),
@@ -345,11 +345,11 @@ static config_var_t testing_tor_network_defaults[] = {
   V(V3AuthVotingInterval,        INTERVAL, "5 minutes"),
   V(V3AuthVoteDelay,             INTERVAL, "20 seconds"),
   V(V3AuthDistDelay,             INTERVAL, "20 seconds"),
-  V(V3AuthInitialVotingInterval, INTERVAL, "5 minutes"),
-  V(V3AuthInitialVoteDelay,      INTERVAL, "20 seconds"),
-  V(V3AuthInitialDistDelay,      INTERVAL, "20 seconds"),
-  V(DirTimeToLearnReachability,  INTERVAL, "0 minutes"),
-  V(EstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
+  V(TestingV3AuthInitialVotingInterval, INTERVAL, "5 minutes"),
+  V(TestingV3AuthInitialVoteDelay, INTERVAL, "20 seconds"),
+  V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"),
+  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),
+  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };
 #undef VAR
@@ -3392,57 +3392,58 @@ options_validate(or_options_t *old_options, or_options_t *options,
 
   /* Keep changes to hard-coded values synchronous to man page and default
    * values table. */
-  if (options->V3AuthInitialVotingInterval != 30*60 &&
+  if (options->TestingV3AuthInitialVotingInterval != 30*60 &&
       !options->TestingTorNetwork) {
-    REJECT("V3AuthInitialVotingInterval may only be changed in testing "
+    REJECT("TestingV3AuthInitialVotingInterval may only be changed in testing "
            "Tor networks!");
-  } else if (options->V3AuthInitialVotingInterval < MIN_VOTE_INTERVAL) {
-    REJECT("V3AuthInitialVotingInterval is insanely low.");
-  } else if (((30*60) % options->V3AuthInitialVotingInterval) != 0) {
-    REJECT("V3AuthInitialVotingInterval does not divide evenly into "
+  } else if (options->TestingV3AuthInitialVotingInterval < MIN_VOTE_INTERVAL) {
+    REJECT("TestingV3AuthInitialVotingInterval is insanely low.");
+  } else if (((30*60) % options->TestingV3AuthInitialVotingInterval) != 0) {
+    REJECT("TestingV3AuthInitialVotingInterval does not divide evenly into "
            "30 minutes.");
   }
 
-  if (options->V3AuthInitialVoteDelay != 5*60 &&
+  if (options->TestingV3AuthInitialVoteDelay != 5*60 &&
       !options->TestingTorNetwork) {
-    REJECT("V3AuthInitialVoteDelay may only be changed in testing "
+    REJECT("TestingV3AuthInitialVoteDelay may only be changed in testing "
            "Tor networks!");
-  } else if (options->V3AuthInitialVoteDelay < MIN_VOTE_SECONDS) {
-    REJECT("V3AuthInitialVoteDelay is way too low.");
+  } else if (options->TestingV3AuthInitialVoteDelay < MIN_VOTE_SECONDS) {
+    REJECT("TestingV3AuthInitialVoteDelay is way too low.");
   }
 
-  if (options->V3AuthInitialDistDelay != 5*60 &&
+  if (options->TestingV3AuthInitialDistDelay != 5*60 &&
       !options->TestingTorNetwork) {
-    REJECT("V3AuthInitialDistDelay may only be changed in testing "
+    REJECT("TestingV3AuthInitialDistDelay may only be changed in testing "
            "Tor networks!");
-  } else if (options->V3AuthInitialDistDelay < MIN_DIST_SECONDS) {
-    REJECT("V3AuthInitialDistDelay is way too low.");
+  } else if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS) {
+    REJECT("TestingV3AuthInitialDistDelay is way too low.");
   }
 
-  if (options->V3AuthInitialVoteDelay + options->V3AuthInitialDistDelay >=
-      options->V3AuthInitialVotingInterval/2) {
-    REJECT("V3AuthInitialVoteDelay plus V3AuthInitialDistDelay must be "
-           "less than half V3AuthInitialVotingInterval");
+  if (options->TestingV3AuthInitialVoteDelay +
+      options->TestingV3AuthInitialDistDelay >=
+      options->TestingV3AuthInitialVotingInterval/2) {
+    REJECT("TestingV3AuthInitialVoteDelay plus TestingV3AuthInitialDistDelay "
+           "must be less than half TestingV3AuthInitialVotingInterval");
   }
 
-  if (options->DirTimeToLearnReachability != 30*60 &&
+  if (options->TestingAuthDirTimeToLearnReachability != 30*60 &&
       !options->TestingTorNetwork) {
-    REJECT("DirTimeToLearnReachability may only be changed in testing "
-           "Tor networks!");
-  } else if (options->DirTimeToLearnReachability < 0) {
-    REJECT("DirTimeToLearnReachability must be non-negative.");
-  } else if (options->DirTimeToLearnReachability > 2*60*60) {
-    COMPLAIN("DirTimeToLearnReachability is insanely high.");
+    REJECT("TestingAuthDirTimeToLearnReachability may only be changed in "
+           "testing Tor networks!");
+  } else if (options->TestingAuthDirTimeToLearnReachability < 0) {
+    REJECT("TestingAuthDirTimeToLearnReachability must be non-negative.");
+  } else if (options->TestingAuthDirTimeToLearnReachability > 2*60*60) {
+    COMPLAIN("TestingAuthDirTimeToLearnReachability is insanely high.");
   }
 
-  if (options->EstimatedDescriptorPropagationTime != 10*60 &&
+  if (options->TestingEstimatedDescriptorPropagationTime != 10*60 &&
       !options->TestingTorNetwork) {
-    REJECT("EstimatedDescriptorPropagationTime may only be changed in "
+    REJECT("TestingEstimatedDescriptorPropagationTime may only be changed in "
            "testing Tor networks!");
-  } else if (options->EstimatedDescriptorPropagationTime < 0) {
-    REJECT("EstimatedDescriptorPropagationTime must be non-negative.");
-  } else if (options->EstimatedDescriptorPropagationTime > 60*60) {
-    COMPLAIN("EstimatedDescriptorPropagationTime is insanely high.");
+  } else if (options->TestingEstimatedDescriptorPropagationTime < 0) {
+    REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative.");
+  } else if (options->TestingEstimatedDescriptorPropagationTime > 60*60) {
+    COMPLAIN("TestingEstimatedDescriptorPropagationTime is insanely high.");
   }
 
   if (options->TestingTorNetwork) {
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index fbe23c2fd7..38c30001db 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2154,7 +2154,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
   tor_assert(private_key);
   tor_assert(cert);
 
-  if (now - time_of_process_start < options->DirTimeToLearnReachability)
+  if (now - time_of_process_start <
+      options->TestingAuthDirTimeToLearnReachability)
     vote_on_reachability = 0;
 
   if (resolve_my_address(LOG_WARN, options, &addr, &hostname)<0) {
@@ -2240,7 +2241,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
       last_consensus_interval = current_consensus->fresh_until -
         current_consensus->valid_after;
     else
-      last_consensus_interval = options->V3AuthInitialVotingInterval;
+      last_consensus_interval = options->TestingV3AuthInitialVotingInterval;
     v3_out->valid_after =
       dirvote_get_start_of_next_interval(now, (int)last_consensus_interval);
     format_iso_time(tbuf, v3_out->valid_after);
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 2b686b8584..3a6c80178d 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1308,9 +1308,9 @@ dirvote_recalculate_timing(or_options_t *options, time_t now)
     vote_delay = consensus->vote_seconds;
     dist_delay = consensus->dist_seconds;
   } else {
-    interval = options->V3AuthInitialVotingInterval;
-    vote_delay = options->V3AuthInitialVoteDelay;
-    dist_delay = options->V3AuthInitialDistDelay;
+    interval = options->TestingV3AuthInitialVotingInterval;
+    vote_delay = options->TestingV3AuthInitialVoteDelay;
+    dist_delay = options->TestingV3AuthInitialDistDelay;
   }
 
   tor_assert(interval > 0);
diff --git a/src/or/or.h b/src/or/or.h
index 43a882ca84..5859643353 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2355,31 +2355,27 @@ typedef struct {
    * migration purposes? */
   int V3AuthUseLegacyKey;
 
-  /*XXXX021 I think all these "Testing Networks only" options should perhaps
-   * have a common prefix. -NM */
   /** The length of time that we think an initial consensus should be fresh.
    * Only altered on testing networks. */
-  int V3AuthInitialVotingInterval;
+  int TestingV3AuthInitialVotingInterval;
 
   /** The length of time we think it will take to distribute initial votes.
    * Only altered on testing networks. */
-  int V3AuthInitialVoteDelay;
+  int TestingV3AuthInitialVoteDelay;
 
   /** The length of time we think it will take to distribute initial
    * signatures.  Only altered on testing networks.*/
-  int V3AuthInitialDistDelay;
+  int TestingV3AuthInitialDistDelay;
 
-  /*XXXX021 why is this not prefixed to indicate that it's an authority
-   * option? */
   /** If an authority has been around for less than this amount of time, it
    * does not believe its reachability information is accurate.  Only
    * altered on testing networks. */
-  int DirTimeToLearnReachability;
+  int TestingAuthDirTimeToLearnReachability;
 
   /** Clients don't download any descriptor this recent, since it will
    * probably not have propagated to enough caches.  Only altered on testing
    * networks. */
-  int EstimatedDescriptorPropagationTime;
+  int TestingEstimatedDescriptorPropagationTime;
 
   /** If true, we take part in a testing network. Change the defaults of a
    * couple of other configuration options and allow to change the values
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index e0fff7ec05..af096ae5c1 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3729,7 +3729,8 @@ client_would_use_router(routerstatus_t *rs, time_t now, or_options_t *options)
      * But, if we want to have a complete list, fetch it anyway. */
     return 0;
   }
-  if (rs->published_on + options->EstimatedDescriptorPropagationTime > now) {
+  if (rs->published_on + options->TestingEstimatedDescriptorPropagationTime
+      > now) {
     /* Most caches probably don't have this descriptor yet. */
     return 0;
   }