diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-26 05:52:53 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-26 05:52:53 +0000 |
| commit | fcaa613f9bdbb9906e896c545d25feadd552eb10 (patch) | |
| tree | 733504afac6821618f370545b556d2541c2176b9 /packet-ieee80211.c | |
| parent | 2bdd160d0e5b40c5651a8f047e6b93ed369d6d5f (diff) | |
From Jesper Peterson:
Extract the FCS decoding section of the PPP_HDLC dissector to
allow the CHDLC dissector to use the same routine.
The ppp_options used for preferences has been renamed to
fcs_options and exported via packet-ppp.h so CHDLC gets a
separate (but identical) FCS preference.
This means prefs.h has to be included before packet-ppp.h so a
couple of ppp related files (packet-{gtp,null,raw,vj}.c) had
their includes slightly re-arranged.
From me: make the PPP/CHDLC FCS code use "crc32()" to check the 32-bit
FCS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8266 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ieee80211.c')
| -rw-r--r-- | packet-ieee80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index dd7a5dc301..97dfb7bd1e 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.93 2003/08/26 05:09:56 guy Exp $ + * $Id: packet-ieee80211.c,v 1.94 2003/08/26 05:52:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1686,7 +1686,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, reported_len -= 4; if (tree) { - guint32 fcs = crc32(tvb_get_ptr(tvb, 0, hdr_len + len), hdr_len + len); + guint32 fcs = crc32_802(tvb_get_ptr(tvb, 0, hdr_len + len), hdr_len + len); guint32 sent_fcs = tvb_get_ntohl(tvb, hdr_len + len); if (fcs == sent_fcs) proto_tree_add_uint_format(hdr_tree, hf_fcs, tvb, |