diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-12-22 18:57:29 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-12-22 21:40:05 +0000 |
commit | 75afb548eb44d73cd0f64cb69e7b7f76d4132d70 (patch) | |
tree | 395410c795bfb8b86e0084a54d72e9afadb880e5 /epan/dissectors | |
parent | 0964b04ee346bd56b830313b0e00404f33321a74 (diff) |
QUIC: Remove draft-13 support
Change-Id: I98e9e53a031929ea9b9ac047166a961c2c30908e
Reviewed-on: https://code.wireshark.org/review/31170
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-quic.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index ebd2d98221..96967cb805 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -1968,8 +1968,6 @@ dissect_quic_retry_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tr { guint offset = 0; guint32 version; - guint32 len_payload_length; - guint64 payload_length; quic_cid_t dcid = {.len=0}, scid = {.len=0}; guint32 odcil = 0; guint retry_token_len; @@ -1980,18 +1978,9 @@ dissect_quic_retry_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *quic_tr offset = dissect_quic_long_header_common(tvb, pinfo, quic_tree, offset, quic_packet, &version, &dcid, &scid); - if (is_quic_draft_max(version, 13)) { - proto_tree_add_item_ret_varint(quic_tree, hf_quic_length, tvb, offset, -1, ENC_VARINT_QUIC, &payload_length, &len_payload_length); - offset += len_payload_length; - // PKN is encrypted, but who cares about draft -13 anyway. - proto_tree_add_item(quic_tree, hf_quic_packet_number, tvb, offset, 1, ENC_NA); - offset += 1; - proto_tree_add_item_ret_uint(quic_tree, hf_quic_odcil_draft13, tvb, offset, 1, ENC_NA, &odcil); - } else { - proto_tree_add_item_ret_uint(quic_tree, hf_quic_odcil, tvb, offset, 1, ENC_NA, &odcil); - if (odcil) { - odcil += 3; - } + proto_tree_add_item_ret_uint(quic_tree, hf_quic_odcil, tvb, offset, 1, ENC_NA, &odcil); + if (odcil) { + odcil += 3; } offset += 1; proto_tree_add_item(quic_tree, hf_quic_odcid, tvb, offset, odcil, ENC_NA); |