diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-05-13 13:50:21 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-14 09:25:55 +0000 |
| commit | 8f4072b481f56688ed6a971b46849de624c3a6c7 (patch) | |
| tree | b65412c23d2c39a421715169daf832dfe9284f87 /epan/dissectors/packet-ssl-utils.h | |
| parent | 5fef0e8c374e4fca413d1179547d823d96311d24 (diff) | |
QUIC: fix initial_max_streams_* decoding and rename it
These are 16-bit fields, not 32-bit. Fixes a malformed packet exception.
While at it, rename fields to match draft-ietf-quic-tls-11-6-g4b762033,
these fields were inconssitently named in draft-11.
Bug: 13881
Change-Id: I797d2b4a24a4f4a9b340db736de0000acd52e639
Reviewed-on: https://code.wireshark.org/review/27491
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 7e23269e97..24daf2749b 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -198,13 +198,13 @@ typedef enum { #define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA 0 #define SSL_HND_QUIC_TP_INITIAL_MAX_DATA 1 -#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI 2 +#define SSL_HND_QUIC_TP_INITIAL_MAX_BIDI_STREAMS 2 #define SSL_HND_QUIC_TP_IDLE_TIMEOUT 3 #define SSL_HND_QUIC_TP_OMIT_CONNECTION_ID 4 /* removed in draft -11 */ #define SSL_HND_QUIC_TP_MAX_PACKET_SIZE 5 #define SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN 6 #define SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT 7 -#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI 8 +#define SSL_HND_QUIC_TP_INITIAL_MAX_UNI_STREAMS 8 /* * Lookup tables @@ -894,12 +894,12 @@ typedef struct ssl_common_dissect { gint hs_ext_quictp_parameter_value; gint hs_ext_quictp_parameter_initial_max_stream_data; gint hs_ext_quictp_parameter_initial_max_data; - gint hs_ext_quictp_parameter_initial_max_streams_bidi; + gint hs_ext_quictp_parameter_initial_max_bidi_streams; gint hs_ext_quictp_parameter_idle_timeout; gint hs_ext_quictp_parameter_max_packet_size; gint hs_ext_quictp_parameter_stateless_reset_token; gint hs_ext_quictp_parameter_ack_delay_exponent; - gint hs_ext_quictp_parameter_initial_max_streams_uni; + gint hs_ext_quictp_parameter_initial_max_uni_streams; /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */ } hf; @@ -1894,8 +1894,8 @@ ssl_common_dissect_t name = { \ FT_UINT32, BASE_DEC, NULL, 0x00, \ "Contains the initial value for the maximum amount of data that can be sent on the connection", HFILL } \ }, \ - { & name .hf.hs_ext_quictp_parameter_initial_max_streams_bidi, \ - { "initial_max_streams_bidi", prefix ".quic.parameter.initial_max_streams_bidi", \ + { & name .hf.hs_ext_quictp_parameter_initial_max_bidi_streams, \ + { "initial_max_bidi_streams", prefix ".quic.parameter.initial_max_bidi_streams", \ FT_UINT16, BASE_DEC, NULL, 0x00, \ "Initial maximum number of application-owned bidirectional streams", HFILL } \ }, \ @@ -1919,8 +1919,8 @@ ssl_common_dissect_t name = { \ FT_UINT8, BASE_DEC, NULL, 0x00, \ "Indicating an exponent used to decode the ACK Delay field in the ACK frame,", HFILL } \ }, \ - { & name .hf.hs_ext_quictp_parameter_initial_max_streams_uni, \ - { "initial_max_streams_uni", prefix ".quic.parameter.initial_max_streams_uni", \ + { & name .hf.hs_ext_quictp_parameter_initial_max_uni_streams, \ + { "initial_max_uni_streams", prefix ".quic.parameter.initial_max_uni_streams", \ FT_UINT16, BASE_DEC, NULL, 0x00, \ "Initial maximum number of application-owned unidirectional streams", HFILL } \ } |