osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

When dissecting an NFS file handle, show the raw bytes of the file 

handle data (snoop does this, and it's somewhat convenient if you're
trying to see whether, say, an ACCESS call is acting on the file whose
file handle you got back from a previous MOUNT request).

Boost the maximum number of bytes worth of hex data shown by
"bytes_to_str()" from 10 to 16, so that we can show the file handle 16
bytes per line (as snoop does).

svn path=/trunk/; revision=1744
This commit is contained in:
Guy Harris 2000-03-23 00:38:11 +00:00
parent fbaa212634
commit 0b8378e622
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packet-nfs.c
View File

@ -2,7 +2,7 @@
* Routines for nfs dissection
* Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
*
* $Id: packet-nfs.c,v 1.24 2000/03/20 22:52:44 gram Exp $
* $Id: packet-nfs.c,v 1.25 2000/03/23 00:38:11 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -229,6 +229,29 @@ char* name)
return offset;
}
static void
dissect_fhandle_data(const u_char *pd, int offset, proto_tree *tree, int fhlen)
{
int sublen;
int bytes_left;
gboolean first_line;
bytes_left = fhlen;
first_line = TRUE;
while (bytes_left != 0) {
sublen = 16;
if (sublen > bytes_left)
sublen = bytes_left;
proto_tree_add_text(tree, offset, sublen,
"%s%s",
first_line ? "data: " :
" ",
bytes_to_str(&pd[offset], sublen));
bytes_left -= sublen;
offset += sublen;
first_line = FALSE;
}
}
/* RFC 1094, Page 15 */
int
@ -244,16 +267,13 @@ dissect_fhandle(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
ftree = proto_item_add_subtree(fitem, ett_nfs_fhandle);
}
if (ftree) {
proto_tree_add_text(ftree,offset+0,FHSIZE,
"file handle (opaque data)");
}
if (ftree)
dissect_fhandle_data(pd, offset, ftree, FHSIZE);
offset += FHSIZE;
return offset;
}
/* RFC 1094, Page 15 */
int
dissect_nfs2_fhandle_call(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
@ -1300,11 +1320,7 @@ dissect_nfs_fh3(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
if (ftree) {
proto_tree_add_text(ftree,offset+0,4,
"length: %u", fh3_len);
proto_tree_add_text(ftree,offset+4,fh3_len,
"file handle (opaque data)");
if (fh3_fill)
proto_tree_add_text(ftree,offset+4+fh3_len,fh3_fill,
"fill bytes");
dissect_fhandle_data(pd, offset+4, ftree, fh3_len);
}
offset += 4 + fh3_len_full;
return offset;

4
packet.c
View File

@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
* $Id: packet.c,v 1.65 2000/03/12 04:47:53 gram Exp $
* $Id: packet.c,v 1.66 2000/03/23 00:38:10 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -251,7 +251,7 @@ time_secs_to_str(guint32 time)
}
/* Max string length for displaying byte string. */
#define MAX_BYTE_STR_LEN 20
#define MAX_BYTE_STR_LEN 32
/* Turn an array of bytes into a string showing the bytes in hex. */
#define N_BYTES_TO_STR_STRINGS 6