diff options
| author | Nathaniel Clark <Nathaniel.Clark@misrule.us> | 2019-10-28 12:32:24 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-10-29 09:38:28 +0000 |
| commit | b6752680ab6451107bcc864845e1322ae16fdfbd (patch) | |
| tree | 55ffc3ad1f1aa4a666774af500a2158566feebff /epan/dissectors/packet-lustre.c | |
| parent | 4d8692fca04958b0794252801fdb3d09988bfb3b (diff) | |
lustre: fix rmfid dissection
Initial member as count is only in ioctl call, not in the wire format.
Change-Id: Ic44b7ccf6510df91e5df78587a84fc502bbd7623
Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>
Reviewed-on: https://code.wireshark.org/review/34880
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lustre.c')
| -rw-r--r-- | epan/dissectors/packet-lustre.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c index 942d4774ee..78753e923b 100644 --- a/epan/dissectors/packet-lustre.c +++ b/epan/dissectors/packet-lustre.c @@ -419,8 +419,6 @@ static int hf_lustre_cfg_marker_comment = -1; static int hf_lustre_rcs = -1; static int hf_lustre_rcs_rc = -1; static int hf_lustre_fid_array = -1; -static int hf_lustre_fid_array_nr = -1; -static int hf_lustre_fid_array_padding = -1; static int hf_lustre_fid_array_fid = -1; static int hf_lustre_niobuf_remote = -1; static int hf_lustre_niobuf_remote_len = -1; @@ -3895,19 +3893,8 @@ dissect_struct_fid_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr item = proto_tree_add_item(parent_tree, hf_lustre_fid_array, tvb, offset, data_len, ENC_NA); tree = proto_item_add_subtree(item, ett_lustre_fid_array); - proto_tree_add_item_ret_uint(tree, hf_lustre_fid_array_nr, tvb, offset, 4, ENC_LITTLE_ENDIAN, &num); - offset += 4; - proto_tree_add_item(tree, hf_lustre_fid_array_padding, tvb, offset, 4, ENC_NA); - offset += 4; - proto_tree_add_item(tree, hf_lustre_fid_array_padding, tvb, offset, 8, ENC_NA); - offset += 8; - - if (num+1 != data_len/16) { - expert_add_info_format(pinfo, tree, &ei_lustre_buflen, - "Buffer Length mismatch: buffer_len:%u !== nr:%u", data_len/16, num+1); - num = MIN((data_len/16)-1, num); - } + num = data_len/16; for (i = 0; i < num; ++i) { offset = dissect_struct_lu_fid(tvb, offset, tree, hf_lustre_fid_array_fid); } @@ -7785,10 +7772,6 @@ proto_register_lustre(void) /* FID Array */ { &hf_lustre_fid_array, { "Fid Array", "lustre.fid_array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_lustre_fid_array_nr, - { "Number", "lustre.fid_array.nr", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, - { &hf_lustre_fid_array_padding, - { "padding", "lustre.fid_array.padding", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_lustre_fid_array_fid, { "FID", "lustre.fid_array.fid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, |