Ticket #13162: XX-basic-middle-variants.patch

File XX-basic-middle-variants.patch, 2.7 KB (added by teor, 6 years ago)

Replace previous patches with files suffixed with the number of routers

  • new file networks/basic+middle-015

    diff --git a/networks/basic+middle-015 b/networks/basic+middle-015
    new file mode 100644
    index 0000000..53f3b4f
    - +  
     1Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
     2Relay = Node(tag="r", relay=1, torrc="relay.tmpl")
     3Exit = Node(tag="e", relay=1, torrc="exit.tmpl")
     4Client = Node(tag="c", torrc="client.tmpl")
     5
     6# Guard percentage has been reduced from 50% to 25% of relays
     7# This may require more relay nodes
     8NODES = Authority.getN(3) + Relay.getN(5) + Exit.getN(5) + Client.getN(2)
     9
     10ConfigureNodes(NODES)
  • new file networks/basic+middle-025

    diff --git a/networks/basic+middle-025 b/networks/basic+middle-025
    new file mode 100644
    index 0000000..586367e
    - +  
     1# If you get failures, try:
     2# ulimit -S -n 512 or similar
     3# a longer delay in test-network.sh
     4Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
     5Relay = Node(tag="r", relay=1, torrc="relay.tmpl")
     6Exit = Node(tag="e", relay=1, torrc="exit.tmpl")
     7Client = Node(tag="c", torrc="client.tmpl")
     8
     9# Guard percentage has been reduced from 50% to 25% of relays
     10# This may require more relay nodes
     11NODES = Authority.getN(4) + Relay.getN(8) + Exit.getN(8) + Client.getN(5)
     12
     13ConfigureNodes(NODES)
  • new file networks/basic+middle-075

    diff --git a/networks/basic+middle-075 b/networks/basic+middle-075
    new file mode 100644
    index 0000000..f1df1f6
    - +  
     1# If you get failures, try:
     2# ulimit -S -n 512 or similar
     3# a longer delay in test-network.sh
     4Authority = Node(tag="a", authority=1, relay=1, torrc="authority-huge.tmpl")
     5Relay = Node(tag="r", relay=1, torrc="relay-huge.tmpl")
     6Exit = Node(tag="e", relay=1, torrc="exit-huge.tmpl")
     7Client = Node(tag="c", torrc="client-huge.tmpl")
     8
     9NODES = Authority.getN(5) + Relay.getN(20) + Exit.getN(10) + Client.getN(40)
     10
     11ConfigureNodes(NODES)
  • new file networks/basic+middle-200

    diff --git a/networks/basic+middle-200 b/networks/basic+middle-200
    new file mode 100644
    index 0000000..6144e25
    - +  
     1# If you get failures, try:
     2# ulimit -S -n 512 or similar
     3# a longer delay in test-network.sh
     4# changing the base socks port so it doesn't conflict with non-test tor ports
     5Authority = Node(tag="a", authority=1, relay=1, torrc="authority-huge.tmpl")
     6Relay = Node(tag="r", relay=1, torrc="relay-huge.tmpl")
     7Exit = Node(tag="e", relay=1, torrc="exit-huge.tmpl")
     8Client = Node(tag="c", torrc="client-huge.tmpl")
     9
     10# Add an extra authority compared to huge
     11# Approximate the proportion of exits to relays in the global network
     12# Add more clients than there are relays
     13NODES = Authority.getN(5) + Relay.getN(75) + Exit.getN(15) + Client.getN(105)
     14
     15ConfigureNodes(NODES)