quentin/tor_multipath_voip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rework scripts

Browse source
This commit is contained in:
Quentin 2020-02-05 10:29:41 +01:00
parent 541b3a85c7
commit ca5b0777a6
11 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/container/dcall-dup2-client
View file

@ -6,10 +6,13 @@ donar \
-c \ -c \
-o $3/shared/onion_services.pub \ -o $3/shared/onion_services.pub \
-l $1 \ -l $1 \
-b \
-e 5000 \ -e 5000 \
-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 &
measlat -h 127.13.3.7 -p 5000 -c 2
dcall \ dcall \
-t filesrc \ -t filesrc \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \

3
scripts/container/dcall-dup2-server
View file

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

3
scripts/container/dcall-dup2-server-single
View file

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

3
scripts/container/dcall-lightning-client
View file

@ -7,10 +7,13 @@ donar \
-o $4/shared/onion_services.pub \ -o $4/shared/onion_services.pub \
-l $1 \ -l $1 \
-p $2 \ -p $2 \
-b \
-e 5000 \ -e 5000 \
-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 &
measlat -h 127.13.3.7 -p 5000 -c 2
dcall \ dcall \
-t filesrc \ -t filesrc \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \

3
scripts/container/dcall-lightning-server
View file

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

3
scripts/container/dcall-lightning-server-single
View file

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

3
scripts/container/dcall-simple-client
View file

@ -6,10 +6,13 @@ donar \
-c \ -c \
-o $3/shared/onion_services.pub \ -o $3/shared/onion_services.pub \
-l $1 \ -l $1 \
-b \
-e 5000 \ -e 5000 \
-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 &
measlat -h 127.13.3.7 -p 5000 -c 2
dcall \ dcall \
-t filesrc \ -t filesrc \
-a file:///assets/i_have_a_dream.mp3 \ -a file:///assets/i_have_a_dream.mp3 \

3
scripts/container/dcall-simple-server
View file

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

2
scripts/container/dcall-simple-server-single
View file

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

2
src/dcall.c
View file

@ -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), "do-retransmission", FALSE, NULL);
g_object_set(G_OBJECT (de->rx_jitterbuffer), "latency", de->latency, 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), "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), "plc", TRUE, NULL);
g_object_set(G_OBJECT (de->rx_opusdec), "use-inband-fec", FALSE, NULL); g_object_set(G_OBJECT (de->rx_opusdec), "use-inband-fec", FALSE, NULL);

2
src/measure.c
View file

@ -44,7 +44,7 @@ void measure_parse(int size, struct measure_conf* mc) {
link_id, link_id,
is_vanilla); 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"); printf("Measurement done\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }