[tor-commits] [chutney/master] networks: Add mixed+hs-v23-ipv6

[teor at torproject.org]

commit 5adf2bfb0b9bc98dcca761b4c37531bbe56786e0
Author: teor <teor at torproject.org>
Date:   Mon Feb 17 13:18:24 2020 +1000

    networks: Add mixed+hs-v23-ipv6
    
    Add a mixed-version network that runs onion services and IPv6.
    
    Closes ticket 33333.
---
 networks/mixed+hs-v23-ipv6 | 61 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6
new file mode 100644
index 0000000..250bde1
--- /dev/null
+++ b/networks/mixed+hs-v23-ipv6
@@ -0,0 +1,61 @@
+# This network uses microdescriptors, even though it doesn't end in -md
+# All current tor versions support microdescriptors for IPv6
+
+Require("IPV6")
+
+import os
+
+OLD_TOR="tor-stable"
+
+# By default, Authorities are not configured as exits
+Authority6 = Node(tag="a", authority=1, relay=1,
+                  ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
+                                           '[::1]'),
+                  torrc="authority-orport-v6.tmpl")
+OldAuthority6 = Node(tag="aOLD", authority=1, relay=1,
+                     ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
+                                              '[::1]'),
+                     torrc="authority-orport-v6.tmpl",
+                     tor=OLD_TOR)
+
+NonExitRelay = Node(tag="r", relay=1,
+                    torrc="relay-non-exit.tmpl")
+OldNonExitRelay = Node(tag="rOLD", relay=1,
+                       torrc="relay-non-exit.tmpl",
+                       tor=OLD_TOR)
+NonExitRelay6 = Node(tag="r", relay=1,
+                     ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
+                                              '[::1]'),
+                     torrc="relay-orport-v6-non-exit.tmpl")
+OldNonExitRelay6 = Node(tag="rOLD", relay=1,
+                        ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
+                                                 '[::1]'),
+                        torrc="relay-orport-v6-non-exit.tmpl",
+                        tor=OLD_TOR)
+
+Client6 = Node(tag="c", client=1,
+               torrc="client-only-v6-md.tmpl")
+OldClient6 = Node(tag="cOLD", client=1,
+                  torrc="client-only-v6-md.tmpl",
+                  tor=OLD_TOR)
+
+HSv2IPv6 = Node(tag="h", hs=1,
+              torrc="hs-only-v6-md.tmpl")
+OldHSv2IPv6 = Node(tag="hOLD", hs=1,
+                 torrc="hs-only-v6-md.tmpl",
+                 tor=OLD_TOR)
+
+HSv3IPv6 = Node(tag="h", hs=1,
+              torrc="hs-v3-only-v6-md.tmpl")
+OldHSv3IPv6 = Node(tag="hOLD", hs=1,
+                 torrc="hs-v3-only-v6-md.tmpl",
+                 tor=OLD_TOR)
+
+NODES = Authority6.getN(1)    + OldAuthority6.getN(1) + \
+        NonExitRelay.getN(1)  + OldNonExitRelay.getN(1) + \
+        NonExitRelay6.getN(1) + OldNonExitRelay6.getN(1) + \
+        Client6.getN(1)       + OldClient6.getN(1) + \
+        HSv2IPv6.getN(1)      + OldHSv2IPv6.getN(1) + \
+        HSv3IPv6.getN(1)      + OldHSv3IPv6.getN(1)
+
+ConfigureNodes(NODES)