commit 55867eef079bb24f6898019d9fe1fe7f17e1a908 Author: juga juga@riseup.net Date: Fri Mar 5 12:11:14 2021 +0000

Add back bwscanner files

because sbws is now using chutney and it would be better the files are maintained as part of chutney. This will also help to reproduce #40013 . --- networks/bwscanner | 20 ++++++++++++++++++++ torrc_templates/client_bwscanner.tmpl | 12 ++++++++++++ torrc_templates/relay-MAB.tmpl | 4 ++++ torrc_templates/relay-MBR.tmpl | 4 ++++ 4 files changed, 40 insertions(+)

diff --git a/networks/bwscanner b/networks/bwscanner new file mode 100644 index 0000000..86f8c78 --- /dev/null +++ b/networks/bwscanner @@ -0,0 +1,20 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +# #40013: All the relays get the EXIT flag +# The relay-non-exit.tmpl includes the relay-non-dir.tmpl, which includdes +# `${include:common.i} ExitRelay=0` and common.i generates a torrc file with +# ExitRelay 0 +# ExitRelay 0 +# ExitPolicy reject *:* +NonExitRelay = Node(tag="m", relay=1, exit=0, torrc="relay-non-exit.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl") +RelayMAB = Node(tag="relay1mbyteMAB", relay=1, exit=1, torrc="relay-MAB.tmpl") +RelayMBR = Node(tag="relay1mbyteMBR", relay=1, exit=1, torrc="relay-MBR.tmpl") + +NODES = Authority.getN(3) + \ + NonExitRelay.getN(7) + \ + RelayMBR.getN(1) + RelayMAB.getN(1) + \ + ExitRelay.getN(3) + Client.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/client_bwscanner.tmpl b/torrc_templates/client_bwscanner.tmpl new file mode 100644 index 0000000..1c0358a --- /dev/null +++ b/torrc_templates/client_bwscanner.tmpl @@ -0,0 +1,12 @@ +${include:common.i} +SocksPort $socksport +UseEntryGuards 0 +UseMicroDescriptors 0 +FetchDirInfoEarly 1 +FetchDirInfoExtraEarly 1 +FetchUselessDescriptors 1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +ConnectionPadding 0 +__DisablePredictedCircuits 1 +__LeaveStreamsUnattached 1 diff --git a/torrc_templates/relay-MAB.tmpl b/torrc_templates/relay-MAB.tmpl new file mode 100644 index 0000000..c53d242 --- /dev/null +++ b/torrc_templates/relay-MAB.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +Nickname relay1mbyteMAB +MaxAdvertisedBandwidth 1 MBytes diff --git a/torrc_templates/relay-MBR.tmpl b/torrc_templates/relay-MBR.tmpl new file mode 100644 index 0000000..a159524 --- /dev/null +++ b/torrc_templates/relay-MBR.tmpl @@ -0,0 +1,4 @@ +${include:relay-non-exit.tmpl} + +Nickname relay1mbyteMBR +RelayBandwidthRate 1 MBytes