another day another fix

This commit is contained in:
Quentin 2020-02-05 21:48:00 +01:00
parent 0caa42787a
commit 79c633ce5a
10 changed files with 29 additions and 20 deletions

View file

@ -7,17 +7,18 @@ donar \
-o $3/shared/onion_services.pub \ -o $3/shared/onion_services.pub \
-l $1 \ -l $1 \
-b \ -b \
-e 5000 \ -e 5001 \
-r 5000 \ -r 5000 \
> $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5001 5000 \
> $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log > $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log
dcall \ dcall \
-t filesrc \ -t filesrc \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-c 5001 \
-b 127.0.0.1 \ -b 127.0.0.1 \
-l $2 \ -l $2 \
-d $3/log/client-dcall-gstreamer.log \ -d $3/log/client-dcall-gstreamer.log \

View file

@ -8,10 +8,10 @@ donar \
-b \ -b \
-l $1 \ -l $1 \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log
dcall \ dcall \
@ -19,6 +19,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $2 \ -l $2 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log > ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -9,10 +9,10 @@ donar \
-b \ -b \
-l $1 \ -l $1 \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
dcall \ dcall \
@ -20,6 +20,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $2 \ -l $2 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log > ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -8,11 +8,11 @@ donar \
-l $1 \ -l $1 \
-p $2 \ -p $2 \
-b \ -b \
-e 5000 \ -e 5001 \
-r 5000 \ -r 5000 \
> $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5001 5000 \
> $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log
dcall \ dcall \
@ -20,6 +20,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-c 5001 \
-l $3 \ -l $3 \
-d $4/log/client-dcall-gstreamer.log \ -d $4/log/client-dcall-gstreamer.log \
> $4/log/client-dcall-stdout.log 2> $4/log/client-dcall-stderr.log > $4/log/client-dcall-stdout.log 2> $4/log/client-dcall-stderr.log

View file

@ -9,10 +9,10 @@ donar \
-p $2 \ -p $2 \
-b \ -b \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log
dcall \ dcall \
@ -20,6 +20,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $3 \ -l $3 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -10,10 +10,10 @@ donar \
-p $2 \ -p $2 \
-b \ -b \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
dcall \ dcall \
@ -21,6 +21,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $3 \ -l $3 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log > ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -7,11 +7,11 @@ donar \
-o $3/shared/onion_services.pub \ -o $3/shared/onion_services.pub \
-l $1 \ -l $1 \
-b \ -b \
-e 5000 \ -e 5001 \
-r 5000 \ -r 5000 \
> $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5001 5000\
> $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log > $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log
dcall \ dcall \
@ -19,6 +19,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-c 5001 \
-l $2 \ -l $2 \
-d $3/log/client-dcall-gstreamer.log \ -d $3/log/client-dcall-gstreamer.log \
> $3/log/client-dcall-stdout.log 2> $3/log/client-dcall-stderr.log > $3/log/client-dcall-stdout.log 2> $3/log/client-dcall-stderr.log

View file

@ -8,10 +8,10 @@ donar \
-l $1 \ -l $1 \
-b \ -b \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log
dcall \ dcall \
@ -19,6 +19,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $2 \ -l $2 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log > ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -8,10 +8,10 @@ donar \
-n \ -n \
-l $1 \ -l $1 \
-e 5000 \ -e 5000 \
-r 5000 \ -r 5001 \
> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log &
sync_barrier_donar \ sync_barrier_donar 5000 5001 \
> ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log &
dcall \ dcall \
@ -19,6 +19,7 @@ dcall \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \
-s fakesink \ -s fakesink \
-b 127.0.0.1 \ -b 127.0.0.1 \
-p 5001 \
-l $2 \ -l $2 \
-d ../log/server-dcall-gstreamer.log \ -d ../log/server-dcall-gstreamer.log \
> ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log > ../log/server-dcall-stdout.log 2> ../log/server-dcall-stderr.log

View file

@ -2,7 +2,7 @@
sleep 1 sleep 1
echo "sync_barrier_start" echo "sync_barrier_start"
nc -v --udp --source 127.0.0.1 --source-port 5000 127.13.3.7 5000 --sh-exec '(while true; do sleep 1; echo a; done) & B=$!; read r; kill $B' nc -v --udp --source 127.0.0.1 --source-port $1 127.13.3.7 $2 --sh-exec '(while true; do sleep 1; echo a; done) & B=$!; read r; kill $B'
echo "sync_barrier_release" echo "sync_barrier_release"
sleep 10 sleep 10
echo "sync_barrier_done" echo "sync_barrier_done"