aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorJake Drahos <drahos@iastate.edu>2015-06-11 20:27:33 -0500
committerJake Drahos <drahos@iastate.edu>2015-06-11 20:27:33 -0500
commit2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9 (patch)
treedb1711fa6758b4f67cb7858bcd3b769dd08e9fe3 /libmproxy/flow.py
parentf2d7a6aa57a622ebc0d025391046d81f289b8cb3 (diff)
downloadmitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.tar.gz
mitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.tar.bz2
mitmproxy-2a6698bf5a2ebe576ae0bbcacdee69d6eed10be9.zip
Moved marking from flow to console
No longer taints the flow primitive
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index 0dffc8d3..1a052f51 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -494,19 +494,8 @@ class FlowStore(FlowList):
self._recalculate_views()
def _clear(self):
- marked_flows = []
- for f in self._list:
- if f.marked:
- marked_flows.append(f)
- if len(marked_flows) == len(self._list):
- marked_flows = []
-
self._list = []
self._set = set()
-
- for f in marked_flows:
- self._add(f)
-
self._recalculate_views()
def _recalculate_views(self):
@@ -815,9 +804,7 @@ class FlowMaster(controller.Master):
return super(FlowMaster, self).tick(q, timeout)
def duplicate_flow(self, f):
- new_flow = f.copy()
- new_flow.marked = False
- return self.load_flow(new_flow)
+ return self.load_flow(f.copy())
def create_request(self, method, scheme, host, port, path):
"""