osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

TLS(QUIC): Enhance MAX_STREAM_ID parameter (from draft-08) 

MAX_STREAM_ID is rename to MAX_STREAM_ID_BIDI
and there is a new paramter MAX_STREAM_ID_UNI

Bug: 13881
Change-Id: I99bcc559a133ded88f4caedd887f481147063496
Reviewed-on: https://code.wireshark.org/review/25120
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2018-01-03 08:16:45 +01:00 committed by Anders Broman
parent b10179faf2
commit f1c87809de
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-ssl-utils.c
View File

@ -1425,12 +1425,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, "initial_max_stream_id" },
{ SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_BIDI, "initial_max_stream_id_bidi" },
{ SSL_HND_QUIC_TP_IDLE_TIMEOUT, "idle_timeout" },
{ SSL_HND_QUIC_TP_OMIT_CONNECTION_ID, "omit_connection_id" },
{ 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" },
{ 0, NULL }
};
@ -6569,8 +6570,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:
proto_tree_add_item(parameter_tree, hf->hf.hs_ext_quictp_parameter_initial_max_stream_id,
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,
tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_tree, " %u", tvb_get_ntohl(tvb, offset));
offset += 4;
@ -6602,6 +6603,12 @@ 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,
tvb, offset, 4, ENC_BIG_ENDIAN);
proto_item_append_text(parameter_tree, " %u", tvb_get_ntohl(tvb, offset));
offset += 4;
break;
default:
offset += parameter_length;
/*TODO display expert info about unknown ? */

20
epan/dissectors/packet-ssl-utils.h
View File

@ -207,12 +207,14 @@ 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 2
#define SSL_HND_QUIC_TP_INITIAL_MAX_STREAM_ID_BIDI 2
#define SSL_HND_QUIC_TP_IDLE_TIMEOUT 3
#define SSL_HND_QUIC_TP_OMIT_CONNECTION_ID 4
#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
/*
* Lookup tables
*/
@ -895,11 +897,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;
gint hs_ext_quictp_parameter_initial_max_stream_id_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;
/* do not forget to update SSL_COMMON_LIST_T and SSL_COMMON_HF_LIST! */
} hf;
@ -1107,7 +1110,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, -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, \
@ -1888,10 +1891,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, \
{ "initial_max_stream_id", prefix ".quic.parameter.initial_max_stream_id", \
{ & name .hf.hs_ext_quictp_parameter_initial_max_stream_id_bidi, \
{ "initial_max_stream_id_bidi", prefix ".quic.parameter.initial_max_stream_id_bidi", \
FT_UINT32, BASE_DEC, NULL, 0x00, \
"Contains the initial maximum stream number the peer may initiate", HFILL } \
"Contains the initial maximum stream number the peer may initiate for bidirectional streams", HFILL } \
}, \
{ & name .hf.hs_ext_quictp_parameter_idle_timeout, \
{ "idle_timeout", prefix ".quic.parameter.idle_timeout", \
@ -1912,6 +1915,11 @@ ssl_common_dissect_t name = { \
{ "ack_delay_exponent", prefix ".quic.parameter.ack_delay_exponent", \
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", \
FT_UINT32, BASE_DEC, NULL, 0x00, \
"Contains the initial maximum stream number the peer may initiate for unidirectional streams", HFILL } \
}
/* }}} */