diff options
author | Guy Harris <guy@alum.mit.edu> | 2002-08-20 22:33:17 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2002-08-20 22:33:17 +0000 |
commit | 71bfe6806c9d5681f541c93569b3a11596d3d9df (patch) | |
tree | 2215517c2dc1c100b177ba02c90e755cd5795119 /packet-iscsi.c | |
parent | 7200333d8b08e948f420cb62d91875eed80fb678 (diff) | |
download | wireshark-71bfe6806c9d5681f541c93569b3a11596d3d9df.tar.gz |
Have "dissect_scsi_cdb()" take an argument that's a SCSI device type,
for the benefit of dissectors such as the NDMP dissector that can at
least supply a reasonable guess for the device type; more than one type
of device can be opened on the same host over NDMP, so the scheme
currently used by the SCSI dissector to remember device types in INQUIRY
replies won't work.
Have the iSCSI dissector supply SCSI_DEV_UNKNOWN, and have the NDMP
dissector supply SCSI_DEV_SMC for NDMP_SCSI_EXECUTE_CDB (under the
assumption that it's operating on a media changer) and supply
SCSI_DEV_SSC for NDMP_TAPE_EXECUTE_CDB (under the assumption that it's
operating on a tape device).
Fix memory leaks in the SCSI dissector.
Fix the dissectors for the SSC READ(6) and WRITE(6) CDBs to dissect the
transfer length as a 24-bit quantity.
svn path=/trunk/; revision=6035
Diffstat (limited to 'packet-iscsi.c')
-rw-r--r-- | packet-iscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-iscsi.c b/packet-iscsi.c index 8e321f184c..d46f1cfd70 100644 --- a/packet-iscsi.c +++ b/packet-iscsi.c @@ -2,7 +2,7 @@ * Routines for iSCSI dissection * Copyright 2001, Eurologic and Mark Burton <markb@ordern.com> * - * $Id: packet-iscsi.c,v 1.36 2002/08/02 23:35:51 jmayer Exp $ + * $Id: packet-iscsi.c,v 1.37 2002/08/20 22:33:16 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1434,7 +1434,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off ~(X_BIT | I_BIT) : ~I_BIT)) == ISCSI_OPCODE_SCSI_COMMAND) { /* SCSI Command */ - dissect_scsi_cdb (tvb, pinfo, tree, cdb_offset, 16); + dissect_scsi_cdb (tvb, pinfo, tree, cdb_offset, 16, SCSI_DEV_UNKNOWN); } else if (opcode == ISCSI_OPCODE_SCSI_RESPONSE) { if (scsi_status == 0x2) { |