From 1754a995d9ef689b8c3a58bc059058078534472e Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Wed, 15 May 2019 11:23:42 +0200
Subject: [PATCH] Update some test scripts

---
 scripts/dup2-client     | 12 ++++++------
 scripts/dup2-server     | 14 +++++++-------
 scripts/rrhr-client     | 12 ++++++------
 scripts/rrhr-server     | 14 +++++++-------
 scripts/witness2-client |  4 ++--
 scripts/witness2-server |  2 +-
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/scripts/dup2-client b/scripts/dup2-client
index 2c7ebaf..9e128e5 100755
--- a/scripts/dup2-client
+++ b/scripts/dup2-client
@@ -1,10 +1,10 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
+mkdir -p $4/log
+tor -f /etc/torrc > $4/log/client-tor-stdout.log 2> $4/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 &
+mkdir -p $4/shared
+donar -a dup2 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/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
+dump_circuits > $4/log/circuits.txt
+measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > $4/res/dup2.csv 2> $4/log/client-measlat-stderr.log
diff --git a/scripts/dup2-server b/scripts/dup2-server
index 3dfce6e..9fe324d 100755
--- a/scripts/dup2-server
+++ b/scripts/dup2-server
@@ -1,10 +1,10 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/server-tor-stdout.log 2> ./log/server-tor-stderr.log  &
+mkdir -p $1/log
+tor -f /etc/torrc > $1/log/server-tor-stdout.log 2> $1/log/server-tor-stderr.log  &
 sleep 2
-mkdir -p ./shared
-cd ./shared
+mkdir -p $1/shared
+cd $1/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
+( sleep 180; dump_circuits > $1/log/server-circuits.txt ) &
+donar -a dup2 -s -e 9000 > $1/log/server-donar-stdout.log 2> $1/log/server-donar-stderr.log &
+udpecho -p 9000 > $1/log/server-udpecho-stdout.log 2> $1/log/server-udpecho-stderr.log
diff --git a/scripts/rrhr-client b/scripts/rrhr-client
index 4731efc..e7d2661 100755
--- a/scripts/rrhr-client
+++ b/scripts/rrhr-client
@@ -1,10 +1,10 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/client-tor-stdout.log 2> ./log/client-tor-stderr.log &
+mkdir -p $4/log
+tor -f /etc/torrc > $4/log/client-tor-stdout.log 2> $4/log/client-tor-stderr.log &
 sleep 2
-mkdir -p ./shared
-donar -a rr -b -h -l 8 -d 1,1 -c -o ./shared/onion_services.pub -r 9000 > ./log/client-donar-stdout.log 2> ./log/client-donar-stderr.log &
+mkdir -p $4/shared
+donar -a rr -b -h -l 8 -d 1,1 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/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/rrh.csv 2> ./log/client-measlat-stderr.log
+dump_circuits > $4/log/circuits.txt
+measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > $4/res/rrh.csv 2> $4/log/client-measlat-stderr.log
diff --git a/scripts/rrhr-server b/scripts/rrhr-server
index 79e2fa4..1cd24ef 100755
--- a/scripts/rrhr-server
+++ b/scripts/rrhr-server
@@ -1,10 +1,10 @@
 #!/bin/bash
-mkdir -p ./log
-tor -f /etc/torrc > ./log/server-tor-stdout.log 2> ./log/server-tor-stderr.log  &
+mkdir -p $1/log
+tor -f /etc/torrc > $1/log/server-tor-stdout.log 2> $1/log/server-tor-stderr.log  &
 sleep 2
-mkdir -p ./shared
-cd ./shared
+mkdir -p $1/shared
+cd $1/shared
 pwd
-( sleep 180; dump_circuits > ../log/server-circuits.txt ) &
-donar -a rr -l 8 -b -h -d 1,1 -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
+( sleep 180; dump_circuits > $1/log/server-circuits.txt ) &
+donar -a rr -l 8 -b -h -d 1,1 -s -e 9000 > $1/log/server-donar-stdout.log 2> $1/log/server-donar-stderr.log &
+udpecho -p 9000 > $1/log/server-udpecho-stdout.log 2> $1/log/server-udpecho-stderr.log
diff --git a/scripts/witness2-client b/scripts/witness2-client
index 74df59d..1fd5481 100755
--- a/scripts/witness2-client
+++ b/scripts/witness2-client
@@ -1,5 +1,5 @@
 #!/bin/bash
-mkdir -p ./{res,log}
+mkdir -p $4/{res,log}
 measlat -h fbx-rennes2.machine.deuxfleurs.fr -p 9000 > /dev/null 2>&1 # Used to wait for connections
-measlat -h fbx-rennes2.machine.deuxfleurs.fr -p 9000 -c $1 -i $2 -s $3 > ./res/witness2.csv 2> ./log/client-measlat-stderr.log
+measlat -h fbx-rennes2.machine.deuxfleurs.fr -p 9000 -c $1 -i $2 -s $3 > $4/res/witness2.csv 2> $4/log/client-measlat-stderr.log
 
diff --git a/scripts/witness2-server b/scripts/witness2-server
index 306149e..866a4f8 100755
--- a/scripts/witness2-server
+++ b/scripts/witness2-server
@@ -1,2 +1,2 @@
 #!/bin/bash
-cat /dev/zero
+sleep 65535