aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/proxy
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2017-03-10 19:37:18 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2017-03-10 19:38:50 +0100
commit49e0f2384891d8ab33844a0a5c9a57981eed5085 (patch)
tree7d6e5e3a4a9b1aadbe4cff16debc25b4c329810a /mitmproxy/proxy
parentb1dd86d7ae7d6692eb3004a5e4b8bf6504af2635 (diff)
downloadmitmproxy-49e0f2384891d8ab33844a0a5c9a57981eed5085.tar.gz
mitmproxy-49e0f2384891d8ab33844a0a5c9a57981eed5085.tar.bz2
mitmproxy-49e0f2384891d8ab33844a0a5c9a57981eed5085.zip
use flow.id to link websocket + handshake flows
Diffstat (limited to 'mitmproxy/proxy')
-rw-r--r--mitmproxy/proxy/protocol/websocket.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/proxy/protocol/websocket.py b/mitmproxy/proxy/protocol/websocket.py
index 1f898ed2..373c6479 100644
--- a/mitmproxy/proxy/protocol/websocket.py
+++ b/mitmproxy/proxy/protocol/websocket.py
@@ -140,7 +140,8 @@ class WebSocketLayer(base.Layer):
def __call__(self):
self.flow = WebSocketFlow(self.client_conn, self.server_conn, self.handshake_flow, self)
- self.handshake_flow.metadata['websocket_flow'] = self.flow
+ self.flow.metadata['websocket_handshake'] = self.handshake_flow.id
+ self.handshake_flow.metadata['websocket_flow'] = self.flow.id
self.channel.ask("websocket_start", self.flow)
client = self.client_conn.connection