[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [chutney/master] networks: Make hs-v23-ipv6-md more readable
commit 0f39f6c73b085f636889ba1b66a31a74976fa576
Author: teor <teor@xxxxxxxxxxxxxx>
Date: Mon Feb 17 13:19:05 2020 +1000
networks: Make hs-v23-ipv6-md more readable
Whitespace-only changes.
---
networks/hs-v23-ipv6-md | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md
index fb7161b..ffe1b5b 100644
--- a/networks/hs-v23-ipv6-md
+++ b/networks/hs-v23-ipv6-md
@@ -1,16 +1,21 @@
Require("IPV6")
+
import os
+
# 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")
+
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-md.tmpl")
+
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")
@@ -21,7 +26,9 @@ HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl")
# connections:
# a minimum path length of 3, plus the client-nominated rendezvous point,
# plus a seperate introduction point
-NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \
- Client.getN(1) + Client6.getN(1) + HSv2IPv6.getN(1) + HSv3IPv6.getN(1)
+NODES = Authority6.getN(2) + \
+ NonExitRelay6.getN(3) + \
+ Client.getN(1) + Client6.getN(1) + \
+ HSv2IPv6.getN(1) + HSv3IPv6.getN(1)
ConfigureNodes(NODES)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits