quentin/tor_multipath_voip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Upgrade scripts to print OWD

Browse source
This commit is contained in:
Quentin 2019-09-23 17:34:37 +02:00
parent c919367e35
commit 3ebee4ff2e
5 changed files with 155 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

286
scripts/Makefile
View file

@ -4,7 +4,7 @@ simple_test:
./run-3 \ ./run-3 \
1,simple_test . \ 1,simple_test . \
thunder-client 600 100 100 8 150 . \ thunder-client 600 100 100 8 150 . \
thunder-server 8 150 . \ thunder-server 8 150 100. \
tor3 -f /etc/torrc_simple . \ tor3 -f /etc/torrc_simple . \
tor3 -f /etc/torrc_simple tor3 -f /etc/torrc_simple
@ -15,10 +15,10 @@ tor_bw_small:
orig-client 120 500 100, \ orig-client 120 500 100, \
orig-client 600 100 100, \ orig-client 600 100 100, \
orig-client 1200 50 100 . \ orig-client 1200 50 100 . \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server . \ orig-server 100. \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
@ -40,11 +40,11 @@ tor_bw_full:
orig-client 6000 100 100, \ orig-client 6000 100 100, \
orig-client 12000 50 100, \ orig-client 12000 50 100, \
orig-client 30000 20 100 . \ orig-client 30000 20 100 . \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server . \ orig-server 100. \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
@ -67,10 +67,10 @@ tor_guards_small:
dup2-client 600 100 100 8, \ dup2-client 600 100 100 8, \
dup2-client 600 100 100 8, \ dup2-client 600 100 100 8, \
dup2-client 600 100 100 8 . \ dup2-client 600 100 100 8 . \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8 . \ dup2-server 8 100. \
tor3 -f /etc/torrc_guard_1, \ tor3 -f /etc/torrc_guard_1, \
tor3 -f /etc/torrc_guard_3, \ tor3 -f /etc/torrc_guard_3, \
tor3 -f /etc/torrc_guard_5, \ tor3 -f /etc/torrc_guard_5, \
@ -92,15 +92,15 @@ tor_guards_full:
dup2-client 6000 100 100 8, \ dup2-client 6000 100 100 8, \
dup2-client 6000 100 100 8, \ dup2-client 6000 100 100 8, \
dup2-client 6000 100 100 8 . \ dup2-client 6000 100 100 8 . \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8, \ dup2-server 8 100, \
dup2-server 8 . \ dup2-server 8 100. \
tor3 -f /etc/torrc_guard_1, \ tor3 -f /etc/torrc_guard_1, \
tor3 -f /etc/torrc_guard_2, \ tor3 -f /etc/torrc_guard_2, \
tor3 -f /etc/torrc_guard_3, \ tor3 -f /etc/torrc_guard_3, \
@ -130,9 +130,9 @@ tor_relays_full:
orig-client 6000 100 100, \ orig-client 6000 100 100, \
orig-client 6000 100 100, \ orig-client 6000 100 100, \
orig-client 6000 100 100 . \ orig-client 6000 100 100 . \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server-single . \ orig-server-single 100. \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple . \ tor2 -f /etc/torrc_simple . \
@ -146,9 +146,9 @@ tor_relays_small:
orig-client 600 100 100, \ orig-client 600 100 100, \
orig-client 600 100 100, \ orig-client 600 100 100, \
orig-client 600 100 100 . \ orig-client 600 100 100 . \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server-single . \ orig-server-single 100. \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple . \ tor2 -f /etc/torrc_simple . \
@ -170,13 +170,13 @@ thunder_configure_small:
thunder-client 600 100 100 $(link_num) 250, \ thunder-client 600 100 100 $(link_num) 250, \
thunder-client 600 100 100 $(link_num) 300, \ thunder-client 600 100 100 $(link_num) 300, \
thunder-client 600 100 100 $(link_num) 350. \ thunder-client 600 100 100 $(link_num) 350. \
thunder-server $(link_num) 50, \ thunder-server $(link_num) 50 100, \
thunder-server $(link_num) 100, \ thunder-server $(link_num) 100 100, \
thunder-server $(link_num) 150, \ thunder-server $(link_num) 150 100, \
thunder-server $(link_num) 200, \ thunder-server $(link_num) 200 100, \
thunder-server $(link_num) 250, \ thunder-server $(link_num) 250 100, \
thunder-server $(link_num) 300, \ thunder-server $(link_num) 300 100, \
thunder-server $(link_num) 350. \ thunder-server $(link_num) 350 100. \
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, \
@ -202,13 +202,13 @@ thunder_configure_full:
thunder-client 6000 100 100 $(link_num) 250, \ thunder-client 6000 100 100 $(link_num) 250, \
thunder-client 6000 100 100 $(link_num) 300, \ thunder-client 6000 100 100 $(link_num) 300, \
thunder-client 6000 100 100 $(link_num) 350. \ thunder-client 6000 100 100 $(link_num) 350. \
thunder-server $(link_num) 50, \ thunder-server $(link_num) 50 100, \
thunder-server $(link_num) 100, \ thunder-server $(link_num) 100 100, \
thunder-server $(link_num) 150, \ thunder-server $(link_num) 150 100, \
thunder-server $(link_num) 200, \ thunder-server $(link_num) 200 100, \
thunder-server $(link_num) 250, \ thunder-server $(link_num) 250 100, \
thunder-server $(link_num) 300, \ thunder-server $(link_num) 300 100, \
thunder-server $(link_num) 350. \ thunder-server $(link_num) 350 100. \
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, \
@ -237,12 +237,12 @@ thunder_configure_2_part:
thunder-client 9900 30 100 8 ${jmax}, \ thunder-client 9900 30 100 8 ${jmax}, \
thunder-client 9900 30 100 12 ${jmax}, \ thunder-client 9900 30 100 12 ${jmax}, \
thunder-client 9900 30 100 16 ${jmax}. \ thunder-client 9900 30 100 16 ${jmax}. \
thunder-server 2 ${jmax}, \ thunder-server 2 ${jmax} 100, \
thunder-server 4 ${jmax}, \ thunder-server 4 ${jmax} 100, \
thunder-server 6 ${jmax}, \ thunder-server 6 ${jmax} 100, \
thunder-server 8 ${jmax}, \ thunder-server 8 ${jmax} 100, \
thunder-server 12 ${jmax}, \ thunder-server 12 ${jmax} 100, \
thunder-server 16 ${jmax}. \ thunder-server 16 ${jmax} 100. \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
@ -301,48 +301,48 @@ thunder_configure_2_full:
thunder-client 9900 30 100 8 450, \ thunder-client 9900 30 100 8 450, \
thunder-client 9900 30 100 8 550, \ thunder-client 9900 30 100 8 550, \
thunder-client 9900 30 100 8 650. \ thunder-client 9900 30 100 8 650. \
thunder-server 2 50, \ thunder-server 2 50 100, \
thunder-server 2 150, \ thunder-server 2 150 100, \
thunder-server 2 250, \ thunder-server 2 250 100, \
thunder-server 2 350, \ thunder-server 2 350 100, \
thunder-server 2 450, \ thunder-server 2 450 100, \
thunder-server 2 550, \ thunder-server 2 550 100, \
thunder-server 2 650, \ thunder-server 2 650 100, \
thunder-server 4 50, \ thunder-server 4 50 100, \
thunder-server 4 150, \ thunder-server 4 150 100, \
thunder-server 4 250, \ thunder-server 4 250 100, \
thunder-server 4 350, \ thunder-server 4 350 100, \
thunder-server 4 450, \ thunder-server 4 450 100, \
thunder-server 4 550, \ thunder-server 4 550 100, \
thunder-server 4 650, \ thunder-server 4 650 100, \
thunder-server 6 50, \ thunder-server 6 50 100, \
thunder-server 6 150, \ thunder-server 6 150 100, \
thunder-server 6 250, \ thunder-server 6 250 100, \
thunder-server 6 350, \ thunder-server 6 350 100, \
thunder-server 6 450, \ thunder-server 6 450 100, \
thunder-server 6 550, \ thunder-server 6 550 100, \
thunder-server 6 650, \ thunder-server 6 650 100, \
thunder-server 12 50, \ thunder-server 12 50 100, \
thunder-server 12 150, \ thunder-server 12 150 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 350, \ thunder-server 12 350 100, \
thunder-server 12 450, \ thunder-server 12 450 100, \
thunder-server 12 550, \ thunder-server 12 550 100, \
thunder-server 12 650, \ thunder-server 12 650 100, \
thunder-server 16 50, \ thunder-server 16 50 100, \
thunder-server 16 150, \ thunder-server 16 150 100, \
thunder-server 16 250, \ thunder-server 16 250 100, \
thunder-server 16 350, \ thunder-server 16 350 100, \
thunder-server 16 450, \ thunder-server 16 450 100, \
thunder-server 16 550, \ thunder-server 16 550 100, \
thunder-server 16 650, \ thunder-server 16 650 100, \
thunder-server 8 50, \ thunder-server 8 50 100, \
thunder-server 8 150, \ thunder-server 8 150 100, \
thunder-server 8 250, \ thunder-server 8 250 100, \
thunder-server 8 350, \ thunder-server 8 350 100, \
thunder-server 8 450, \ thunder-server 8 450 100, \
thunder-server 8 550, \ thunder-server 8 550 100, \
thunder-server 8 650. \ thunder-server 8 650 100. \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \
@ -495,46 +495,46 @@ tor_just_many_latencies:
orig-client 9900 30 100, \ orig-client 9900 30 100, \
orig-client 9900 30 100, \ orig-client 9900 30 100, \
orig-client 9900 30 100 . \ orig-client 9900 30 100 . \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server, \ orig-server 100, \
orig-server . \ orig-server 100. \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
tor3 -f /etc/torrc_simple, \ tor3 -f /etc/torrc_simple, \
@ -659,18 +659,18 @@ thunder_guards:
thunder-client 9900 30 100 12 250, \ thunder-client 9900 30 100 12 250, \
thunder-client 9900 30 100 12 250, \ thunder-client 9900 30 100 12 250, \
thunder-client 9900 30 100 12 250. \ thunder-client 9900 30 100 12 250. \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250, \ thunder-server 12 250 100, \
thunder-server 12 250. \ thunder-server 12 250 100. \
tor2 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_2, \
tor2 -f /etc/torrc_guard_4, \ tor2 -f /etc/torrc_guard_4, \
tor2 -f /etc/torrc_guard_6, \ tor2 -f /etc/torrc_guard_6, \

6
scripts/dup2-server
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
mkdir -p $2/{log,shared} mkdir -p $3/{log,shared}
cd $2/shared cd $3/shared
donar \ donar \
-a dup2 \ -a dup2 \
@ -10,4 +10,4 @@ donar \
-e 9000 \ -e 9000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log udpecho -p 9000 -m -s $2 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log

6
scripts/orig-server
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
mkdir -p $1/{log,shared} mkdir -p $2/{log,shared}
cd $1/shared cd $2/shared
torecho > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log torecho -m -s $1 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log

6
scripts/orig-server-single
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
mkdir -p $1/{log,shared} mkdir -p $2/{log,shared}
cd $1/shared cd $2/shared
torecho -n > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log torecho -n -m -s $1 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log

6
scripts/thunder-server
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
mkdir -p $3/{log,shared} mkdir -p $4/{log,shared}
cd $3/shared cd $4/shared
donar \ donar \
-a thunder \ -a thunder \
@ -11,4 +11,4 @@ donar \
-e 9000 \ -e 9000 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log udpecho -p 9000 -m -s $3 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log