diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-07-25 13:31:55 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 20:32:10 +0200 |
| commit | e815915b22ef266ac4122027a10c59d9e036d0b4 (patch) | |
| tree | 16f6ac87a1e966bf146062268ca0dc38f85efd37 /libmproxy/protocol2/socks.py | |
| parent | c1d016823c67fc834a2fdb6c77181d14b5fd8008 (diff) | |
| download | mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.tar.gz mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.tar.bz2 mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.zip | |
add auto layer, multiple other fixes
Diffstat (limited to 'libmproxy/protocol2/socks.py')
| -rw-r--r-- | libmproxy/protocol2/socks.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/protocol2/socks.py b/libmproxy/protocol2/socks.py index 90771015..9ca30bb4 100644 --- a/libmproxy/protocol2/socks.py +++ b/libmproxy/protocol2/socks.py @@ -1,9 +1,7 @@ from __future__ import (absolute_import, print_function, division, unicode_literals) from ..proxy import ProxyError, Socks5ProxyMode, ProxyError2 -from . import Layer, ServerConnectionMixin -from .rawtcp import TcpLayer -from .ssl import SslLayer +from .layer import Layer, ServerConnectionMixin class Socks5IncomingLayer(Layer, ServerConnectionMixin): @@ -18,9 +16,11 @@ class Socks5IncomingLayer(Layer, ServerConnectionMixin): self._set_address(address) if address[1] == 443: - layer = SslLayer(self, True, True) + layer = AutoLayer(self) else: - layer = TcpLayer(self) + layer = AutoLayer(self) for message in layer(): if not self._handle_server_message(message): yield message + +from .auto import AutoLayer |