aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-17 13:58:56 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-17 13:58:56 +1200
commitb4ecd96beb77a8bae02d82eac174dded198797a3 (patch)
tree1868202264b5e201338698b76dbed5104448ec28 /libmproxy/proxy
parent51db9a5612f0899ed61751dbee3f4e4b19a74ea4 (diff)
downloadmitmproxy-b4ecd96beb77a8bae02d82eac174dded198797a3.tar.gz
mitmproxy-b4ecd96beb77a8bae02d82eac174dded198797a3.tar.bz2
mitmproxy-b4ecd96beb77a8bae02d82eac174dded198797a3.zip
Introduce short form object state, and connect the ends to send data to web app
Diffstat (limited to 'libmproxy/proxy')
-rw-r--r--libmproxy/proxy/connection.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py
index e0e94a2b..ff36d39c 100644
--- a/libmproxy/proxy/connection.py
+++ b/libmproxy/proxy/connection.py
@@ -36,8 +36,8 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject):
timestamp_ssl_setup=float
)
- def get_state(self):
- d = super(ClientConnection, self).get_state()
+ def get_state(self, short=False):
+ d = super(ClientConnection, self).get_state(short)
d.update(
address={"address": self.address(), "use_ipv6": self.address.use_ipv6},
clientcert=self.cert.to_pem() if self.clientcert else None
@@ -107,8 +107,8 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
sni=str
)
- def get_state(self):
- d = super(ServerConnection, self).get_state()
+ def get_state(self, short=False):
+ d = super(ServerConnection, self).get_state(short)
d.update(
address={"address": self.address(),
"use_ipv6": self.address.use_ipv6},