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-fcp.c | |
| parent | af78f19109a82fed2292050d13f461b6e9e330ab (diff) | |
| download | wireshark-73e65216bcc31c5afb5fc795d3bdf97a9c49acf1.tar.gz | |
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-fcp.c')
| -rw-r--r-- | epan/dissectors/packet-fcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 0989d14ac4..efde328fc1 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -462,7 +462,7 @@ dissect_fcp_cmnd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, pro if(tvb_rlen>(16+add_len)) tvb_rlen=16+add_len; cdb_tvb=tvb_new_subset(tvb, offset+12, tvb_len, tvb_rlen); - dissect_scsi_cdb(cdb_tvb, pinfo, parent_tree, SCSI_DEV_UNKNOWN, lun, itl); + dissect_scsi_cdb(cdb_tvb, pinfo, parent_tree, SCSI_DEV_UNKNOWN, fchdr->itlq, itl); proto_tree_add_item(tree, hf_fcp_dl, tvb, offset+12+16+add_len, 4, 0); @@ -477,7 +477,7 @@ dissect_fcp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, con task_key.task_id = conversation->index; pinfo->private_data = (void *)&task_key; - dissect_scsi_payload(tvb, pinfo, parent_tree, FALSE, fchdr->itlq->lun, itl); + dissect_scsi_payload(tvb, pinfo, parent_tree, FALSE, fchdr->itlq, itl); } /* fcp-3 9.5 table 24 */ |