diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-07-24 10:32:56 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-07-24 10:32:56 +1200 |
| commit | 5c1157ddaf01b9245519d176469587aa6539ac5d (patch) | |
| tree | 064877904e9a52199f5a84ea6d465b544d7c71ad /libmproxy/flow.py | |
| parent | 64ce3b358ffed2eb34d6836b57dd7849ce856a09 (diff) | |
| download | mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.gz mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.bz2 mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.zip | |
Move app instantiation out of proxy.py.
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 427f1547..e5061dfb 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1376,6 +1376,18 @@ class FlowMaster(controller.Master): self.stream = None app.mapp.config["PMASTER"] = self + def start_app(self, domain, ip): + self.server.apps.add( + app.mapp, + domain, + 80 + ) + self.server.apps.add( + app.mapp, + ip, + 80 + ) + def add_event(self, e, level="info"): """ level: info, error @@ -1655,7 +1667,7 @@ class FlowReader: try: while 1: data = tnetstring.load(self.fo) - if tuple(data["version"][:1]) != version.IVERSION[:1]: + if tuple(data["version"][:2]) != version.IVERSION[:2]: v = ".".join(str(i) for i in data["version"]) raise FlowReadError("Incompatible serialized data version: %s"%v) off = self.fo.tell() @@ -1678,4 +1690,3 @@ class FilteredFlowWriter: d = f._get_state() tnetstring.dump(d, self.fo) - |