aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-11 20:27:34 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-11 20:32:14 +0200
commitaef3b626a70de5f385c8f5496c2e49575b5c3e1c (patch)
tree868b8786906eb7bdc1a269b64494594c5831b54b /libmproxy/proxy
parent026330a3b014f24f095b839b29186036854de3bc (diff)
downloadmitmproxy-aef3b626a70de5f385c8f5496c2e49575b5c3e1c.tar.gz
mitmproxy-aef3b626a70de5f385c8f5496c2e49575b5c3e1c.tar.bz2
mitmproxy-aef3b626a70de5f385c8f5496c2e49575b5c3e1c.zip
wip commit
Diffstat (limited to 'libmproxy/proxy')
-rw-r--r--libmproxy/proxy/server.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index c107cbed..6a7048e0 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -7,6 +7,7 @@ from netlib import tcp
from ..protocol.handle import protocol_handler
from .. import protocol2
+from ..exceptions import ProtocolException
from .primitives import ProxyServerError, Log, ProxyError
from .connection import ClientConnection, ServerConnection
@@ -79,12 +80,12 @@ class ConnectionHandler2:
self.config,
self.channel
)
- root_layer = protocol2.Socks5IncomingLayer(root_context)
+ root_layer = protocol2.Socks5Proxy(root_context)
try:
for message in root_layer():
print("Root layer receveived: %s" % message)
- except protocol2.ProtocolException as e:
+ except ProtocolException as e:
self.log(e, "info")
except Exception:
self.log(traceback.format_exc(), "error")