aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol2/socks_proxy.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/protocol2/socks_proxy.py
parentc04fa1b233224d28e85be34ab5b6a8718497488c (diff)
downloadmitmproxy-a2b85048892626e6834df06e9022498814724636.tar.gz
mitmproxy-a2b85048892626e6834df06e9022498814724636.tar.bz2
mitmproxy-a2b85048892626e6834df06e9022498814724636.zip
improve protocol handling
Diffstat (limited to 'libmproxy/protocol2/socks_proxy.py')
-rw-r--r--libmproxy/protocol2/socks_proxy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/protocol2/socks_proxy.py b/libmproxy/protocol2/socks_proxy.py
index c89477ca..c6126a42 100644
--- a/libmproxy/protocol2/socks_proxy.py
+++ b/libmproxy/protocol2/socks_proxy.py
@@ -5,7 +5,7 @@ from ..proxy import ProxyError, Socks5ProxyMode
from .layer import Layer, ServerConnectionMixin
-class Socks5Proxy(Layer, ServerConnectionMixin):
+class Socks5Proxy(ServerConnectionMixin, Layer):
def __call__(self):
try:
s5mode = Socks5ProxyMode(self.config.ssl_ports)
@@ -14,7 +14,7 @@ class Socks5Proxy(Layer, ServerConnectionMixin):
# TODO: Unmonkeypatch
raise ProtocolException(str(e), e)
- self.server_address = address
+ self.server_conn.address = address
layer = self.ctx.next_layer(self)
for message in layer():