diff options
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/__init__.py | 1 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libmproxy/proxy/__init__.py b/libmproxy/proxy/__init__.py index e69de29b..f5d6a2d0 100644 --- a/libmproxy/proxy/__init__.py +++ b/libmproxy/proxy/__init__.py @@ -0,0 +1 @@ +from .primitives import *
\ No newline at end of file diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index c77ab2a8..e0f058b5 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -3,7 +3,8 @@ from OpenSSL import SSL from netlib import tcp from .primitives import ProxyServerError, Log, ProxyError, ConnectionTypeChange, AddressPriority from .connection import ClientConnection, ServerConnection -from .. import version, protocol +from ..protocol.handle import handle_messages, handle_error +from .. import version class DummyServer: @@ -81,14 +82,14 @@ class ConnectionHandler: while not self.close: try: - protocol.handle_messages(self.conntype, self) + handle_messages(self.conntype, self) except ConnectionTypeChange: self.log("Connection Type Changed: %s" % self.conntype) continue # FIXME: Do we want to persist errors? except (ProxyError, tcp.NetLibError), e: - protocol.handle_error(self.conntype, self, e) + handle_error(self.conntype, self, e) except Exception, e: self.log(e.__class__) import traceback |