From da4e270d87cc300c463ffef03b9cdb6d598b46f6 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 22 Oct 2019 18:38:26 +0200
Subject: [PATCH] Final script

---
 r/lightning_begin.R            |  2 +-
 scripts/container/start_client |  6 +++---
 scripts/container/start_server | 10 +++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/r/lightning_begin.R b/r/lightning_begin.R
index 9d2d0ed..c57ff3a 100644
--- a/r/lightning_begin.R
+++ b/r/lightning_begin.R
@@ -84,7 +84,7 @@ ggplot(data=xz, aes(y=lat, x=conf)) +
   theme_classic()
 
 xa <- sqldf("select packet_id,1.0 * MIN(latency) / 1000.0 as lat,way,conf,run from xy group by packet_id,way,conf,run")
-ggplot(data=sqldf("select * from xa where run='L6woUXrfE3XkJLyt-0'"), aes(x=packet_id, y=lat, color=way)) +
+ggplot(data=sqldf("select * from xa where run='out/I0mj7t5OJu9DGMq1-6'"), aes(x=packet_id, y=lat, color=way)) +
   geom_line() +
   geom_hline(yintercept=400) +
   geom_hline(yintercept=200) +
diff --git a/scripts/container/start_client b/scripts/container/start_client
index f93c604..81b9a0e 100755
--- a/scripts/container/start_client
+++ b/scripts/container/start_client
@@ -12,7 +12,7 @@ echo "[+] Started Tor"
 sleep 2
 
 echo "[+] Please enter links and finish with an empty line"
-while read -r $line; do
+while read line; do
   [ -z "$line" ] && break
   echo $line >> onion_services.pub
 done
@@ -23,7 +23,6 @@ donar \
   -o onion_services.pub \
   -l $NLINKS \
   -p $SCHED \
-  -b \
   -e $LPORT \
   -r $RPORT \
 > $LOGS/client-donar-stdout.log 2> $LOGS/client-donar-stderr.log &
@@ -51,8 +50,9 @@ connections=0
 while [ $connections -ne $NLINKS ]; do
   sleep 1
   connections=$(grep 'Succeeded,' $LOGS/client-donar-stdout.log | wc -l)
-  echo -ne "Connecting: $connections/$NLINKS%\033[0K\r"
+  echo -ne "Connecting: $connections/$NLINKS\033[0K\r"
 done
 echo "Ready"
 
 echo "[+] Let's rocks!"
+wait
diff --git a/scripts/container/start_server b/scripts/container/start_server
index f63a3a7..107fdad 100755
--- a/scripts/container/start_server
+++ b/scripts/container/start_server
@@ -16,7 +16,6 @@ donar \
   -s \
   -l $NLINKS \
   -p $SCHED \
-  -b \
   -e $LPORT \
   -r $RPORT \
 > $LOGS/server-donar-stdout.log 2> $LOGS/server-donar-stderr.log &
@@ -46,12 +45,9 @@ gst-launch-1.0 \
 echo "[+] Started GStreamer"
 
 echo "[+] Waiting for connections"
-connections=0
-while [ $connections -ne $NLINKS ]; do
-  sleep 1
-  connections=$(grep 'Succeeded,' $LOGS/server-donar-stdout.log | wc -l)
-  echo -ne "Connecting: $connections/$NLINKS%\033[0K\r"
+until grep "requested circuits are now up" $LOGS/server-donar-stdout.log; do
+  sleep 1;
 done
-echo "Ready"
 
 echo "[+] Let's rocks!"
+wait