From e8a63a5a464f56628f179cf14afd4429e61b7d91 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Mon, 13 Oct 2014 12:30:26 +0200 Subject: SPDY: Add Slot field for SYN_STREAM (and also unused field...) Ping-Bug: 10566 Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6 Reviewed-on: https://code.wireshark.org/review/4645 Reviewed-by: Michael Mann --- epan/dissectors/packet-spdy.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-spdy.c') diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index d843f54917..fae1067432 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -215,6 +215,8 @@ static int hf_spdy_header_value = -1; static int hf_spdy_streamid = -1; static int hf_spdy_associated_streamid = -1; static int hf_spdy_priority = -1; +static int hf_spdy_unused = -1; +static int hf_spdy_slot = -1; static int hf_spdy_num_headers = -1; static int hf_spdy_rst_stream_status = -1; static int hf_spdy_num_settings = -1; @@ -1110,7 +1112,9 @@ static int dissect_spdy_header_payload( offset += 4; /* Get priority */ - proto_tree_add_item(frame_tree, hf_spdy_priority, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(frame_tree, hf_spdy_priority, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(frame_tree, hf_spdy_unused, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(frame_tree, hf_spdy_slot, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; } @@ -1813,10 +1817,22 @@ void proto_register_spdy(void) }, { &hf_spdy_priority, { "Priority", "spdy.priority", - FT_UINT8, BASE_DEC, NULL, 0xE0, + FT_UINT16, BASE_DEC, NULL, 0xE000, NULL, HFILL } }, + { &hf_spdy_unused, + { "Unused", "spdy.unused", + FT_UINT16, BASE_HEX, NULL, 0x1F00, + "Reserved for future use", HFILL + } + }, + { &hf_spdy_slot, + { "Slot", "spdy.slot", + FT_UINT16, BASE_DEC, NULL, 0x00FF, + "Specifying the index in the server's CREDENTIAL vector of the client certificate to be used for this reques", HFILL + } + }, { &hf_spdy_num_headers, { "Number of headers", "spdy.numheaders", FT_UINT32, BASE_DEC, NULL, 0x0, -- cgit v1.2.3