diff --git a/scripts/Makefile b/scripts/Makefile index 72ce788..5df5c6d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -7,6 +7,7 @@ simple_test: thunder-server 8 150 . \ tor3 -f /etc/torrc_simple . \ tor3 -f /etc/torrc_simple + tor_bw_small: ./run-3 \ 1,tor_bw_small . \ @@ -158,3 +159,36 @@ tor_relays_small: tor_relays_full_parse: @. parse_lib.sh && \ parse_latency tor_relays_full 2 + +thunder_configure_small: + ./run-3 \ + 16,thunder_configure. \ + thunder-client 600 100 100 $(link_num) 50, \ + thunder-client 600 100 100 $(link_num) 100, \ + thunder-client 600 100 100 $(link_num) 150, \ + thunder-client 600 100 100 $(link_num) 200, \ + thunder-client 600 100 100 $(link_num) 250, \ + thunder-client 600 100 100 $(link_num) 300, \ + thunder-client 600 100 100 $(link_num) 350. \ + thunder-server $(link_num) 50, + thunder-server $(link_num) 100, \ + thunder-server $(link_num) 150, \ + thunder-server $(link_num) 200, \ + thunder-server $(link_num) 250, \ + thunder-server $(link_num) 300, \ + thunder-server $(link_num) 350. \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2. \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_2 + diff --git a/scripts/thunder-client b/scripts/thunder-client index 8113e35..bf5efc6 100755 --- a/scripts/thunder-client +++ b/scripts/thunder-client @@ -8,8 +8,8 @@ donar \ -p $5 \ -b \ -r 9000 \ -> $5/log/client-donar-stdout.log 2> $5/log/client-donar-stderr.log & +> $6/log/client-donar-stdout.log 2> $6/log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections -measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > $5/res/thunder.csv 2> $5/log/client-measlat-stderr.log +measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > $6/res/thunder.csv 2> $6/log/client-measlat-stderr.log