diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:51:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:51:35 +0000 |
| commit | 930d95c0b00d0b81685ab553dfdecdafb8e1b649 (patch) | |
| tree | 51d39ceb11b0829795a52a7cbdccee8b227c4698 /packet-ppp.c | |
| parent | f2246ebb65b7640ecf7e17a974ef4521427dca47 (diff) | |
Fix a bunch of dissectors to use "pi.captured_len" rather than
"fd->cap_len" for the frame length - or to use macros such as
"BYTES_ARE_IN_FRAME()", "IS_DATA_IN_FRAME()", and "END_OF_FRAME", which
use "pi.captured_len" - so that they correctly handle frames where the
actual data length of the packet is less than the size of the raw frame,
e.g. with encapsulations such as ISL.
svn path=/trunk/; revision=1531
Diffstat (limited to 'packet-ppp.c')
| -rw-r--r-- | packet-ppp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-ppp.c b/packet-ppp.c index 6e3228a4b4..12f322f4b7 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -1,7 +1,7 @@ /* packet-ppp.c * Routines for ppp packet disassembly * - * $Id: packet-ppp.c,v 1.25 2000/01/23 08:55:35 guy Exp $ + * $Id: packet-ppp.c,v 1.26 2000/01/24 03:51:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1103,7 +1103,7 @@ dissect_mp(const u_char *pd, int offset, frame_data *fd, offset += 4; - if (fd->cap_len > offset) { + if (IS_DATA_IN_FRAME(offset)) { if (tree) { ti = proto_tree_add_item(tree, proto_ppp, offset, 1, NULL); fh_tree = proto_item_add_subtree(ti, ett_ppp); |