aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-31 01:44:55 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-31 01:44:55 +0100
commit30a44cbb41fab51a30e609ba6318e1e8c062f73a (patch)
tree3a2585a3393ee2469d7d70b3635ae5a35cee101d /libmproxy/protocol/tcp.py
parent6ce1470631e843bef926d9fee5c2ad1f359dc0ac (diff)
downloadmitmproxy-30a44cbb41fab51a30e609ba6318e1e8c062f73a.tar.gz
mitmproxy-30a44cbb41fab51a30e609ba6318e1e8c062f73a.tar.bz2
mitmproxy-30a44cbb41fab51a30e609ba6318e1e8c062f73a.zip
fix server reconnect
Diffstat (limited to 'libmproxy/protocol/tcp.py')
-rw-r--r--libmproxy/protocol/tcp.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py
index 9fb2e01b..4441d2f0 100644
--- a/libmproxy/protocol/tcp.py
+++ b/libmproxy/protocol/tcp.py
@@ -15,10 +15,12 @@ class TCPHandler(ProtocolHandler):
for rfile in r:
if self.c.client_conn.rfile == rfile:
src, dst = self.c.client_conn, self.c.server_conn
- src_str, dst_str = "client", "server"
+ direction = "-> tcp ->"
+ dst_str = "%s:%s" % self.c.server_conn.address()[:2]
else:
dst, src = self.c.client_conn, self.c.server_conn
- dst_str, src_str = "client", "server"
+ direction = "<- tcp <-"
+ dst_str = "client"
data = StringIO()
while range(4096):
@@ -52,6 +54,6 @@ class TCPHandler(ProtocolHandler):
self.c.close = True
break
- self.c.log("%s -> %s" % (src_str, dst_str), ["\r\n" + data])
+ self.c.log("%s %s" % (direction, dst_str), ["\r\n" + data])
dst.wfile.write(data)
dst.wfile.flush() \ No newline at end of file