commit 7fb1e61a1290fb09635fe30446e44053b3ff71bb Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 24 13:18:20 2020 -0400
Use multiphase launching in all networks with onion services. --- networks/bridges+hs-v23 | 8 ++++---- networks/hs-ob-v3 | 4 ++-- networks/hs-v2-min | 4 ++-- networks/hs-v23-ipv6-md | 8 ++++---- networks/hs-v23-min | 6 +++--- networks/hs-v3 | 4 ++-- networks/hs-v3-ipv6 | 6 +++--- networks/hs-v3-min | 4 ++-- networks/mixed+hs-v23 | 12 ++++++------ networks/mixed+hs-v23-ipv6 | 12 ++++++------ 10 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index 1022849..9411414 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -5,10 +5,10 @@ Client = Node(tag="c", client=1, torrc="client.tmpl")
BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl", launch_phase=2) +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl", launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2)
# We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ diff --git a/networks/hs-ob-v3 b/networks/hs-ob-v3 index 6309762..056eebd 100644 --- a/networks/hs-ob-v3 +++ b/networks/hs-ob-v3 @@ -5,8 +5,8 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2)
NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(2) + HS.getN(4) diff --git a/networks/hs-v2-min b/networks/hs-v2-min index 3f1cea8..a483adc 100644 --- a/networks/hs-v2-min +++ b/networks/hs-v2-min @@ -3,8 +3,8 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md index 2254309..47c9aa2 100644 --- a/networks/hs-v23-ipv6-md +++ b/networks/hs-v23-ipv6-md @@ -13,11 +13,11 @@ NonExitRelay6 = Node(tag="r", relay=1, '[::1]'), torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl", launch_phase=2)
-HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl") -HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") +HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl", launch_phase=2) +HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v23-min b/networks/hs-v23-min index de0ff16..def8b46 100644 --- a/networks/hs-v23-min +++ b/networks/hs-v23-min @@ -1,9 +1,9 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v3 b/networks/hs-v3 index 6367c41..4112756 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -3,8 +3,8 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2)
# We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6 index a363991..c5eee74 100644 --- a/networks/hs-v3-ipv6 +++ b/networks/hs-v3-ipv6 @@ -9,9 +9,9 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl", launch_phase=2) +HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v3-min b/networks/hs-v3-min index e007f84..03894ce 100644 --- a/networks/hs-v3-min +++ b/networks/hs-v3-min @@ -1,8 +1,8 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2)
# Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index 992e99a..47bc88e 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -6,12 +6,12 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR, launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR, launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR, launch_phase=2)
NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(1) + OldRelay.getN(1) + \ diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6 index 5d9e2e3..c7fdbcd 100644 --- a/networks/mixed+hs-v23-ipv6 +++ b/networks/mixed+hs-v23-ipv6 @@ -34,22 +34,22 @@ OldNonExitRelay6 = Node(tag="rOLD", relay=1, tor=OLD_TOR)
Client6 = Node(tag="c", client=1, - torrc="client-only-v6-md.tmpl") + torrc="client-only-v6-md.tmpl", launch_phase=2) OldClient6 = Node(tag="cOLD", client=1, torrc="client-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2)
HSv2IPv6 = Node(tag="h", hs=1, - torrc="hs-only-v6-md.tmpl") + torrc="hs-only-v6-md.tmpl", launch_phase=2) OldHSv2IPv6 = Node(tag="hOLD", hs=1, torrc="hs-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2)
HSv3IPv6 = Node(tag="h", hs=1, - torrc="hs-v3-only-v6-md.tmpl") + torrc="hs-v3-only-v6-md.tmpl", launch_phase=2) OldHSv3IPv6 = Node(tag="hOLD", hs=1, torrc="hs-v3-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2)
# (XXX We have temporarily added an extra authority to work around issue # 34447.)