[tor-commits] [flashproxy/master] Use 127.0.0.1 for localhost.

[dcf at torproject.org]

commit 5d654c3d92bddabb92045deae54e27e211a6f846
Author: David Fifield <david at 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=$NUM_CLIENTS&facilitator_poll_interval=1.0"
+PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NUM_CLIENTS&facilitator_poll_interval=1.0"
 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