aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-spdy.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-10-13 12:30:26 +0200
committerMichael Mann <mmann78@netscape.net>2014-10-13 15:07:59 +0000
commite8a63a5a464f56628f179cf14afd4429e61b7d91 (patch)
treee046aaa4aa4c379cd5c1918cfa415bb9d1c96cef /epan/dissectors/packet-spdy.c
parent017fc82d7404444ef43212be19f1307ad129ccf2 (diff)
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 <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-spdy.c')
-rw-r--r--epan/dissectors/packet-spdy.c20
1 files changed, 18 insertions, 2 deletions
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,