osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Javier Godoy: 

SCSI (SPC) sense key specific information field must not include SKSV.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8782

#Backport 1.10 1.8

svn path=/trunk/; revision=49863
This commit is contained in:
Anders Broman 2013-06-09 16:51:42 +00:00
parent d8bf16a6dc
commit 0d936038c1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-scsi.c
View File

@ -188,6 +188,7 @@ static int hf_scsi_ascascq = -1;
static int hf_scsi_ascq = -1;
static int hf_scsi_fru = -1;
static int hf_scsi_sksv = -1;
static int hf_scsi_sks_info = -1;
static int hf_scsi_inq_reladrflags = -1;
static int hf_scsi_inq_reladr = -1;
static int hf_scsi_inq_linked = -1;
@ -4540,9 +4541,7 @@ dissect_scsi_fix_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
PROTO_ITEM_SET_HIDDEN(hidden_item);
proto_tree_add_item(sns_tree, hf_scsi_fru, tvb, offset+14, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sns_tree, hf_scsi_sksv, tvb, offset+15, 1, ENC_BIG_ENDIAN);
proto_tree_add_text(sns_tree, tvb, offset+15, 3,
"Sense Key Specific: %s",
tvb_bytes_to_str(tvb, offset+15, 3));
proto_tree_add_item(sns_tree, hf_scsi_sks_info, tvb, offset+15, 3, ENC_BIG_ENDIAN);
}
static void
@ -5755,6 +5754,8 @@ proto_register_scsi(void)
{ &hf_scsi_sksv,
{"SKSV", "scsi.sns.sksv", FT_BOOLEAN, 8, NULL, 0x80, NULL,
HFILL}},
{ &hf_scsi_sks_info,
{"Sense Key Specific", "scsi.sns.sks_info", FT_UINT24, BASE_HEX, NULL, 0x7FFFFF, NULL, HFILL}},
{ &hf_scsi_persresv_key,
{"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_NONE, NULL,
0x0, NULL, HFILL}},