diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 14:35:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 14:35:07 -0500 |
| commit | 22ccfc6b5f25f75795e5f9d554b18e717962de3e (patch) | |
| tree | 044c2f7b84d34b32710d557338928ad5e45b6a65 /src/or/config.c | |
| parent | 103cebd9243367106909251e73ee97aafe9d201c (diff) | |
| download | tor-22ccfc6b5f25f75795e5f9d554b18e717962de3e.tar tor-22ccfc6b5f25f75795e5f9d554b18e717962de3e.tar.gz | |
Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTime
All circuits are predictive; it's the ports that are expiring here.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index 26fe91170..4c292d82b 100644 --- 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) { |