diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-06-02 10:45:17 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-06-02 10:45:17 +1200 |
| commit | 62f9864395fcb9933992257d5beabf84e532f85f (patch) | |
| tree | afe048a485913801fd04f8e0baf9678234cedfcc /libmproxy/console.py | |
| parent | 1de5209340cf0f032a93244bee1696abbb879154 (diff) | |
| parent | 07110bbbf192339b52d1067b531d0cea20b245d2 (diff) | |
| download | mitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.tar.gz mitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.tar.bz2 mitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.zip | |
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'libmproxy/console.py')
| -rw-r--r-- | libmproxy/console.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index 63dbf4f0..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..." @@ -1127,11 +1132,10 @@ class ConsoleMaster(flow.FlowMaster): try: f = file(path, "r") fr = flow.FlowReader(f) - data = list(fr.stream()) - f.close() except IOError, v: return v.strerror - self.state.load_flows(data) + flow.FlowMaster.load_flows(self, fr) + f.close() if self.conn_list_view: self.sync_list_view() self.focus_current() |