QUIC: fix trailing data after VN packet
authorPeter Wu <peter@lekensteyn.nl>
Sun, 30 Sep 2018 22:42:21 +0000 (00:42 +0200)
committerAnders Broman <a.broman58@gmail.com>
Mon, 1 Oct 2018 04:37:05 +0000 (04:37 +0000)
The returned offset must be non-zero or the data dissector is invoked.

Change-Id: Iaff6e1f19fc94e17b41ad06a8be491fbec4835ba
Fixes: v2.9.0rc0-1797-g91c5942c93 ("QUIC: implement packet coalescing (draft >= 11)")
Reviewed-on: https://code.wireshark.org/review/29945
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
epan/dissectors/packet-quic.c

index b38e8289f67e35b6885a19f29fb3a2879ad50752..7c1695aa552533588ab85d6f01ee22da34124f05 100644 (file)
@@ -2218,7 +2218,7 @@ dissect_quic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
             guint8 long_packet_type = tvb_get_guint8(next_tvb, 0) & 0x7f;
             guint32 version = tvb_get_ntohl(next_tvb, 1);
             if (version == 0) {
-                dissect_quic_version_negotiation(next_tvb, pinfo, quic_tree, quic_packet);
+                offset += dissect_quic_version_negotiation(next_tvb, pinfo, quic_tree, quic_packet);
                 break;
             }
             if (long_packet_type == QUIC_LPT_RETRY) {