diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-13 13:51:19 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-13 13:51:19 +0000 |
| commit | 5fa16b2008aac4953001db10c8141ae7f9e031c6 (patch) | |
| tree | d26626e1de3ca8f0fee43bcd23a2b494d8986764 /epan/dissectors/packet-scsi.c | |
| parent | 32bec588924411ce68dd2a77e5c80146ea8e9eb0 (diff) | |
From Javier Godoy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8794 :
Display the value of unknown sense descriptor codes in the tree item.
Also fix the length of the subtree.
svn path=/trunk/; revision=49916
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 9d4c57f217..8b83708ec7 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -4586,7 +4586,7 @@ dissect_spc_mgmt_protocol_in(tvbuff_t *tvb, packet_info *pinfo _U_, service_action = tvb_get_guint8 (tvb_v, offset_v) & 0x1F; if (cdata) { cdata->itlq->flags=service_action; - } + } col_append_str(pinfo->cinfo, COL_INFO, val_to_str(service_action, mpi_action_vals, "Unknown")); @@ -4808,8 +4808,8 @@ dissect_scsi_descriptor_snsinfo(tvbuff_t *tvb, proto_tree *sns_tree, guint offse desc_type = tvb_get_guint8(tvb, offset); desc_length = tvb_get_guint8(tvb, offset+1); - item = proto_tree_add_text(sns_tree, tvb, offset, desc_length, "%s", - val_to_str_const(desc_type, scsi_sense_desc_type_val, "unknown")); + item = proto_tree_add_text(sns_tree, tvb, offset, desc_length+2, "%s", + val_to_str(desc_type, scsi_sense_desc_type_val, "Unknown (0x%02x)")); desc_tree = proto_item_add_subtree(item, ett_sense_descriptor); proto_tree_add_item(desc_tree, hf_scsi_sns_desc_type, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(desc_tree, hf_scsi_sns_desc_length, tvb, offset+1, 1, ENC_BIG_ENDIAN); @@ -6046,7 +6046,7 @@ proto_register_scsi(void) {"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}}, + {"Sense Key Specific", "scsi.sns.sks_info", FT_UINT24, BASE_HEX, NULL, 0x7FFFFF, NULL, HFILL}}, { &hf_scsi_sks_fp_cd, {"Command/Data", "scsi.sns.sks.fp.cd", FT_UINT24, BASE_HEX, VALS(scsi_sense_sks_fp_cd_val), 0x400000, NULL, HFILL}}, { &hf_scsi_sks_fp_bpv, |