diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-17 02:13:28 +0200 |
| commit | 14a5f405fdf3973f05ca11182e927d145d10d8d6 (patch) | |
| tree | 2843010882d64d928c0f53edffa9f8d48cee6da0 /libmproxy/proxy/modes/socks_proxy.py | |
| parent | 8fbed971ae4a84e875f1072805b17cc7ada39fad (diff) | |
| download | mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.gz mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.tar.bz2 mitmproxy-14a5f405fdf3973f05ca11182e927d145d10d8d6.zip | |
use new netlib exceptions
Diffstat (limited to 'libmproxy/proxy/modes/socks_proxy.py')
| -rw-r--r-- | libmproxy/proxy/modes/socks_proxy.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/proxy/modes/socks_proxy.py b/libmproxy/proxy/modes/socks_proxy.py index 545c38d6..1eb7db5b 100644 --- a/libmproxy/proxy/modes/socks_proxy.py +++ b/libmproxy/proxy/modes/socks_proxy.py @@ -1,9 +1,9 @@ from __future__ import (absolute_import, print_function, division) from netlib import socks -from netlib.tcp import NetLibError +from netlib.exceptions import TcpException -from ...exceptions import Socks5Exception +from ...exceptions import Socks5ProtocolException from ...protocol import Layer, ServerConnectionMixin @@ -47,8 +47,8 @@ class Socks5Proxy(Layer, ServerConnectionMixin): connect_reply.to_file(self.client_conn.wfile) self.client_conn.wfile.flush() - except (socks.SocksError, NetLibError) as e: - raise Socks5Exception("SOCKS5 mode failure: %s" % repr(e)) + except (socks.SocksError, TcpException) as e: + raise Socks5ProtocolException("SOCKS5 mode failure: %s" % repr(e)) self.server_conn.address = connect_request.addr |