aboutsummaryrefslogtreecommitdiffstats
path: root/packet-smb.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-09-17 05:56:58 +0000
committerGuy Harris <guy@alum.mit.edu>1999-09-17 05:56:58 +0000
commit96e79ab6f80abdad1e3b525f4febef278de7eacc (patch)
tree7b49cc8eb0de5d9a929aa1676bc1981c3ebcfad3 /packet-smb.c
parentff20b92b67d90a1e14ef73fde3300cec25c54932 (diff)
Add a "BYTES_ARE_IN_FRAME()" macro, to test whether there are a
specified number of bytes of captured data in the frame at the specified offset, and a "IS_DATA_IN_FRAME()" macro, to test whether there are any bytes of captured data in the frame at the specified offset, and convert some bounds checks to use them. Add a dissector for the Internet Printing Protocol. svn path=/trunk/; revision=685
Diffstat (limited to 'packet-smb.c')
-rw-r--r--packet-smb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-smb.c b/packet-smb.c
index 98b5aca784..02f50ef428 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
- * $Id: packet-smb.c,v 1.24 1999/08/26 07:34:38 guy Exp $
+ * $Id: packet-smb.c,v 1.25 1999/09/17 05:56:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@@ -1444,7 +1444,7 @@ dissect_negprot_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tr
}
- while (pi.captured_len > offset) {
+ while (IS_DATA_IN_FRAME(offset)) {
const char *str;
if (tree) {