diff --git a/scripts/Makefile b/scripts/Makefile index 27cf5ec..c3b7220 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -283,8 +283,30 @@ lightning-complementarity: battle: ./run-3 \ 1,battle. \ - dup2-client 7500 40 172 2. \ - dup2-server 7500 40 172 2. \ + orig-client 7500 40 172, \ + orig-client 7500 40 172, \ + orig-client 7500 40 172, \ + dup2-client 7500 40 172 2, \ + dup2-client 7500 40 172 2, \ + dup2-client 7500 40 172 2, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + orig-server-single 7500 40 172, \ + orig-server 7500 40 172, \ + orig-server 7500 40 172, \ + dup2-server-single 7500 40 172 2, \ + dup2-server 7500 40 172 2, \ + dup2-server 7500 40 172 2, \ + lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ tor2 -f /etc/torrc_simple. \ tor2 -f /etc/torrc_simple. diff --git a/scripts/container/dup2-server-single b/scripts/container/dup2-server-single new file mode 100755 index 0000000..48951de --- /dev/null +++ b/scripts/container/dup2-server-single @@ -0,0 +1,14 @@ +#!/bin/bash +mkdir -p $5/{log,shared} +cd $5/shared + +donar \ + -a dup2 \ + -s \ + -l $4 \ + -b \ + -n \ + -e 9000 \ +> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & + +measlat -h 127.0.0.1 -p 9000 -l -c $1 -i $2 -s $3 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log diff --git a/scripts/container/lightning-server-single b/scripts/container/lightning-server-single new file mode 100755 index 0000000..3a28ed3 --- /dev/null +++ b/scripts/container/lightning-server-single @@ -0,0 +1,15 @@ +#!/bin/bash +mkdir -p $6/{log,shared} +cd $6/shared + +donar \ + -a lightning \ + -s \ + -l $4 \ + -p $5 \ + -b \ + -n \ + -e 9000 \ +> ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & + +measlat -h 127.0.0.1 -p 9000 -l -c $1 -i $2 -s $3 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log