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-netbios.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-netbios.c')
| -rw-r--r-- | packet-netbios.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-netbios.c b/packet-netbios.c index 8ceb02c69c..f9386cca66 100644 --- a/packet-netbios.c +++ b/packet-netbios.c @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.c,v 1.13 2000/01/16 02:54:48 guy Exp $ + * $Id: packet-netbios.c,v 1.14 2000/01/23 08:55:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -178,8 +178,7 @@ static char *CommandName[] = { "Session Alive", /* 0x1f */ }; -void capture_netbios(const u_char *pd, int offset, guint32 cap_len, - packet_counts *ld) +void capture_netbios(const u_char *pd, int offset, packet_counts *ld) { ld->netbios++; } |