[tor-commits] [flashproxy/master] Use connector.py --register.

[dcf at torproject.org]

commit 8f2ec50ab9074d43bfbf0a0d35051406d1b02d7e
Author: David Fifield <david at bamsoftware.com>
Date:   Wed May 2 13:56:44 2012 -0700

    Use connector.py --register.
---
 experiments/switching/local-http-constant.sh    |    3 +--
 experiments/switching/remote-tor-alternating.sh |    3 +--
 experiments/switching/remote-tor-constant.sh    |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh
index f7a8aba..4eb51b2 100755
--- a/experiments/switching/local-http-constant.sh
+++ b/experiments/switching/local-http-constant.sh
@@ -45,9 +45,8 @@ PIDS_TO_KILL+=($!)
 visible_sleep 5
 
 echo "Start connector."
-"$FLASHPROXY_DIR"/connector.py >/dev/null &
+"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null &
 PIDS_TO_KILL+=($!)
-echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002
 visible_sleep 1
 
 echo "Start browser."
diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh
index cd21f07..4b0df87 100755
--- a/experiments/switching/remote-tor-alternating.sh
+++ b/experiments/switching/remote-tor-alternating.sh
@@ -38,9 +38,8 @@ PIDS_TO_KILL+=($!)
 visible_sleep 15
 
 echo "Start connector."
-"$FLASHPROXY_DIR"/connector.py >/dev/null &
+"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null &
 PIDS_TO_KILL+=($!)
-echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002
 visible_sleep 1
 
 echo "Start Tor."
diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh
index fbe56a5..7320999 100755
--- a/experiments/switching/remote-tor-constant.sh
+++ b/experiments/switching/remote-tor-constant.sh
@@ -37,9 +37,8 @@ PIDS_TO_KILL+=($!)
 visible_sleep 15
 
 echo "Start connector."
-"$FLASHPROXY_DIR"/connector.py >/dev/null &
+"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null &
 PIDS_TO_KILL+=($!)
-echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002
 visible_sleep 1
 
 echo "Start Tor."