[tor-commits] [flashproxy/master] Use the 0.0.0.0:1 for the dummy Bridge address.

[dcf at torproject.org]

commit bf51cf0b761214e39f635d14451582d27a8915ab
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Jul 5 07:36:52 2012 -0700

    Use the 0.0.0.0:1 for the dummy Bridge address.
    
    It was more confusing when we used the same address as the client
    transport plugin's listening address; it wasn't clear which one was
    actually used and which was ignored.
---
 README                           |    2 +-
 doc/design.txt                   |    2 +-
 experiments/exercise/exercise.sh |    2 +-
 torrc                            |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README b/README
index d14c9cc..f26d0c5 100644
--- a/README
+++ b/README
@@ -77,7 +77,7 @@ public instance of it. This way is not as realistic because all your Tor
 traffic will first go to a fixed address and can be easily blocked.
 However this is an easy way to try out the system without having to do
 port forwarding.
-	$ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 127.0.0.1:9001" LearnCircuitBuildTimeout 0
+	$ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0
 
 
 == Troubleshooting
diff --git a/doc/design.txt b/doc/design.txt
index 7520cb5..5f58cc9 100644
--- a/doc/design.txt
+++ b/doc/design.txt
@@ -86,7 +86,7 @@ Design of flash proxies
   sufficient:
     ClientTransportPlugin websocket socks4 127.0.0.1:9001
     UseBridges 1
-    Bridge websocket 127.0.0.1:9001
+    Bridge websocket 0.0.0.0:1
     LearnCircuitBuildTimeout 0
   The address given for the "Bridge" option is actually irrelevant. The
   client transport plugin will ignore it and connect (through the flash
diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh
index 554e5fb..c60a97e 100755
--- a/experiments/exercise/exercise.sh
+++ b/experiments/exercise/exercise.sh
@@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!)
 
 sleep 20
 
-"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 &
+"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 &
 PIDS_TO_KILL+=($!)
 
 sleep 60
diff --git a/torrc b/torrc
index d502265..ec0b552 100644
--- a/torrc
+++ b/torrc
@@ -5,5 +5,6 @@
 
 ClientTransportPlugin websocket socks4 127.0.0.1:9001
 UseBridges 1
-Bridge websocket 127.0.0.1:9001
+# The address and port are ignored by the client transport plugin.
+Bridge websocket 0.0.0.0:1
 LearnCircuitBuildTimeout 0