nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dir-spec.txt to describe w line.

Browse Source 
"Measured=" is present in votes regardless of consensus method.
This commit is contained in:
Mike Perry 2009-07-13 19:21:00 -07:00
parent da88e05edc
commit db297fb944
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1029,13 +1029,20 @@
descriptors if they would cause "v" lines to be over 128 characters descriptors if they would cause "v" lines to be over 128 characters
long. long.
"w" SP "Bandwidth=" INT NL "w" SP "Bandwidth=" INT [SP "Measured=" INT] NL
[At most once.] [At most once.]
An estimate of the bandwidth of this server, in an arbitrary An estimate of the bandwidth of this server, in an arbitrary
unit (currently kilobytes per second). Used to weight router unit (currently kilobytes per second). Used to weight router
selection. Other weighting keywords may be added later. selection.
Additionally, the Measured= keyword is present in votes by
participating bandwidth measurement authorites to indicate
a measured bandwidth currently produced by measuring stream
capacities.
Other weighting keywords may be added later.
Clients MUST ignore keywords they do not recognize. Clients MUST ignore keywords they do not recognize.
"p" SP ("accept" / "reject") SP PortList NL "p" SP ("accept" / "reject") SP PortList NL
@ -1178,6 +1185,13 @@
rate limit from the router descriptor. It is given in kilobytes rate limit from the router descriptor. It is given in kilobytes
per second, and capped at some arbitrary value (currently 10 MB/s). per second, and capped at some arbitrary value (currently 10 MB/s).
The Measured= keyword on a "w" line vote is currently computed
by multiplying the previous published consensus bandwidth by the
ratio of the measured average node stream capacity to the network
average. If 3 or more authorities provide a Measured= keyword for
a router, the authorites produce a consensus containing a "w"
Bandwidth= keyword equal to the median of the Measured= votes.
The ports listed in a "p" line should be taken as those ports for The ports listed in a "p" line should be taken as those ports for
which the router's exit policy permits 'most' addresses, ignoring any which the router's exit policy permits 'most' addresses, ignoring any
accept not for all addresses, ignoring all rejects for private accept not for all addresses, ignoring all rejects for private
@ -1260,6 +1274,11 @@
one, breaking ties in favor of the lexicographically larger one, breaking ties in favor of the lexicographically larger
vote.) The port list is encoded as specified in 3.4.2. vote.) The port list is encoded as specified in 3.4.2.
* If consensus-method 6 or later is in use and if 3 or more
authorities provide a Measured= keyword in their votes for
a router, the authorities produce a consensus containing a
Bandwidth= keyword equal to the median of the Measured= votes.
The signatures at the end of a consensus document are sorted in The signatures at the end of a consensus document are sorted in
ascending order by identity digest. ascending order by identity digest.
@ -1280,6 +1299,7 @@
"3" -- Added legacy ID key support to aid in authority ID key rollovers "3" -- Added legacy ID key support to aid in authority ID key rollovers
"4" -- No longer list routers that are not running in the consensus "4" -- No longer list routers that are not running in the consensus
"5" -- adds support for "w" and "p" lines. "5" -- adds support for "w" and "p" lines.
"6" -- Prefers measured bandwidth values rather than advertised
Before generating a consensus, an authority must decide which consensus Before generating a consensus, an authority must decide which consensus
method to use. To do this, it looks for the highest version number method to use. To do this, it looks for the highest version number