diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-01-23 08:55:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-01-23 08:55:37 +0000 |
| commit | 2461d79698e685644e2f07ee46381a092348461c (patch) | |
| tree | 8647292ca380ae9108970a167959b9df1c931ec9 /packet-raw.c | |
| parent | 42d68156a9599948fb0c5c633efc9d61548d5a5b (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-raw.c')
| -rw-r--r-- | packet-raw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-raw.c b/packet-raw.c index ae7b829e9e..6465bcb51b 100644 --- a/packet-raw.c +++ b/packet-raw.c @@ -1,7 +1,7 @@ /* packet-raw.c * Routines for raw packet disassembly * - * $Id: packet-raw.c,v 1.11 1999/11/16 11:42:50 guy Exp $ + * $Id: packet-raw.c,v 1.12 2000/01/23 08:55:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,7 +38,7 @@ static gint ett_raw = -1; void -capture_raw( const u_char *pd, guint32 cap_len, packet_counts *ld ) { +capture_raw( const u_char *pd, packet_counts *ld ) { /* So far, the only time we get raw connection types are with Linux and * Irix PPP connections. We can't tell what type of data is coming down @@ -49,9 +49,9 @@ capture_raw( const u_char *pd, guint32 cap_len, packet_counts *ld ) { * sometimes. This check should be removed when 2.2 is out. */ if (pd[0] == 0xff && pd[1] == 0x03) - capture_ip(pd, 4, cap_len, ld); + capture_ip(pd, 4, ld); else - capture_ip(pd, 0, cap_len, ld); + capture_ip(pd, 0, ld); } void |