diff options
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index a13ebc2ac0..4953692523 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -130,8 +130,8 @@ static int hf_smb2_max_ioctl_in_size = -1; static int hf_smb2_max_ioctl_out_size = -1; static int hf_smb2_flags = -1; static int hf_smb2_required_buffer_size = -1; -static int hf_smb2_getinfo_size = -1; -static int hf_smb2_getinfo_offset = -1; +static int hf_smb2_getinfo_input_size = -1; +static int hf_smb2_getinfo_input_offset = -1; static int hf_smb2_getinfo_additional = -1; static int hf_smb2_getinfo_flags = -1; static int hf_smb2_setinfo_size = -1; @@ -4727,12 +4727,15 @@ dissect_smb2_getinfo_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4; /* offset */ - offset_item = proto_tree_add_item_ret_uint(tree, hf_smb2_getinfo_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &getinfo_offset); - /* XXX - check that the two reserved bytes are zero? */ - offset += 4; + offset_item = proto_tree_add_item_ret_uint(tree, hf_smb2_getinfo_input_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN, &getinfo_offset); + offset += 2; + + /* reserved */ + proto_tree_add_item(tree, hf_smb2_reserved, tvb, offset, 2, ENC_NA); + offset += 2; /* size */ - proto_tree_add_item_ret_uint(tree, hf_smb2_getinfo_size, tvb, offset, 4, ENC_LITTLE_ENDIAN, &getinfo_size); + proto_tree_add_item_ret_uint(tree, hf_smb2_getinfo_input_size, tvb, offset, 4, ENC_LITTLE_ENDIAN, &getinfo_size); offset += 4; /* parameters */ @@ -9588,13 +9591,13 @@ proto_register_smb2(void) NULL, 0, NULL, HFILL } }, - { &hf_smb2_getinfo_size, - { "Getinfo Size", "smb2.getinfo_size", FT_UINT32, BASE_DEC, + { &hf_smb2_getinfo_input_size, + { "Getinfo Input Size", "smb2.getinfo_input_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, - { &hf_smb2_getinfo_offset, - { "Getinfo Offset", "smb2.getinfo_offset", FT_UINT16, BASE_HEX, + { &hf_smb2_getinfo_input_offset, + { "Getinfo Input Offset", "smb2.getinfo_input_offset", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } }, |