aboutsummaryrefslogtreecommitdiffstats
path: root/mitmdump
diff options
context:
space:
mode:
Diffstat (limited to 'mitmdump')
-rwxr-xr-xmitmdump11
1 files changed, 7 insertions, 4 deletions
diff --git a/mitmdump b/mitmdump
index 49d129d6..5ab7c076 100755
--- a/mitmdump
+++ b/mitmdump
@@ -1,6 +1,9 @@
#!/usr/bin/env python
import sys, signal
from libmproxy import proxy, dump, cmdline
+from libmproxy.proxy.config import process_proxy_options
+from libmproxy.proxy.primitives import ProxyServerError
+from libmproxy.proxy.server import DummyServer, ProxyServer
import libmproxy.version, netlib.version
import argparse
@@ -25,13 +28,13 @@ if __name__ == '__main__':
if options.quiet:
options.verbose = 0
- proxyconfig = proxy.process_proxy_options(parser, options)
+ proxyconfig = process_proxy_options(parser, options)
if options.no_server:
- server = proxy.DummyServer(proxyconfig)
+ server = DummyServer(proxyconfig)
else:
try:
- server = proxy.ProxyServer(proxyconfig, options.port, options.addr)
- except proxy.ProxyServerError, v:
+ server = ProxyServer(proxyconfig, options.port, options.addr)
+ except ProxyServerError, v:
print >> sys.stderr, "mitmdump:", v.args[0]
sys.exit(1)