[tor-commits] [chutney/master] Add another network with bridges and hidden services

[teor@xxxxxxxxxxxxxx]

commit 25c1528e879d89a6c00f99a188b181438b5cb9ac
Author: teor <teor2345@xxxxxxxxx>
Date:   Wed Sep 13 09:30:04 2017 +1000

    Add another network with bridges and hidden services
    
    We can use this one to test tor 0.3.2 and later.
    
    Closes 22691.
---
 networks/bridges+ipv6+hs-v23 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23
new file mode 100644
index 0000000..c99dff5
--- /dev/null
+++ b/networks/bridges+ipv6+hs-v23
@@ -0,0 +1,26 @@
+# 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")
+
+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")
+HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
+HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
+
+# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
+# in 0.2.6
+# We need 5 authorities/relays/exits to ensure we can build HS connections
+# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4
+# Unfortunately, this does not prevent clients falling back to IPv4
+# bridges+ipv6-min only has IPv6 bridges
+NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \
+    ExitRelay.getN(4) + \
+    BridgeIPv6.getN(1) + Bridge.getN(1) + \
+    Client.getN(1) + BridgeClient.getN(1) + \
+    HSv2.getN(1) + HSv3.getN(1)
+
+ConfigureNodes(NODES)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits