diff options
| author | teor <teor@torproject.org> | 2018-12-07 11:16:15 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-12-07 15:54:32 +1000 |
| commit | 75b5cc047d3e257701de6dfab9f80d358025fb95 (patch) | |
| tree | 3477de6a3c70970f2ca850a14dbf17a872ec95fa /scripts/maint/fallback.whitelist | |
| parent | 7f3a7d9a2713ecddaf0cd8e08e054de4c2870792 (diff) | |
| download | tor-75b5cc047d3e257701de6dfab9f80d358025fb95.tar.gz tor-75b5cc047d3e257701de6dfab9f80d358025fb95.zip | |
Fallbacks: refactor is_in_whitelist() to take an exact match boolean
No behaviour change.
Preparation for 24838.
Diffstat (limited to 'scripts/maint/fallback.whitelist')
| -rw-r--r-- | scripts/maint/fallback.whitelist | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/scripts/maint/fallback.whitelist b/scripts/maint/fallback.whitelist index 79551948c6..97291d73be 100644 --- a/scripts/maint/fallback.whitelist +++ b/scripts/maint/fallback.whitelist @@ -1,34 +1,21 @@ # updateFallbackDirs.py directory mirror whitelist -# -# Format: -# IPv4:DirPort orport=<ORPort> id=<ID> [ ipv6=<IPv6>:<IPv6 ORPort> ] -# or use: -# scripts/maint/generateFallbackDirLine.py fingerprint ... -# + # All attributes must match for the directory mirror to be included. # If the fallback has an ipv6 key, the whitelist line must also have # it, and vice versa, otherwise they don't match. -# (The blacklist overrides the whitelist.) # To replace this list with the hard-coded fallback list (for testing), use -# a command similar to: +# "updateFallbackDirs.py check_existing", or a command similar to: # cat src/app/config/fallback_dirs.inc | grep \" | grep -v weight | \ # tr -d '\n' | \ # sed 's/"" / /g' | sed 's/""/"/g' | tr \" '\n' | grep -v '^$' \ # > scripts/maint/fallback.whitelist -# -# When testing before a release, exclusions due to changed details will result -# in a warning, unless the IPv4 address or port change happened recently. -# Then it is only logged at info level, as part of the eligibility check. -# Exclusions due to stability also are only shown at info level. -# -# Add the number of selected, slow, and excluded relays, and compare that to -# the number of hard-coded relays. If it's less, use info-level logs to find -# out why each of the missing relays was excluded. # If a relay operator wants their relay to be a FallbackDir, # enter the following information here: -# <IPv4>:<DirPort> orport=<ORPort> id=<ID> [ ipv6=<IPv6>:<IPv6 ORPort> ] +# <IPv4>:<DirPort> orport=<ORPort> id=<ID> ( ipv6=[<IPv6>]:<IPv6 ORPort> )? +# or use: +# scripts/maint/generateFallbackDirLine.py fingerprint ... # https://lists.torproject.org/pipermail/tor-relays/2015-December/008362.html # https://trac.torproject.org/projects/tor/ticket/22321#comment:22 |