diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-08-05 09:41:29 +1200 | 
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-08-05 09:41:29 +1200 | 
| commit | ce48cb4debab8caa518ea54e36dee722aaabb8a5 (patch) | |
| tree | 87ca81d9078a1405d5d38304c326550733ef4586 | |
| parent | be133e7a0b8b968e23b0813c64e205aa9e829e76 (diff) | |
| download | mitmproxy-ce48cb4debab8caa518ea54e36dee722aaabb8a5.tar.gz mitmproxy-ce48cb4debab8caa518ea54e36dee722aaabb8a5.tar.bz2 mitmproxy-ce48cb4debab8caa518ea54e36dee722aaabb8a5.zip  | |
Make scripted rewriting of saved traffic work in mitmdump.
| -rw-r--r-- | libmproxy/dump.py | 19 | 
1 files changed, 10 insertions, 9 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 6f544d6a..67f39a06 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -85,15 +85,6 @@ class DumpMaster(flow.FlowMaster):                  not options.keepserving              ) -        if options.rfile: -            path = os.path.expanduser(options.rfile) -            try: -                f = file(path, "r") -                freader = flow.FlowReader(f) -            except IOError, v: -                raise DumpError(v.strerror) -            self.load_flows(freader) -          if options.client_replay:              self.start_client_playback(                  self._readflow(options.client_replay), @@ -105,6 +96,16 @@ class DumpMaster(flow.FlowMaster):              if err:                  raise DumpError(err) +        if options.rfile: +            path = os.path.expanduser(options.rfile) +            try: +                f = file(path, "r") +                freader = flow.FlowReader(f) +            except IOError, v: +                raise DumpError(v.strerror) +            self.load_flows(freader) + +      def _readflow(self, path):          path = os.path.expanduser(path)          try:  | 
