From 3b6fa6e7579c51f83b67aa46813e5cf856bccea3 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 6 May 2019 17:06:01 +0200 Subject: [PATCH] Add dup2 and remove valgrind --- scripts/dup2-client | 10 ++++++++++ scripts/dup2-server | 10 ++++++++++ scripts/rr-client | 4 ++-- scripts/rr-server | 6 +++--- scripts/rrh-client | 2 +- scripts/rrh-server | 4 ++-- 6 files changed, 28 insertions(+), 8 deletions(-) create mode 100755 scripts/dup2-client create mode 100755 scripts/dup2-server diff --git a/scripts/dup2-client b/scripts/dup2-client new file mode 100755 index 0000000..2c7ebaf --- /dev/null +++ b/scripts/dup2-client @@ -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 diff --git a/scripts/dup2-server b/scripts/dup2-server new file mode 100755 index 0000000..3dfce6e --- /dev/null +++ b/scripts/dup2-server @@ -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 diff --git a/scripts/rr-client b/scripts/rr-client index 208bee7..aaaba45 100755 --- a/scripts/rr-client +++ b/scripts/rr-client @@ -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 diff --git a/scripts/rr-server b/scripts/rr-server index b266d51..4b4238d 100755 --- a/scripts/rr-server +++ b/scripts/rr-server @@ -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 diff --git a/scripts/rrh-client b/scripts/rrh-client index 9410355..99e733e 100755 --- a/scripts/rrh-client +++ b/scripts/rrh-client @@ -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 diff --git a/scripts/rrh-server b/scripts/rrh-server index f9edbdf..0ce18b2 100755 --- a/scripts/rrh-server +++ b/scripts/rrh-server @@ -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