diff options
author | Peter Wu <peter@lekensteyn.nl> | 2018-04-18 13:56:47 +0200 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-04-18 20:03:57 +0000 |
commit | c3b2519ea178b3b97cf0c97c457474e68668f079 (patch) | |
tree | b8fb81ae96ea4a50ebd5f3d62de9f858e1ca242e | |
parent | 3c9249433fd7583a014fb9c05e7da7ef46329f43 (diff) |
QUIC: add draft version and rename some transport parameters (draft-11)
Bug: 13881
Change-Id: Ia7c695ba081b4b744821744a6209f09ff87912fd
Reviewed-on: https://code.wireshark.org/review/27008
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r-- | epan/dissectors/packet-quic.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 22 |
3 files changed, 19 insertions, 18 deletions
diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c index bc021cf7ee..8caa40fb9d 100644 --- a/epan/dissectors/packet-quic.c +++ b/epan/dissectors/packet-quic.c @@ -182,6 +182,7 @@ const value_string quic_version_vals[] = { { 0xff000008, "draft-08" }, { 0xff000009, "draft-09" }, { 0xff00000a, "draft-10" }, + { 0xff00000b, "draft-11" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index fe7f255e41..56bf2aa0d5 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1422,13 +1422,13 @@ static const ssl_alpn_protocol_t ssl_alpn_protocols[] = { const value_string quic_transport_parameter_id[] = { { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_DATA, "initial_max_stream_data" }, { SSL_HND_QUIC_TP_INITIAL_MAX_DATA, "initial_max_data" }, - { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_BIDI, "initial_max_stream_id_bidi" }, + { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI, "initial_max_streams_bidi" }, { SSL_HND_QUIC_TP_IDLE_TIMEOUT, "idle_timeout" }, - { SSL_HND_QUIC_TP_OMIT_CONNECTION_ID, "omit_connection_id" }, + { SSL_HND_QUIC_TP_OMIT_CONNECTION_ID, "omit_connection_id" }, // removed in draft -11 { SSL_HND_QUIC_TP_MAX_PACKET_SIZE, "max_packet_size" }, { SSL_HND_QUIC_TP_STATELESS_RESET_TOKEN, "stateless_reset_token" }, { SSL_HND_QUIC_TP_ACK_DELAY_EXPONENT, "ack_delay_exponent" }, - { SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_UNI, "initial_max_stream_id_uni" }, + { SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI, "initial_max_streams_uni" }, { 0, NULL } }; @@ -6632,8 +6632,8 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv proto_item_append_text(parameter_tree, " %u", tvb_get_ntohl(tvb, offset)); offset += 4; break; - case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_BIDI: - proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_id_bidi, + case SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI: + proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_streams_bidi, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(parameter_tree, " %u", tvb_get_ntohl(tvb, offset)); offset += 4; @@ -6665,8 +6665,8 @@ ssl_dissect_hnd_hello_ext_quic_transport_parameters(ssl_common_dissect_t *hf, tv /*TODO display multiplier (x8) and expert info about invaluid value (> 20) ? */ offset += 1; break; - case SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_UNI: - proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_id_uni, + case SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI: + proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_streams_uni, tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(parameter_tree, " %u", tvb_get_ntohl(tvb, offset)); offset += 4; diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index d861370d7a..3f4c794718 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_STREAM_ID_BIDI 2 +#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_BIDI 2 #define SSL_HND_QUIC_TP_IDLE_TIMEOUT 3 -#define SSL_HND_QUIC_TP_OMIT_CONNECTION_ID 4 +#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_STREAM_ID_UNI 8 +#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAMS_UNI 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_stream_id_bidi; + gint hs_ext_quictp_parameter_initial_max_streams_bidi; 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_stream_id_uni; + gint hs_ext_quictp_parameter_initial_max_streams_uni; /* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */ } hf; @@ -1894,10 +1894,10 @@ 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_stream_id_bidi, \ - { "initial_max_stream_id_bidi", prefix ".quic.parameter.initial_max_stream_id_bidi", \ + { & name .hf.hs_ext_quictp_parameter_initial_max_streams_bidi, \ + { "initial_max_streams_bidi", prefix ".quic.parameter.initial_max_streams_bidi", \ FT_UINT32, BASE_DEC, NULL, 0x00, \ - "Contains the initial maximum stream number the peer may initiate for bidirectional streams", HFILL } \ + "Initial maximum number of application-owned bidirectional streams", HFILL } \ }, \ { & name .hf.hs_ext_quictp_parameter_idle_timeout, \ { "idle_timeout", prefix ".quic.parameter.idle_timeout", \ @@ -1919,10 +1919,10 @@ 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_stream_id_uni, \ - { "initial_max_stream_id_uni", prefix ".quic.parameter.initial_max_stream_id_uni", \ + { & name .hf.hs_ext_quictp_parameter_initial_max_streams_uni, \ + { "initial_max_streams_uni", prefix ".quic.parameter.initial_max_streams_uni", \ FT_UINT32, BASE_DEC, NULL, 0x00, \ - "Contains the initial maximum stream number the peer may initiate for unidirectional streams", HFILL } \ + "Initial maximum number of application-owned unidirectional streams", HFILL } \ } /* }}} */ |