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 6b1dba214d.  Bug not in any released tor.
This commit is contained in:
Nick Mathewson 2018-04-25 09:15:47 -04:00
parent a052eea480
commit 2748dd0f1c

View File

@ -643,7 +643,7 @@ get_circuit_priority_halflife(const or_options_t *options,
((double) CMUX_PRIORITY_HALFLIFE_MSEC_DEFAULT) / 1000.0; ((double) CMUX_PRIORITY_HALFLIFE_MSEC_DEFAULT) / 1000.0;
/* Try to get it from configuration file first. */ /* Try to get it from configuration file first. */
if (options && options->CircuitPriorityHalflife < EPSILON) { if (options && options->CircuitPriorityHalflife >= -EPSILON) {
halflife = options->CircuitPriorityHalflife; halflife = options->CircuitPriorityHalflife;
*source_msg = "CircuitPriorityHalflife in configuration"; *source_msg = "CircuitPriorityHalflife in configuration";
goto end; goto end;