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

Fix experience

Browse source
This commit is contained in:
Quentin 2019-09-02 17:09:58 +02:00
parent e1e35e159b
commit 8d30c8928a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Makefile
View file

@ -1,6 +1,6 @@
tor_bw_small: tor_bw_small:
./run-3 \ ./run-3 \
1 . \ 1 . \
orig-client 1000 1000 100, orig-client 1000 100 100, orig-client 10000 10 100, 10000 1 100 . \ orig-client 1000 1000 100, orig-client 1000 100 100, orig-client 10000 10 100, orig-client 10000 1 100 . \
orig-server, orig-server, orig-server, orig-server . \ orig-server, orig-server, orig-server, orig-server . \
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, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple

4
scripts/orig-client
View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
mkdir -p $4/{log,shared,res} mkdir -p $4/{log,shared,res}
pushd $4/shared pushd $4/shared > /dev/null
HS="`cat onion_services.pub | head -n1`.onion" HS="`cat onion_services.pub | head -n1`.onion"
popd popd > /dev/null
measlat -h $HS -p 7500 -t tor > /dev/null 2> $4/log/client-bootstrap-stderr.log # Used to wait for connections measlat -h $HS -p 7500 -t tor > /dev/null 2> $4/log/client-bootstrap-stderr.log # Used to wait for connections
measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/res/orig.csv 2> $4/log/client-measlat-stderr.log measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/res/orig.csv 2> $4/log/client-measlat-stderr.log

2
scripts/run-3
View file

@ -11,7 +11,7 @@ WAITFOR=2280 # 38min
OLD_IFS=$IFS; IFS="." OLD_IFS=$IFS; IFS="."
read -a PARTS <<< "$@" read -a PARTS <<< "$@"
IFS=$OLD_IFS IFS=$OLD_IFS
[[ ${#PARTS[@]} == 3 ]] || die "Separate count, clients and servers experiments by starts. I expect 3 parts but got ${#PARTS[@]}" [[ ${#PARTS[@]} == 4 ]] || die "Separate count, clients, servers experiments and tor daemon command by dots. I expect 4 parts but got ${#PARTS[@]}"
# EXTRACT DATA # EXTRACT DATA
OLD_IFS=$IFS; IFS="," OLD_IFS=$IFS; IFS=","