commit c16848c3e4dc325db1ad6f795a4e4ecbf0956191 Author: teor teor2345@gmail.com Date: Thu Oct 2 02:22:02 2014 +1000

Create a middle flavour, and size variants for basic and middle

Create a middle flavour, which includes non-exit routers.

Create size variants for basic and middle, with 25 and 100 tor nodes. As these variants get larger, approximate the proportions of the global tor network. --- networks/basic-025 | 7 +++++++ networks/basic-100 | 7 +++++++ networks/middle | 8 ++++++++ networks/middle-025 | 8 ++++++++ networks/middle-100 | 8 ++++++++ 5 files changed, 38 insertions(+)

diff --git a/networks/basic-025 b/networks/basic-025 new file mode 100644 index 0000000..103224b --- /dev/null +++ b/networks/basic-025 @@ -0,0 +1,7 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(4) + Relay.getN(16) + Client.getN(5) + +ConfigureNodes(NODES) diff --git a/networks/basic-100 b/networks/basic-100 new file mode 100644 index 0000000..561c4c4 --- /dev/null +++ b/networks/basic-100 @@ -0,0 +1,7 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(5) + Relay.getN(35) + Client.getN(60) + +ConfigureNodes(NODES) diff --git a/networks/middle b/networks/middle new file mode 100644 index 0000000..168f837 --- /dev/null +++ b/networks/middle @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(3) + Middle.getN(4) + Relay.getN(4) + Client.getN(2) + +ConfigureNodes(NODES) diff --git a/networks/middle-025 b/networks/middle-025 new file mode 100644 index 0000000..7687b8c --- /dev/null +++ b/networks/middle-025 @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(4) + Middle.getN(10) + Relay.getN(6) + Client.getN(5) + +ConfigureNodes(NODES) diff --git a/networks/middle-100 b/networks/middle-100 new file mode 100644 index 0000000..d67702c --- /dev/null +++ b/networks/middle-100 @@ -0,0 +1,8 @@ +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +Middle = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") +Relay = Node(tag="r", relay=1, torrc="relay.tmpl") +Client = Node(tag="c", torrc="client.tmpl") + +NODES = Authority.getN(5) + Middle.getN(25) + Relay.getN(10) + Client.getN(60) + +ConfigureNodes(NODES)