Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTime

All circuits are predictive; it's the ports that are expiring here.

diff --git a/changes/ticket9176 b/changes/ticket9176
index bee3d2f343a6e1ac57202bd85ef52f75718015a5..53c30e330e25bde7ccbccb29a5e53586d49a1b65 100644 (file)
--- a/changes/ticket9176
+++ b/changes/ticket9176
@@ -1,4 +1,5 @@
   o Minor features:
 
     - Made PREDICTED_CIRCS_RELEVANCE_TIME configurable from config
-      file. Implements ticket #9176. Patch by unixninja92.
+      file with a new option, PredictedPortsRelevanceTime. Implements
+      ticket #9176. Patch by unixninja92.

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index bad8810c875b801a22dc194b17156f36b3796ee4..89608f7dc05518400e40a2efddfd0d13dae9efd0 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -544,7 +544,7 @@ GENERAL OPTIONS
     following the Tor specification. Otherwise, they are logged with severity
     \'info'. (Default: 0)
 
-[[PredictedCircsRelevanceTime]] **PredictedCircsRelevanceTime** __NUM__::
+[[PredictedPortsRelevanceTime]] **PredictedPortsRelevanceTime** __NUM__::
     Set how long, after the client has mad an anonymized connection to a
     given port, we will try to make sure that we build circuits to
     exits that support that port. The maximum value for this option is 1

diff --git a/src/or/config.c b/src/or/config.c
index 26fe911701335613b3a6dc7c39bed6a6b3cc6694..4c292d82bf62b66cbc9db0126f109f45aba8e50f 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -318,7 +318,7 @@ static config_var_t option_vars_[] = {
   V(NATDListenAddress,           LINELIST, NULL),
   VPORT(NATDPort,                    LINELIST, NULL),
   V(Nickname,                    STRING,   NULL),
-  V(PredictedCircsRelevanceTime,  INTERVAL, "1 hour"),
+  V(PredictedPortsRelevanceTime,  INTERVAL, "1 hour"),
   V(WarnUnsafeSocks,              BOOL,     "1"),
   OBSOLETE("NoPublish"),
   VAR("NodeFamily",              LINELIST, NodeFamilies,         NULL),
@@ -2382,7 +2382,7 @@ compute_publishserverdescriptor(or_options_t *options)
  * services can overload the directory system. */
 #define MIN_REND_POST_PERIOD (10*60)
 
-/** Higest allowable value for PredictedCircsRelevanceTime; if this is
+/** Higest allowable value for PredictedPortsRelevanceTime; if this is
  * too high, our selection of exits will decrease for an extended
  * period of time to an uncomfortable level .*/
 #define MAX_PREDICTED_CIRCS_RELEVANCE (60*60)
@@ -2847,11 +2847,11 @@ options_validate(or_options_t *old_options, or_options_t *options,
     options->RendPostPeriod = MAX_DIR_PERIOD;
   }
 
-  if (options->PredictedCircsRelevanceTime >
+  if (options->PredictedPortsRelevanceTime >
       MAX_PREDICTED_CIRCS_RELEVANCE) {
-    log_warn(LD_CONFIG, "PredictedCircsRelevanceTime is too large; "
+    log_warn(LD_CONFIG, "PredictedPortsRelevanceTime is too large; "
              "clipping to %ds.", MAX_PREDICTED_CIRCS_RELEVANCE);
-    options->PredictedCircsRelevanceTime = MAX_PREDICTED_CIRCS_RELEVANCE;
+    options->PredictedPortsRelevanceTime = MAX_PREDICTED_CIRCS_RELEVANCE;
   }
 
   if (options->Tor2webMode && options->LearnCircuitBuildTimeout) {

diff --git a/src/or/or.h b/src/or/or.h
index 7043e2f9763c9b2b0e4019692f0e74bf075487d9..546adaa3a2acefdb2b6a1d83dc09c2fe0880d2ed 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3638,7 +3638,7 @@ typedef struct {
                          * a new one? */
   int MaxCircuitDirtiness; /**< Never use circs that were first used more than
                                 this interval ago. */
-  int PredictedCircsRelevanceTime; /** How long after we've requested a
+  int PredictedPortsRelevanceTime; /** How long after we've requested a
                                     * connection for a given port, do we want
                                     * to continue to pick exits that support
                                     * that port?  */

diff --git a/src/or/rephist.c b/src/or/rephist.c
index a65f7251f8f9de639ed1e866258f15ef17437701..16e16ab6514620578fd945c8e306da399e50e7a2 100644 (file)
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1871,7 +1871,7 @@ rep_hist_get_predicted_ports(time_t now)
   int predicted_circs_relevance_time;
   smartlist_t *out = smartlist_new();
   tor_assert(predicted_ports_list);
-  predicted_circs_relevance_time = get_options()->PredictedCircsRelevanceTime;
+  predicted_circs_relevance_time = get_options()->PredictedPortsRelevanceTime;
 
   /* clean out obsolete entries */
   SMARTLIST_FOREACH_BEGIN(predicted_ports_list, predicted_port_t *, pp) {
@@ -1943,7 +1943,7 @@ rep_hist_get_predicted_internal(time_t now, int *need_uptime,
                                 int *need_capacity)
 {
   int predicted_circs_relevance_time;
-  predicted_circs_relevance_time = get_options()->PredictedCircsRelevanceTime;
+  predicted_circs_relevance_time = get_options()->PredictedPortsRelevanceTime;
 
   if (!predicted_internal_time) { /* initialize it */
     predicted_internal_time = now;
@@ -1965,7 +1965,7 @@ int
 any_predicted_circuits(time_t now)
 {
   int predicted_circs_relevance_time;
-  predicted_circs_relevance_time = get_options()->PredictedCircsRelevanceTime;
+  predicted_circs_relevance_time = get_options()->PredictedPortsRelevanceTime;
 
   return smartlist_len(predicted_ports_list) ||
          predicted_internal_time + predicted_circs_relevance_time >= now;