aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/connection.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-16 23:25:02 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-16 23:25:02 +0200
commita2b85048892626e6834df06e9022498814724636 (patch)
tree4b020376b618617c44355710aba4cbd6ba82b6b0 /libmproxy/proxy/connection.py
parentc04fa1b233224d28e85be34ab5b6a8718497488c (diff)
downloadmitmproxy-a2b85048892626e6834df06e9022498814724636.tar.gz
mitmproxy-a2b85048892626e6834df06e9022498814724636.tar.bz2
mitmproxy-a2b85048892626e6834df06e9022498814724636.zip
improve protocol handling
Diffstat (limited to 'libmproxy/proxy/connection.py')
-rw-r--r--libmproxy/proxy/connection.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py
index f33e84cd..f92b53aa 100644
--- a/libmproxy/proxy/connection.py
+++ b/libmproxy/proxy/connection.py
@@ -96,6 +96,9 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
self.timestamp_ssl_setup = None
self.protocol = None
+ def __nonzero__(self):
+ return bool(self.connection)
+
def __repr__(self):
if self.ssl_established and self.sni:
ssl = "[ssl: {0}] ".format(self.sni)
@@ -132,8 +135,8 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
d.update(
address={"address": self.address(),
"use_ipv6": self.address.use_ipv6},
- source_address= ({"address": self.source_address(),
- "use_ipv6": self.source_address.use_ipv6} if self.source_address else None),
+ source_address=({"address": self.source_address(),
+ "use_ipv6": self.source_address.use_ipv6} if self.source_address else None),
cert=self.cert.to_pem() if self.cert else None
)
return d