diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-02-10 20:31:01 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-02-10 20:31:01 +0000 |
commit | c6a7dc376a196d34ad2d81dd85698c3fbc4d1266 (patch) | |
tree | f0b00eee0ff991e6f532701ee9843dd5f68c5848 /epan/dissectors/packet-scsi-ssc.c | |
parent | 38fef4967b2f634f01e46ddcb1b2c7da8647c7d5 (diff) |
add dissection of the WRITE16 and the WRITEFILEMARKS16 cdbs
svn path=/trunk/; revision=20769
Diffstat (limited to 'epan/dissectors/packet-scsi-ssc.c')
-rw-r--r-- | epan/dissectors/packet-scsi-ssc.c | 76 |
1 files changed, 74 insertions, 2 deletions
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c index 1505894552..1bdf120f2a 100644 --- a/epan/dissectors/packet-scsi-ssc.c +++ b/epan/dissectors/packet-scsi-ssc.c @@ -158,6 +158,78 @@ dissect_ssc2_read16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } static void +dissect_ssc2_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, + guint offset, gboolean isreq, gboolean iscdb, + guint payload_len _U_, scsi_task_data_t *cdata _U_) +{ + guint8 flags; + static const int *write16_fields[] = { + &hf_scsi_ssc_fcs, + &hf_scsi_ssc_lcs, + &hf_scsi_ssc_fixed, + NULL + }; + + if (isreq) { + if (check_col (pinfo->cinfo, COL_INFO)) + col_append_fstr (pinfo->cinfo, COL_INFO, "(Len: %u)", + tvb_get_ntoh24 (tvb, offset+1)); + } + + if (tree && isreq && iscdb) { + proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, ett_scsi_read6, write16_fields, FALSE); + + proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); + + proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); + + proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + + flags = tvb_get_guint8 (tvb, offset+14); + proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+14, 1, + flags, + "Vendor Unique = %u, NACA = %u, Link = %u", + flags & 0xC0, flags & 0x4, flags & 0x1); + } +} + +static void +dissect_ssc2_writefilemarks16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, + guint offset, gboolean isreq, gboolean iscdb, + guint payload_len _U_, scsi_task_data_t *cdata _U_) +{ + guint8 flags; + static const int *wf16_fields[] = { + &hf_scsi_ssc_fcs, + &hf_scsi_ssc_lcs, + &hf_scsi_ssc_immed, + NULL + }; + + if (isreq) { + if (check_col (pinfo->cinfo, COL_INFO)) + col_append_fstr (pinfo->cinfo, COL_INFO, "(Len: %u)", + tvb_get_ntoh24 (tvb, offset+1)); + } + + if (tree && isreq && iscdb) { + proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_ssc_read6_flags, ett_scsi_read6, wf16_fields, FALSE); + + proto_tree_add_item (tree, hf_scsi_ssc_partition, tvb, offset+2, 1, 0); + + proto_tree_add_item (tree, hf_scsi_ssc_locate16_loid, tvb, offset+3, 8, 0); + + proto_tree_add_item (tree, hf_scsi_ssc_rdwr6_xferlen, tvb, offset+11, 3, 0); + + flags = tvb_get_guint8 (tvb, offset+14); + proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+14, 1, + flags, + "Vendor Unique = %u, NACA = %u, Link = %u", + flags & 0xC0, flags & 0x4, flags & 0x1); + } +} + +static void dissect_ssc2_verify16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) @@ -975,7 +1047,7 @@ scsi_cdb_table_t scsi_ssc_table[256] = { /*SSC 0x7d*/{NULL}, /*SSC 0x7e*/{NULL}, /*SSC 0x7f*/{NULL}, -/*SSC 0x80*/{NULL}, +/*SSC 0x80*/{dissect_ssc2_writefilemarks16}, /*SSC 0x81*/{dissect_ssc2_readreverse16}, /*SSC 0x82*/{NULL}, /*SPC 0x83*/{dissect_spc3_extcopy}, @@ -985,7 +1057,7 @@ scsi_cdb_table_t scsi_ssc_table[256] = { /*SSC 0x87*/{NULL}, /*SSC 0x88*/{dissect_ssc2_read16}, /*SSC 0x89*/{NULL}, -/*SSC 0x8a*/{NULL}, +/*SSC 0x8a*/{dissect_ssc2_write16}, /*SSC 0x8b*/{NULL}, /*SSC 0x8c*/{NULL}, /*SSC 0x8d*/{NULL}, |