Rework scripts

scripts/container/dcall-dup2-client

@@ -6,10 +6,13 @@ donar \
   -c \
   -o $3/shared/onion_services.pub \
   -l $1 \
+  -b \
   -e 5000 \
   -r 5000 \
 > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
 
+measlat -h 127.13.3.7 -p 5000 -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-dup2-server

@@ -5,11 +5,14 @@ cd $3/shared
 donar \
   -a dup2 \
   -s \
+  -b \
   -l $1 \
   -e 5000 \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-dup2-server-single

@@ -6,11 +6,14 @@ donar \
   -a dup2 \
   -s \
   -n \
+  -b \
   -l $1 \
   -e 5000 \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-lightning-client

@@ -7,10 +7,13 @@ donar \
   -o $4/shared/onion_services.pub \
   -l $1 \
   -p $2 \
+  -b \
   -e 5000 \
   -r 5000 \
 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
 
+measlat -h 127.13.3.7 -p 5000 -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-lightning-server

@@ -7,10 +7,13 @@ donar \
   -s \
   -l $1 \
   -p $2 \
+  -b \
   -e 5000 \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-lightning-server-single

@@ -8,10 +8,13 @@ donar \
   -n \
   -l $1 \
   -p $2 \
+  -b \
   -e 5000 \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-simple-client

@@ -6,10 +6,13 @@ donar \
   -c \
   -o $3/shared/onion_services.pub \
   -l $1 \
+  -b \
   -e 5000 \
   -r 5000 \
 > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
 
+measlat -h 127.13.3.7 -p 5000 -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-simple-server

@@ -6,10 +6,13 @@ donar \
   -a naive \
   -s \
   -l $1 \
+  -b \
   -e 5000 \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

scripts/container/dcall-simple-server-single

@@ -11,6 +11,8 @@ donar \
   -r 5000 \
 > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
 
+measlat -l -h 127.0.0.1 -p 5000 -r -c 2
+
 dcall \
   -t filesrc \
   -a file:///assets/i_have_a_dream.mp3 \

src/dcall.c

@@ -41,7 +41,7 @@ int create_rx_chain(struct dcall_elements* de) {
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "do-retransmission", FALSE, NULL);
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "latency", de->latency, NULL);
   g_object_set(G_OBJECT (de->rx_jitterbuffer), "drop-on-latency", TRUE, NULL);
-  g_object_set(G_OBJECT (de->rx_jitterbuffer), "mode", "slave", NULL);
+  /* g_object_set(G_OBJECT (de->rx_jitterbuffer), "mode", "slave", NULL); */
 
   g_object_set(G_OBJECT (de->rx_opusdec), "plc", TRUE, NULL);
   g_object_set(G_OBJECT (de->rx_opusdec), "use-inband-fec", FALSE, NULL);

src/measure.c

@@ -44,7 +44,7 @@ void measure_parse(int size, struct measure_conf* mc) {
     link_id,
     is_vanilla);
 
-  if (!mc->is_server && head->counter >= mc->max_measure) {
+  if ((!mc->is_server || mc->is_rtt) && head->counter >= mc->max_measure) {
     printf("Measurement done\n");
     exit(EXIT_SUCCESS);
   }