- tor-commits - lists.torproject.org

[flashproxy/master] Insist on bash in experiments.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 3e401407a3e421e143883057f32edcc808fd741f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 23:25:52 2011 -0700 Insist on bash in experiments. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/local-http-constant.sh | 2 +- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- experiments/throughput/throughput-all.sh | 2 +- experiments/throughput/throughput.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index d83651a..cae696c 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: ./local-http-alternating.sh # diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index b551140..1632d62 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: ./local-http-constant.sh # diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index e7c14fd..b665bc2 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: ./remote-tor-alternating.sh # diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 0f84a06..76bca81 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: ./remote-tor-constant.sh # diff --git a/experiments/throughput/throughput-all.sh b/experiments/throughput/throughput-all.sh index 015e3e1..7d881a9 100755 --- a/experiments/throughput/throughput-all.sh +++ b/experiments/throughput/throughput-all.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash for n in $(seq 1 50); do ./throughput.sh -n $n diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 304e5e5..944bcc1 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: ./throughput.sh [-n NUM_CLIENTS] #

1 0

[flashproxy/master] Define FLASHPROXY_DIR in one place.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 447c6eba6e8d8e6f14bc1dcd3f38feac4e397912 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 23:26:09 2011 -0700 Define FLASHPROXY_DIR in one place. --- experiments/common.sh | 2 ++ experiments/switching/local-http-alternating.sh | 2 -- experiments/switching/local-http-constant.sh | 2 -- experiments/switching/remote-tor-alternating.sh | 2 -- experiments/switching/remote-tor-constant.sh | 2 -- experiments/throughput/throughput.sh | 2 -- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 7e5d0a4..632a99b 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -1,6 +1,8 @@ # This file contains common variables and subroutines used by the experiment # scripts. +FLASHPROXY_DIR="$(dirname $BASH_SOURCE)/.." + FIREFOX=firefox SOCAT=socat THTTPD=thttpd diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index cae696c..2e8144b 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -6,8 +6,6 @@ . ../common.sh -FLASHPROXY_DIR=../../../flashproxy - PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 1632d62..05f6b4e 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -6,8 +6,6 @@ . ../common.sh -FLASHPROXY_DIR=../../../flashproxy - PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index b665bc2..6fca22b 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -6,8 +6,6 @@ . ../common.sh -FLASHPROXY_DIR=../../../flashproxy - PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 76bca81..02b550c 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -6,8 +6,6 @@ . ../common.sh -FLASHPROXY_DIR=../../../flashproxy - PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 944bcc1..b814fc7 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -10,8 +10,6 @@ . ../common.sh -FLASHPROXY_DIR=../../../flashproxy - NUM_CLIENTS=1 while getopts "n:" OPTNAME; do

1 0

[flashproxy/master] Use 127.0.0.1 for localhost.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 5d654c3d92bddabb92045deae54e27e211a6f846 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 23:39:43 2011 -0700 Use 127.0.0.1 for localhost. This is to avoid Wget trying ::1 first. --- experiments/switching/local-http-alternating.sh | 6 +++--- experiments/switching/local-http-constant.sh | 6 +++--- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- experiments/throughput/throughput.sh | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 2e8144b..5eea428 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -8,7 +8,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" # Declare an array. @@ -52,8 +52,8 @@ PIDS_TO_KILL+=($!) visible_sleep 1 echo "Start socat." -"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:localhost:dummy:0,socksport=9001 & +"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://localhost:2000/dump -t 0 -O /dev/null +time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 05f6b4e..1a74aaf 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -8,7 +8,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" # Declare an array. @@ -47,8 +47,8 @@ echo "Start browser." browser_goto "$PROFILE_1" "$PROXY_URL" echo "Start socat." -"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:localhost:dummy:0,socksport=9001 & +"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://localhost:2000/dump -t 0 -O /dev/null +time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 6fca22b..52da3aa 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -8,7 +8,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" # Declare an array. diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 02b550c..4f530be 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -8,7 +8,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" # Declare an array. diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index b814fc7..02939b1 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -19,7 +19,7 @@ while getopts "n:" OPTNAME; do done PROFILE=flashexp1 -PROXY_URL="http://localhost:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" RESULTS_FILE_NAME="results-$NUM_CLIENTS-$(date --iso)" @@ -62,7 +62,7 @@ visible_sleep 2 i=0 while [ $i -lt $NUM_CLIENTS ]; do echo -ne "\rRegister client $((i + 1))." - echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | socat STDIN TCP-CONNECT:localhost:9002 + echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | socat STDIN TCP-CONNECT:127.0.0.1:9002 sleep 1 i=$((i + 1)) done @@ -70,7 +70,7 @@ echo visible_sleep 2 echo "Start socat." -"$SOCAT" TCP-LISTEN:2000,fork,reuseaddr SOCKS4A:localhost:dummy:0,socksport=9001 & +"$SOCAT" TCP-LISTEN:2000,fork,reuseaddr SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) visible_sleep 1 @@ -82,7 +82,7 @@ declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do echo "Start downloader $((i + 1))." - ./httpget.py -l proxy http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & + ./httpget.py -l proxy http://127.0.0.1:2000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done @@ -96,7 +96,7 @@ declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do echo "Start downloader $((i + 1))." - ./httpget.py -l direct http://localhost:8000/dump >> "$RESULTS_FILE_NAME" & + ./httpget.py -l direct http://127.0.0.1:8000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done

1 0

[flashproxy/master] Add switching-all.sh.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 3160def02d3175158064c98c175a5af2ec1f14c7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:41:33 2011 -0700 Add switching-all.sh. This automatically runs all the switching experiments multiple times. --- experiments/common.sh | 11 ++++++++++ experiments/switching/switching-all.sh | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index f788235..dcafd84 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -45,3 +45,14 @@ real_time() { # original stderr (fd 2) output of time. (time -p eval "$@" 2>&3) |& tail -n 3 | head -n 1 | awk '{print $2}' } + +# Repeat a subcommand N times. +repeat() { + local N + N="$1" + shift + while [ $N -gt 0 ]; do + eval "$@" + N=$((N-1)) + done +} diff --git a/experiments/switching/switching-all.sh b/experiments/switching/switching-all.sh new file mode 100755 index 0000000..b3051cc --- /dev/null +++ b/experiments/switching/switching-all.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Usage: ./switching-all.sh [-n NUM_ITERATIONS] +# +# Runs the switching experiment scripts several times and stores the results in +# log files +# local-http-constant-DATE.log +# local-http-alternating-DATE.log +# remote-tor-constant-DATE.log +# remote-tor-alternating-DATE.log +# where DATE is the current date. + +. ../common.sh + +NUM_ITERATIONS=1 + +while getopts "n:" OPTNAME; do + if [ "$OPTNAME" == n ]; then + NUM_ITERATIONS="$OPTARG" + fi +done + +DATE="$(date --iso)" + +> "local-http-constant-$DATE.log" +repeat $NUM_ITERATIONS ./local-http-constant.sh "local-http-constant-$DATE.log" + +> "local-http-alternating-$DATE.log" +repeat $NUM_ITERATIONS ./local-http-alternating.sh "local-http-alternating-$DATE.log" + +> "remote-tor-constant-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-constant.sh "remote-tor-constant-$DATE.log" + +> "remote-tor-alternating-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-alternating.sh "remote-tor-alternating-$DATE.log"

1 0

[flashproxy/master] Let switching experiments write time to a log file.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit c907b00a096f770942fc2df7507dcf54233a2659 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:26:12 2011 -0700 Let switching experiments write time to a log file. --- experiments/common.sh | 10 ++++++++++ experiments/switching/local-http-alternating.sh | 13 ++++++++++--- experiments/switching/local-http-constant.sh | 12 +++++++++--- experiments/switching/remote-tor-alternating.sh | 12 +++++++++--- experiments/switching/remote-tor-constant.sh | 10 ++++++++-- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 632a99b..f788235 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -35,3 +35,13 @@ browser_goto() { ensure_browser_started "$PROFILE" "$FIREFOX" -P "$PROFILE" -remote "openurl($URL)" 2>/dev/null } + +# Run a command and get the "real" part of time(1) output as a number of +# seconds. +real_time() { + # Make a spare copy of stderr (fd 1). + exec 3>&2 + # Point the subcommand's stderr to our copy (fd 3), and extract the + # original stderr (fd 2) output of time. + (time -p eval "$@" 2>&3) |& tail -n 3 | head -n 1 | awk '{print $2}' +} diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 5eea428..8e11065 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./local-http-alternating.sh +# Usage: ./local-http-alternating.sh [OUTPUT_FILENAME] # -# Tests a download over alternating flash proxies. +# Tests a download over alternating flash proxies. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -56,4 +58,9 @@ echo "Start socat." PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + +if [ -n "$OUTPUT_FILENAME" ]; then + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 1a74aaf..0fed6e4 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./local-http-constant.sh +# Usage: ./local-http-constant.sh [OUTPUT_FILENAME] # -# Tests a download over an uninterrupted flash proxy. +# Tests a download over an uninterrupted flash proxy. If OUTPUT_FILENAME +# is supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -51,4 +53,8 @@ echo "Start socat." PIDS_TO_KILL+=($!) visible_sleep 1 -time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null +fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 52da3aa..5309dce 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -1,8 +1,9 @@ #!/bin/bash -# Usage: ./remote-tor-alternating.sh +# Usage: ./remote-tor-alternating.sh [OUTPUT_FILENAME] # -# Tests a Tor download over alternating flash proxies. +# Tests a Tor download over alternating flash proxies. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -52,4 +54,8 @@ PIDS_TO_KILL+=($!) # Let Tor bootstrap. visible_sleep 15 -time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 4f530be..c0d6338 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -2,7 +2,8 @@ # Usage: ./remote-tor-constant.sh # -# Tests a Tor download over an uninterrupted flash proxy. +# Tests a Tor download over an uninterrupted flash proxy. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. . ../common.sh @@ -10,6 +11,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" # Declare an array. declare -a PIDS_TO_KILL @@ -47,4 +49,8 @@ browser_goto "$PROFILE_1" "$PROXY_URL" # Let Tor bootstrap. visible_sleep 15 -time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null +fi

1 0

[flashproxy/master] Use a smaller 500 MB local download file.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 751c46714d914dc17ac197bbb3c452c610770752 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 01:42:21 2011 -0700 Use a smaller 500 MB local download file. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/local-http-constant.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 8e11065..05276e7 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -29,7 +29,7 @@ stop() { trap stop EXIT echo "Create data file." -dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=1024 2>/dev/null || exit +dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=500 2>/dev/null || exit echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 & diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index 0fed6e4..e5e50be 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -29,7 +29,7 @@ stop() { trap stop EXIT echo "Create data file." -dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=1024 2>/dev/null || exit +dd if=/dev/null of="$DATA_FILE_NAME" bs=1M seek=500 2>/dev/null || exit echo "Start web server." "$THTTPD" -D -d "$FLASHPROXY_DIR" -p 8000 &

1 0

[flashproxy/master] Increase some delays to make sure browser starts up.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 46de5dfda5774934ed7c85b2716f94e4f49e7bee Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 02:35:01 2011 -0700 Increase some delays to make sure browser starts up. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/proxy-loop.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 7847a33..8b3bf91 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -51,7 +51,7 @@ ensure_browser_started "$PROFILE_2" ./proxy-loop.sh "$PROXY_URL" "$PROFILE_1" "$PROFILE_2" >/dev/null 2>&1 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & diff --git a/experiments/switching/proxy-loop.sh b/experiments/switching/proxy-loop.sh index 3c3b78a..5fa76a7 100755 --- a/experiments/switching/proxy-loop.sh +++ b/experiments/switching/proxy-loop.sh @@ -22,6 +22,8 @@ browser_clear "$PROFILE_1" ensure_browser_started "$PROFILE_2" browser_clear "$PROFILE_2" +sleep 1 + while true; do echo "1 on" firefox -P "$PROFILE_1" -remote "openurl($URL)"

1 0

[flashproxy/master] Use --wait=0 --waitretry=0 in Wgets that retry.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 7b4695fdb7b2cbafd9d5b4c664ad8a9cca70614e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 31 02:21:56 2011 -0700 Use --wait=0 --waitretry=0 in Wgets that retry. By default, Wget waits between retrying failed downloads, and this was interfering with measurements. Here's an except from wget(1): --waitretry=seconds If you don't want Wget to wait between every retrieval, but only between retries of failed downloads, you can use this option. Wget will use linear backoff, waiting 1 second after the first failure on a given file, then waiting 2 seconds after the second failure on that file, up to the maximum number of seconds you specify. By default, Wget will assume a value of 10 seconds. --- experiments/switching/local-http-alternating.sh | 6 +++--- experiments/switching/local-http-constant.sh | 6 +++--- experiments/switching/remote-tor-alternating.sh | 4 ++-- experiments/switching/remote-tor-constant.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 05276e7..7847a33 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -56,11 +56,11 @@ visible_sleep 1 echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index e5e50be..bcc65c8 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -51,10 +51,10 @@ browser_goto "$PROFILE_1" "$PROXY_URL" echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 5309dce..97fb749 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -55,7 +55,7 @@ PIDS_TO_KILL+=($!) visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c0d6338..e4dc48c 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -50,7 +50,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi

1 0

[flashproxy/master] Keep retrying remote-tor downloads.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit f993a27167655b4d565987d54acf3aa6a9b39221 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 3 20:29:15 2011 -0700 Keep retrying remote-tor downloads. Sometimes a proxy going down at just the right moment can cause Tor to reject a SOCKS connection (with code 91). This seems to confuse Wget's automatic retrying; it starts over from the beginning. I have also seen it abort the Wget download completely. So download the file to an actual file rather than /dev/null, and run Wget with -c in a loop. --- experiments/switching/remote-tor-alternating.sh | 12 ++++++++++-- experiments/switching/remote-tor-constant.sh | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 97fb749..a9c394d 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -22,6 +22,8 @@ stop() { echo "Kill pids ${PIDS_TO_KILL[@]}." kill "${PIDS_TO_KILL[@]}" fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" exit } trap stop EXIT @@ -54,8 +56,14 @@ PIDS_TO_KILL+=($!) # Let Tor bootstrap. visible_sleep 15 +repeat_download() { + until torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME"; do + echo "retrying" + done +} + if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time repeat_download >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time repeat_download fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index e4dc48c..c1cce88 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -21,6 +21,8 @@ stop() { echo "Kill pids ${PIDS_TO_KILL[@]}." kill "${PIDS_TO_KILL[@]}" fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" exit } trap stop EXIT @@ -50,7 +52,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" fi

1 0

r25194: {website} update mirror status (website/trunk/include)
by Andrew Lewman 04 Nov '11

04 Nov '11

Author: phobos Date: 2011-11-04 02:31:24 +0000 (Fri, 04 Nov 2011) New Revision: 25194 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror status Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-11-01 03:35:45 UTC (rev 25193) +++ website/trunk/include/mirrors-table.wmi 2011-11-04 02:31:24 UTC (rev 25194) @@ -1,8 +1,42 @@ <tr> + <td>TN</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirror.tn/dist/">http</a></td> + <td><a href="http://tor.mirror.tn/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + <td></td> <td>Up to date</td> @@ -52,15 +86,15 @@ <tr> - <td>EE</td> + <td>IS</td> - <td>CyberSIDE</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -224,6 +258,23 @@ <td>DE</td> + <td>factor.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + <td>chaos darmstadt</td> <td>Up to date</td> @@ -290,91 +341,6 @@ <tr> - <td>IS</td> - - <td>TheOnionRouter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.theonionrouter.com/dist/">http</a></td> - <td><a href="http://www.theonionrouter.com/">http</a></td> - <td><a href="https://www.theonionrouter.com/dist/">https</a></td> - <td><a href="https://www.theonionrouter.com/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>TN</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.mirror.tn/dist/">http</a></td> - <td><a href="http://tor.mirror.tn/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IL</td> <td>Host4site</td> @@ -426,6 +392,23 @@ <tr> + <td>IS</td> + + <td>TheOnionRouter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.theonionrouter.com/dist/">http</a></td> + <td><a href="http://www.theonionrouter.com/">http</a></td> + <td><a href="https://www.theonionrouter.com/dist/">https</a></td> + <td><a href="https://www.theonionrouter.com/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>SE</td> <td>homosu</td> @@ -460,15 +443,15 @@ <tr> - <td>DE</td> + <td>EE</td> - <td></td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,15 +460,15 @@ <tr> - <td>LT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -545,6 +528,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td>

1 0