osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

RSVD dissector: minor fixes 

DataIn field should be three-state enum (not boolean)
See https://msdn.microsoft.com/en-us/library/dn393496.aspx

Fixed HandleStateShared value of QUERY_SHARED_VIRTUAL_DISK_SUPPORT reply
See https://msdn.microsoft.com/en-us/library/dn409282.aspx

Added VHDSET disk format (used by RSVD v2).

Change-Id: I7a9528e680dd4fede7e982d98316af5ef40cff3b
Reviewed-on: https://code.wireshark.org/review/19964
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>
This commit is contained in:
Volodymyr Khomenko 2017-02-05 21:03:04 +02:00 committed by Anders Broman
parent a69d0b1fba
commit 9ffff86e8d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-rsvd.c
View File

@ -120,6 +120,7 @@ static const value_string rsvd_disk_type_vals[] = {
static const value_string rsvd_disk_format_vals[] = {
{ 0x03, "VIRTUAL_STORAGE_TYPE_DEVICE_VHDX" },
{ 0x04, "VIRTUAL_STORAGE_TYPE_DEVICE_VHDSET" },
{ 0, NULL }
};
@ -186,6 +187,13 @@ dissect_RSVD_GET_INITIAL_INFO(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
return offset;
}
static const value_string rsvd_data_in_vals[] = {
{ 0x00, "Client is requesting data from the server" },
{ 0x01, "Client is sending data to the server" },
{ 0x02, "Client is neither sending nor requesting an additional data buffer" },
{ 0, NULL }
};
/*
* Dissect a tunnelled SCSI request and call the SCSI dissector where
* needed.
@ -699,8 +707,8 @@ proto_register_rsvd(void)
NULL, 0, NULL, HFILL }},
{ &hf_svhdx_tunnel_scsi_data_in,
{ "DataIn", "rsvd.svhdx_scsi_data_in", FT_BOOLEAN, 8,
NULL, 0, NULL, HFILL }},
{ "DataIn", "rsvd.svhdx_scsi_data_in", FT_UINT8, BASE_HEX,
VALS(rsvd_data_in_vals), 0, "SCSI CDB transfer type", HFILL }},
{ &hf_svhdx_tunnel_scsi_reserved2,
{ "Reserved2", "rsvd.svhdx_scsi_reserved2", FT_UINT8, BASE_HEX,

2
epan/dissectors/packet-smb2.c
View File

@ -1697,7 +1697,7 @@ static const value_string smb2_ioctl_shared_virtual_disk_vals[] = {
static const value_string smb2_ioctl_shared_virtual_disk_hstate_vals[] = {
{ 0x00, "HandleStateNone" },
{ 0x01, "HandleStateFileShared" },
{ 0x02, "HandleStateShared" },
{ 0x03, "HandleStateShared" },
{ 0, NULL }
};