osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Bill Studenmund: fix handling of SCSI mode sense. 

Fix Yasuhiro Shirasaki's e-mail address, and [AT]ify Vassilii
Khachaturov's address.

svn path=/trunk/; revision=6014
This commit is contained in:
Guy Harris 2002-08-18 19:59:40 +00:00
parent d487e4f968
commit 0f3a02c956
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AUTHORS
View File

@ -1307,7 +1307,7 @@ Tsutomu Mieno <iitom[AT]utouto.com> {
DHCPv6 updates
}
Yasuhiro Shirasaki <yasuhiro@gnome[AT]gr.jp> {
Yasuhiro Shirasaki <yasuhiro[AT]gnome.gr.jp> {
DHCPv6 updates
}
@ -1366,11 +1366,15 @@ Alfred Koebler <ak[AT]icon-sult.de> {
files for Ethernet)
}
Vassilii Khachaturov <Vassilii.Khachaturov@comverse.com> {
Vassilii Khachaturov <Vassilii.Khachaturov[AT]comverse.com> {
Put protocol blurbs into tables generated with the "-G fields"
flag
}
Bill Studenmund <wrstuden[AT]wasabisystems.com> {
Fix handling of SCSI mode sense
}
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

5
doc/ethereal.pod.template
View File

@ -1455,7 +1455,7 @@ B<http://www.ethereal.com>.
Jaime Fournier <jafour1[AT]yahoo.com>
Markus Steinmann <ms[AT]seh.de>
Tsutomu Mieno <iitom[AT]utouto.com>
Yasuhiro Shirasaki <yasuhiro@gnome[AT]gr.jp>
Yasuhiro Shirasaki <yasuhiro[AT]gnome.gr.jp>
Anand V. Narwani <anarwani[AT]cisco.com>
Christopher K. St. John <cks[AT]distributopia.com>
Nix <nix[AT]esperi.demon.co.uk>
@ -1467,7 +1467,8 @@ B<http://www.ethereal.com>.
Hidetaka Ogawa <ogawa[AT]bs2.qnes.nec.co.jp>
Jan Kratochvil <short[AT]ucw.cz>
Alfred Koebler <ak[AT]icon-sult.de>
Vassilii Khachaturov <Vassilii.Khachaturov@comverse.com>
Vassilii Khachaturov <Vassilii.Khachaturov[AT]comverse.com>
Bill Studenmund <wrstuden[AT]wasabisystems.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

11
packet-scsi.c
View File

@ -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.
*/