diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-09-17 05:56:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-09-17 05:56:58 +0000 |
| commit | 96e79ab6f80abdad1e3b525f4febef278de7eacc (patch) | |
| tree | 7b49cc8eb0de5d9a929aa1676bc1981c3ebcfad3 /packet-isakmp.c | |
| parent | ff20b92b67d90a1e14ef73fde3300cec25c54932 (diff) | |
| download | wireshark-96e79ab6f80abdad1e3b525f4febef278de7eacc.tar.gz wireshark-96e79ab6f80abdad1e3b525f4febef278de7eacc.tar.bz2 wireshark-96e79ab6f80abdad1e3b525f4febef278de7eacc.zip | |
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-isakmp.c')
| -rw-r--r-- | packet-isakmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-isakmp.c b/packet-isakmp.c index 65867c86da..1e12c542bb 100644 --- a/packet-isakmp.c +++ b/packet-isakmp.c @@ -2,7 +2,7 @@ * Routines for the Internet Security Association and Key Management Protocol (ISAKMP) * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-isakmp.c,v 1.8 1999/08/26 07:34:41 guy Exp $ + * $Id: packet-isakmp.c,v 1.9 1999/09/17 05:56:54 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -289,7 +289,7 @@ void dissect_isakmp(const u_char *pd, int offset, frame_data *fd, proto_tree *tr if (check_col(fd, COL_INFO)) col_add_fstr(fd, COL_INFO, "%s", exchtype2str(hdr->exch_type)); - if (pi.captured_len > offset && tree) { + if (IS_DATA_IN_FRAME(offset) && tree) { proto_item * ti; proto_tree * isakmp_tree; |