osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GQUIC: add decoding of CGST tag 

Regression introduced by b287e7165e.

To avoid an infinite loop with malformed packets, that commit stops
parsing the tags list after finding an unknown tag.
When this "unknown" tag is perfectly valid but not supported by
Wireshark, we don't decode any subsequent (valid) tags anymore.

GQUIC is going to die soon and it is quite unlikely it will change in
the next future. Therefore the best/quick solution is simply decoding
any valid tag.

Close #17250


(cherry picked from commit 7fd7153696)
This commit is contained in:
Nardi Ivan 2021-02-22 19:54:53 +00:00 committed by Alexis La Goutte
parent 4560ac0527
commit 16bc7095b9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-gquic.c
View File

@ -169,6 +169,7 @@ static int hf_gquic_tag_smhl = -1;
static int hf_gquic_tag_tbkp = -1;
static int hf_gquic_tag_mad0 = -1;
static int hf_gquic_tag_qlve = -1;
static int hf_gquic_tag_cgst = -1;
/* Public Reset Tags */
static int hf_gquic_tag_rnon = -1;
@ -430,6 +431,7 @@ static const value_string message_tag_vals[] = {
#define TAG_TBKP 0x54424B50
#define TAG_MAD0 0x4d414400
#define TAG_QLVE 0x514C5645
#define TAG_CGST 0x43475354
/* Public Reset Tag */
#define TAG_RNON 0x524E4F4E
@ -478,6 +480,7 @@ static const value_string tag_vals[] = {
{ TAG_TBKP, "Token Binding Key Params" },
{ TAG_MAD0, "Max Ack Delay (IETF QUIC)" },
{ TAG_QLVE, "Legacy Version Encapsulation" },
{ TAG_CGST, "Congestion Control Feedback Type" },
{ TAG_RNON, "Public Reset Nonce Proof" },
{ TAG_RSEQ, "Rejected Packet Number" },
@ -1671,6 +1674,10 @@ dissect_gquic_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gquic_tree, gui
tag_offset += tag_len;
}
break;
case TAG_CGST:
proto_tree_add_item(tag_tree, hf_gquic_tag_cgst, tvb, tag_offset_start + tag_offset, tag_len, ENC_NA);
tag_offset += tag_len;
break;
default:
proto_tree_add_item(tag_tree, hf_gquic_tag_unknown, tvb, tag_offset_start + tag_offset, tag_len, ENC_NA);
expert_add_info_format(pinfo, ti_tag, &ei_gquic_tag_undecoded,
@ -3164,6 +3171,11 @@ proto_register_gquic(void)
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gquic_tag_cgst,
{ "Congestion Control Feedback Type", "gquic.tag.cgst",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_gquic_tag_unknown,
{ "Unknown tag", "gquic.tag.unknown",