From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9595

Small changes (mainly textual) to packet-scsi.c

The attached patch fixes small issues in SCSI dissection:
1. Extends the meaning of some fields (for example, the mysterious 'LBPME' becomes 'LBPME (logical block provisioning management enabled) / TPE'
2. Adds another ASC value which is important to me - 'Thin Provisioning Soft Threshold Reached' . Added comment where to get all of them (at  http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt)
3. Fixes a small typo: scsi.extcopy.dest_lba is 'Destination LBA', not 'Source LBA' (silly copy-paste mistake).

svn path=/trunk/; revision=54455

1 files changed, 10 insertions, 8 deletions

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index dc6befae7a..f4c31bec0c 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -2277,6 +2277,7 @@ static const value_string scsi_sns_errtype_val[] = {
     {0, NULL},
 };
 
+/* All can be found @ http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt */
 static const value_string scsi_asc_val[] = {
     {0x0000,  "No Additional Sense Information"},
     {0x0001,  "Filemark Detected"},
@@ -2442,6 +2443,7 @@ static const value_string scsi_asc_val[] = {
     {0x3503,  "Enclosure Services Transfer Failure"},
     {0x3504,  "Enclosure Services Transfer Refused"},
     {0x3700,  "Rounded Parameter"},
+    {0x3807,  "Thin Provisioning Soft Threshold Reached"},
     {0x3900,  "Saving Parameters Not Supported"},
     {0x3A00,  "Medium Not Present"},
     {0x3A01,  "Medium Not Present - Tray Closed"},
@@ -6872,28 +6874,28 @@ proto_register_scsi(void)
           {"Threshold Exponent", "scsi_sbc.threshold_exponent", FT_UINT8, BASE_DEC, NULL, 0,
            NULL, HFILL}},
         { &hf_scsi_sbc_lbpu,
-          {"LBPU", "scsi_sbc.lbpu", FT_BOOLEAN, 8, NULL, 0x80,
+          {"LBPU (logical block provisioning UNMAP)", "scsi_sbc.lbpu", FT_BOOLEAN, 8, NULL, 0x80,
            NULL, HFILL}},
         { &hf_scsi_sbc_lbpws,
-          {"LBPWS", "scsi_sbc.lbpws", FT_BOOLEAN, 8, NULL, 0x40,
+          {"LBPWS (logical block provisioning WRITE SAME)", "scsi_sbc.lbpws", FT_BOOLEAN, 8, NULL, 0x40,
            NULL, HFILL}},
         { &hf_scsi_sbc_lbpws10,
-          {"LBPWS10", "scsi_sbc.lbpws10", FT_BOOLEAN, 8, NULL, 0x20,
+          {"LBPWS10 (logical block provisioning WRITE SAME (10) )", "scsi_sbc.lbpws10", FT_BOOLEAN, 8, NULL, 0x20,
            NULL, HFILL}},
         { &hf_scsi_sbc_lbprz,
-          {"LBPRZ", "scsi_sbc.lbprz", FT_BOOLEAN, 8, NULL, 0x04,
+          {"LBPRZ (logical block provisioning read zeros)", "scsi_sbc.lbprz", FT_BOOLEAN, 8, NULL, 0x04,
            NULL, HFILL}},
         { &hf_scsi_sbc_anc_sup,
-          {"ANC_SUP", "scsi_sbc.anc_sup", FT_BOOLEAN, 8, NULL, 0x02,
+          {"ANC_SUP (anchor supported)", "scsi_sbc.anc_sup", FT_BOOLEAN, 8, NULL, 0x02,
            NULL, HFILL}},
         { &hf_scsi_sbc_dp,
-          {"DP", "scsi_sbc.dp", FT_BOOLEAN, 8, NULL, 0x01,
+          {"DP (descriptor present)", "scsi_sbc.dp", FT_BOOLEAN, 8, NULL, 0x01,
            NULL, HFILL}},
         { &hf_scsi_sbc_ptype,
           {"Provisioning Type", "scsi_sbc.ptype", FT_UINT8, BASE_DEC, VALS(provisioning_vals), 0x07,
            NULL, HFILL}},
         { &hf_scsi_block_limits_wsnz,
-          {"WSNZ", "scsi_sbc.bl.wsnz", FT_BOOLEAN, 8, NULL, 0x01,
+          {"WSNZ (write same non-zero)", "scsi_sbc.bl.wsnz", FT_BOOLEAN, 8, NULL, 0x01,
            NULL, HFILL}},
         { &hf_scsi_block_limits_mcawl,
           {"Maximum Compare And Write Length", "scsi_sbc.bl.mcawl", FT_UINT8, BASE_DEC, NULL, 0,
@@ -7360,7 +7362,7 @@ proto_register_scsi(void)
       { &hf_scsi_spc_xcopy_param_priority, { "Priority", "scsi.extcopy.xcopy_param_priority", FT_UINT8, BASE_HEX, NULL, 0x7, NULL, HFILL }},
       { &hf_scsi_spc_xcopy_param_byte, { "Extended copy Parameters: str, list ID usage, priority", "scsi.extcopy.xcopy_params_byte", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
       { &hf_scsi_spc_xcopy_source_lba, { "Source LBA", "scsi.extcopy.source_lba", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-      { &hf_scsi_spc_xcopy_dest_lba, { "Source LBA", "scsi.extcopy.source_lba", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+      { &hf_scsi_spc_xcopy_dest_lba, { "Destination LBA", "scsi.extcopy.dest_lba", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
       { &hf_scsi_recv_copy_max_cscd_desc_count, { "Max. CSCD descriptors count", "scsi.recv_copy.max_cscd_desc_count", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_scsi_recv_copy_max_seg_desc_count, { "Max. segment descriptors count", "scsi.recv_copy.max_seg_desc_count", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_scsi_recv_copy_max_desc_list_len, { "Max. descriptor list length", "scsi.recv_copy.max_desc_list_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},