diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:51:24 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-09 21:51:24 +0100 |
commit | 5598a8de82f28232fb4407911a8643dceacc9ebc (patch) | |
tree | 832c4db3c0b897ad6615761083a7735e18d45b44 /mitmdump | |
parent | fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c (diff) | |
download | mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.gz mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.bz2 mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.zip |
finish proxy.py split up
Diffstat (limited to 'mitmdump')
-rwxr-xr-x | mitmdump | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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) |