diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-18 19:59:40 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-18 19:59:40 +0000 |
| commit | 53d2312ec6f9ad1c8b1cc49d34dc12230a2b2c06 (patch) | |
| tree | 22a5d6f324b91e2435d372ddc41f3f38ed95a15c /packet-scsi.c | |
| parent | b86665674e73809c4e82d941e3351e83cfa1dbd7 (diff) | |
From Bill Studenmund: fix handling of SCSI mode sense.
Fix Yasuhiro Shirasaki's e-mail address, and [AT]ify Vassilii
Khachaturov's address.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6014 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-scsi.c')
| -rw-r--r-- | packet-scsi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-scsi.c b/packet-scsi.c index 076238d2b2..06a201bbb3 100644 --- a/packet-scsi.c +++ b/packet-scsi.c @@ -2,7 +2,7 @@ * Routines for decoding SCSI CDBs and responses * Author: Dinesh G Dutt (ddutt@cisco.com) * - * $Id: packet-scsi.c,v 1.11 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-scsi.c,v 1.12 2002/08/18 19:59:37 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1869,7 +1869,8 @@ dissect_scsi_modeselect6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, desclen = tvb_get_guint8 (tvb, offset+3); proto_tree_add_text (tree, tvb, offset+3, 1, "Block Descriptor Length: %u", desclen); - offset = 4; + tot_len += offset; + offset += 4; tot_len -= 3; /* tot_len does not include the len field */ if (desclen) { proto_tree_add_text (tree, tvb, offset, 4, "No. of Blocks: %u", @@ -1938,7 +1939,8 @@ dissect_scsi_modeselect10 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, desclen = tvb_get_guint8 (tvb, offset+6); proto_tree_add_text (tree, tvb, offset+6, 1, "Block Descriptor Length: %u", desclen); - offset = 8; + tot_len += offset; + offset += 8; tot_len -= 6; /* tot_len does not include the len field */ if (desclen) { proto_tree_add_text (tree, tvb, offset, 8, "No. of Blocks: %s", @@ -2006,7 +2008,8 @@ dissect_scsi_modesense6 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, desclen = tvb_get_guint8 (tvb, offset+3); proto_tree_add_text (tree, tvb, offset+3, 1, "Block Descriptor Length: %u", desclen); - offset = 4; + tot_len += offset; + offset += 4; /* The actual payload is the min of the length in the response & the * space allocated by the initiator as specified in the request. */ |