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

QUIC: Remove some field of Preferred Address TP before draft-18 

Ping-Bug: 13881
Change-Id: Iae8a547d1726ae5977c59ab94f581c856225b38f
Reviewed-on: https://code.wireshark.org/review/34702
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2019-10-03 18:34:25 +02:00 committed by Anders Broman
parent 21cfde4c6d
commit 931a80492d
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-tls-utils.c
View File

@ -1391,13 +1391,6 @@ const value_string quic_transport_parameter_id[] = {
{ 0, NULL }
};
// Removed in QUIC draft -18
const value_string quic_tp_preferred_address_vals[] = {
{ 4, "IPv4" },
{ 6, "IPv6" },
{ 0, NULL }
};
/* Lookup tables }}} */
void
@ -6762,7 +6755,6 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv
case SSL_HND_QUIC_TP_PREFERRED_ADDRESS: {
guint32 connectionid_length;
// Since draft -18
proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_pa_ipv4address,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;

15
epan/dissectors/packet-tls-utils.h
View File

@ -204,7 +204,6 @@ extern const value_string tls13_key_update_request[];
extern const value_string compress_certificate_algorithm_vals[];
extern const value_string quic_transport_parameter_id[];
extern const value_string quic_version_vals[];
extern const value_string quic_tp_preferred_address_vals[];
/* XXX Should we use GByteArray instead? */
typedef struct _StringInfo {
@ -909,8 +908,6 @@ typedef struct ssl_common_dissect {
gint hs_ext_quictp_parameter_ack_delay_exponent;
gint hs_ext_quictp_parameter_max_ack_delay;
gint hs_ext_quictp_parameter_max_packet_size;
gint hs_ext_quictp_parameter_pa_ipversion; // Remove in draft -18
gint hs_ext_quictp_parameter_pa_ipaddress_length; // Remove in draft -18
gint hs_ext_quictp_parameter_pa_ipv4address;
gint hs_ext_quictp_parameter_pa_ipv6address;
gint hs_ext_quictp_parameter_pa_ipv4port;
@ -1147,7 +1144,7 @@ ssl_common_dissect_t name = { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
-1, -1, -1, -1, -1, \
-1, -1, -1, \
}, \
/* ett */ { \
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \
@ -1988,16 +1985,6 @@ ssl_common_dissect_t name = { \
FT_UINT64, BASE_DEC, NULL, 0x00, \
"Indicating the maximum amount of time in milliseconds by which it will delay sending of acknowledgments", HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_pa_ipversion, \
{ "ipVersion", prefix ".quic.parameter.preferred_address.ipversion", \
FT_UINT8, BASE_DEC, VALS(quic_tp_preferred_address_vals), 0x00, \
"IP Version (until draft -17)", HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_pa_ipaddress_length, \
{ "Length", prefix ".quic.parameter.preferred_address.ipaddress.length", \
FT_UINT8, BASE_DEC, NULL, 0x00, \
"Length of ipAddress field (until draft -17)", HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_pa_ipv4address, \
{ "ipv4Address", prefix ".quic.parameter.preferred_address.ipv4address", \
FT_IPv4, BASE_NONE, NULL, 0x00, \