diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-05-15 11:54:12 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-05-15 11:54:12 +1200 |
| commit | e285b17e3ff2e48455a5bc45b9a401b5b78b65cf (patch) | |
| tree | 32b5ee56b86436de30b4e9f8346dd9bc2346e73e /libmproxy/console.py | |
| parent | 613e9a298ec2fc82a4811c35f806d129ff883f2a (diff) | |
| download | mitmproxy-e285b17e3ff2e48455a5bc45b9a401b5b78b65cf.tar.gz mitmproxy-e285b17e3ff2e48455a5bc45b9a401b5b78b65cf.tar.bz2 mitmproxy-e285b17e3ff2e48455a5bc45b9a401b5b78b65cf.zip | |
Add -r option to mitmdump and mitmproxy.
This option reads a set of flows from a file. I've also regularized the
mitmdump and mitmproxy command-line signatures by removing mitmproxy's old way
of specifying flow loads through naked arguments.
Diffstat (limited to 'libmproxy/console.py')
| -rw-r--r-- | libmproxy/console.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 9e065e4d..aa763930 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -782,6 +782,7 @@ class Options(object): "refresh_server_playback", "request_script", "response_script", + "rfile", "rheaders", "server_replay", "stickycookie", @@ -818,6 +819,7 @@ class ConsoleMaster(flow.FlowMaster): def __init__(self, server, options): flow.FlowMaster.__init__(self, server, ConsoleState()) self.looptime = 0 + self.options = options self.conn_list_view = None self.set_palette() @@ -1031,6 +1033,9 @@ class ConsoleMaster(flow.FlowMaster): slave = controller.Slave(self.masterq, self.server) slave.start() + if self.options.rfile: + self.load_flows(self.options.rfile) + self.ui.run_wrapper(self.loop) # If True, quit just pops out to connection list view. print >> sys.stderr, "Shutting down..." |