aboutsummaryrefslogtreecommitdiffstats
path: root/packet-scsi.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-01-16 20:25:07 +0000
committerGuy Harris <guy@alum.mit.edu>2002-01-16 20:25:07 +0000
commit704493f4e2ac502de06bcf975d6222c8f4a38808 (patch)
tree39742786cf8600dd2006164bd39ceba7e8c0f469 /packet-scsi.c
parent06348ee4e0bf301d357ddf8cd11ef05971c17515 (diff)
From Mark Burton: reinstate data segment digest handling, and stop the
SCSI dissector from treating data digests as payload. svn path=/trunk/; revision=4552
Diffstat (limited to 'packet-scsi.c')
-rw-r--r--packet-scsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-scsi.c b/packet-scsi.c
index a77fb8f0e9..c9e115f9d5 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.1 2002/01/10 01:28:43 guy Exp $
+ * $Id: packet-scsi.c,v 1.2 2002/01/16 20:25:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2055,7 +2055,7 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (tree) {
if (cmd == SCSI_CMND_SPC2) {
ti = proto_tree_add_protocol_format (tree, proto_scsi, tvb, offset,
- tvb_length (tvb),
+ payload_len,
"SCSI Payload (%s %s)",
val_to_str (opcode,
scsi_spc2_val,
@@ -2064,7 +2064,7 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
else if (cmd == SCSI_CMND_SBC2) {
ti = proto_tree_add_protocol_format (tree, proto_scsi, tvb, offset,
- tvb_length (tvb),
+ payload_len,
"SCSI Payload (%s %s)",
val_to_str (opcode,
scsi_sbc2_val,
@@ -2073,7 +2073,7 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
else {
ti = proto_tree_add_protocol_format (tree, proto_scsi, tvb, offset,
- tvb_length (tvb),
+ payload_len,
"SCSI Payload (0x%02x %s)",
opcode,
isreq ? "Request" : "Response");