diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-08 16:08:57 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 20:32:13 +0200 |
| commit | 026330a3b014f24f095b839b29186036854de3bc (patch) | |
| tree | c5770ef28332b61f56b5435136e8dcd95340ed1d /libmproxy/protocol2/socks.py | |
| parent | 314e0f5839fcd4a1c35323f61938b207232de287 (diff) | |
| download | mitmproxy-026330a3b014f24f095b839b29186036854de3bc.tar.gz mitmproxy-026330a3b014f24f095b839b29186036854de3bc.tar.bz2 mitmproxy-026330a3b014f24f095b839b29186036854de3bc.zip | |
cleaner Exceptions, ssl -> tls, upstream proxy mode
Diffstat (limited to 'libmproxy/protocol2/socks.py')
| -rw-r--r-- | libmproxy/protocol2/socks.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol2/socks.py b/libmproxy/protocol2/socks.py index 14564521..1222ef5c 100644 --- a/libmproxy/protocol2/socks.py +++ b/libmproxy/protocol2/socks.py @@ -1,10 +1,10 @@ from __future__ import (absolute_import, print_function, division) -from ..proxy import ProxyError, Socks5ProxyMode, ProxyError2 +from ..exceptions import ProtocolException +from ..proxy import ProxyError, Socks5ProxyMode from .layer import Layer, ServerConnectionMixin from .auto import AutoLayer - class Socks5IncomingLayer(Layer, ServerConnectionMixin): def __call__(self): try: @@ -12,7 +12,7 @@ class Socks5IncomingLayer(Layer, ServerConnectionMixin): address = s5mode.get_upstream_server(self.client_conn)[2:] except ProxyError as e: # TODO: Unmonkeypatch - raise ProxyError2(str(e), e) + raise ProtocolException(str(e), e) self.server_address = address |