commit d1535113b2ef5c803877347612ad0376a1a034b0 Author: teor <teor2345@gmail.com> Date: Wed Sep 13 13:14:48 2017 +1000 Tag every client and bridge client in every networks file Using the following mass replace scripts: sed -i~ 's/tag="c",/tag="c", client=1,/' sed -i~ 's/tag="cOLD",/tag="cOLD", client=1,/' sed -i~ 's/tag="bc",/tag="bc", client=1, bridgeclient=1,/' sed -i~ 's/tag="bcOLD",/tag="bcOLD", client=1, bridgeclient=1,/' Part of 22224, but currently unused. --- networks/basic | 2 +- networks/basic-025 | 2 +- networks/basic-100 | 2 +- networks/basic-min | 2 +- networks/basic-min-mixed | 4 ++-- networks/bridges | 4 ++-- networks/bridges+hs | 4 ++-- networks/bridges+hs-v23 | 4 ++-- networks/bridges+ipv6 | 4 ++-- networks/bridges+ipv6+hs | 4 ++-- networks/bridges+ipv6+hs-v23 | 4 ++-- networks/bridges+ipv6-min | 2 +- networks/bridges-min | 2 +- networks/client-ipv6-only | 2 +- networks/hs | 2 +- networks/hs-025 | 2 +- networks/hs-100 | 2 +- networks/hs-100-clients | 2 +- networks/hs-client-ipv6 | 2 +- networks/hs-exit-min | 2 +- networks/hs-intro | 2 +- networks/hs-ipv6 | 4 ++-- networks/hs-min | 2 +- networks/hs-min-mixed | 4 ++-- networks/hs-v2-min | 2 +- networks/hs-v23-ipv6 | 4 ++-- networks/hs-v23-min | 2 +- networks/hs-v3 | 2 +- networks/hs-v3-intro | 2 +- networks/hs-v3-ipv6 | 4 ++-- networks/hs-v3-min | 2 +- networks/ipv6-exit-min | 2 +- networks/middle | 2 +- networks/middle-025 | 2 +- networks/middle-100 | 2 +- networks/mixed | 4 ++-- networks/mixed+hs-v2 | 4 ++-- networks/mixed+hs-v23 | 4 ++-- networks/mixed+hs-v3 | 4 ++-- networks/single-onion | 2 +- networks/single-onion-client-ipv6 | 2 +- networks/single-onion-indirect | 2 +- networks/single-onion-ipv6 | 4 ++-- networks/single-onion-v23 | 2 +- networks/single-onion-v23-ipv6 | 4 ++-- networks/single-onion-v3 | 2 +- networks/single-onion-v3-ipv6 | 4 ++-- 47 files changed, 65 insertions(+), 65 deletions(-) diff --git a/networks/basic b/networks/basic index f3f94de..703f5fc 100644 --- a/networks/basic +++ b/networks/basic @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag # in 0.2.6 diff --git a/networks/basic-025 b/networks/basic-025 index d57bcb8..266643f 100644 --- a/networks/basic-025 +++ b/networks/basic-025 @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5) diff --git a/networks/basic-100 b/networks/basic-100 index 1b181eb..b1546e6 100644 --- a/networks/basic-100 +++ b/networks/basic-100 @@ -3,7 +3,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60) diff --git a/networks/basic-min b/networks/basic-min index 48cf1cf..e5e0187 100644 --- a/networks/basic-min +++ b/networks/basic-min @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/basic-min-mixed b/networks/basic-min-mixed index 5ae7bd5..6f19c16 100644 --- a/networks/basic-min-mixed +++ b/networks/basic-min-mixed @@ -17,8 +17,8 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) # Choose old or new Exit and Client at random OldNewExitRelay = rng.choice([OldExitRelay, ExitRelay]) diff --git a/networks/bridges b/networks/bridges index 8b28eef..2557c0f 100644 --- a/networks/bridges +++ b/networks/bridges @@ -1,12 +1,12 @@ # 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", torrc="client.tmpl") +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", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag # in 0.2.6 diff --git a/networks/bridges+hs b/networks/bridges+hs index 8cf0ec6..3d01cfa 100644 --- a/networks/bridges+hs +++ b/networks/bridges+hs @@ -1,12 +1,12 @@ # 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", torrc="client.tmpl") +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", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index 5a5a367..e2ac4cd 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -1,12 +1,12 @@ # 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", torrc="client.tmpl") +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", torrc="bridgeclient.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-.tmpl") diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 796a7be..92c9e22 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -1,13 +1,13 @@ # 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", torrc="client.tmpl") +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") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag # in 0.2.6 diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 39caee4..8cd3d71 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -1,13 +1,13 @@ # 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", torrc="client.tmpl") +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") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 index c99dff5..4e60a9a 100644 --- a/networks/bridges+ipv6+hs-v23 +++ b/networks/bridges+ipv6+hs-v23 @@ -1,13 +1,13 @@ # 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", torrc="client.tmpl") +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") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.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") diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min index 4542f31..5c4d05f 100644 --- a/networks/bridges+ipv6-min +++ b/networks/bridges+ipv6-min @@ -6,7 +6,7 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/bridges-min b/networks/bridges-min index ffa3194..6ad3c75 100644 --- a/networks/bridges-min +++ b/networks/bridges-min @@ -5,7 +5,7 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.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", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only index d36ba4f..59d5a63 100644 --- a/networks/client-ipv6-only +++ b/networks/client-ipv6-only @@ -9,7 +9,7 @@ ExitRelay6 = Node(tag="r", relay=1, exit=1, '[::1]'), torrc="relay-orport-v6-exit.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs b/networks/hs index 3776ed9..b08879e 100644 --- a/networks/hs +++ b/networks/hs @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag diff --git a/networks/hs-025 b/networks/hs-025 index bb75ed1..ccdd321 100644 --- a/networks/hs-025 +++ b/networks/hs-025 @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") NODES = Authority.getN(4) + NonExitRelay.getN(10) + \ diff --git a/networks/hs-100 b/networks/hs-100 index a8401c9..2373e39 100644 --- a/networks/hs-100 +++ b/networks/hs-100 @@ -3,7 +3,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") NODES = Authority.getN(5) + NonExitRelay.getN(25) + \ diff --git a/networks/hs-100-clients b/networks/hs-100-clients index aecaf37..e61b42f 100644 --- a/networks/hs-100-clients +++ b/networks/hs-100-clients @@ -3,7 +3,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Well, 100 instances, with lots of clients diff --git a/networks/hs-client-ipv6 b/networks/hs-client-ipv6 index 62ffae2..89c1920 100644 --- a/networks/hs-client-ipv6 +++ b/networks/hs-client-ipv6 @@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-exit-min b/networks/hs-exit-min index 4a1705e..609561a 100644 --- a/networks/hs-exit-min +++ b/networks/hs-exit-min @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag diff --git a/networks/hs-intro b/networks/hs-intro index c5714ce..3a21a7b 100644 --- a/networks/hs-intro +++ b/networks/hs-intro @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS0 = Node(tag="h", hs=1, torrc="hs0.tmpl") HS1 = Node(tag="h", hs=1, torrc="hs1.tmpl") HS2 = Node(tag="h", hs=1, torrc="hs2.tmpl") diff --git a/networks/hs-ipv6 b/networks/hs-ipv6 index 3e3984f..33edcf9 100644 --- a/networks/hs-ipv6 +++ b/networks/hs-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.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-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-min b/networks/hs-min index bb48287..39dac23 100644 --- a/networks/hs-min +++ b/networks/hs-min @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-min-mixed b/networks/hs-min-mixed index 8de3825..ebe3beb 100644 --- a/networks/hs-min-mixed +++ b/networks/hs-min-mixed @@ -17,8 +17,8 @@ NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") OldNonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) HS = Node(tag="h", hs=1, torrc="hs.tmpl") OldHS = Node(tag="h", hs=1, torrc="hs.tmpl", tor=OLD_TOR) diff --git a/networks/hs-v2-min b/networks/hs-v2-min index fb68be8..461c56e 100644 --- a/networks/hs-v2-min +++ b/networks/hs-v2-min @@ -3,7 +3,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6 index b95123c..a217be9 100644 --- a/networks/hs-v23-ipv6 +++ b/networks/hs-v23-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl") HSv3IPv6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl") diff --git a/networks/hs-v23-min b/networks/hs-v23-min index 91338e8..4732520 100644 --- a/networks/hs-v23-min +++ b/networks/hs-v23-min @@ -1,7 +1,7 @@ # 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", torrc="client.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") diff --git a/networks/hs-v3 b/networks/hs-v3 index ea67f79..ee440dd 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -3,7 +3,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag diff --git a/networks/hs-v3-intro b/networks/hs-v3-intro index 6dc39f2..a76858f 100644 --- a/networks/hs-v3-intro +++ b/networks/hs-v3-intro @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS10 = Node(tag="h", hs=1, torrc="hs-v3-10.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6 index e606e53..2b9f63c 100644 --- a/networks/hs-v3-ipv6 +++ b/networks/hs-v3-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.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="hs3-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v3-min b/networks/hs-v3-min index 9812a31..20709d9 100644 --- a/networks/hs-v3-min +++ b/networks/hs-v3-min @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/ipv6-exit-min b/networks/ipv6-exit-min index 70379cc..410373e 100644 --- a/networks/ipv6-exit-min +++ b/networks/ipv6-exit-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/middle b/networks/middle index 9fbdf98..1dc49aa 100644 --- a/networks/middle +++ b/networks/middle @@ -2,7 +2,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag # in 0.2.6 diff --git a/networks/middle-025 b/networks/middle-025 index a3d11e3..ce02d27 100644 --- a/networks/middle-025 +++ b/networks/middle-025 @@ -2,7 +2,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(4) + \ NonExitRelay.getN(10) + ExitRelay.getN(6) + \ diff --git a/networks/middle-100 b/networks/middle-100 index 72f5689..3046bb0 100644 --- a/networks/middle-100 +++ b/networks/middle-100 @@ -4,7 +4,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(5) + \ NonExitRelay.getN(25) + ExitRelay.getN(10) + \ diff --git a/networks/mixed b/networks/mixed index 38e0d4e..2c016eb 100644 --- a/networks/mixed +++ b/networks/mixed @@ -6,8 +6,8 @@ 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", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.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) # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag # in 0.2.6 diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index 5afafde..a03d1d8 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -6,8 +6,8 @@ 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", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.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) diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index ca4dd2f..f959032 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -6,8 +6,8 @@ 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", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.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) # Old tor versions don't have HSv3 support yet diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index e9dcf5d..ec9b593 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -6,8 +6,8 @@ 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", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.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) # Old tor versions don't have HSv3 support yet HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") diff --git a/networks/single-onion b/networks/single-onion index 14539a6..36dad53 100644 --- a/networks/single-onion +++ b/networks/single-onion @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-client-ipv6 b/networks/single-onion-client-ipv6 index 9f19915..a9bcaa8 100644 --- a/networks/single-onion-client-ipv6 +++ b/networks/single-onion-client-ipv6 @@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-indirect b/networks/single-onion-indirect index 1c2a3ae..014e8bf 100644 --- a/networks/single-onion-indirect +++ b/networks/single-onion-indirect @@ -7,7 +7,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnionIndirect = Node(tag="h", hs=1, torrc="single-onion-indirect.tmpl") # A hidden service needs 5 authorities/relays to ensure it can build HS diff --git a/networks/single-onion-ipv6 b/networks/single-onion-ipv6 index 392de36..9535940 100644 --- a/networks/single-onion-ipv6 +++ b/networks/single-onion-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-v23 b/networks/single-onion-v23 index 6816c94..7afd6b9 100644 --- a/networks/single-onion-v23 +++ b/networks/single-onion-v23 @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl") SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") diff --git a/networks/single-onion-v23-ipv6 b/networks/single-onion-v23-ipv6 index b88f867..aeef809 100644 --- a/networks/single-onion-v23-ipv6 +++ b/networks/single-onion-v23-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") diff --git a/networks/single-onion-v3 b/networks/single-onion-v3 index e282b80..38d1a2a 100644 --- a/networks/single-onion-v3 +++ b/networks/single-onion-v3 @@ -1,7 +1,7 @@ # 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-v3-ipv6 b/networks/single-onion-v3-ipv6 index 9a8dd3a..c5210a4 100644 --- a/networks/single-onion-v3-ipv6 +++ b/networks/single-onion-v3-ipv6 @@ -8,8 +8,8 @@ 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", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") # Since only 25% of relays get the guard flag,