aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitmux_ewma.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-25 09:15:47 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-25 09:15:47 -0400
commit2748dd0f1c5587433f3ef791aa85b8a7aa54515a (patch)
tree22efd17ad0f3e7ee27c1645fd8282f4d411c0663 /src/or/circuitmux_ewma.c
parenta052eea4803808d4da09ef8728de22344d1241be (diff)
downloadtor-2748dd0f1c5587433f3ef791aa85b8a7aa54515a.tar.gz
tor-2748dd0f1c5587433f3ef791aa85b8a7aa54515a.zip
Ignore CircuitPriorityHalflife values under -EPSILON.
Previously, we were ignoring values _over_ EPSILON. This bug was also causing a warning at startup because the default value is set to -1.0. Fixes bug 25577; bugfix on 6b1dba214db. Bug not in any released tor.
Diffstat (limited to 'src/or/circuitmux_ewma.c')
-rw-r--r--src/or/circuitmux_ewma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index b2ace8a9fa..4b80124a77 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/or/circuitmux_ewma.c
@@ -643,7 +643,7 @@ get_circuit_priority_halflife(const or_options_t *options,
((double) CMUX_PRIORITY_HALFLIFE_MSEC_DEFAULT) / 1000.0;
/* Try to get it from configuration file first. */
- if (options && options->CircuitPriorityHalflife < EPSILON) {
+ if (options && options->CircuitPriorityHalflife >= -EPSILON) {
halflife = options->CircuitPriorityHalflife;
*source_msg = "CircuitPriorityHalflife in configuration";
goto end;