summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Fifield <david@bamsoftware.com>2012-07-06 04:43:57 -0700
committerDavid Fifield <david@bamsoftware.com>2012-07-06 04:43:57 -0700
commitfdcb2d1382b430565afbcd5dcfad829479c0bb7b (patch)
treeff7f3fec997e70f2ddffb9690768529825682079
parentf06895533bf78916b956936224d85be18deddbd6 (diff)
Use dummy address 0.0.1.0 in place of 0.0.0.0.
addr == 0 is used in at least one place to indicate that no IPv4 address is set. An example is circuitbuild.c: int router_ipv6_preferred(const routerinfo_t *router) { return (!tor_addr_is_null(&router->ipv6_addr) && (router->ipv6_preferred || router->addr == 0)); } This function can return true even if router->ipv6_preferred is false, causing the later erroneous output [notice] Bridge 'xxx' has both an IPv4 and an IPv6 address. Will prefer using its IPv4 address (2600:<...>:9001). The address 0.0.0.1 doesn't work; it causes this error message: [warn] Proxy Client: unable to connect to 0.0.0.1:1 ("server rejected connection")
-rw-r--r--README2
-rw-r--r--doc/design.txt2
-rw-r--r--torrc2
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index f26d0c5..68f4cfe 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 0.0.0.0:1" LearnCircuitBuildTimeout 0
+ $ tor ClientTransportPlugin "websocket socks4 tor-facilitator.bamsoftware.com:9999" UseBridges 1 Bridge "websocket 0.0.1.0:1" LearnCircuitBuildTimeout 0
== Troubleshooting
diff --git a/doc/design.txt b/doc/design.txt
index 5f58cc9..7f1e548 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 0.0.0.0:1
+ Bridge websocket 0.0.1.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/torrc b/torrc
index ec0b552..b04e174 100644
--- a/torrc
+++ b/torrc
@@ -6,5 +6,5 @@
ClientTransportPlugin websocket socks4 127.0.0.1:9001
UseBridges 1
# The address and port are ignored by the client transport plugin.
-Bridge websocket 0.0.0.0:1
+Bridge websocket 0.0.1.0:1
LearnCircuitBuildTimeout 0