[tor-commits] [chutney/master] Add the missing networks/bridges+ipv6+hs-v2 network

[teor at torproject.org]

commit 8b09c95affad2ab1264efc6b0c7959bbed572997
Author: teor <teor at torproject.org>
Date:   Fri Oct 26 11:30:42 2018 +1000

    Add the missing networks/bridges+ipv6+hs-v2 network
    
    It's a copy of networks/bridges+ipv6+hs, but it is explicit about using
    hsv2.
---
 networks/bridges+ipv6+hs-v2 | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/networks/bridges+ipv6+hs-v2 b/networks/bridges+ipv6+hs-v2
new file mode 100644
index 0000000..5b62b7c
--- /dev/null
+++ b/networks/bridges+ipv6+hs-v2
@@ -0,0 +1,23 @@
+# 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")
+
+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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
+HSv2 = Node(tag="h", hs=1, torrc="hs-v2.tmpl")
+
+# 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)
+
+ConfigureNodes(NODES)