diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-04-12 15:38:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-04-12 15:38:54 -0400 |
| commit | d888a8210fc33d9d0ad835c05a2bf8b7b6882830 (patch) | |
| tree | d0cad8809ca872a2851ec019ffeb2f0edfd46926 | |
| parent | 8aec982f910f918785158038e5afafe55f869372 (diff) | |
| download | tor-d888a8210fc33d9d0ad835c05a2bf8b7b6882830.tar.gz tor-d888a8210fc33d9d0ad835c05a2bf8b7b6882830.zip | |
Fix a bug in reading CircPriorityHalflife from consensus
When you mean (a=b(c,d)) >= 0, you had better not say (a=b(c,d)>=0).
We did the latter, and so whenever CircPriorityHalflife was in the
consensus, it was treated as having a value of 1 msec (that is,
boolean true).
| -rw-r--r-- | changes/read_circpriorityhalflife_correctly | 5 | ||||
| -rw-r--r-- | src/or/relay.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/read_circpriorityhalflife_correctly b/changes/read_circpriorityhalflife_correctly new file mode 100644 index 0000000000..9fcbd6923e --- /dev/null +++ b/changes/read_circpriorityhalflife_correctly @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a stupid parenthesization error that made every possible value + of CircPriorityHalflifeMsec get treated as "1 msec". Bugfix on + 0.2.2.7-alpha. + diff --git a/src/or/relay.c b/src/or/relay.c index 599d3d9c80..c417cbedcb 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1865,7 +1865,7 @@ cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus) source = "CircuitPriorityHalflife in configuration"; } else if (consensus && (halflife_ms = networkstatus_get_param( - consensus, "CircPriorityHalflifeMsec", -1) >= 0)) { + consensus, "CircPriorityHalflifeMsec", -1)) >= 0) { halflife = ((double)halflife_ms)/1000.0; source = "CircPriorityHalflifeMsec in consensus"; } else { |