Merging upstream version 4.2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c
index a41ce9c..cabc2c5 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;