[tor-commits] [flashproxy/master] Log the right address for WebSocket- and SOCKS-pending.

[dcf at torproject.org]

commit 3e30205b55479c07045102e8bcb0ef60eb76dec8
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Sep 23 10:16:23 2012 -0700

    Log the right address for WebSocket- and SOCKS-pending.
    
    Use the peername, not a leftover potentially unrelated local addr
    variable.
---
 flashproxy-client |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index 293c26c..a7e4b50 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -807,7 +807,7 @@ def main():
                 socks_pending.append(local_c)
                 register()
             elif fd in websocket_pending:
-                log(u"Data from WebSocket-pending %s." % safe_format_sockaddr(addr))
+                log(u"Data from WebSocket-pending %s." % safe_format_peername(fd))
                 protocols = handle_websocket_request(fd)
                 if protocols is not None:
                     wrapped = RemoteSocket(fd, protocols)
@@ -819,7 +819,7 @@ def main():
                 websocket_pending.remove(fd)
                 report_pending()
             elif fd in socks_pending:
-                log(u"SOCKS request from %s." % safe_format_sockaddr(addr))
+                log(u"SOCKS request from %s." % safe_format_peername(fd))
                 if handle_socks_request(fd):
                     wrapped = LocalSocket(fd)
                     locals.append(wrapped)