nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'correct_halflife'

Browse Source
This commit is contained in:
Nick Mathewson 2010-04-13 13:37:33 -04:00
commit fe57aab283
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/read_circpriorityhalflife_correctly Normal file
View File

@ -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.

6
doc/spec/dir-spec.txt
View File

@ -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:

4
src/or/relay.c
View File

@ -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";