diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-04-21 22:00:38 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-04-21 22:00:38 +0000 |
| commit | 73e65216bcc31c5afb5fc795d3bdf97a9c49acf1 (patch) | |
| tree | 28fcb7d17de40dba96908f7b42382962438b82e9 /epan/dissectors/packet-ndmp.c | |
| parent | af78f19109a82fed2292050d13f461b6e9e330ab (diff) | |
remover the lun parameter from dissect_scsi_cdb/payload since this is now part of the exchange data in itlq
remove the two fields opcode and devtype from the scsi_task_data structure since these are also part of the itlq and itl structures
svn path=/trunk/; revision=17949
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index aba9213597..c0f1120ac9 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1108,6 +1108,7 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, if (cdb_len != 0) { tvbuff_t *cdb_tvb; int tvb_len, tvb_rlen; + itlq_nexus_t itlq; tvb_len=tvb_length_remaining(tvb, offset); if(tvb_len>16) @@ -1116,7 +1117,16 @@ dissect_execute_cdb_cdb(tvbuff_t *tvb, int offset, packet_info *pinfo, if(tvb_rlen>16) tvb_rlen=16; cdb_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); - dissect_scsi_cdb(cdb_tvb, pinfo, tree, devtype, 0xffff, NULL); + + /* create a fake itlq structure until we have proper + * tracking in ndmp + */ + itlq.lun=0xffff; + + itlq.first_exchange_frame=0; + itlq.last_exchange_frame=0; + itlq.scsi_opcode=0xffff; + dissect_scsi_cdb(cdb_tvb, pinfo, tree, devtype, &itlq, NULL); offset += cdb_len_full; } @@ -1149,6 +1159,7 @@ dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto if (payload_len != 0) { tvbuff_t *data_tvb; int tvb_len, tvb_rlen; + itlq_nexus_t itlq; tvb_len=tvb_length_remaining(tvb, offset); if(tvb_len>(int)payload_len) @@ -1158,8 +1169,16 @@ dissect_execute_cdb_payload(tvbuff_t *tvb, int offset, packet_info *pinfo, proto tvb_rlen=payload_len; data_tvb=tvb_new_subset(tvb, offset, tvb_len, tvb_rlen); + /* create a fake itlq structure until we have proper + * tracking in ndmp + */ + itlq.lun=0xffff; + + itlq.first_exchange_frame=0; + itlq.last_exchange_frame=0; + itlq.scsi_opcode=0xffff; dissect_scsi_payload(data_tvb, pinfo, tree, isreq, - 0xffff, NULL); + &itlq, NULL); offset += payload_len_full; } |