aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMirko Parthey <mirko.parthey@web.de>2016-12-28 14:56:52 +0100
committerAnders Broman <a.broman58@gmail.com>2016-12-29 07:01:01 +0000
commit9bcf111b7dcd9bc570919b525a5cdfdc5ed38bb3 (patch)
tree9da3b744cb1c8888f80a1d71b01e563c1fcc724c /epan
parent31872655ad257cadbf8805d0e94c0bae9696a746 (diff)
ISAKMP: add Reserved fields for Fibre Channel
Add Reserved fields for Fibre Channel Traffic Selectors. Reference: RFC 4595, section 4.4 Change-Id: Iba0b3d9a4d3d96918971a9a597fa313b022b5ca2 Reviewed-on: https://code.wireshark.org/review/19444 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-isakmp.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index d56e9752c5..3bae160e88 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -227,6 +227,7 @@ static int hf_isakmp_ts_start_r_ctl = -1;
static int hf_isakmp_ts_end_r_ctl = -1;
static int hf_isakmp_ts_start_type = -1;
static int hf_isakmp_ts_end_type = -1;
+static int hf_isakmp_reserved = -1;
static int hf_isakmp_ts_data = -1;
static int hf_isakmp_num_spis = -1;
static int hf_isakmp_hash = -1;
@@ -5180,17 +5181,20 @@ dissect_ts(tvbuff_t *tvb, int offset, proto_tree *payload_tree)
break;
case IKEV2_TS_FC_ADDR_RANGE:
- offset += 1; /* Reserved */
+ proto_tree_add_item(tree, hf_isakmp_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
proto_tree_add_item(tree, hf_isakmp_ts_selector_length, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- offset += 1; /* Reserved */
+ proto_tree_add_item(tree, hf_isakmp_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
proto_tree_add_item(tree, hf_isakmp_ts_start_addr_fc, tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
- offset += 1; /* Reserved */
+ proto_tree_add_item(tree, hf_isakmp_reserved, tvb, offset, 1, ENC_NA);
+ offset += 1;
proto_tree_add_item(tree, hf_isakmp_ts_end_addr_fc, tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3;
@@ -6382,6 +6386,10 @@ proto_register_isakmp(void)
{ "Ending Type", "isakmp.ts.end_type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
+ { &hf_isakmp_reserved,
+ { "Reserved", "isakmp.reserved",
+ FT_BYTES, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }},
{ &hf_isakmp_ts_data,
{ "Traffic Selector", "isakmp.ts.data",
FT_NONE, BASE_NONE, NULL, 0x0,