aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol2/socks.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-07-25 14:48:50 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-11 20:32:10 +0200
commit531ca4a35684a83e57d4655922e9817814de41f6 (patch)
tree5b7b171fb7ecfa301e65dc94b34c5a0eb92a3ec7 /libmproxy/protocol2/socks.py
parente815915b22ef266ac4122027a10c59d9e036d0b4 (diff)
downloadmitmproxy-531ca4a35684a83e57d4655922e9817814de41f6.tar.gz
mitmproxy-531ca4a35684a83e57d4655922e9817814de41f6.tar.bz2
mitmproxy-531ca4a35684a83e57d4655922e9817814de41f6.zip
minor fixes
Diffstat (limited to 'libmproxy/protocol2/socks.py')
-rw-r--r--libmproxy/protocol2/socks.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/libmproxy/protocol2/socks.py b/libmproxy/protocol2/socks.py
index 9ca30bb4..7835b1a4 100644
--- a/libmproxy/protocol2/socks.py
+++ b/libmproxy/protocol2/socks.py
@@ -2,6 +2,7 @@ from __future__ import (absolute_import, print_function, division, unicode_liter
from ..proxy import ProxyError, Socks5ProxyMode, ProxyError2
from .layer import Layer, ServerConnectionMixin
+from .auto import AutoLayer
class Socks5IncomingLayer(Layer, ServerConnectionMixin):
@@ -15,12 +16,7 @@ class Socks5IncomingLayer(Layer, ServerConnectionMixin):
self._set_address(address)
- if address[1] == 443:
- layer = AutoLayer(self)
- else:
- layer = AutoLayer(self)
+ layer = AutoLayer(self)
for message in layer():
if not self._handle_server_message(message):
yield message
-
-from .auto import AutoLayer