Commit 1e810b6d authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Make all networks have >=3 authorities. 

When we fix #34446 in Tor, we will need to have at least three
AssumeReachable relays on every network, or else Tor relays won't
ever actually upload enough descriptors to build circuits, and so
they won't upload their descriptors, and so on forever.
parent 052a9dc0

networks/hs-v2-min

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ HS = Node(tag="h", hs=1, torrc="hs.tmpl") 
# connections:

# a minimum path length of 3, plus the client-nominated rendezvous point,

# plus a seperate introduction point

NODES = Authority.getN(2) + NonExitRelay.getN(3) + \

#

# (XXX We have temporarily added an extra authority to work around issue

# 34447.)

NODES = Authority.getN(3) + NonExitRelay.getN(3) + \

        Client.getN(1) + HS.getN(1)



ConfigureNodes(NODES)

networks/hs-v23-ipv6-md

+4 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") 
# connections:

# a minimum path length of 3, plus the client-nominated rendezvous point,

# plus a seperate introduction point

NODES = Authority6.getN(2) + \

#

# (XXX We have temporarily added an extra authority to work around issue

# 34447.)

NODES = Authority6.getN(3) + \

        NonExitRelay6.getN(3) + \

        Client.getN(1) + Client6.getN(1) + \

        HSv2IPv6.getN(1) + HSv3IPv6.getN(1)

networks/hs-v23-min

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") 
# connections:

# a minimum path length of 3, plus the client-nominated rendezvous point,

# plus a seperate introduction point

NODES = Authority.getN(2) + NonExitRelay.getN(3) + \

#

# (XXX We have temporarily added an extra authority to work around issue

# 34447.)

NODES = Authority.getN(3) + NonExitRelay.getN(3) + \

        Client.getN(1) + HSv2.getN(1) + HSv3.getN(1)



ConfigureNodes(NODES)

networks/hs-v3-min

+4 −1
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") 
# connections:

# a minimum path length of 3, plus the client-nominated rendezvous point,

# plus a seperate introduction point

NODES = Authority.getN(2) + NonExitRelay.getN(3) + \

#

# (XXX We have temporarily added an extra authority to work around issue

# 34447.)

NODES = Authority.getN(3) + NonExitRelay.getN(3) + \

        Client.getN(1) + HS.getN(1)



ConfigureNodes(NODES)

networks/mixed+hs-v23-ipv6

+3 −1
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ OldHSv3IPv6 = Node(tag="hOLD", hs=1, 
                 torrc="hs-v3-only-v6-md.tmpl",

                 tor=OLD_TOR)



NODES = Authority6.getN(1)    + OldAuthority6.getN(1) + \

# (XXX We have temporarily added an extra authority to work around issue

# 34447.)

NODES = Authority6.getN(2)    + OldAuthority6.getN(1) + \

        NonExitRelay.getN(1)  + OldNonExitRelay.getN(1) + \

        NonExitRelay6.getN(1) + OldNonExitRelay6.getN(1) + \

        Client6.getN(1)       + OldClient6.getN(1) + \