[tor-commits] [tor/master] Ignore CircuitPriorityHalflife values under -EPSILON.

nickm at torproject.org nickm at torproject.org
Wed Apr 25 14:37:15 UTC 2018


commit 2748dd0f1c5587433f3ef791aa85b8a7aa54515a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 25 09:15:47 2018 -0400

    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.
---
 src/or/circuitmux_ewma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index b2ace8a9f..4b80124a7 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;



More information about the tor-commits mailing list