nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "weight=10" line from fallback directory mirror entries

Browse Source 
This removes some redundant repeated lines.

Ticket 24681 will maintain the current fallback weights by changing
Tor's default fallback weight to 10.

Implements ticket 24679.
This commit is contained in:
teor 2017-12-22 23:05:45 +11:00
parent 0e6fdbea8d
commit ac5058ac8a
No known key found for this signature in database
GPG Key ID: 740D9E39025272A2
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket24679 Normal file
View File

@ -0,0 +1,5 @@
o Minor features (fallback directory mirrors):
- Remove the "weight=10" line from fallback directory mirror entries.
Ticket 24681 will maintain the current fallback weights by changing
Tor's default fallback weight to 10.
Implements ticket 24679.

19
scripts/maint/updateFallbackDirs.py
View File

@ -245,21 +245,6 @@ CONSENSUS_DOWNLOAD_SPEED_MAX = 15.0
# This avoids delisting a relay due to transient network conditions # This avoids delisting a relay due to transient network conditions
CONSENSUS_DOWNLOAD_RETRY = True CONSENSUS_DOWNLOAD_RETRY = True
## Fallback Weights for Client Selection
# All fallback weights are equal, and set to the value below
# Authorities are weighted 1.0 by default
# Clients use these weights to select fallbacks and authorities at random
# If there are 100 fallbacks and 9 authorities:
# - each fallback is chosen with probability 10.0/(10.0*100 + 1.0*9) ~= 0.99%
# - each authority is chosen with probability 1.0/(10.0*100 + 1.0*9) ~= 0.09%
# A client choosing a bootstrap directory server will choose a fallback for
# 10.0/(10.0*100 + 1.0*9) * 100 = 99.1% of attempts, and an authority for
# 1.0/(10.0*100 + 1.0*9) * 9 = 0.9% of attempts.
# (This disregards the bootstrap schedules, where clients start by choosing
# from fallbacks & authoritites, then later choose from only authorities.)
FALLBACK_OUTPUT_WEIGHT = 10.0
## Parsing Functions ## Parsing Functions
def parse_ts(t): def parse_ts(t):
@ -1346,7 +1331,7 @@ class Candidate(object):
def fallbackdir_info(self, dl_speed_ok): def fallbackdir_info(self, dl_speed_ok):
# "address:dirport orport=port id=fingerprint" # "address:dirport orport=port id=fingerprint"
# "[ipv6=addr:orport]" # "[ipv6=addr:orport]"
# "weight=FALLBACK_OUTPUT_WEIGHT", # ,
# #
# Do we want a C string, or a commented-out string? # Do we want a C string, or a commented-out string?
c_string = dl_speed_ok c_string = dl_speed_ok
@ -1370,7 +1355,7 @@ class Candidate(object):
if self.has_ipv6(): if self.has_ipv6():
s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport) s += '" ipv6=%s:%d"'%(cleanse_c_string(self.ipv6addr), self.ipv6orport)
s += '\n' s += '\n'
s += '" weight=%d",'%(FALLBACK_OUTPUT_WEIGHT) s += ','
if comment_string: if comment_string:
s += '\n' s += '\n'
s += '*/' s += '*/'