commit 25bae0dc902e3b486c357e29ea0368cb85fad262 Author: Ana Custura ana@netstat.org.uk Date: Fri Jun 26 10:40:24 2020 +0100
Update TGen traffic model to use TGen version 1.0.0 --- onionperf/model.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/onionperf/model.py b/onionperf/model.py index 1f4d9fe..f06f8e0 100644 --- a/onionperf/model.py +++ b/onionperf/model.py @@ -74,7 +74,7 @@ class TorperfModel(GeneratableTGenModel): else: g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") g.add_node("pause", time="5 minutes") - g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="270 seconds", stallout="0 seconds") + g.add_node("stream5m", sendsize="0", recvsize="5 mib", timeout="270 seconds", stallout="0 seconds")
g.add_edge("start", "pause")
@@ -83,7 +83,7 @@ class TorperfModel(GeneratableTGenModel): g.add_edge("pause", "pause")
# these are chosen with weighted probability, change edge 'weight' attributes to adjust probability - g.add_edge("pause", "transfer5m") + g.add_edge("pause", "stream5m")
return g
@@ -103,10 +103,10 @@ class OneshotModel(GeneratableTGenModel): g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute", socksproxy=self.socksproxy) else: g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") - g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="15 seconds", stallout="10 seconds") + g.add_node("stream5m", sendsize="0", recvsize="5 mib", timeout="270 seconds", stallout="0 seconds")
- g.add_edge("start", "transfer5m") - g.add_edge("transfer5m", "start") + g.add_edge("start", "stream5m") + g.add_edge("stream5m", "start")
return g