diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-02-04 04:51:41 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-02-04 04:51:41 +0100 |
commit | 0bbc40dc33dd7bd3729e639874882dd6dd7ea818 (patch) | |
tree | 095aff61c0cce463b43f56e4de06c1e19f36c9a2 /netlib/tcp.py | |
parent | dc45b4bf19bff5edc0b72ccb68fad04d479aff83 (diff) | |
download | mitmproxy-0bbc40dc33dd7bd3729e639874882dd6dd7ea818.tar.gz mitmproxy-0bbc40dc33dd7bd3729e639874882dd6dd7ea818.tar.bz2 mitmproxy-0bbc40dc33dd7bd3729e639874882dd6dd7ea818.zip |
store used sni in TCPClient, add equality check for tcp.Address
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r-- | netlib/tcp.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 346bc053..94ea8806 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -207,8 +207,12 @@ class Address(object): def use_ipv6(self, b): self.family = socket.AF_INET6 if b else socket.AF_INET + def __eq__(self, other): + other = Address.wrap(other) + return (self.address, self.family) == (other.address, other.family) -class SocketCloseMixin: + +class SocketCloseMixin(object): def finish(self): self.finished = True try: @@ -250,6 +254,7 @@ class TCPClient(SocketCloseMixin): self.connection, self.rfile, self.wfile = None, None, None self.cert = None self.ssl_established = False + self.sni = None def convert_to_ssl(self, cert=None, sni=None, method=TLSv1_METHOD, options=None): """ @@ -267,6 +272,7 @@ class TCPClient(SocketCloseMixin): self.connection = SSL.Connection(context, self.connection) self.ssl_established = True if sni: + self.sni = sni self.connection.set_tlsext_host_name(sni) self.connection.set_connect_state() try: |