Add dup2 and remove valgrind

This commit is contained in:
Quentin 2019-05-06 17:06:01 +02:00
parent 39e50ba7f5
commit 3b6fa6e757
6 changed files with 28 additions and 8 deletions

10
scripts/dup2-client Executable file
View file

@ -0,0 +1,10 @@
#!/bin/bash
mkdir -p ./log
tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
sleep 2
mkdir -p ./shared
donar -a dup2 -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
sleep 2
measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
dump_circuits > ./log/circuits.txt
measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/dup2.csv 2> ./log/client-measlat-stderr.log

10
scripts/dup2-server Executable file
View file

@ -0,0 +1,10 @@
#!/bin/bash
mkdir -p ./log
tor -f /etc/torrc > ./log/server-tor-stdout.log 2> ./log/server-tor-stderr.log &
sleep 2
mkdir -p ./shared
cd ./shared
pwd
( sleep 180; dump_circuits > ./log/server-circuits.txt ) &
donar -a dup2 -s -e 9000 > ../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

View file

@ -3,8 +3,8 @@ mkdir -p ./log
tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
sleep 2
mkdir -p ./shared
valgrind --leak-check=full donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 -v > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
donar -a rr -b -c -o ./shared/onion_services.pub -r 9000 -v > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
sleep 2
measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
dump_circuits > ./log/circuits.txt
valgrind --leak-check=full measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 -v > ./res/rr.csv 2> ./log/client-measlat-stderr.log
measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 -v > ./res/rr.csv 2> ./log/client-measlat-stderr.log

View file

@ -5,6 +5,6 @@ sleep 2
mkdir -p ./shared
cd ./shared
pwd
( sleep 180; dump_circuits > ./log/server-circuits.txt ) &
valgrind --leak-check=full donar -a rr -b -s -e 9000 -v > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
valgrind --leak-check=full udpecho -p 9000 -v > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
donar -a rr -b -s -e 9000 -v > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
udpecho -p 9000 -v > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log

View file

@ -3,7 +3,7 @@ mkdir -p ./log
tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
sleep 2
mkdir -p ./shared
valgrind --leak-check=full donar -a rr -b -h -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
donar -a rr -b -h -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
sleep 2
measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections
dump_circuits > ./log/circuits.txt

View file

@ -5,6 +5,6 @@ sleep 2
mkdir -p ./shared
cd ./shared
pwd
( sleep 180; dump_circuits > ./log/server-circuits.txt ) &
valgrind --leak-check=full donar -a rr -b -h -s -e 9000 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
donar -a rr -b -h -s -e 9000 > ../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