diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-30 12:18:29 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-30 12:18:29 +0000 |
| commit | c0cccf43c28e9c38af1464e196dc9b23ebbd40d9 (patch) | |
| tree | 7258c1673a24f57db86d6b802bd5317d8b69e607 /epan/dissectors/packet-scsi.c | |
| parent | 268f9c37d664f2ed894843f8ead2318e710d3f61 (diff) | |
| download | wireshark-c0cccf43c28e9c38af1464e196dc9b23ebbd40d9.tar.gz wireshark-c0cccf43c28e9c38af1464e196dc9b23ebbd40d9.tar.bz2 wireshark-c0cccf43c28e9c38af1464e196dc9b23ebbd40d9.zip | |
start splitting the monolitic scsi dissector up into commandset dissectors
split the MMC commandset out of the main scsi dissector
svn path=/trunk/; revision=19738
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 1715 |
1 files changed, 13 insertions, 1702 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 1e3d87f0a9..bec90cc714 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -96,19 +96,20 @@ #include "packet-scsi.h" #include "packet-fc.h" #include "packet-scsi-osd.h" +#include "packet-scsi-mmc.h" static int proto_scsi = -1; + int hf_scsi_control = -1; + int hf_scsi_alloclen16 = -1; static int hf_scsi_time = -1; static int hf_scsi_request_frame = -1; static int hf_scsi_response_frame = -1; static int hf_scsi_lun = -1; static int hf_scsi_status = -1; static int hf_scsi_spcopcode = -1; -static int hf_scsi_mmcopcode = -1; static int hf_scsi_sbcopcode = -1; static int hf_scsi_sscopcode = -1; static int hf_scsi_smcopcode = -1; -static int hf_scsi_control = -1; static int hf_scsi_inquiry_flags = -1; static int hf_scsi_inquiry_evpd_page = -1; static int hf_scsi_inquiry_cmdt_page = -1; @@ -121,7 +122,6 @@ static int hf_scsi_logsns_pc = -1; static int hf_scsi_logsns_pagecode = -1; static int hf_scsi_paramlen16 = -1; static int hf_scsi_modesel_flags = -1; -static int hf_scsi_alloclen16 = -1; static int hf_scsi_modesns_pc = -1; static int hf_scsi_spcpagecode = -1; static int hf_scsi_sbcpagecode = -1; @@ -219,123 +219,6 @@ static int hf_scsi_senddiag_pf = -1; static int hf_scsi_senddiag_st = -1; static int hf_scsi_senddiag_devoff = -1; static int hf_scsi_senddiag_unitoff = -1; -static int hf_scsi_key_class = -1; -static int hf_scsi_key_format = -1; -static int hf_scsi_agid = -1; -static int hf_scsi_lba = -1; -static int hf_scsi_read_compatibility_lba = -1; -static int hf_scsi_num_blocks = -1; -static int hf_scsi_data_length = -1; -static int hf_scsi_report_key_type_code = -1; -static int hf_scsi_report_key_vendor_resets = -1; -static int hf_scsi_report_key_user_changes = -1; -static int hf_scsi_report_key_region_mask = -1; -static int hf_scsi_report_key_rpc_scheme = -1; -static int hf_scsi_setcdspeed_rc = -1; -static int hf_scsi_getconf_rt = -1; -static int hf_scsi_getconf_starting_feature = -1; -static int hf_scsi_getconf_current_profile = -1; -static int hf_scsi_feature = -1; -static int hf_scsi_feature_version = -1; -static int hf_scsi_feature_persistent = -1; -static int hf_scsi_feature_current = -1; -static int hf_scsi_feature_additional_length = -1; -static int hf_scsi_feature_lun_sn = -1; -static int hf_scsi_feature_cdread_dap = -1; -static int hf_scsi_feature_cdread_c2flag = -1; -static int hf_scsi_feature_cdread_cdtext = -1; -static int hf_scsi_feature_dvdrw_write = -1; -static int hf_scsi_feature_dvdrw_quickstart = -1; -static int hf_scsi_feature_dvdrw_closeonly = -1; -static int hf_scsi_feature_dvdr_write = -1; -static int hf_scsi_feature_tao_buf = -1; -static int hf_scsi_feature_tao_rwraw = -1; -static int hf_scsi_feature_tao_rwpack = -1; -static int hf_scsi_feature_tao_testwrite = -1; -static int hf_scsi_feature_tao_cdrw = -1; -static int hf_scsi_feature_tao_rwsubcode = -1; -static int hf_scsi_feature_dts = -1; -static int hf_scsi_feature_sao_buf = -1; -static int hf_scsi_feature_sao_sao = -1; -static int hf_scsi_feature_sao_rawms = -1; -static int hf_scsi_feature_sao_raw = -1; -static int hf_scsi_feature_sao_testwrite = -1; -static int hf_scsi_feature_sao_cdrw = -1; -static int hf_scsi_feature_sao_rw = -1; -static int hf_scsi_feature_sao_mcsl = -1; -static int hf_scsi_feature_dvdr_buf = -1; -static int hf_scsi_feature_dvdr_testwrite = -1; -static int hf_scsi_feature_dvdr_dvdrw = -1; -static int hf_scsi_feature_profile = -1; -static int hf_scsi_feature_profile_current = -1; -static int hf_scsi_feature_isw_buf = -1; -static int hf_scsi_feature_isw_num_linksize = -1; -static int hf_scsi_feature_isw_linksize = -1; -static int hf_scsi_readtoc_time = -1; -static int hf_scsi_readtoc_format = -1; -static int hf_scsi_track = -1; -static int hf_scsi_track_size = -1; -static int hf_scsi_session = -1; -static int hf_scsi_first_track = -1; -static int hf_scsi_readtoc_first_session = -1; -static int hf_scsi_readtoc_last_track = -1; -static int hf_scsi_readtoc_last_session = -1; -static int hf_scsi_q_subchannel_adr = -1; -static int hf_scsi_q_subchannel_control = -1; -static int hf_scsi_track_start_address = -1; -static int hf_scsi_next_writable_address = -1; -static int hf_scsi_track_start_time = -1; -static int hf_scsi_synccache_immed = -1; -static int hf_scsi_synccache_reladr = -1; -static int hf_scsi_rbc_block = -1; -static int hf_scsi_rbc_lob_blocks = -1; -static int hf_scsi_rbc_alob_blocks = -1; -static int hf_scsi_rbc_lob_bytes = -1; -static int hf_scsi_rbc_alob_bytes = -1; -static int hf_scsi_setstreaming_type = -1; -static int hf_scsi_setstreaming_param_len = -1; -static int hf_scsi_setstreaming_wrc = -1; -static int hf_scsi_setstreaming_rdd = -1; -static int hf_scsi_setstreaming_exact = -1; -static int hf_scsi_setstreaming_ra = -1; -static int hf_scsi_setstreaming_start_lba = -1; -static int hf_scsi_setstreaming_end_lba = -1; -static int hf_scsi_setstreaming_read_size = -1; -static int hf_scsi_setstreaming_read_time = -1; -static int hf_scsi_setstreaming_write_size = -1; -static int hf_scsi_setstreaming_write_time = -1; -static int hf_scsi_reservation_size = -1; -static int hf_scsi_rti_address_type = -1; -static int hf_scsi_rti_damage = -1; -static int hf_scsi_rti_copy = -1; -static int hf_scsi_rti_track_mode = -1; -static int hf_scsi_rti_rt = -1; -static int hf_scsi_rti_blank = -1; -static int hf_scsi_rti_packet = -1; -static int hf_scsi_rti_fp = -1; -static int hf_scsi_rti_data_mode = -1; -static int hf_scsi_rti_lra_v = -1; -static int hf_scsi_rti_nwa_v = -1; -static int hf_scsi_free_blocks = -1; -static int hf_scsi_fixed_packet_size = -1; -static int hf_scsi_last_recorded_address = -1; -static int hf_scsi_disc_info_erasable = -1; -static int hf_scsi_disc_info_state_of_last_session = -1; -static int hf_scsi_disc_info_disk_status = -1; -static int hf_scsi_disc_info_number_of_sessions = -1; -static int hf_scsi_disc_info_first_track_in_last_session = -1; -static int hf_scsi_disc_info_last_track_in_last_session = -1; -static int hf_scsi_disc_info_did_v = -1; -static int hf_scsi_disc_info_dbc_v = -1; -static int hf_scsi_disc_info_uru = -1; -static int hf_scsi_disc_info_dac_v = -1; -static int hf_scsi_disc_info_dbit = -1; -static int hf_scsi_disc_info_bgfs = -1; -static int hf_scsi_disc_info_disc_type = -1; -static int hf_scsi_disc_info_disc_identification = -1; -static int hf_scsi_disc_info_last_session_lead_in_start_address = -1; -static int hf_scsi_disc_info_last_possible_lead_out_start_address = -1; -static int hf_scsi_disc_info_disc_bar_code = -1; static int hf_sbc2_verify_lba = -1; static int hf_sbc2_verify_vlen = -1; static int hf_sbc2_verify_dpo = -1; @@ -364,7 +247,6 @@ static int hf_scsi_reassembled_in = -1; static gint ett_scsi = -1; static gint ett_scsi_page = -1; -static gint ett_scsi_profile = -1; static gint ett_scsi_inq_acaflags = -1; static gint ett_scsi_inq_sccsflags = -1; static gint ett_scsi_inq_bqueflags = -1; @@ -403,84 +285,6 @@ static const fragment_items scsi_frag_items = { - - -/* These two defines are used to handle cases where data coming back from - * the device is truncated due to a too short allocation_length specified - * in the command CDB. - * This is semi-common in SCSI and it would be wrong to mark these packets - * as [malformed packets]. - * These macros will reset the reported length to what the data pdu specified - * and if a ReportedBoundsError is generated we will instead throw - * ScsiBoundsError - * - * Please see dissect_spc3_inquiry() for an example how to use these - * macros. - */ -#define TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, length) \ - { \ - gboolean short_packet; \ - tvbuff_t *new_tvb; \ - guint32 end_data_offset=0; \ - \ - short_packet=pinfo->fd->cap_len<pinfo->fd->pkt_len; \ - new_tvb=tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), length);\ - tvb=new_tvb; \ - offset=0; \ - TRY { - -#define END_TRY_SCSI_CDB_ALLOC_LEN \ - if(end_data_offset){ \ - /* just verify we can read all the bytes we were\ - * supposed to. \ - */ \ - tvb_get_guint8(tvb,end_data_offset); \ - } \ - } /* TRY */ \ - CATCH(BoundsError) { \ - if(short_packet){ \ - /* this was a short packet */ \ - RETHROW; \ - } else { \ - /* We probably tried to dissect beyond the end \ - * of the alloc len reported in the data \ - * pdu. This is not an error so dont flag it as \ - * one \ - * it is the alloc_len in the CDB that is the \ - * important one \ - */ \ - } \ - } \ - CATCH(ReportedBoundsError) { \ - if(short_packet){ \ - /* this was a short packet */ \ - RETHROW; \ - } else { \ - /* this packet was not really short but limited \ - * due to a short SCSI allocation length \ - */ \ - THROW(ScsiBoundsError); \ - } \ - } \ - CATCH_ALL { \ - RETHROW; \ - } \ - ENDTRY; \ - } - -/* If the data pdu contains an alloc_len as well, this macro can be set - * to registe this offset for the TRY section above. - * At the end of the TRY section we will, if set, verify that the data - * pdu contained all bytes that was specified in the data alloc len. - * - * This macro does currently not do anything but we might enhance it in - * the future. There is no harm in teaching the dissector about how long - * the data pdu is supposed to be according to alloc_len in the data pdu - */ -#define SET_SCSI_DATA_END(offset) \ - end_data_offset=offset; - - typedef guint32 scsi_cmnd_type; typedef guint32 scsi_device_type; @@ -548,7 +352,6 @@ static const value_string scsi_spc2_vals[] = { #define SCSI_SBC2_SEEK10 0x2B #define SCSI_SBC2_SETLIMITS10 0x33 #define SCSI_SBC2_SETLIMITS12 0xB3 -#define SCSI_SBC2_STARTSTOPUNIT 0x1B #define SCSI_SBC2_SYNCCACHE10 0x35 #define SCSI_SBC2_SYNCCACHE16 0x91 #define SCSI_SBC2_VERIFY10 0x2F @@ -644,56 +447,6 @@ const value_string scsi_sbc2_vals[] = { {0, NULL}, }; -/* MMC Commands */ -#define SCSI_MMC4_READCAPACITY10 0x25 -#define SCSI_MMC4_READ10 0x28 -#define SCSI_MMC4_WRITE10 0x2a -#define SCSI_MMC4_SYNCHRONIZECACHE 0x35 -#define SCSI_MMC4_READTOCPMAATIP 0x43 -#define SCSI_MMC4_GETCONFIGURATION 0x46 -#define SCSI_MMC4_GETEVENTSTATUSNOTIFY 0x4a -#define SCSI_MMC4_READDISCINFORMATION 0x51 -#define SCSI_MMC4_READTRACKINFORMATION 0x52 -#define SCSI_MMC4_RESERVETRACK 0x53 -#define SCSI_MMC4_READBUFFERCAPACITY 0x5c -#define SCSI_MMC4_REPORTKEY 0xa4 -#define SCSI_MMC4_READ12 0xa8 -#define SCSI_MMC4_WRITE12 0xaa -#define SCSI_MMC4_GETPERFORMANCE 0xac -#define SCSI_MMC4_READDISCSTRUCTURE 0xad -#define SCSI_MMC4_SETSTREAMING 0xb6 -#define SCSI_MMC4_SETCDSPEED 0xbb -const value_string scsi_mmc_vals[] = { - {SCSI_MMC4_GETCONFIGURATION , "Get Configuraion"}, - {SCSI_MMC4_GETEVENTSTATUSNOTIFY , "Get Event Status Notification"}, - {SCSI_MMC4_GETPERFORMANCE , "Get Performance"}, - {SCSI_SPC2_INQUIRY , "Inquiry"}, - {SCSI_SPC2_MODESELECT10 , "Mode Select(10)"}, - {SCSI_SPC2_MODESENSE10 , "Mode Sense(10)"}, - {SCSI_SPC2_PREVMEDREMOVAL , "Prevent/Allow Medium Removal"}, - {SCSI_MMC4_READ10 , "Read(10)"}, - {SCSI_MMC4_READ12 , "Read(12)"}, - {SCSI_MMC4_READBUFFERCAPACITY , "Read Buffer Capacity"}, - {SCSI_MMC4_READCAPACITY10 , "Read Capacity(10)"}, - {SCSI_MMC4_READDISCINFORMATION , "Read Disc Information"}, - {SCSI_MMC4_READDISCSTRUCTURE , "Read DISC Structure"}, - {SCSI_MMC4_READTOCPMAATIP , "Read TOC/PMA/ATIP"}, - {SCSI_MMC4_READTRACKINFORMATION , "Read Track Information"}, - {SCSI_MMC4_REPORTKEY , "Report Key"}, - {SCSI_SPC2_REPORTLUNS , "Report LUNs"}, - {SCSI_SPC2_REQSENSE , "Request Sense"}, - {SCSI_MMC4_RESERVETRACK , "Reserve Track"}, - {SCSI_MMC4_SETCDSPEED , "Set CD Speed"}, - {SCSI_MMC4_SETSTREAMING , "Set Streaming"}, - {SCSI_SBC2_STARTSTOPUNIT , "Start Stop Unit"}, - {SCSI_MMC4_SYNCHRONIZECACHE , "Synchronize Cache"}, - {SCSI_SPC2_TESTUNITRDY , "Test Unit Ready"}, - {SCSI_MMC4_WRITE10 , "Write(10)"}, - {SCSI_MMC4_WRITE12 , "Write(12)"}, - {SCSI_SPC2_WRITEBUFFER , "Write Buffer"}, - {0, NULL}, -}; - /* SMC2 Commands */ #define SCSI_SMC2_EXCHANGE_MEDIUM 0x40 #define SCSI_SMC2_INITIALIZE_ELEMENT_STATUS 0x07 @@ -3559,7 +3312,7 @@ dissect_spc3_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } -static void +void dissect_spc3_preventallowmediaremoval (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_) @@ -3810,7 +3563,7 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset) tvb_bytes_to_str (tvb, offset+15, 3)); } -static void +void dissect_spc3_requestsense (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_) @@ -3883,7 +3636,7 @@ dissect_spc2_reserve10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } } -static void +void dissect_sbc2_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq _U_, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_) @@ -3905,7 +3658,7 @@ dissect_sbc2_startstopunit (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t flags & 0xC0, flags & 0x4, flags & 0x1); } -static void +void dissect_spc3_testunitready (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_) @@ -3978,7 +3731,7 @@ dissect_sbc2_readwrite6 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree } } -static void +void dissect_sbc2_readwrite10 (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_) @@ -4010,7 +3763,7 @@ dissect_sbc2_readwrite10 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre } } -static void +void dissect_sbc2_readwrite12 (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_) @@ -4262,836 +4015,7 @@ dissect_sbc2_wrverify16 (tvbuff_t *tvb, packet_info *pinfo _U_, } } -static const value_string scsi_key_class_val[] = { - {0x00, "DVD CSS/CPPM or CPRM"}, - {0x01, "ReWriteable Security Service - A"}, - {0,NULL} -}; -static const value_string scsi_key_format_val[] = { - {0x00, "AGID for CSS/CPPM"}, - {0x01, "Challenge Key"}, - {0x02, "Key 1"}, - {0x04, "Title Key"}, - {0x05, "Authentication Success Flag"}, - {0x08, "RPC State"}, - {0x11, "AGID for CPRM"}, - {0x3f, "None"}, - {0,NULL} -}; -static const value_string scsi_report_key_type_code_val[] = { - {0x00, "NONE"}, - {0x01, "SET"}, - {0x02, "LAST CHANCE"}, - {0x03, "PERM"}, - {0,NULL} -}; -static const value_string scsi_report_key_rpc_scheme_val[] = { - {0x00, "Unknown (RPC not enforced)"}, - {0x01, "RPC Phase II"}, - {0,NULL} -}; - -static void -dissect_mmc4_reportkey (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, agid, key_format, key_class; - proto_item *ti; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_lba, tvb, offset+1, - 4, 0); - key_class=tvb_get_guint8(tvb, offset+6); - proto_tree_add_item (tree, hf_scsi_key_class, tvb, offset+6, - 1, 0); - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+7, 2, 0); - - agid=tvb_get_guint8(tvb, offset+9)&0xc0; - key_format=tvb_get_guint8(tvb, offset+9)&0x3f; - switch(key_format){ - case 0x01: - case 0x02: - case 0x04: - case 0x3f: - /* agid is only valid for some formats */ - proto_tree_add_uint (tree, hf_scsi_agid, tvb, offset+9, 1, agid); - break; - } - proto_tree_add_uint (tree, hf_scsi_key_format, tvb, offset+9, 1, key_format); - /* save key_class/key_format so we can decode the response */ - cdata->itlq->flags=(key_format<<8)|key_class; - - 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); - } - if(tree && (!isreq)) { - switch(cdata->itlq->flags){ - case 0x0800: /* format:RPC State class:00 */ - proto_tree_add_item (tree, hf_scsi_data_length, tvb, offset, 2, 0); - proto_tree_add_item (tree, hf_scsi_report_key_type_code, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_report_key_vendor_resets, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_report_key_user_changes, tvb, offset+4, 1, 0); - proto_tree_add_item (tree, hf_scsi_report_key_region_mask, tvb, offset+5, 1, 0); - proto_tree_add_item (tree, hf_scsi_report_key_rpc_scheme, tvb, offset+6, 1, 0); - break; - default: - ti = proto_tree_add_text (tree, tvb, 0, 0, - "SCSI/MMC Unknown Format:0x%02x/Class:0x%02x combination", - cdata->itlq->flags>>8,cdata->itlq->flags&0xff); - PROTO_ITEM_SET_GENERATED(ti); - break; - } - } -} - -static const value_string scsi_setstreaming_type_val[] = { - {0x00, "Performance Descriptor"}, - {0x05, "DBI cache zone descriptor"}, - {0,NULL} -}; - -static void -dissect_mmc4_setstreaming (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, type; - proto_item *ti; - - if (tree && isreq && iscdb) { - type=tvb_get_guint8(tvb, offset+7); - cdata->itlq->flags=type; - proto_tree_add_item (tree, hf_scsi_setstreaming_type, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_param_len, tvb, offset+8, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+10); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - } - if(tree && isreq && (!iscdb)) { - switch(cdata->itlq->flags){ - case 0x00: /* performance descriptor */ - proto_tree_add_item (tree, hf_scsi_setstreaming_wrc, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_rdd, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_exact, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_ra, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_start_lba, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_end_lba, tvb, offset+8, 4, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_read_size, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_read_time, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_write_size, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_setstreaming_write_time, tvb, offset+24, 4, 0); - break; - default: - ti = proto_tree_add_text (tree, tvb, 0, 0, - "SCSI/MMC Unknown SetStreaming Type:0x%02x",cdata->itlq->flags); - PROTO_ITEM_SET_GENERATED(ti); - break; - } - } -} - -static const value_string scsi_setcdspeed_rc_val[] = { - {0x00, "CLV and none-pure CAV"}, - {0x01, "Pure CAV"}, - {0x02, "Reserved"}, - {0x03, "Reserved"}, - {0,NULL} -}; - -static void -dissect_mmc4_setcdspeed (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; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_setcdspeed_rc, tvb, offset+0, 1, 0); - - proto_tree_add_text (tree, tvb, offset+1, 2, - "Logical Unit Read Speed(bytes/sec): %u", - tvb_get_ntohs (tvb, offset+1)); - proto_tree_add_text (tree, tvb, offset+3, 2, - "Logical Unit Write Speed(bytes/sec): %u", - tvb_get_ntohs (tvb, offset+3)); - - flags = tvb_get_guint8 (tvb, offset+10); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - } -} - -static const value_string scsi_getconf_rt_val[] = { - {0x00, "Return all features"}, - {0x01, "Return all current features"}, - {0x02, "Return all identified by Starting Feature"}, - {0,NULL} -}; -static const value_string scsi_getconf_current_profile_val[] = { - {0x0000, "Reserved"}, - {0x0001, "Non-removable disk"}, - {0x0002, "Removable disk"}, - {0x0003, "MO Erasable"}, - {0x0004, "Optical Write Once"}, - {0x0005, "AS-MO"}, - {0x0008, "CD-ROM"}, - {0x0009, "CD-R"}, - {0x000a, "CD-RW"}, - {0x0010, "DVD-ROM"}, - {0x0011, "DVD-R"}, - {0x0012, "DVD-RAM"}, - {0x0013, "DVD-RW Restricted Overwrite"}, - {0x0014, "DVD-RW Sequential recording"}, - {0x001a, "DVD+RW"}, - {0x001b, "DVD+R"}, - {0x0020, "DDCD-ROM"}, - {0x0021, "DDCD-R"}, - {0x0022, "DDCD-RW"}, - {0xffff, "Logical unit not conforming to a standard profile"}, - {0,NULL} -}; - -static const value_string scsi_feature_val[] = { - {0x0000, "Profile List"}, - {0x0001, "Core"}, - {0x0002, "Morphing"}, - {0x0003, "Removable Medium"}, - {0x0004, "Write Protect"}, - {0x0010, "Random Readable"}, - {0x001d, "Multi-read"}, - {0x001e, "CD Read"}, - {0x001f, "DVD Read"}, - {0x0020, "Random Writeable"}, - {0x0021, "Incremental Streaming Writeable"}, - {0x0022, "Sector Erasable"}, - {0x0023, "Formattable"}, - {0x0024, "Defect Management"}, - {0x0025, "Write Once"}, - {0x0026, "Restricted Overwrite"}, - {0x0027, "CD-RW CAV Write"}, - {0x0028, "MRW"}, - {0x0029, "Enhanced Defect Reporting"}, - {0x002a, "DVD+RW"}, - {0x002b, "DVD+R"}, - {0x002c, "Rigid Restricted Overwrite"}, - {0x002d, "CD Track At Once"}, - {0x002e, "CD Mastering"}, - {0x002f, "DVD-R/-RW Write"}, - {0x0030, "DDCD Read"}, - {0x0031, "DDCD-R Write"}, - {0x0032, "DDCD-RW Write"}, - {0x0037, "CD-RW Media Write Support"}, - {0x0100, "Power Management"}, - {0x0101, "SMART"}, - {0x0102, "Embedded Changer"}, - {0x0103, "CD Audio analog play"}, - {0x0104, "Microcode Upgrade"}, - {0x0105, "Timeout"}, - {0x0106, "DVD-CSS"}, - {0x0107, "Real Time Streaming"}, - {0x0108, "Logical Unit serial number"}, - {0x010a, "Disc control Block"}, - {0x010b, "DVD CPRM"}, - {0x010c, "Firmware Information"}, - {0,NULL} -}; - -static void -dissect_mmc4_getconfiguration (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; - gint32 len; - guint old_offset; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_getconf_rt, tvb, offset+0, 1, 0); - proto_tree_add_item (tree, hf_scsi_getconf_starting_feature, tvb, offset+1, 2, 0); - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - /* we need the alloc_len in the response */ - if(cdata){ - cdata->itlq->alloc_len=tvb_get_ntohs(tvb, offset+6); - } - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - } - if(!isreq) { - if(!cdata){ - return; - } - - TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, cdata->itlq->alloc_len); - - len=tvb_get_ntohl(tvb, offset+0); - proto_tree_add_item (tree, hf_scsi_data_length, tvb, offset, 4, 0); - proto_tree_add_item (tree, hf_scsi_getconf_current_profile, tvb, offset+6, 2, 0); - offset+=8; - len-=4; - while(len>0){ - guint16 feature; - guint8 additional_length; - guint8 num_linksize; - - feature=tvb_get_ntohs(tvb, offset); - proto_tree_add_item (tree, hf_scsi_feature, tvb, offset, 2, 0); - offset+=2; - proto_tree_add_item (tree, hf_scsi_feature_version, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_persistent, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_current, tvb, offset, 1, 0); - offset+=1; - additional_length=tvb_get_guint8(tvb, offset); - proto_tree_add_item (tree, hf_scsi_feature_additional_length, tvb, offset, 1, 0); - offset+=1; - old_offset=offset; - switch(feature){ - case 0x0000: /* profile list */ - while(offset<(old_offset+additional_length)){ - proto_item *it=NULL; - proto_tree *tr=NULL; - guint16 profile; - guint8 cur_profile; - - if(tree){ - it=proto_tree_add_text(tree, tvb, offset, 4, "Profile:"); - tr=proto_item_add_subtree(it, ett_scsi_profile); - } - - profile=tvb_get_ntohs(tvb, offset); - proto_tree_add_item (tr, hf_scsi_feature_profile, tvb, offset, 2, 0); - proto_item_append_text(it, "%s", val_to_str(profile, scsi_getconf_current_profile_val, "Unknown 0x%04x")); - - cur_profile=tvb_get_guint8(tvb, offset+2); - proto_tree_add_item (tr, hf_scsi_feature_profile_current, tvb, offset+2, 1, 0); - if(cur_profile&0x01){ - proto_item_append_text(it, " [CURRENT PROFILE]"); - } - - offset+=4; - } - break; - case 0x001d: /* multi-read */ - case 0x001f: /* dvd read feature */ - /* no data for this one */ - break; - case 0x001e: /* cd read */ - proto_tree_add_item (tree, hf_scsi_feature_cdread_dap, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_cdread_c2flag, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_cdread_cdtext, tvb, offset, 1, 0); - break; - case 0x0021: /* incremental streaming writeable */ - proto_tree_add_item (tree, hf_scsi_feature_dts, tvb, offset, 2, 0); - offset+=2; - proto_tree_add_item (tree, hf_scsi_feature_isw_buf, tvb, offset, 1, 0); - offset+=1; - num_linksize=tvb_get_guint8(tvb, offset); - proto_tree_add_item (tree, hf_scsi_feature_isw_num_linksize, tvb, offset, 1, 0); - offset+=1; - while(num_linksize--){ - proto_tree_add_item (tree, hf_scsi_feature_isw_linksize, tvb, offset, 1, 0); - offset+=1; - } - break; - case 0x002a: /* dvd-rw */ - proto_tree_add_item (tree, hf_scsi_feature_dvdrw_write, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_dvdrw_quickstart, tvb, offset, 2, 0); - proto_tree_add_item (tree, hf_scsi_feature_dvdrw_closeonly, tvb, offset, 2, 0); - break; - case 0x002b: /* dvd-r */ - proto_tree_add_item (tree, hf_scsi_feature_dvdr_write, tvb, offset, 1, 0); - break; - case 0x002d: /* track at once */ - proto_tree_add_item (tree, hf_scsi_feature_tao_buf, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_tao_rwraw, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_tao_rwpack, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_tao_testwrite, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_tao_cdrw, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_tao_rwsubcode, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_dts, tvb, offset+2, 2, 0); - break; - case 0x002e: /* session at once */ - proto_tree_add_item (tree, hf_scsi_feature_sao_buf, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_sao, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_rawms, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_raw, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_testwrite, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_cdrw, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_rw, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_sao_mcsl, tvb, offset+1, 3, 0); - break; - case 0x002f: /* dvd-r/-rw*/ - proto_tree_add_item (tree, hf_scsi_feature_dvdr_buf, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_dvdr_testwrite, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_feature_dvdr_dvdrw, tvb, offset, 1, 0); - break; - case 0x0108: /* logical unit serial number */ - proto_tree_add_item (tree, hf_scsi_feature_lun_sn, tvb, offset, additional_length, 0); - break; - default: - proto_tree_add_text (tree, tvb, offset, additional_length, - "SCSI/MMC Unknown Feature:0x%04x",feature); - break; - } - old_offset+=additional_length; - len-=4+additional_length; - } - END_TRY_SCSI_CDB_ALLOC_LEN; - } -} - -static void -dissect_mmc4_geteventstatusnotification (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; - - if (tree && isreq && iscdb) { - flags = tvb_get_guint8 (tvb, offset); - proto_tree_add_text (tree, tvb, offset, 1, - "Polled: %u", - flags & 0x01); - - flags = tvb_get_guint8 (tvb, offset+3); - proto_tree_add_text (tree, tvb, offset+3, 1, - "Notification Class Request: %u", - flags); - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - } -} - -static const value_string scsi_q_subchannel_adr_val[] = { - {0x0, "Q-Subchannel mode info not supplied"}, - {0x1, "Q-Subchannel encodes current position data"}, - {0x2, "Q-Subchannel encodes media catalog number"}, - {0x3, "Q-Subchannel encodes ISRC"}, - {0,NULL} -}; -static const value_string scsi_q_subchannel_control_val[] = { - {0x0, "2 Audio channels without pre-emphasis (digital copy prohibited)"}, - {0x2, "2 Audio channels without pre-emphasis (digital copy permitted)"}, - {0x1, "2 Audio channels with pre-emphasis of 50/15us (digital copy prohibited)"}, - {0x3, "2 Audio channels with pre-emphasis of 50/15us (digital copy permitted)"}, - {0x8, "audio channels without pre-emphasis (digital copy prohibited)"}, - {0xa, "audio channels without pre-emphasis (digital copy permitted)"}, - {0x9, "2 Audio channels with pre-emphasis of 50/15us (digital copy prohibited)"}, - {0xb, "2 Audio channels with pre-emphasis of 50/15us (digital copy permitted)"}, - {0x4, "Data track, recorded uninterrupted (digital copy prohibited)"}, - {0x6, "Data track, recorded uninterrupted (digital copy permitted)"}, - {0x5, "Data track, recorded incremental (digital copy prohibited)"}, - {0x7, "Data track, recorded incremental (digital copy permitted)"}, - {0,NULL} -}; - -static void -dissect_mmc4_readtocpmaatip (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, format; - gint16 len; - - if (tree && isreq && iscdb) { - format=tvb_get_guint8(tvb, offset+1)&0x0f; - /* save format so we can decode the response */ - cdata->itlq->flags=format; - - switch(format){ - case 0x00: - case 0x01: - proto_tree_add_item (tree, hf_scsi_readtoc_time, tvb, offset, 1, 0); - /* save time so we can pick it up in the response */ - if(tvb_get_guint8(tvb, offset)&0x02){ - cdata->itlq->flags|=0x0100; - } - break; - } - proto_tree_add_item (tree, hf_scsi_readtoc_format, tvb, offset+1, 1, 0); - - switch(format){ - case 0x00: - proto_tree_add_item (tree, hf_scsi_track, tvb, offset+5, 1, 0); - /* save track so we can pick it up in the response */ - cdata->itlq->flags|=0x0200; - break; - case 0x02: - proto_tree_add_item (tree, hf_scsi_session, tvb, offset+5, 1, 0); - /* save session so we can pick it up in the response */ - cdata->itlq->flags|=0x0400; - break; - } - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } - if(tree && (!isreq)) { - len=tvb_get_ntohs(tvb, offset); - proto_tree_add_item (tree, hf_scsi_data_length, tvb, offset, 2, 0); - if(cdata->itlq->flags&0x0200){ - proto_tree_add_item (tree, hf_scsi_first_track, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_readtoc_last_track, tvb, offset+3, 1, 0); - } - if(cdata->itlq->flags&0x0400){ - proto_tree_add_item (tree, hf_scsi_readtoc_first_session, tvb, offset+2, 1, 0); - proto_tree_add_item (tree, hf_scsi_readtoc_last_session, tvb, offset+3, 1, 0); - } - offset+=4; - len-=2; - switch(cdata->itlq->flags&0x000f){ - case 0x0: - while(len>0){ - proto_tree_add_item (tree, hf_scsi_q_subchannel_adr, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_q_subchannel_control, tvb, offset+1, 1, 0); - proto_tree_add_item (tree, hf_scsi_track, tvb, offset+2, 1, 0); - if(cdata->itlq->flags&0x0100){ - proto_tree_add_item (tree, hf_scsi_track_start_time, tvb, offset+4, 4, 0); - } else { - proto_tree_add_item (tree, hf_scsi_track_start_address, tvb, offset+4, 4, 0); - } - offset+=8; - len-=8; - } - break; - default: - proto_tree_add_text (tree, tvb, offset, len, - "SCSI/MMC Unknown READ TOC Format:0x%04x",cdata->itlq->flags&0x000f); - break; - } - } -} - -static void -dissect_mmc4_getperformance (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; - - if (tree && isreq && iscdb) { - flags = tvb_get_guint8 (tvb, offset); - proto_tree_add_text (tree, tvb, offset, 1, - "Data Type: %u", - flags & 0x1f); - - proto_tree_add_text (tree, tvb, offset+1, 4, - "Starting LBA: %u", - tvb_get_ntohl (tvb, offset+1)); - - proto_tree_add_text (tree, tvb, offset+7, 2, - "Maximum Number of Descriptors: %u", - tvb_get_ntohs (tvb, offset+7)); - - flags = tvb_get_guint8 (tvb, offset+9); - proto_tree_add_text (tree, tvb, offset+9, 1, - "Type: %u", - flags); - - flags = tvb_get_guint8 (tvb, offset+10); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } -} - -static void -dissect_mmc4_synchronizecache (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; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_synccache_immed, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_synccache_reladr, tvb, offset, 1, 0); - proto_tree_add_item (tree, hf_scsi_lba, tvb, offset+1, 4, 0); - proto_tree_add_item (tree, hf_scsi_num_blocks, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } -} - -static void -dissect_mmc4_readbuffercapacity (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; - gint16 len; - - if (tree && isreq && iscdb) { - cdata->itlq->flags=0; - proto_tree_add_item (tree, hf_scsi_rbc_block, tvb, offset, 1, 0); - if(tvb_get_guint8(tvb, offset)&0x01){ - cdata->itlq->flags=1; - } - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } - if(tree && (!isreq)) { - len=tvb_get_ntohs(tvb, offset); - proto_tree_add_item (tree, hf_scsi_data_length, tvb, offset, 2, 0); - if(cdata->itlq->flags){ - proto_tree_add_item (tree, hf_scsi_rbc_lob_blocks, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_rbc_alob_blocks, tvb, offset+8, 4, 0); - } else { - proto_tree_add_item (tree, hf_scsi_rbc_lob_bytes, tvb, offset+4, 4, 0); - proto_tree_add_item (tree, hf_scsi_rbc_alob_bytes, tvb, offset+8, 4, 0); - } - } -} - -static void -dissect_mmc4_reservetrack (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; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_reservation_size, tvb, offset+4, 4, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } -} - -static const value_string scsi_rti_address_type_val[] = { - {0x00, "Logical Block Address"}, - {0x01, "Logical Track Number"}, - {0x02, "Session Number"}, - {0,NULL} -}; - -static void -dissect_mmc4_readtrackinformation (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, addresstype; - - if (tree && isreq && iscdb) { - addresstype=tvb_get_guint8(tvb, offset)&0x03; - proto_tree_add_item (tree, hf_scsi_rti_address_type, tvb, offset+0, 1, 0); - switch(addresstype){ - case 0x00: /* logical block address */ - proto_tree_add_item (tree, hf_scsi_lba, tvb, offset+1, - 4, 0); - break; - case 0x01: /* logical track number */ - proto_tree_add_item (tree, hf_scsi_track, tvb, offset+1, - 4, 0); - break; - case 0x02: /* logical session number */ - proto_tree_add_item (tree, hf_scsi_session, tvb, offset+1, - 4, 0); - break; - } - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } - if(tree && (!isreq)) { - proto_tree_add_item (tree, hf_scsi_data_length, tvb, 0, 2, 0); - /* track offset+2 and offset+32 */ - proto_tree_add_uint (tree, hf_scsi_track, tvb, 2, 1, (tvb_get_guint8(tvb, offset+32)<<8)|tvb_get_guint8(tvb, offset+2)); - /* session offset+3 and offset+33 */ - proto_tree_add_uint (tree, hf_scsi_session, tvb, 3, 1, (tvb_get_guint8(tvb, offset+33)<<8)|tvb_get_guint8(tvb, offset+3)); - proto_tree_add_item (tree, hf_scsi_rti_damage, tvb, 5, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_copy, tvb, 5, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_track_mode, tvb, 5, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_rt, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_blank, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_packet, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_fp, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_data_mode, tvb, 6, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_lra_v, tvb, 7, 1, 0); - proto_tree_add_item (tree, hf_scsi_rti_nwa_v, tvb, 7, 1, 0); - proto_tree_add_item (tree, hf_scsi_track_start_address, tvb, offset+8, 4, 0); - proto_tree_add_item (tree, hf_scsi_next_writable_address, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_free_blocks, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_fixed_packet_size, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_track_size, tvb, offset+24, 4, 0); - proto_tree_add_item (tree, hf_scsi_last_recorded_address, tvb, offset+28, 4, 0); - proto_tree_add_item (tree, hf_scsi_read_compatibility_lba, tvb, offset+36, 4, 0); - } -} - -static const value_string scsi_disc_info_sols_val[] = { - {0x00, "Empty Session"}, - {0x01, "Incomplete Session"}, - {0x02, "Reserved/Damaged Session"}, - {0x03, "Complete Session"}, - {0,NULL} -}; - -static const value_string scsi_disc_info_disc_status_val[] = { - {0x00, "Empty Disc"}, - {0x01, "Incomplete Disc"}, - {0x02, "Finalized Disc"}, - {0x03, "Others"}, - {0,NULL} -}; - -static const value_string scsi_disc_info_bgfs_val[] = { - {0x00, "Blank or not CD-RW/DVD-RW"}, - {0x01, "Background Format started but is not running nor complete"}, - {0x02, "Backgroung Format in progress"}, - {0x03, "Backgroung Format has completed"}, - {0,NULL} -}; - -static const value_string scsi_disc_info_disc_type_val[] = { - {0x00, "CD-DA or CD-ROM Disc"}, - {0x10, "CD-I Disc"}, - {0x20, "CD-ROM XA Disc or DDCD"}, - {0xff, "Undefined"}, - {0,NULL} -}; - -static void -dissect_mmc4_readdiscinformation (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; - - if (tree && isreq && iscdb) { - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+8); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - - } - if(tree && (!isreq)) { - proto_tree_add_item (tree, hf_scsi_data_length, tvb, 0, 2, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_erasable, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_state_of_last_session, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_disk_status, tvb, 2, 1, 0); - proto_tree_add_item (tree, hf_scsi_first_track, tvb, offset+3, 1, 0); - /* number of session offset+4 and offset+9 */ - proto_tree_add_uint (tree, hf_scsi_disc_info_number_of_sessions, tvb, 4, 1, (tvb_get_guint8(tvb, offset+9)<<8)|tvb_get_guint8(tvb, offset+4)); - /* first track in last session offset+5 and offset+10 */ - proto_tree_add_uint (tree, hf_scsi_disc_info_first_track_in_last_session, tvb, 5, 1, (tvb_get_guint8(tvb, offset+10)<<8)|tvb_get_guint8(tvb, offset+5)); - /* last track in last session offset+6 and offset+11 */ - proto_tree_add_uint (tree, hf_scsi_disc_info_last_track_in_last_session, tvb, 6, 1, (tvb_get_guint8(tvb, offset+11)<<8)|tvb_get_guint8(tvb, offset+6)); - proto_tree_add_item (tree, hf_scsi_disc_info_did_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_dbc_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_uru, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_dac_v, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_dbit, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_bgfs, tvb, offset+7, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_disc_type, tvb, offset+8, 1, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_disc_identification, tvb, offset+12, 4, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_last_session_lead_in_start_address, tvb, offset+16, 4, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_last_possible_lead_out_start_address, tvb, offset+20, 4, 0); - proto_tree_add_item (tree, hf_scsi_disc_info_disc_bar_code, tvb, offset+24, 8, 0); - /* XXX should add OPC table decoding here ... */ - } -} - -static void -dissect_mmc4_readdiscstructure (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; - - if (tree && isreq && iscdb) { - proto_tree_add_text (tree, tvb, offset+1, 4, - "Address: %u", - tvb_get_ntohl (tvb, offset+1)); - - proto_tree_add_text (tree, tvb, offset+5, 1, - "Layer Number: %u", - tvb_get_guint8 (tvb, offset+5)); - - proto_tree_add_text (tree, tvb, offset+6, 1, - "Format Code: %u", - tvb_get_guint8 (tvb, offset+6)); - - proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+7, 2, 0); - - flags = tvb_get_guint8 (tvb, offset+9); - proto_tree_add_text (tree, tvb, offset+9, 1, - "AGID: %u", - flags & 0xc0); - - flags = tvb_get_guint8 (tvb, offset+10); - proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1, - flags, - "Vendor Unique = %u, NACA = %u, Link = %u", - flags & 0xC0, flags & 0x4, flags & 0x1); - } -} - -static void +void dissect_sbc2_readcapacity10 (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_) @@ -5325,7 +4249,7 @@ dissect_spc3_senddiagnostic (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * flags & 0xC0, flags & 0x4, flags & 0x1); } -static void +void dissect_spc3_writebuffer (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb _U_, guint payload_len _U_, scsi_task_data_t *cdata _U_) @@ -7467,264 +6391,6 @@ static scsi_cdb_table_t smc[256] = { /*SMC 0xff*/{NULL} }; -static scsi_cdb_table_t mmc[256] = { -/*SPC 0x00*/{dissect_spc3_testunitready}, -/*MMC 0x01*/{NULL}, -/*MMC 0x02*/{NULL}, -/*SPC 0x03*/{dissect_spc3_requestsense}, -/*MMC 0x04*/{NULL}, -/*MMC 0x05*/{NULL}, -/*MMC 0x06*/{NULL}, -/*MMC 0x07*/{NULL}, -/*MMC 0x08*/{NULL}, -/*MMC 0x09*/{NULL}, -/*MMC 0x0a*/{NULL}, -/*MMC 0x0b*/{NULL}, -/*MMC 0x0c*/{NULL}, -/*MMC 0x0d*/{NULL}, -/*MMC 0x0e*/{NULL}, -/*MMC 0x0f*/{NULL}, -/*MMC 0x10*/{NULL}, -/*MMC 0x11*/{NULL}, -/*SPC 0x12*/{dissect_spc3_inquiry}, -/*MMC 0x13*/{NULL}, -/*MMC 0x14*/{NULL}, -/*MMC 0x15*/{NULL}, -/*MMC 0x16*/{NULL}, -/*MMC 0x17*/{NULL}, -/*MMC 0x18*/{NULL}, -/*MMC 0x19*/{NULL}, -/*MMC 0x1a*/{NULL}, -/*MMC 0x1b*/{dissect_sbc2_startstopunit}, -/*MMC 0x1c*/{NULL}, -/*MMC 0x1d*/{NULL}, -/*MMC 0x1e*/{dissect_spc3_preventallowmediaremoval}, -/*MMC 0x1f*/{NULL}, -/*MMC 0x20*/{NULL}, -/*MMC 0x21*/{NULL}, -/*MMC 0x22*/{NULL}, -/*MMC 0x23*/{NULL}, -/*MMC 0x24*/{NULL}, -/*MMC 0x25*/{dissect_sbc2_readcapacity10}, -/*MMC 0x26*/{NULL}, -/*MMC 0x27*/{NULL}, -/*MMC 0x28*/{dissect_sbc2_readwrite10}, -/*MMC 0x29*/{NULL}, -/*MMC 0x2a*/{dissect_sbc2_readwrite10}, -/*MMC 0x2b*/{NULL}, -/*MMC 0x2c*/{NULL}, -/*MMC 0x2d*/{NULL}, -/*MMC 0x2e*/{NULL}, -/*MMC 0x2f*/{NULL}, -/*MMC 0x30*/{NULL}, -/*MMC 0x31*/{NULL}, -/*MMC 0x32*/{NULL}, -/*MMC 0x33*/{NULL}, -/*MMC 0x34*/{NULL}, -/*MMC 0x35*/{dissect_mmc4_synchronizecache}, -/*MMC 0x36*/{NULL}, -/*MMC 0x37*/{NULL}, -/*MMC 0x38*/{NULL}, -/*MMC 0x39*/{NULL}, -/*MMC 0x3a*/{NULL}, -/*SPC 0x3b*/{dissect_spc3_writebuffer}, -/*MMC 0x3c*/{NULL}, -/*MMC 0x3d*/{NULL}, -/*MMC 0x3e*/{NULL}, -/*MMC 0x3f*/{NULL}, -/*MMC 0x40*/{NULL}, -/*MMC 0x41*/{NULL}, -/*MMC 0x42*/{NULL}, -/*MMC 0x43*/{dissect_mmc4_readtocpmaatip}, -/*MMC 0x44*/{NULL}, -/*MMC 0x45*/{NULL}, -/*MMC 0x46*/{dissect_mmc4_getconfiguration}, -/*MMC 0x47*/{NULL}, -/*MMC 0x48*/{NULL}, -/*MMC 0x49*/{NULL}, -/*MMC 0x4a*/{dissect_mmc4_geteventstatusnotification}, -/*MMC 0x4b*/{NULL}, -/*MMC 0x4c*/{NULL}, -/*MMC 0x4d*/{NULL}, -/*MMC 0x4e*/{NULL}, -/*MMC 0x4f*/{NULL}, -/*MMC 0x50*/{NULL}, -/*MMC 0x51*/{dissect_mmc4_readdiscinformation}, -/*MMC 0x52*/{dissect_mmc4_readtrackinformation}, -/*MMC 0x53*/{dissect_mmc4_reservetrack}, -/*MMC 0x54*/{NULL}, -/*SPC 0x55*/{dissect_spc3_modeselect10}, -/*MMC 0x56*/{NULL}, -/*MMC 0x57*/{NULL}, -/*MMC 0x58*/{NULL}, -/*MMC 0x59*/{NULL}, -/*SPC 0x5a*/{dissect_spc3_modesense10}, -/*MMC 0x5b*/{NULL}, -/*MMC 0x5c*/{dissect_mmc4_readbuffercapacity}, -/*MMC 0x5d*/{NULL}, -/*MMC 0x5e*/{NULL}, -/*MMC 0x5f*/{NULL}, -/*MMC 0x60*/{NULL}, -/*MMC 0x61*/{NULL}, -/*MMC 0x62*/{NULL}, -/*MMC 0x63*/{NULL}, -/*MMC 0x64*/{NULL}, -/*MMC 0x65*/{NULL}, -/*MMC 0x66*/{NULL}, -/*MMC 0x67*/{NULL}, -/*MMC 0x68*/{NULL}, -/*MMC 0x69*/{NULL}, -/*MMC 0x6a*/{NULL}, -/*MMC 0x6b*/{NULL}, -/*MMC 0x6c*/{NULL}, -/*MMC 0x6d*/{NULL}, -/*MMC 0x6e*/{NULL}, -/*MMC 0x6f*/{NULL}, -/*MMC 0x70*/{NULL}, -/*MMC 0x71*/{NULL}, -/*MMC 0x72*/{NULL}, -/*MMC 0x73*/{NULL}, -/*MMC 0x74*/{NULL}, -/*MMC 0x75*/{NULL}, -/*MMC 0x76*/{NULL}, -/*MMC 0x77*/{NULL}, -/*MMC 0x78*/{NULL}, -/*MMC 0x79*/{NULL}, -/*MMC 0x7a*/{NULL}, -/*MMC 0x7b*/{NULL}, -/*MMC 0x7c*/{NULL}, -/*MMC 0x7d*/{NULL}, -/*MMC 0x7e*/{NULL}, -/*MMC 0x7f*/{NULL}, -/*MMC 0x80*/{NULL}, -/*MMC 0x81*/{NULL}, -/*MMC 0x82*/{NULL}, -/*MMC 0x83*/{NULL}, -/*MMC 0x84*/{NULL}, -/*MMC 0x85*/{NULL}, -/*MMC 0x86*/{NULL}, -/*MMC 0x87*/{NULL}, -/*MMC 0x88*/{NULL}, -/*MMC 0x89*/{NULL}, -/*MMC 0x8a*/{NULL}, -/*MMC 0x8b*/{NULL}, -/*MMC 0x8c*/{NULL}, -/*MMC 0x8d*/{NULL}, -/*MMC 0x8e*/{NULL}, -/*MMC 0x8f*/{NULL}, -/*MMC 0x90*/{NULL}, -/*MMC 0x91*/{NULL}, -/*MMC 0x92*/{NULL}, -/*MMC 0x93*/{NULL}, -/*MMC 0x94*/{NULL}, -/*MMC 0x95*/{NULL}, -/*MMC 0x96*/{NULL}, -/*MMC 0x97*/{NULL}, -/*MMC 0x98*/{NULL}, -/*MMC 0x99*/{NULL}, -/*MMC 0x9a*/{NULL}, -/*MMC 0x9b*/{NULL}, -/*MMC 0x9c*/{NULL}, -/*MMC 0x9d*/{NULL}, -/*MMC 0x9e*/{NULL}, -/*MMC 0x9f*/{NULL}, -/*SPC 0xa0*/{dissect_spc3_reportluns}, -/*MMC 0xa1*/{NULL}, -/*MMC 0xa2*/{NULL}, -/*MMC 0xa3*/{NULL}, -/*MMC 0xa4*/{dissect_mmc4_reportkey}, -/*MMC 0xa5*/{NULL}, -/*MMC 0xa6*/{NULL}, -/*MMC 0xa7*/{NULL}, -/*MMC 0xa8*/{dissect_sbc2_readwrite12}, -/*MMC 0xa9*/{NULL}, -/*MMC 0xaa*/{dissect_sbc2_readwrite12}, -/*MMC 0xab*/{NULL}, -/*MMC 0xac*/{dissect_mmc4_getperformance}, -/*MMC 0xad*/{dissect_mmc4_readdiscstructure}, -/*MMC 0xae*/{NULL}, -/*MMC 0xaf*/{NULL}, -/*MMC 0xb0*/{NULL}, -/*MMC 0xb1*/{NULL}, -/*MMC 0xb2*/{NULL}, -/*MMC 0xb3*/{NULL}, -/*MMC 0xb4*/{NULL}, -/*MMC 0xb5*/{NULL}, -/*MMC 0xb6*/{dissect_mmc4_setstreaming}, -/*MMC 0xb7*/{NULL}, -/*MMC 0xb8*/{NULL}, -/*MMC 0xb9*/{NULL}, -/*MMC 0xba*/{NULL}, -/*MMC 0xbb*/{dissect_mmc4_setcdspeed}, -/*MMC 0xbc*/{NULL}, -/*MMC 0xbd*/{NULL}, -/*MMC 0xbe*/{NULL}, -/*MMC 0xbf*/{NULL}, -/*MMC 0xc0*/{NULL}, -/*MMC 0xc1*/{NULL}, -/*MMC 0xc2*/{NULL}, -/*MMC 0xc3*/{NULL}, -/*MMC 0xc4*/{NULL}, -/*MMC 0xc5*/{NULL}, -/*MMC 0xc6*/{NULL}, -/*MMC 0xc7*/{NULL}, -/*MMC 0xc8*/{NULL}, -/*MMC 0xc9*/{NULL}, -/*MMC 0xca*/{NULL}, -/*MMC 0xcb*/{NULL}, -/*MMC 0xcc*/{NULL}, -/*MMC 0xcd*/{NULL}, -/*MMC 0xce*/{NULL}, -/*MMC 0xcf*/{NULL}, -/*MMC 0xd0*/{NULL}, -/*MMC 0xd1*/{NULL}, -/*MMC 0xd2*/{NULL}, -/*MMC 0xd3*/{NULL}, -/*MMC 0xd4*/{NULL}, -/*MMC 0xd5*/{NULL}, -/*MMC 0xd6*/{NULL}, -/*MMC 0xd7*/{NULL}, -/*MMC 0xd8*/{NULL}, -/*MMC 0xd9*/{NULL}, -/*MMC 0xda*/{NULL}, -/*MMC 0xdb*/{NULL}, -/*MMC 0xdc*/{NULL}, -/*MMC 0xdd*/{NULL}, -/*MMC 0xde*/{NULL}, -/*MMC 0xdf*/{NULL}, -/*MMC 0xe0*/{NULL}, -/*MMC 0xe1*/{NULL}, -/*MMC 0xe2*/{NULL}, -/*MMC 0xe3*/{NULL}, -/*MMC 0xe4*/{NULL}, -/*MMC 0xe5*/{NULL}, -/*MMC 0xe6*/{NULL}, -/*MMC 0xe7*/{NULL}, -/*MMC 0xe8*/{NULL}, -/*MMC 0xe9*/{NULL}, -/*MMC 0xea*/{NULL}, -/*MMC 0xeb*/{NULL}, -/*MMC 0xec*/{NULL}, -/*MMC 0xed*/{NULL}, -/*MMC 0xee*/{NULL}, -/*MMC 0xef*/{NULL}, -/*MMC 0xf0*/{NULL}, -/*MMC 0xf1*/{NULL}, -/*MMC 0xf2*/{NULL}, -/*MMC 0xf3*/{NULL}, -/*MMC 0xf4*/{NULL}, -/*MMC 0xf5*/{NULL}, -/*MMC 0xf6*/{NULL}, -/*MMC 0xf7*/{NULL}, -/*MMC 0xf8*/{NULL}, -/*MMC 0xf9*/{NULL}, -/*MMC 0xfa*/{NULL}, -/*MMC 0xfb*/{NULL}, -/*MMC 0xfc*/{NULL}, -/*MMC 0xfd*/{NULL}, -/*MMC 0xfe*/{NULL}, -/*MMC 0xff*/{NULL} -}; /* This function must be called with walid pointers for both itlq and itl */ void @@ -8067,9 +6733,9 @@ get_cmdset_data(itlq_nexus_t *itlq, itl_nexus_t *itl) csdata->cdb_table=sbc; break; case SCSI_DEV_CDROM: - csdata->hf_opcode=hf_scsi_mmcopcode; + csdata->hf_opcode=hf_scsi_mmc_opcode; csdata->cdb_vals=scsi_mmc_vals; - csdata->cdb_table=mmc; + csdata->cdb_table=scsi_mmc_table; break; case SCSI_DEV_SSC: csdata->hf_opcode=hf_scsi_sscopcode; @@ -8113,9 +6779,6 @@ proto_register_scsi (void) { &hf_scsi_spcopcode, {"SPC-2 Opcode", "scsi.spc.opcode", FT_UINT8, BASE_HEX, VALS (scsi_spc2_vals), 0x0, "", HFILL}}, - { &hf_scsi_mmcopcode, - {"MMC Opcode", "scsi.mmc.opcode", FT_UINT8, BASE_HEX, - VALS (scsi_mmc_vals), 0x0, "", HFILL}}, { &hf_scsi_sbcopcode, {"SBC-2 Opcode", "scsi.sbc.opcode", FT_UINT8, BASE_HEX, VALS (scsi_sbc2_vals), 0x0, "", HFILL}}, @@ -8458,357 +7121,6 @@ proto_register_scsi (void) { &hf_scsi_senddiag_unitoff, {"Unit Offline", "scsi.spc2.senddiag.unitoff", FT_BOOLEAN, BASE_HEX, NULL, 0x1, "", HFILL}}, - { &hf_scsi_key_class, - {"Key Class", "scsi.mmc4.key_class", FT_UINT8, BASE_HEX, - VALS (scsi_key_class_val), 0x00, "", HFILL}}, - { &hf_scsi_agid, - {"AGID", "scsi.mmc4.agid", FT_UINT8, BASE_HEX, - NULL, 0xc0, "", HFILL}}, - { &hf_scsi_key_format, - {"Key Format", "scsi.mmc4.key_format", FT_UINT8, BASE_HEX, - VALS (scsi_key_format_val), 0x3f, "", HFILL}}, - { &hf_scsi_lba, - {"Logical Block Address", "scsi.lba", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL}}, - { &hf_scsi_num_blocks, - {"Number of Blocks", "scsi.num_blocks", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL}}, - { &hf_scsi_data_length, - {"Data Length", "scsi.data_length", FT_UINT32, BASE_DEC, - NULL, 0x0, "", HFILL}}, - { &hf_scsi_report_key_type_code, - {"Type Code", "scsi.report_key.type_code", FT_UINT8, BASE_HEX, - VALS(scsi_report_key_type_code_val), 0xc0, "", HFILL}}, - { &hf_scsi_report_key_vendor_resets, - {"Vendor Resets", "scsi.report_key.vendor_resets", FT_UINT8, BASE_HEX, - NULL, 0x38, "", HFILL}}, - { &hf_scsi_report_key_user_changes, - {"User Changes", "scsi.report_key.user_changes", FT_UINT8, BASE_HEX, - NULL, 0x07, "", HFILL}}, - { &hf_scsi_report_key_region_mask, - {"Region Mask", "scsi.report_key.region_mask", FT_UINT8, BASE_HEX, - NULL, 0xff, "", HFILL}}, - { &hf_scsi_report_key_rpc_scheme, - {"RPC Scheme", "scsi.report_key.rpc_scheme", FT_UINT8, BASE_HEX, - VALS(scsi_report_key_rpc_scheme_val), 0, "", HFILL}}, - { &hf_scsi_setcdspeed_rc, - {"Rotational Control", "scsi.setcdspeed.rc", FT_UINT8, BASE_HEX, - VALS(scsi_setcdspeed_rc_val), 0x03, "", HFILL}}, - { &hf_scsi_getconf_rt, - {"RT", "scsi.getconf.rt", FT_UINT8, BASE_HEX, - VALS(scsi_getconf_rt_val), 0x03, "", HFILL}}, - { &hf_scsi_getconf_current_profile, - {"Current Profile", "scsi.getconf.current_profile", FT_UINT16, BASE_HEX, - VALS(scsi_getconf_current_profile_val), 0, "", HFILL}}, - { &hf_scsi_getconf_starting_feature, - {"Starting Feature", "scsi.getconf.starting_feature", FT_UINT16, BASE_HEX, - VALS(scsi_feature_val), 0, "", HFILL}}, - { &hf_scsi_feature, - {"Feature", "scsi.feature", FT_UINT16, BASE_HEX, - VALS(scsi_feature_val), 0, "", HFILL}}, - { &hf_scsi_feature_version, - {"Version", "scsi.feature.version", FT_UINT8, BASE_DEC, - NULL, 0x3c, "", HFILL}}, - { &hf_scsi_feature_persistent, - {"Persistent", "scsi.feature.persistent", FT_UINT8, BASE_HEX, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_current, - {"Current", "scsi.feature.current", FT_UINT8, BASE_HEX, - NULL, 001, "", HFILL}}, - { &hf_scsi_feature_additional_length, - {"Additional Length", "scsi.feature.additional_length", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_feature_lun_sn, - {"LUN Serial Number", "scsi.feature.lun_sn", FT_STRING, BASE_NONE, - NULL, 0, "", HFILL}}, - { &hf_scsi_feature_cdread_dap, - {"DAP", "scsi.feature.cdread.dap", FT_BOOLEAN, 8, - NULL, 0x80, "", HFILL}}, - { &hf_scsi_feature_cdread_c2flag, - {"C2 Flag", "scsi.feature.cdread.c2flag", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_cdread_cdtext, - {"CD-Text", "scsi.feature.cdread.cdtext", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_dvdrw_write, - {"Write", "scsi.feature.dvdrw.write", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_dvdrw_quickstart, - {"Quick Start", "scsi.feature.dvdrw.quickstart", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_dvdrw_closeonly, - {"Close Only", "scsi.feature.dvdrw.closeonly", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_dvdr_write, - {"Write", "scsi.feature.dvdr.write", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_tao_buf, - {"BUF", "scsi.feature.tao.buf", FT_BOOLEAN, 8, - NULL, 0x40, "", HFILL}}, - { &hf_scsi_feature_tao_rwraw, - {"R-W Raw", "scsi.feature.tao.rwraw", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_feature_tao_rwpack, - {"R-W Pack", "scsi.feature.tao.rwpack", FT_BOOLEAN, 8, - NULL, 0x08, "", HFILL}}, - { &hf_scsi_feature_tao_testwrite, - {"Test Write", "scsi.feature.tao.testwrite", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, - { &hf_scsi_feature_tao_cdrw, - {"CD-RW", "scsi.feature.tao.cdrw", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_tao_rwsubcode, - {"R-W Subcode", "scsi.feature.tao.rwsubcode", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_dts, - {"Data Type Supported", "scsi.feature.dts", FT_UINT16, BASE_HEX, - NULL, 0xffff, "", HFILL}}, - { &hf_scsi_feature_sao_buf, - {"BUF", "scsi.feature.sao.buf", FT_BOOLEAN, 8, - NULL, 0x40, "", HFILL}}, - { &hf_scsi_feature_sao_sao, - {"SAO", "scsi.feature.sao.sao", FT_BOOLEAN, 8, - NULL, 0x20, "", HFILL}}, - { &hf_scsi_feature_sao_rawms, - {"Raw MS", "scsi.feature.sao.rawms", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_feature_sao_raw, - {"Raw", "scsi.feature.sao.raw", FT_BOOLEAN, 8, - NULL, 0x08, "", HFILL}}, - { &hf_scsi_feature_sao_testwrite, - {"Test Write", "scsi.feature.sao.testwrite", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, - { &hf_scsi_feature_sao_cdrw, - {"CD-RW", "scsi.feature.sao.cdrw", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_sao_rw, - {"R-W", "scsi.feature.sao.rw", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_sao_mcsl, - {"Maximum Cue Sheet Length", "scsi.feature.sao.mcsl", FT_UINT24, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_feature_dvdr_buf, - {"BUF", "scsi.feature.dvdr.buf", FT_BOOLEAN, 8, - NULL, 0x40, "", HFILL}}, - { &hf_scsi_feature_dvdr_testwrite, - {"Test Write", "scsi.feature.dvdr.testwrite", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, - { &hf_scsi_feature_dvdr_dvdrw, - {"DVD-RW", "scsi.feature.dvdr.dvdrw", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_feature_profile, - {"Profile", "scsi.feature.profile", FT_UINT16, BASE_HEX, - VALS(scsi_getconf_current_profile_val), 0, "", HFILL}}, - { &hf_scsi_feature_profile_current, - {"Current", "scsi.feature.profile.current", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_isw_buf, - {"BUF", "scsi.feature.isw.buf", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_feature_isw_num_linksize, - {"Number of Link Sizes", "scsi.feature.isw.num_linksize", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_feature_isw_linksize, - {"Link Size", "scsi.feature.isw.linksize", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_readtoc_time, - {"Time", "scsi.readtoc.time", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_readtoc_format, - {"Format", "scsi.readtoc.format", FT_UINT8, BASE_HEX, - NULL, 0x0f, "", HFILL}}, - { &hf_scsi_track, - {"Track", "scsi.track", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_track_size, - {"Track Size", "scsi.track_size", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_session, - {"Session", "scsi.session", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_first_track, - {"First Track", "scsi.first_track", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_readtoc_first_session, - {"First Session", "scsi.readtoc.first_session", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_readtoc_last_track, - {"Last Track", "scsi.readtoc.last_track", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_readtoc_last_session, - {"Last Session", "scsi.readtoc.last_session", FT_UINT8, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_q_subchannel_adr, - {"Q Subchannel ADR", "scsi.q.subchannel.adr", FT_UINT8, BASE_HEX, - VALS(scsi_q_subchannel_adr_val), 0xf0, "", HFILL}}, - { &hf_scsi_q_subchannel_control, - {"Q Subchannel Control", "scsi.q.subchannel.control", FT_UINT8, BASE_HEX, - VALS(scsi_q_subchannel_control_val), 0x0f, "", HFILL}}, - { &hf_scsi_track_start_address, - {"Track Start Address", "scsi.track_start_address", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_next_writable_address, - {"Next Writable Address", "scsi.next_writable_address", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_track_start_time, - {"Track Start Time", "scsi.track_start_time", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_synccache_immed, - {"IMMED", "scsi.synccache.immed", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_synccache_reladr, - {"RelAdr", "scsi.synccache.reladr", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_rbc_block, - {"BLOCK", "scsi.rbc.block", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_rbc_lob_blocks, - {"Buffer Len (blocks)", "scsi.rbc.lob_blocks", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_rbc_alob_blocks, - {"Available Buffer Len (blocks)", "scsi.rbc.alob_blocks", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_rbc_lob_bytes, - {"Buffer Len (bytes)", "scsi.rbc.lob_bytes", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_rbc_alob_bytes, - {"Available Buffer Len (bytes)", "scsi.rbc.alob_bytes", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_type, - {"Type", "scsi.setstreaming.type", FT_UINT8, BASE_DEC, - VALS(scsi_setstreaming_type_val), 0, "", HFILL}}, - { &hf_scsi_setstreaming_param_len, - {"Parameter Length", "scsi.setstreaming.param_len", FT_UINT16, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_wrc, - {"WRC", "scsi.setstreaming.wrc", FT_UINT8, BASE_HEX, - NULL, 0x18, "", HFILL}}, - { &hf_scsi_setstreaming_rdd, - {"RDD", "scsi.setstreaming.rdd", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, - { &hf_scsi_setstreaming_exact, - {"Exact", "scsi.setstreaming.exact", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_setstreaming_ra, - {"RA", "scsi.setstreaming.ra", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_setstreaming_start_lba, - {"Start LBA", "scsi.setstreaming.start_lbs", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_end_lba, - {"End LBA", "scsi.setstreaming.end_lba", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_read_size, - {"Read Size", "scsi.setstreaming.read_size", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_read_time, - {"Read Time", "scsi.setstreaming.read_time", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_write_size, - {"Write Size", "scsi.setstreaming.write_size", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_setstreaming_write_time, - {"Write Time", "scsi.setstreaming.write_time", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_reservation_size, - {"Reservation Size", "scsi.reservation_size", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_rti_address_type, - {"Address Type", "scsi.rti.address_type", FT_UINT8, BASE_HEX, - VALS(scsi_rti_address_type_val), 0x03, "", HFILL}}, - { &hf_scsi_rti_damage, - {"Damage", "scsi.rti.damage", FT_BOOLEAN, 8, - NULL, 0x20, "", HFILL}}, - { &hf_scsi_rti_copy, - {"Copy", "scsi.rti.copy", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_rti_track_mode, - {"Track Mode", "scsi.rti.track_mode", FT_UINT8, BASE_HEX, - NULL, 0x0f, "", HFILL}}, - { &hf_scsi_rti_rt, - {"RT", "scsi.rti.rt", FT_BOOLEAN, 8, - NULL, 0x80, "", HFILL}}, - { &hf_scsi_rti_blank, - {"Blank", "scsi.rti.blank", FT_BOOLEAN, 8, - NULL, 0x40, "", HFILL}}, - { &hf_scsi_rti_packet, - {"Packet/Inc", "scsi.rti.packet", FT_BOOLEAN, 8, - NULL, 0x20, "", HFILL}}, - { &hf_scsi_rti_fp, - {"FP", "scsi.rti.fp", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_rti_data_mode, - {"Data Mode", "scsi.rti.data_mode", FT_UINT8, BASE_HEX, - NULL, 0x0f, "", HFILL}}, - { &hf_scsi_rti_lra_v, - {"LRA_V", "scsi.rti.lra_v", FT_BOOLEAN, 8, - NULL, 0x02, "", HFILL}}, - { &hf_scsi_rti_nwa_v, - {"NWA_V", "scsi.rti.nwa_v", FT_BOOLEAN, 8, - NULL, 0x01, "", HFILL}}, - { &hf_scsi_free_blocks, - {"Free Blocks", "scsi.free_blocks", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_fixed_packet_size, - {"Fixed Packet Size", "scsi.fixed_packet_size", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_last_recorded_address, - {"Last Recorded Address", "scsi.last_recorded_address", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_read_compatibility_lba, - {"Read Compatibility LBA", "scsi.read_compatibility_lba", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_erasable, - {"Erasable", "scsi.disc_info.erasable", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_disc_info_state_of_last_session, - {"State Of Last Session", "scsi.disc_info.state_of_last_session", FT_UINT8, BASE_HEX, - VALS(scsi_disc_info_sols_val), 0x0c, "", HFILL}}, - { &hf_scsi_disc_info_disk_status, - {"Disk Status", "scsi.disc_info.disk_status", FT_UINT8, BASE_HEX, - VALS(scsi_disc_info_disc_status_val), 0x03, "", HFILL}}, - { &hf_scsi_disc_info_number_of_sessions, - {"Number Of Sessions", "scsi.disc_info.number_of_sessions", FT_UINT16, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_first_track_in_last_session, - {"First Track In Last Session", "scsi.disc_info.first_track_in_last_session", FT_UINT16, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_last_track_in_last_session, - {"Last Track In Last Session", "scsi.disc_info.last_track_in_last_session", FT_UINT16, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_did_v, - {"DID_V", "scsi.disc_info.did_v", FT_BOOLEAN, 8, - NULL, 0x80, "", HFILL}}, - { &hf_scsi_disc_info_dbc_v, - {"DBC_V", "scsi.disc_info.dbc_v", FT_BOOLEAN, 8, - NULL, 0x40, "", HFILL}}, - { &hf_scsi_disc_info_uru, - {"URU", "scsi.disc_info.uru", FT_BOOLEAN, 8, - NULL, 0x20, "", HFILL}}, - { &hf_scsi_disc_info_dac_v, - {"DAC_V", "scsi.disc_info.dac_v", FT_BOOLEAN, 8, - NULL, 0x10, "", HFILL}}, - { &hf_scsi_disc_info_dbit, - {"Dbit", "scsi.disc_info.dbit", FT_BOOLEAN, 8, - NULL, 0x04, "", HFILL}}, - { &hf_scsi_disc_info_bgfs, - {"BG Format Status", "scsi.disc_info.bgfs", FT_UINT8, BASE_HEX, - VALS(scsi_disc_info_bgfs_val), 0x03, "", HFILL}}, - { &hf_scsi_disc_info_disc_type, - {"Disc Type", "scsi.disc_info.disc_type", FT_UINT8, BASE_HEX, - VALS(scsi_disc_info_disc_type_val), 0, "", HFILL}}, - { &hf_scsi_disc_info_disc_identification, - {"Disc Identification", "scsi.disc_info.disc_identification", FT_UINT32, BASE_HEX, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_last_session_lead_in_start_address, - {"Last Session Lead-In Start Address", "scsi.disc_info.last_session_lead_in_start_address", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_last_possible_lead_out_start_address, - {"Last Possible Lead-Out Start Address", "scsi.disc_info.last_possible_lead_out_start_address", FT_UINT32, BASE_DEC, - NULL, 0, "", HFILL}}, - { &hf_scsi_disc_info_disc_bar_code, - {"Disc Bar Code", "scsi.disc_info.disc_bar_code", FT_UINT64, BASE_HEX, - NULL, 0, "", HFILL}}, { &hf_sbc2_verify_lba, {"LBA", "scsi.sbc2.verify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}}, @@ -8909,7 +7221,6 @@ proto_register_scsi (void) static gint *ett[] = { &ett_scsi, &ett_scsi_page, - &ett_scsi_profile, &ett_scsi_inq_acaflags, &ett_scsi_inq_sccsflags, &ett_scsi_inq_bqueflags, |