[tor-commits] [flashproxy/master] Listen only on 127.0.0.1 and not [::] in managed mode.

[dcf at torproject.org]

commit 93f461faefcfdef02cd31b82f0b7a76abc6a7c2f
Author: David Fifield <david at bamsoftware.com>
Date:   Tue Nov 20 18:25:37 2012 -0800

    Listen only on 127.0.0.1 and not [::] in managed mode.
    
    The managed proxy needs only one listening address, and this warning
    from Tor is harmless but possibly confusing:
    [notice] You tried to add transport 'websocket' at '[::1]:46380' but the same transport already exists at '127.0.0.1:50406'. Skipping.
---
 flashproxy-client |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index 6a81968..b6d80ce 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -1080,12 +1080,13 @@ def main():
         usage(sys.stderr)
         sys.exit(1)
 
-    # Listen on both IPv4 and IPv6 if no host is given.
     if local_addr[0]:
         options.local_addrs.append(local_addr)
     else:
         options.local_addrs.append(("127.0.0.1", local_addr[1]))
-        if socket.has_ipv6:
+        # Listen on both IPv4 and IPv6 if no host is given, unless we are in
+        # managed mode.
+        if not options.managed and socket.has_ipv6:
             options.local_addrs.append(("::1", local_addr[1]))
     if remote_addr[0]:
         options.remote_addrs.append(remote_addr)