diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-10-01 07:11:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-10-01 07:11:49 +0000 |
| commit | be2736adcf8ac583c2d56e37db9ef01f391913f9 (patch) | |
| tree | defd8c4db6a77dd4d288de2b0b10f39d6c701b73 /packet-llc.c | |
| parent | 44bb98184df93ebb56b5dce5dbd1deb6f37d716a (diff) | |
Have a pseudo-header for Ethernet packets, giving the size of the FCS -
0 means "there is no FCS in the packet data", 4 means "there is an FCS
in the packet data", -1 means "I don't know whether there's an FCS in
the packet data, guess based on the packet size".
Assume that Ethernet encapsulated inside other protocols has no FCS, by
having the "eth" dissector assume that (and not check for an Ethernet
pseudo-header).
Have "ethertype()" take an argument giving the FCS size; pass 0 when
appropriate.
Fix up Wiretap routines to set the pseudo-header. This means we no
longer use the "generic" seek-and-read routine, so get rid of it.
svn path=/trunk/; revision=8574
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-llc.c b/packet-llc.c index aa06bb5e07..3bd505e93d 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-llc.c,v 1.115 2003/09/03 06:38:15 guy Exp $ + * $Id: packet-llc.c,v 1.116 2003/10/01 07:11:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -446,7 +446,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, packet type for AARP packets. */ if (XDLC_IS_INFORMATION(control)) { ethertype(etype, tvb, offset+5, - pinfo, tree, snap_tree, hf_type, -1); + pinfo, tree, snap_tree, hf_type, -1, 0); } else { next_tvb = tvb_new_subset(tvb, offset+5, -1, -1); call_dissector(data_handle,next_tvb, pinfo, tree); |