diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:33:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:33:35 +0000 |
| commit | f2246ebb65b7640ecf7e17a974ef4521427dca47 (patch) | |
| tree | 0e9b2b89c52b9e6ccceab293202cf1051f4b1c5f /packet-ipx.c | |
| parent | 9d4c965c819bf9ff2e979db0fb18dd3d8d3cfd4c (diff) | |
| download | wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.tar.gz wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.tar.bz2 wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.zip | |
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=1530
Diffstat (limited to 'packet-ipx.c')
| -rw-r--r-- | packet-ipx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ipx.c b/packet-ipx.c index 8cce00579f..3883d84d32 100644 --- a/packet-ipx.c +++ b/packet-ipx.c @@ -2,7 +2,7 @@ * Routines for NetWare's IPX * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-ipx.c,v 1.47 2000/01/23 08:55:33 guy Exp $ + * $Id: packet-ipx.c,v 1.48 2000/01/24 03:33:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -638,7 +638,7 @@ dissect_ipxrip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { proto_tree_add_text(rip_tree, offset, 2, "Unknown RIP packet type"); } - for (cursor = offset + 2; cursor < fd->cap_len; cursor += 8) { + for (cursor = offset + 2; cursor < pi.captured_len; cursor += 8) { memcpy(&route.network, &pd[cursor], 4); route.hops = pntohs(&pd[cursor+4]); route.ticks = pntohs(&pd[cursor+6]); @@ -787,7 +787,7 @@ dissect_ipxsap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (query.query_type == IPX_SAP_GENERAL_RESPONSE || query.query_type == IPX_SAP_NEAREST_RESPONSE) { /* responses */ - for (cursor = offset + 2; (cursor + 64) <= fd->cap_len; cursor += 64) { + for (cursor = offset + 2; (cursor + 64) <= pi.captured_len; cursor += 64) { server.server_type = pntohs(&pd[cursor]); memcpy(server.server_name, &pd[cursor+2], 48); memcpy(&server.server_network, &pd[cursor+50], 4); |