diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-01 07:11:49 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-01 07:11:49 +0000 |
| commit | 23c827c589030ee5f0fb99faeb4ebfed24ab2edf (patch) | |
| tree | defd8c4db6a77dd4d288de2b0b10f39d6c701b73 /packet-vlan.c | |
| parent | 9289780f1e8ea16abd527d2d4cd637ea9da5b655 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8574 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-vlan.c')
| -rw-r--r-- | packet-vlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-vlan.c b/packet-vlan.c index cfc6bb1a0e..5a43b697fb 100644 --- a/packet-vlan.c +++ b/packet-vlan.c @@ -1,7 +1,7 @@ /* packet-vlan.c * Routines for VLAN 802.1Q ethernet header disassembly * - * $Id: packet-vlan.c,v 1.42 2003/01/31 03:17:47 guy Exp $ + * $Id: packet-vlan.c,v 1.43 2003/10/01 07:11:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -116,10 +116,10 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENDTRY; dissect_802_3(encap_proto, is_802_2, tvb, 4, pinfo, tree, vlan_tree, - hf_vlan_len, hf_vlan_trailer); + hf_vlan_len, hf_vlan_trailer, 0); } else { ethertype(encap_proto, tvb, 4, pinfo, tree, vlan_tree, - hf_vlan_etype, hf_vlan_trailer); + hf_vlan_etype, hf_vlan_trailer, 0); } } |