diff options
Diffstat (limited to 'mitmproxy/flow/master.py')
-rw-r--r-- | mitmproxy/flow/master.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py index a2b225b8..a1b0a631 100644 --- a/mitmproxy/flow/master.py +++ b/mitmproxy/flow/master.py @@ -6,6 +6,7 @@ import sys from typing import Optional # noqa import netlib.exceptions +from netlib import http from mitmproxy import controller from mitmproxy import exceptions from mitmproxy import models @@ -29,13 +30,13 @@ def event_sequence(f): messages = f.messages f.messages = [] f.reply = controller.DummyReply() - yield "tcp_open", f + yield "tcp_start", f while messages: f.messages.append(messages.pop(0)) yield "tcp_message", f if f.error: yield "tcp_error", f - yield "tcp_close", f + yield "tcp_end", f else: raise NotImplementedError @@ -83,7 +84,7 @@ class FlowMaster(controller.Master): s = models.ServerConnection.make_dummy((host, port)) f = models.HTTPFlow(c, s) - headers = models.Headers() + headers = http.Headers() req = models.HTTPRequest( "absolute", @@ -261,7 +262,7 @@ class FlowMaster(controller.Master): self.state.update_flow(f) @controller.handler - def tcp_open(self, flow): + def tcp_start(self, flow): # TODO: This would break mitmproxy currently. # self.state.add_flow(flow) pass @@ -275,5 +276,5 @@ class FlowMaster(controller.Master): pass @controller.handler - def tcp_close(self, flow): + def tcp_end(self, flow): pass |