diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-04-13 13:37:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-04-13 13:37:33 -0400 |
| commit | fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4 (patch) | |
| tree | 011a9e53889fa6bb87e14cf84da2af77a138a6f2 | |
| parent | 7221d15acc87d2438aba7e3c261c2fc460479a01 (diff) | |
| parent | 96a0edf373b52da382206d12716ebd1cb96a1518 (diff) | |
| download | tor-fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4.tar.gz tor-fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4.zip | |
Merge branch 'correct_halflife'
| -rw-r--r-- | changes/read_circpriorityhalflife_correctly | 7 | ||||
| -rw-r--r-- | doc/spec/dir-spec.txt | 6 | ||||
| -rw-r--r-- | src/or/relay.c | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/changes/read_circpriorityhalflife_correctly b/changes/read_circpriorityhalflife_correctly new file mode 100644 index 0000000000..651e4db284 --- /dev/null +++ b/changes/read_circpriorityhalflife_correctly @@ -0,0 +1,7 @@ + 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. + - Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec, + so authorities can tell newer relays about the option without + breaking older ones. diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt index cfe6cd8f92..b88e838f36 100644 --- a/doc/spec/dir-spec.txt +++ b/doc/spec/dir-spec.txt @@ -1149,9 +1149,11 @@ transit in the network at any given time. Obeyed by Tor 0.2.1.20 and later. - "CircPriorityHalflifeMsec" -- the halflife parameter used when + "CircuitPriorityHalflifeMsec" -- the halflife parameter used when weighting which circuit will send the next cell. Obeyed by Tor - 0.2.2.7-alpha and later. + 0.2.2.10-alpha and later. (Versions of Tor between 0.2.2.7-alpha + and 0.2.2.10-alpha recognized a "CircPriorityHalflifeMsec" parameter, + but mishandled it badly.) The authority section of a vote contains the following items, followed in turn by the authority's current key certificate: diff --git a/src/or/relay.c b/src/or/relay.c index 599d3d9c80..fab2d8896e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1865,9 +1865,9 @@ 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, "CircuitPriorityHalflifeMsec", -1)) >= 0) { halflife = ((double)halflife_ms)/1000.0; - source = "CircPriorityHalflifeMsec in consensus"; + source = "CircuitPriorityHalflifeMsec in consensus"; } else { halflife = EWMA_DEFAULT_HALFLIFE; source = "Default value"; |