From 882196850f24e081fb82e35b4d4b50c8cb973aeb Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin.dufour@inria.fr>
Date: Thu, 28 Mar 2019 16:59:03 +0100
Subject: [PATCH] WIP script

---
 scripts/{xp1-client => naive-client} | 2 +-
 scripts/{xp1-server => naive-server} | 0
 scripts/{xp2-client => orig-client}  | 2 +-
 scripts/{xp2-server => orig-server}  | 0
 scripts/rr-client                    | 9 +++++++++
 scripts/rr-server                    | 9 +++++++++
 scripts/rrh-client                   | 9 +++++++++
 scripts/rrh-server                   | 9 +++++++++
 8 files changed, 38 insertions(+), 2 deletions(-)
 rename scripts/{xp1-client => naive-client} (73%)
 rename scripts/{xp1-server => naive-server} (100%)
 rename scripts/{xp2-client => orig-client} (71%)
 rename scripts/{xp2-server => orig-server} (100%)
 create mode 100755 scripts/rr-client
 create mode 100755 scripts/rr-server
 create mode 100755 scripts/rrh-client
 create mode 100755 scripts/rrh-server

diff --git a/scripts/xp1-client b/scripts/naive-client
similarity index 73%
rename from scripts/xp1-client
rename to scripts/naive-client
index df0bcad..8cb18c6 100755
--- a/scripts/xp1-client
+++ b/scripts/naive-client
@@ -6,4 +6,4 @@ mkdir -p ./shared
 valgrind donar -a naive -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
-measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > `mktemp -p ./res res-XXXXXXXXXXXXXXXX.txt` 2> ./log/client-measlat-stderr.log
+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/xp1-server b/scripts/naive-server
similarity index 100%
rename from scripts/xp1-server
rename to scripts/naive-server
diff --git a/scripts/xp2-client b/scripts/orig-client
similarity index 71%
rename from scripts/xp2-client
rename to scripts/orig-client
index 6921149..38f0c1b 100755
--- a/scripts/xp2-client
+++ b/scripts/orig-client
@@ -5,4 +5,4 @@ sleep 2
 mkdir -p ./shared
 HS="`cat ./shared/onion_services.pub | head -n1`.onion"
 measlat -h $HS -p 7500 -t tor # Used to wait for connections
-measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > ./res/xp2.csv 2> ./log/client-measlat-stderr.log
+measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > ./res/orig.csv 2> ./log/client-measlat-stderr.log
diff --git a/scripts/xp2-server b/scripts/orig-server
similarity index 100%
rename from scripts/xp2-server
rename to scripts/orig-server
diff --git a/scripts/rr-client b/scripts/rr-client
new file mode 100755
index 0000000..f0e8329
--- /dev/null
+++ b/scripts/rr-client
@@ -0,0 +1,9 @@
+#!/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
+valgrind donar -a rr -b -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
+measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rr.csv 2> ./log/client-measlat-stderr.log
diff --git a/scripts/rr-server b/scripts/rr-server
new file mode 100755
index 0000000..35a8752
--- /dev/null
+++ b/scripts/rr-server
@@ -0,0 +1,9 @@
+#!/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
+valgrind donar -a rr -b -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/rrh-client b/scripts/rrh-client
new file mode 100755
index 0000000..5d8564d
--- /dev/null
+++ b/scripts/rrh-client
@@ -0,0 +1,9 @@
+#!/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
+valgrind 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
+measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > ./res/rrh.csv 2> ./log/client-measlat-stderr.log
diff --git a/scripts/rrh-server b/scripts/rrh-server
new file mode 100755
index 0000000..e357adf
--- /dev/null
+++ b/scripts/rrh-server
@@ -0,0 +1,9 @@
+#!/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
+valgrind 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