path: root/packet-vines.c
diff options
authorGuy Harris <guy@alum.mit.edu>2000-01-23 08:55:37 +0000
committerGuy Harris <guy@alum.mit.edu>2000-01-23 08:55:37 +0000
commit2461d79698e685644e2f07ee46381a092348461c (patch)
tree8647292ca380ae9108970a167959b9df1c931ec9 /packet-vines.c
parent42d68156a9599948fb0c5c633efc9d61548d5a5b (diff)
In "dissect_eth()", update "pi.len" and "pi.captured_len" regardless of
whether we're building a protocol tree or not. Make "dissect_eth()" use "BYTES_ARE_IN_FRAME()" to see if we have a full Ethernet header - it can be called with a non-zero offset, if Ethernet frames are encapsulated inside other frames (e.g., ATM LANE). Make capture routines take an "offset" argument if the corresponding dissect routine takes one (for symmetry, and for Cisco ISL or any other protocol that encapsulates Ethernet or Token-Ring frames inside other frames). Pass the frame lengths to capture routines via the "pi" structure, rather than as an in-line argument, so that they can macros such as "BYTES_ARE_IN_FRAME()" the way the corresponding dissect routines do. Make capture routines update "pi.len" and "pi.captured_len" the same way the corresponding diseect routines do, if the capture routines then call other capture routines. Make "capture_vlan()" count as "other" frames that are too short, the way other capture routines do. svn path=/trunk/; revision=1525
Diffstat (limited to 'packet-vines.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-vines.c b/packet-vines.c
index 5d293e430f..b1d35e04c5 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
- * $Id: packet-vines.c,v 1.11 2000/01/21 00:07:53 gram Exp $
+ * $Id: packet-vines.c,v 1.12 2000/01/23 08:55:37 guy Exp $
* Don Lafontaine <lafont02@cn.ca>
@@ -45,7 +45,7 @@ static gint ett_vines_frp = -1;
static gint ett_vines_spp = -1;
-capture_vines(const u_char *pd, int offset, guint32 cap_len, packet_counts *ld)
+capture_vines(const u_char *pd, int offset, packet_counts *ld)