From 0f157e7d6c4be48f213ea022cb2d6d1316c423c8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 17 May 2024 17:00:52 +0200 Subject: Merging upstream version 4.2.5. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-quic.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'epan/dissectors/packet-quic.c') diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index a41ce9cc..cabc2c50 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -1257,6 +1257,14 @@ quic_connection_find(packet_info *pinfo, guint8 long_packet_type, // No match found, truncate DCID (not really needed, but this // ensures that debug prints clearly show that DCID is invalid). dcid->len = 0; + } else if (quic_connection_from_conv(pinfo) == NULL) { + // Connection information might not be attached to the conversation, + // because of connection migration. + conversation_t *conv = find_conversation_pinfo(pinfo, 0); + if (conv) { + // attach the connection information to the conversation. + conversation_add_proto_data(conv, proto_quic, conn); + } } } return conn; -- cgit v1.2.3