From 1cb7203802868fdd474361f2965438148d4f7972 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 2 Sep 2019 15:50:48 +0200
Subject: [PATCH] update my scripts

---
 Dockerfile           | 2 +-
 scripts/dup2-client  | 1 +
 scripts/dup2-server  | 3 +--
 scripts/naive-client | 6 ++----
 scripts/naive-server | 8 ++------
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d7c57ce..c413b42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,4 +64,4 @@ COPY --from=builder /home/donar-build/out/torecho /usr/local/bin
 COPY --from=builder /home/donar-build/tor2/src/app/tor /usr/local/bin/tor2
 COPY --from=builder /home/donar-build/tor3/src/app/tor /usr/local/bin/tor3
 COPY ./scripts/* /usr/local/bin/
-COPY ./torrc_simple /etc/torrc
+COPY ./torrc_* /etc/
diff --git a/scripts/dup2-client b/scripts/dup2-client
index 93e923f..b1af41b 100755
--- a/scripts/dup2-client
+++ b/scripts/dup2-client
@@ -2,6 +2,7 @@
 mkdir -p $4/{log,shared,res}
 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 > $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 600b63b..5698b88 100755
--- a/scripts/dup2-server
+++ b/scripts/dup2-server
@@ -1,7 +1,6 @@
 #!/bin/bash
 mkdir -p $1/{log,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
diff --git a/scripts/naive-client b/scripts/naive-client
index e2f8fc9..6794b66 100755
--- a/scripts/naive-client
+++ b/scripts/naive-client
@@ -1,9 +1,7 @@
 #!/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
+mkdir -p $4/{log,shared,res}
 donar -a naive -c -o ./shared/onion_services.pub -v -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
 measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/naive.csv 2> ./log/client-measlat-stderr.log
diff --git a/scripts/naive-server b/scripts/naive-server
index b2b50ef..ff6f729 100755
--- a/scripts/naive-server
+++ b/scripts/naive-server
@@ -1,9 +1,5 @@
 #!/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
+mkdir -p $1/{log,shared,res}
+cd $1/shared
 donar -a naive -s -e 9000 -v > ../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