osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

another attempt to let windows buildbot becoming green 

fix rev21398 (gcc warning fix)

svn path=/trunk/; revision=21412
This commit is contained in:
Sebastien Tandel 2007-04-13 17:16:24 +00:00
parent 7be3171467
commit a7615a1afb
7 changed files with 325 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
epan/dissectors/packet-scsi-mmc.c
View File

@ -246,8 +246,8 @@ static const value_string scsi_feature_val[] = {
};
static void
dissect_mmc4_getconfiguration (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset,
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_)
@ -256,19 +256,21 @@ dissect_mmc4_getconfiguration (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
guint8 flags;
gint32 len;
guint old_offset;
tvbuff_t *tvb_v = tvb;
volatile guint offset_v = offset;
if (tree && isreq && iscdb) {
proto_tree_add_item (tree, hf_scsi_mmc_getconf_rt, tvb, offset+0, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_getconf_starting_feature, tvb, offset+1, 2, 0);
proto_tree_add_item (tree, hf_scsi_mmc_getconf_rt, tvb_v, offset_v+0, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_getconf_starting_feature, tvb_v, offset_v+1, 2, 0);
proto_tree_add_item (tree, hf_scsi_alloclen16, tvb, offset+6, 2, 0);
proto_tree_add_item (tree, hf_scsi_alloclen16, tvb_v, offset_v+6, 2, 0);
/* we need the alloc_len in the response */
if(cdata){
cdata->itlq->alloc_len=tvb_get_ntohs(tvb, offset+6);
cdata->itlq->alloc_len=tvb_get_ntohs(tvb_v, offset_v+6);
}
flags = tvb_get_guint8 (tvb, offset+8);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+8, 1,
flags = tvb_get_guint8 (tvb_v, offset_v+8);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb_v, offset_v+8, 1,
flags,
"Vendor Unique = %u, NACA = %u, Link = %u",
flags & 0xC0, flags & 0x4, flags & 0x1);
@ -278,53 +280,53 @@ dissect_mmc4_getconfiguration (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
return;
}
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, cdata->itlq->alloc_len);
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb_v, offset_v, cdata->itlq->alloc_len);
len=tvb_get_ntohl(tvb, offset+0);
proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb, offset, 4, 0);
proto_tree_add_item (tree, hf_scsi_mmc_getconf_current_profile, tvb, offset+6, 2, 0);
offset+=8;
len=tvb_get_ntohl(tvb_v, offset_v+0);
proto_tree_add_item (tree, hf_scsi_mmc_data_length, tvb_v, offset_v, 4, 0);
proto_tree_add_item (tree, hf_scsi_mmc_getconf_current_profile, tvb_v, offset_v+6, 2, 0);
offset_v+=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_mmc_feature, tvb, offset, 2, 0);
offset+=2;
proto_tree_add_item (tree, hf_scsi_mmc_feature_version, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_persistent, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_current, tvb, offset, 1, 0);
offset+=1;
additional_length=tvb_get_guint8(tvb, offset);
proto_tree_add_item (tree, hf_scsi_mmc_feature_additional_length, tvb, offset, 1, 0);
offset+=1;
old_offset=offset;
feature=tvb_get_ntohs(tvb_v, offset_v);
proto_tree_add_item (tree, hf_scsi_mmc_feature, tvb_v, offset_v, 2, 0);
offset_v+=2;
proto_tree_add_item (tree, hf_scsi_mmc_feature_version, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_persistent, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_current, tvb_v, offset_v, 1, 0);
offset_v+=1;
additional_length=tvb_get_guint8(tvb_v, offset_v);
proto_tree_add_item (tree, hf_scsi_mmc_feature_additional_length, tvb_v, offset_v, 1, 0);
offset_v+=1;
old_offset=offset_v;
switch(feature){
case 0x0000: /* profile list */
while(offset<(old_offset+additional_length)){
while(offset_v<(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:");
it=proto_tree_add_text(tree, tvb_v, offset_v, 4, "Profile:");
tr=proto_item_add_subtree(it, ett_scsi_mmc_profile);
}
profile=tvb_get_ntohs(tvb, offset);
proto_tree_add_item (tr, hf_scsi_mmc_feature_profile, tvb, offset, 2, 0);
profile=tvb_get_ntohs(tvb_v, offset_v);
proto_tree_add_item (tr, hf_scsi_mmc_feature_profile, tvb_v, offset_v, 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_mmc_feature_profile_current, tvb, offset+2, 1, 0);
cur_profile=tvb_get_guint8(tvb_v, offset_v+2);
proto_tree_add_item (tr, hf_scsi_mmc_feature_profile_current, tvb_v, offset_v+2, 1, 0);
if(cur_profile&0x01){
proto_item_append_text(it, " [CURRENT PROFILE]");
}
offset+=4;
offset_v+=4;
}
break;
case 0x001d: /* multi-read */
@ -332,60 +334,60 @@ dissect_mmc4_getconfiguration (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
/* no data for this one */
break;
case 0x001e: /* cd read */
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_dap, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_c2flag, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_cdtext, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_dap, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_c2flag, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_cdread_cdtext, tvb_v, offset_v, 1, 0);
break;
case 0x0021: /* incremental streaming writeable */
proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb, offset, 2, 0);
offset+=2;
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_buf, tvb, offset, 1, 0);
offset+=1;
num_linksize=tvb_get_guint8(tvb, offset);
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_num_linksize, tvb, offset, 1, 0);
offset+=1;
proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v, 2, 0);
offset_v+=2;
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_buf, tvb_v, offset_v, 1, 0);
offset_v+=1;
num_linksize=tvb_get_guint8(tvb_v, offset_v);
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_num_linksize, tvb_v, offset_v, 1, 0);
offset_v+=1;
while(num_linksize--){
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_linksize, tvb, offset, 1, 0);
offset+=1;
proto_tree_add_item (tree, hf_scsi_mmc_feature_isw_linksize, tvb_v, offset_v, 1, 0);
offset_v+=1;
}
break;
case 0x002a: /* dvd-rw */
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_write, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_quickstart, tvb, offset, 2, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_closeonly, tvb, offset, 2, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_write, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_quickstart, tvb_v, offset_v, 2, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdrw_closeonly, tvb_v, offset_v, 2, 0);
break;
case 0x002b: /* dvd-r */
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_write, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_write, tvb_v, offset_v, 1, 0);
break;
case 0x002d: /* track at once */
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_buf, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwraw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwpack, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_testwrite, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_cdrw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwsubcode, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb, offset+2, 2, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_buf, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwraw, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwpack, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_testwrite, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_cdrw, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_tao_rwsubcode, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dts, tvb_v, offset_v+2, 2, 0);
break;
case 0x002e: /* session at once */
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_buf, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_sao, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rawms, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_raw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_testwrite, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_cdrw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_mcsl, tvb, offset+1, 3, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_buf, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_sao, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rawms, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_raw, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_testwrite, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_cdrw, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_rw, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_sao_mcsl, tvb_v, offset_v+1, 3, 0);
break;
case 0x002f: /* dvd-r/-rw*/
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_buf, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_testwrite, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, tvb, offset, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_buf, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_testwrite, tvb_v, offset_v, 1, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_dvdr_dvdrw, tvb_v, offset_v, 1, 0);
break;
case 0x0108: /* logical unit serial number */
proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, tvb, offset, additional_length, 0);
proto_tree_add_item (tree, hf_scsi_mmc_feature_lun_sn, tvb_v, offset_v, additional_length, 0);
break;
default:
proto_tree_add_text (tree, tvb, offset, additional_length,
proto_tree_add_text (tree, tvb_v, offset_v, additional_length,
"SCSI/MMC Unknown Feature:0x%04x",feature);
break;
}
@ -421,8 +423,8 @@ static const value_string scsi_q_subchannel_control_val[] = {
};
static void
dissect_mmc4_readtocpmaatip (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -537,8 +539,8 @@ static const value_string scsi_disc_info_disc_type_val[] = {
};
static void
dissect_mmc4_readdiscinformation (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -582,8 +584,8 @@ dissect_mmc4_readdiscinformation (tvbuff_t *volatile tvb, packet_info *pinfo _U_
}
static void
dissect_mmc4_readdiscstructure (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -618,8 +620,8 @@ dissect_mmc4_readdiscstructure (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_mmc4_getperformance (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -654,8 +656,8 @@ dissect_mmc4_getperformance (tvbuff_t *volatile tvb, packet_info *pinfo _U_, pro
}
static void
dissect_mmc4_synchronizecache (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -706,8 +708,8 @@ static const value_string scsi_report_key_rpc_scheme_val[] = {
};
static void
dissect_mmc4_reportkey (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -771,8 +773,8 @@ static const value_string scsi_rti_address_type_val[] = {
};
static void
dissect_mmc4_readtrackinformation (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -832,8 +834,8 @@ dissect_mmc4_readtrackinformation (tvbuff_t *volatile tvb, packet_info *pinfo _U
}
static void
dissect_mmc4_geteventstatusnotification (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -862,8 +864,8 @@ dissect_mmc4_geteventstatusnotification (tvbuff_t *volatile tvb, packet_info *pi
static void
dissect_mmc4_reservetrack (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -883,8 +885,8 @@ dissect_mmc4_reservetrack (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto
static void
dissect_mmc4_readbuffercapacity (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -930,8 +932,8 @@ static const value_string scsi_setcdspeed_rc_val[] = {
};
static void
dissect_mmc4_setcdspeed (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{
@ -963,8 +965,8 @@ static const value_string scsi_setstreaming_type_val[] = {
};
static void
dissect_mmc4_setstreaming (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
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_)
{

4
epan/dissectors/packet-scsi-osd.c
View File

@ -2573,8 +2573,8 @@ find_svcaction_dissector(guint16 svcaction)
static void
dissect_osd_opcode(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint16 svcaction=0;

132
epan/dissectors/packet-scsi-sbc.c
View File

@ -165,8 +165,8 @@ static const true_false_string pmi_tfs = {
};
static void
dissect_sbc_formatunit (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_formatunit (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;
@ -200,8 +200,8 @@ dissect_sbc_formatunit (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tr
}
static void
dissect_sbc_read6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_read6 (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;
@ -225,8 +225,8 @@ dissect_sbc_read6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *t
}
static void
dissect_sbc_write6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_write6 (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;
@ -250,8 +250,8 @@ dissect_sbc_write6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_sbc_prefetch10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_prefetch10 (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_)
{
@ -285,8 +285,8 @@ dissect_sbc_prefetch10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tr
}
static void
dissect_sbc_synchronizecache10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_synchronizecache10 (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_)
{
@ -321,8 +321,8 @@ dissect_sbc_synchronizecache10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_synchronizecache16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_synchronizecache16 (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_)
{
@ -356,8 +356,8 @@ dissect_sbc_synchronizecache16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_prefetch16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_prefetch16 (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_)
{
@ -390,8 +390,8 @@ dissect_sbc_prefetch16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tr
}
void
dissect_sbc_read10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_read10 (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_)
{
@ -427,8 +427,8 @@ dissect_sbc_read10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_sbc_xdread10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_xdread10 (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_)
{
@ -461,8 +461,8 @@ dissect_sbc_xdread10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_sbc_xdwrite10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_xdwrite10 (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_)
{
@ -499,8 +499,8 @@ dissect_sbc_xdwrite10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tre
}
static void
dissect_sbc_xdwriteread10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_xdwriteread10 (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_)
{
@ -538,8 +538,8 @@ dissect_sbc_xdwriteread10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto
}
static void
dissect_sbc_xpwrite10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_xpwrite10 (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_)
{
@ -575,8 +575,8 @@ dissect_sbc_xpwrite10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tre
}
void
dissect_sbc_write10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_write10 (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_)
{
@ -612,8 +612,8 @@ dissect_sbc_write10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
void
dissect_sbc_read12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_read12 (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;
@ -647,8 +647,8 @@ dissect_sbc_read12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
}
void
dissect_sbc_write12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_write12 (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;
@ -683,8 +683,8 @@ dissect_sbc_write12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_sbc_read16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_read16 (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;
@ -718,8 +718,8 @@ dissect_sbc_read16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
}
static void
dissect_sbc_write16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_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;
@ -771,8 +771,8 @@ static const value_string scsi_ssu_pwrcnd_val[] = {
};
void
dissect_sbc_startstopunit (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq _U_, gboolean iscdb,
dissect_sbc_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_)
{
guint8 flags;
@ -805,8 +805,8 @@ dissect_sbc_startstopunit (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto
}
static void
dissect_sbc_verify10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_verify10 (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_)
{
@ -841,8 +841,8 @@ dissect_sbc_verify10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_sbc_verify12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_verify12 (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_)
{
@ -879,8 +879,8 @@ dissect_sbc_verify12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_sbc_verify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_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_)
{
@ -916,8 +916,8 @@ dissect_sbc_verify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
static void
dissect_sbc_wrverify10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_wrverify10 (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_)
@ -954,8 +954,8 @@ dissect_sbc_wrverify10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_wrverify12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_wrverify12 (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_)
{
@ -991,8 +991,8 @@ dissect_sbc_wrverify12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_wrverify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_wrverify16 (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_)
{
@ -1029,8 +1029,8 @@ dissect_sbc_wrverify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
void
dissect_sbc_readcapacity10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_sbc_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_)
{
guint8 flags;
@ -1071,8 +1071,8 @@ dissect_sbc_readcapacity10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, prot
}
static void
dissect_sbc_readdefectdata10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_readdefectdata10 (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_)
{
@ -1102,8 +1102,8 @@ dissect_sbc_readdefectdata10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
static void
dissect_sbc_readlong10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_readlong10 (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_)
{
@ -1131,8 +1131,8 @@ dissect_sbc_readlong10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_writelong10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_writelong10 (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_)
{
@ -1154,8 +1154,8 @@ dissect_sbc_writelong10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_writesame10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_writesame10 (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_)
{
@ -1187,8 +1187,8 @@ dissect_sbc_writesame10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_sbc_writesame16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_writesame16 (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_)
{
@ -1220,8 +1220,8 @@ dissect_sbc_writesame16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
static void
dissect_sbc_readdefectdata12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_readdefectdata12 (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_)
{
@ -1251,8 +1251,8 @@ dissect_sbc_readdefectdata12 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
static void
dissect_sbc_reassignblocks (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_reassignblocks (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_)
{
@ -1293,8 +1293,8 @@ const value_string service_action_vals[] = {
action is set to.
*/
static void
dissect_sbc_serviceactionin16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_sbc_serviceactionin16 (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_)
{

28
epan/dissectors/packet-scsi-smc.c
View File

@ -68,8 +68,8 @@ static gint ett_scsi_range = -1;
static gint ett_scsi_move = -1;
void
dissect_smc_exchangemedium (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_exchangemedium (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;
@ -100,8 +100,8 @@ dissect_smc_exchangemedium (tvbuff_t *volatile tvb, packet_info *pinfo _U_, prot
}
void
dissect_smc_position_to_element (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_position_to_element (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;
@ -128,8 +128,8 @@ dissect_smc_position_to_element (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
void
dissect_smc_initialize_element_status (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_initialize_element_status (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;
@ -147,8 +147,8 @@ dissect_smc_initialize_element_status (tvbuff_t *volatile tvb, packet_info *pinf
}
void
dissect_smc_initialize_element_status_with_range (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_initialize_element_status_with_range (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;
@ -177,8 +177,8 @@ dissect_smc_initialize_element_status_with_range (tvbuff_t *volatile tvb, packet
}
void
dissect_smc_openclose_importexport_element (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_openclose_importexport_element (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;
@ -199,8 +199,8 @@ dissect_smc_openclose_importexport_element (tvbuff_t *volatile tvb, packet_info
}
}
void
dissect_smc_movemedium (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_smc_movemedium (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;
@ -494,8 +494,8 @@ dissect_scsi_smc_elements (tvbuff_t *tvb, packet_info *pinfo,
void
dissect_smc_readelementstatus (tvbuff_t *volatile tvb, packet_info *pinfo,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_smc_readelementstatus (tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, guint offset, gboolean isreq,
gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{

92
epan/dissectors/packet-scsi-ssc.c
View File

@ -102,8 +102,8 @@ static gint ett_scsi_read6 = -1;
static void
dissect_ssc_read6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_read6 (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;
@ -132,8 +132,8 @@ dissect_ssc_read6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *t
}
static void
dissect_ssc_recoverbuffereddata (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_recoverbuffereddata (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;
@ -162,8 +162,8 @@ dissect_ssc_recoverbuffereddata (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
static void
dissect_ssc_reportdensitysupport (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_reportdensitysupport (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;
@ -197,8 +197,8 @@ dissect_ssc_reportdensitysupport (tvbuff_t *volatile tvb, packet_info *pinfo _U_
}
static void
dissect_ssc_readreverse6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_readreverse6 (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;
@ -228,8 +228,8 @@ dissect_ssc_readreverse6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_
}
static void
dissect_ssc_read16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_read16 (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;
@ -299,8 +299,8 @@ dissect_ssc_write16 (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
}
static void
dissect_ssc_writefilemarks16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_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;
@ -335,8 +335,8 @@ dissect_ssc_writefilemarks16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, pr
}
static void
dissect_ssc_verify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_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_)
{
guint8 flags;
@ -371,8 +371,8 @@ dissect_ssc_verify16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_ssc_verify6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_verify6 (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;
@ -403,8 +403,8 @@ dissect_ssc_verify6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
static void
dissect_ssc_readreverse16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_readreverse16 (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;
@ -439,8 +439,8 @@ dissect_ssc_readreverse16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto
}
static void
dissect_ssc_write6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_write6 (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;
@ -470,8 +470,8 @@ dissect_ssc_write6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_ssc_writefilemarks6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_writefilemarks6 (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;
@ -501,8 +501,8 @@ dissect_ssc_writefilemarks6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, pro
}
static void
dissect_ssc_loadunload (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_loadunload (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;
@ -543,8 +543,8 @@ dissect_ssc_loadunload (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tr
static void
dissect_ssc_readblocklimits (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_readblocklimits (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, granularity;
@ -572,8 +572,8 @@ dissect_ssc_readblocklimits (tvbuff_t *volatile tvb, packet_info *pinfo _U_, pro
}
static void
dissect_ssc_rewind (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_rewind (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;
@ -601,8 +601,8 @@ dissect_ssc_rewind (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_ssc_setcapacity (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_setcapacity (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;
@ -629,8 +629,8 @@ dissect_ssc_setcapacity (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_t
static void
dissect_ssc_locate10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_locate10 (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;
@ -661,8 +661,8 @@ dissect_ssc_locate10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
static void
dissect_ssc_locate16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_locate16 (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;
@ -699,8 +699,8 @@ dissect_ssc_locate16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
static void
dissect_ssc_erase6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_erase6 (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;
@ -725,8 +725,8 @@ dissect_ssc_erase6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
static void
dissect_ssc_erase16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_erase16 (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;
@ -758,8 +758,8 @@ dissect_ssc_erase16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
static void
dissect_ssc_space6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_space6 (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;
@ -781,8 +781,8 @@ dissect_ssc_space6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *
}
static void
dissect_ssc_space16 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_space16 (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;
@ -829,8 +829,8 @@ static const value_string dest_type_vals[] = {
};
static void
dissect_ssc_formatmedium (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_formatmedium (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;
@ -865,8 +865,8 @@ dissect_ssc_formatmedium (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_
#define BPU 0x04
static void
dissect_ssc_readposition (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_ssc_readposition (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)
{
gint service_action;

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

@ -2036,12 +2036,15 @@ dissect_spc_inq_reladrflags(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
}
void
dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo,
proto_tree *tree, volatile guint offset, gboolean isreq,
dissect_spc_inquiry (tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, guint offset, gboolean isreq,
gboolean iscdb, guint32 payload_len,
scsi_task_data_t *cdata)
{
guint8 flags, i;
tvbuff_t *volatile tvb_v = tvb;
volatile guint offset_v = offset;
static const int *peripheal_fields[] = {
&hf_scsi_inq_qualifier,
&hf_scsi_inq_devtype,
@ -2061,42 +2064,42 @@ dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo,
};
if (!isreq && (cdata == NULL || !(cdata->itlq->flags & 0x3))
&& (tvb_length_remaining(tvb, offset)>=1) ) {
&& (tvb_length_remaining(tvb_v, offset_v)>=1) ) {
/*
* INQUIRY response with device type information; add device type
* to list of known devices & their types if not already known.
*/
if(cdata && cdata->itl){
cdata->itl->cmdset=tvb_get_guint8(tvb, offset)&SCSI_DEV_BITS;
cdata->itl->cmdset=tvb_get_guint8(tvb_v, offset_v)&SCSI_DEV_BITS;
}
}
if (isreq && iscdb) {
flags = tvb_get_guint8 (tvb, offset);
flags = tvb_get_guint8 (tvb_v, offset_v);
if (cdata) {
cdata->itlq->flags = flags;
}
proto_tree_add_uint_format (tree, hf_scsi_inquiry_flags, tvb, offset, 1,
proto_tree_add_uint_format (tree, hf_scsi_inquiry_flags, tvb_v, offset_v, 1,
flags, "CMDT = %u, EVPD = %u",
flags & 0x2, flags & 0x1);
if (flags & 0x1) {
proto_tree_add_item (tree, hf_scsi_inquiry_evpd_page, tvb, offset+1,
proto_tree_add_item (tree, hf_scsi_inquiry_evpd_page, tvb_v, offset_v+1,
1, 0);
}
else if (flags & 0x2) {
proto_tree_add_item (tree, hf_scsi_inquiry_cmdt_page, tvb, offset+1,
proto_tree_add_item (tree, hf_scsi_inquiry_cmdt_page, tvb_v, offset_v+1,
1, 0);
}
proto_tree_add_item (tree, hf_scsi_alloclen, tvb, offset+3, 1, 0);
proto_tree_add_item (tree, hf_scsi_alloclen, tvb_v, offset_v+3, 1, 0);
/* we need the alloc_len in the response */
if(cdata){
cdata->itlq->alloc_len=tvb_get_guint8(tvb, offset+3);
cdata->itlq->alloc_len=tvb_get_guint8(tvb_v, offset_v+3);
}
flags = tvb_get_guint8 (tvb, offset+4);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+4, 1,
flags = tvb_get_guint8 (tvb_v, offset_v+4);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb_v, offset_v+4, 1,
flags,
"Vendor Unique = %u, NACA = %u, Link = %u",
flags & 0xC0, flags & 0x4, flags & 0x1);
@ -2106,74 +2109,74 @@ dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo,
}
if (cdata->itlq->flags & 0x1) {
dissect_scsi_evpd (tvb, pinfo, tree, offset, payload_len);
dissect_scsi_evpd (tvb_v, pinfo, tree, offset_v, payload_len);
return;
}
if (cdata->itlq->flags & 0x2) {
dissect_scsi_cmddt (tvb, pinfo, tree, offset, payload_len);
dissect_scsi_cmddt (tvb_v, pinfo, tree, offset_v, payload_len);
return;
}
/* These pdus are sometimes truncated by SCSI allocation length
* in the CDB
*/
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, cdata->itlq->alloc_len);
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb_v, offset_v, cdata->itlq->alloc_len);
/* Qualifier and DeviceType */
proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_inq_peripheral, ett_scsi_inq_peripheral, peripheal_fields, FALSE);
offset+=1;
proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_peripheral, ett_scsi_inq_peripheral, peripheal_fields, FALSE);
offset_v+=1;
/* RMB */
proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_inq_rmbflags, ett_scsi_inq_rmbflags, rmb_fields, FALSE);
offset+=1;
proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_rmbflags, ett_scsi_inq_rmbflags, rmb_fields, FALSE);
offset_v+=1;
/* Version */
proto_tree_add_item (tree, hf_scsi_inq_version, tvb, offset, 1, 0);
offset+=1;
proto_tree_add_item (tree, hf_scsi_inq_version, tvb_v, offset_v, 1, 0);
offset_v+=1;
/* aca flags */
proto_tree_add_bitmask(tree, tvb, offset, hf_scsi_inq_acaflags, ett_scsi_inq_acaflags, aca_fields, FALSE);
offset+=1;
proto_tree_add_bitmask(tree, tvb_v, offset_v, hf_scsi_inq_acaflags, ett_scsi_inq_acaflags, aca_fields, FALSE);
offset_v+=1;
/* Additional Length */
SET_SCSI_DATA_END(tvb_get_guint8(tvb, offset)+offset);
proto_tree_add_item(tree, hf_scsi_inq_add_len, tvb, offset, 1, 0);
offset+=1;
SET_SCSI_DATA_END(tvb_get_guint8(tvb_v, offset_v)+offset);
proto_tree_add_item(tree, hf_scsi_inq_add_len, tvb_v, offset_v, 1, 0);
offset_v+=1;
/* sccs flags */
offset=dissect_spc_inq_sccsflags(tvb, offset, tree);
offset_v=dissect_spc_inq_sccsflags(tvb_v, offset, tree);
/* bque flags */
offset=dissect_spc_inq_bqueflags(tvb, offset, tree);
offset_v=dissect_spc_inq_bqueflags(tvb_v, offset, tree);
/* reladdr flags */
offset=dissect_spc_inq_reladrflags(tvb, offset, tree);
offset_v=dissect_spc_inq_reladrflags(tvb_v, offset, tree);
/* vendor id */
proto_tree_add_item(tree, hf_scsi_inq_vendor_id, tvb, offset, 8, 0);
offset+=8;
proto_tree_add_item(tree, hf_scsi_inq_vendor_id, tvb_v, offset_v, 8, 0);
offset_v+=8;
/* product id */
proto_tree_add_item(tree, hf_scsi_inq_product_id, tvb, offset, 16, 0);
offset+=16;
proto_tree_add_item(tree, hf_scsi_inq_product_id, tvb_v, offset_v, 16, 0);
offset_v+=16;
/* product revision level */
proto_tree_add_item(tree, hf_scsi_inq_product_rev, tvb, offset, 4, 0);
offset+=4;
proto_tree_add_item(tree, hf_scsi_inq_product_rev, tvb_v, offset_v, 4, 0);
offset_v+=4;
/* vendor specific, 20 bytes */
offset+=20;
offset_v+=20;
/* clocking, qas, ius */
offset++;
offset_v++;
/* reserved */
offset++;
offset_v++;
/* version descriptors */
for(i=0;i<8;i++){
proto_tree_add_item(tree, hf_scsi_inq_version_desc, tvb, offset, 2, 0);
offset+=2;
proto_tree_add_item(tree, hf_scsi_inq_version_desc, tvb_v, offset_v, 2, 0);
offset_v+=2;
}
END_TRY_SCSI_CDB_ALLOC_LEN;
@ -2181,8 +2184,8 @@ dissect_spc_inquiry (tvbuff_t *volatile tvb, packet_info *pinfo,
}
void
dissect_spc_extcopy (tvbuff_t *volatile tvb _U_, packet_info *pinfo _U_,
proto_tree *tree _U_, volatile guint offset _U_,
dissect_spc_extcopy (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
proto_tree *tree _U_, guint offset _U_,
gboolean isreq _U_, gboolean iscdb _U_,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
@ -2299,8 +2302,8 @@ dissect_scsi_log_page (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
}
void
dissect_spc_logselect (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_logselect (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;
@ -2348,8 +2351,8 @@ static const true_false_string scsi_log_sp_tfs = {
};
void
dissect_spc_logsense (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_logsense (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
guint8 flags;
@ -3178,8 +3181,8 @@ dissect_scsi_modepage (tvbuff_t *tvb, packet_info *pinfo,
}
void
dissect_spc_modeselect6 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint8 flags;
@ -3276,8 +3279,8 @@ dissect_spc_modeselect6 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree
}
void
dissect_spc_modeselect10 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint8 flags;
@ -3432,8 +3435,8 @@ dissect_scsi_pagecode (tvbuff_t *tvb, packet_info *pinfo _U_,
}
void
dissect_spc_modesense6 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint8 flags;
@ -3525,8 +3528,8 @@ dissect_spc_modesense6 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *
}
void
dissect_spc_modesense10 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_modesense10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint8 flags;
@ -3625,8 +3628,8 @@ dissect_spc_modesense10 (tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree
}
void
dissect_spc_preventallowmediaremoval (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_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_)
{
guint8 flags;
@ -3649,8 +3652,8 @@ dissect_spc_preventallowmediaremoval (tvbuff_t *volatile tvb, packet_info *pinfo
}
void
dissect_spc_persistentreservein (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_persistentreservein (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
guint offset, gboolean isreq, gboolean iscdb,
guint payload_len, scsi_task_data_t *cdata)
{
guint16 flags;
@ -3713,8 +3716,8 @@ dissect_spc_persistentreservein (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
}
void
dissect_spc_persistentreserveout (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_persistentreserveout (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;
@ -3740,8 +3743,8 @@ dissect_spc_persistentreserveout (tvbuff_t *volatile tvb, packet_info *pinfo _U_
}
void
dissect_spc_release6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_release6 (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;
@ -3759,8 +3762,8 @@ dissect_spc_release6 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree
}
void
dissect_spc_release10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_release10 (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;
@ -3790,33 +3793,35 @@ dissect_spc_release10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tre
}
static void
dissect_spc_reportdeviceidentifier (tvbuff_t *volatile tvb _U_, packet_info *pinfo _U_,
dissect_spc_reportdeviceidentifier (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
proto_tree *tree _U_,
volatile guint offset _U_, gboolean isreq _U_, gboolean iscdb _U_,
guint offset _U_, gboolean isreq _U_, gboolean iscdb _U_,
guint payload_len _U_, scsi_task_data_t *cdata _U_)
{
}
void
dissect_spc_reportluns (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
proto_tree *tree, volatile guint offset,
dissect_spc_reportluns (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;
gint listlen;
tvbuff_t *volatile tvb_v = tvb;
volatile guint offset_v = offset;
if (isreq && iscdb) {
proto_tree_add_item (tree, hf_scsi_select_report, tvb, offset+1, 1, 0);
proto_tree_add_item (tree, hf_scsi_select_report, tvb_v, offset_v+1, 1, 0);
proto_tree_add_item (tree, hf_scsi_alloclen32, tvb, offset+5, 4, 0);
proto_tree_add_item (tree, hf_scsi_alloclen32, tvb_v, offset_v+5, 4, 0);
if(cdata){
cdata->itlq->alloc_len=tvb_get_ntohl(tvb, offset+5);
cdata->itlq->alloc_len=tvb_get_ntohl(tvb_v, offset_v+5);
}
flags = tvb_get_guint8 (tvb, offset+10);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb, offset+10, 1,
flags = tvb_get_guint8 (tvb_v, offset_v+10);
proto_tree_add_uint_format (tree, hf_scsi_control, tvb_v, offset_v+10, 1,
flags,
"Vendor Unique = %u, NACA = %u, Link = %u",
flags & 0xC0, flags & 0x4, flags & 0x1);
@ -3825,20 +3830,20 @@ dissect_spc_reportluns (tvbuff_t *volatile tvb, packet_info *pinfo _U_,
return;
}
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb, offset, cdata->itlq->alloc_len);
listlen = tvb_get_ntohl(tvb, offset);
proto_tree_add_text (tree, tvb, offset, 4, "LUN List Length: %u",
TRY_SCSI_CDB_ALLOC_LEN(pinfo, tvb_v, offset_v, cdata->itlq->alloc_len);
listlen = tvb_get_ntohl(tvb_v, offset_v);
proto_tree_add_text (tree, tvb_v, offset_v, 4, "LUN List Length: %u",
listlen);
offset += 8;
offset_v += 8;
while(listlen>0){
if (!tvb_get_guint8 (tvb, offset))
proto_tree_add_item (tree, hf_scsi_rluns_lun, tvb, offset+1, 1,
if (!tvb_get_guint8 (tvb_v, offset_v))
proto_tree_add_item (tree, hf_scsi_rluns_lun, tvb_v, offset_v+1, 1,
0);
else
proto_tree_add_item (tree, hf_scsi_rluns_multilun, tvb, offset,
proto_tree_add_item (tree, hf_scsi_rluns_multilun, tvb_v, offset_v,
8, 0);
offset+=8;
offset_v+=8;
listlen-=8;
}
END_TRY_SCSI_CDB_ALLOC_LEN;
@ -3877,8 +3882,8 @@ dissect_scsi_fix_snsinfo (tvbuff_t *tvb, proto_tree *sns_tree, guint offset)
}
void
dissect_spc_requestsense (tvbuff_t * volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_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_)
{
guint8 flags;
@ -3900,8 +3905,8 @@ dissect_spc_requestsense (tvbuff_t * volatile tvb, packet_info *pinfo _U_, proto
}
void
dissect_spc_reserve6 (tvbuff_t * volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_reserve6 (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;
@ -3919,8 +3924,8 @@ dissect_spc_reserve6 (tvbuff_t * volatile tvb, packet_info *pinfo _U_, proto_tre
}
void
dissect_spc_reserve10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_reserve10 (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;
@ -3950,8 +3955,8 @@ dissect_spc_reserve10 (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tre
}
void
dissect_spc_testunitready (tvbuff_t * volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_spc_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_)
{
guint8 flags;
@ -3974,8 +3979,8 @@ dissect_spc_testunitready (tvbuff_t * volatile tvb, packet_info *pinfo _U_, prot
void
dissect_spc_senddiagnostic (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb _U_,
dissect_spc_senddiagnostic (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_)
{
guint8 flags;
@ -3998,8 +4003,8 @@ dissect_spc_senddiagnostic (tvbuff_t *volatile tvb, packet_info *pinfo _U_, prot
}
void
dissect_spc_writebuffer (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb _U_,
dissect_spc_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_)
{
guint8 flags;
@ -4020,8 +4025,8 @@ dissect_spc_writebuffer (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_t
}
static void
dissect_scsi_varlencdb (tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree,
volatile guint offset, gboolean isreq, gboolean iscdb,
dissect_scsi_varlencdb (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_)
{
if (!tree)

8
epan/dissectors/packet-scsi.h
View File

@ -96,8 +96,8 @@ typedef struct _scsi_task_data {
/* list of commands for each commandset */
typedef void (*scsi_dissector_t)(tvbuff_t *volatile tvb, packet_info *pinfo,
proto_tree *tree, volatile guint offset,
typedef void (*scsi_dissector_t)(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, guint offset,
gboolean isreq, gboolean iscdb,
guint32 payload_len, scsi_task_data_t *cdata);
@ -140,7 +140,7 @@ typedef struct _scsi_cdb_table_t {
#define SCSI_SPC_WRITEBUFFER 0x3B
#define SCSI_SPC_VARLENCDB 0x7F
void dissect_spc_inquiry(tvbuff_t *volatile tvb, packet_info *pinfo, proto_tree *tree, volatile guint offset, gboolean isreq, gboolean iscdb, guint32 payload_len, scsi_task_data_t *cdata);
void dissect_spc_inquiry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint32 payload_len, scsi_task_data_t *cdata);
void dissect_spc_logselect(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_);
void dissect_spc_logsense(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_);
void dissect_spc_modeselect6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
@ -149,7 +149,7 @@ void dissect_spc_modeselect10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
void dissect_spc_modesense10(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
void dissect_spc_persistentreservein(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset, gboolean isreq, gboolean iscdb, guint payload_len, scsi_task_data_t *cdata);
void dissect_spc_persistentreserveout(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_);
void dissect_spc_reportluns(tvbuff_t *volatile tvb, packet_info *pinfo _U_, proto_tree *tree, volatile guint offset, gboolean isreq, gboolean iscdb, guint payload_len _U_, scsi_task_data_t *cdata _U_);
void dissect_spc_reportluns(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_);
void dissect_spc_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_);
void dissect_spc_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_);
void dissect_spc_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_);