diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-06-26 09:48:12 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-06-26 09:48:12 +0000 |
| commit | d88cd5d6dd84ac93f5772e733de0f3e23a0e6c82 (patch) | |
| tree | 1211bd2ae769213f1ab378bce824d813c0dc621a /packet-ieee80211.c | |
| parent | a0414ee1ab8db44275599cd3ec38e2b1b16bd5bd (diff) | |
Use the "crc16.c" CRC-16 routine in the PPP dissector.
Rename the "crc32.c" CRC-32 routine "crc32_ccitt_tvb()", to match the
"crc16.c" CRC-16 routine, and rename the table it uses to match. Also
rename "crc32_tvb_802" to "crc32_802_tvb", to match "crc32_ccitt_tvb()".
svn path=/trunk/; revision=11245
Diffstat (limited to 'packet-ieee80211.c')
| -rw-r--r-- | packet-ieee80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 98ea595d63..8438b38258 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.109 2004/06/06 14:29:06 gerald Exp $ + * $Id: packet-ieee80211.c,v 1.110 2004/06/26 09:48:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1839,7 +1839,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, reported_len -= 4; if (tree) { - guint32 fcs = crc32_tvb_802(tvb, hdr_len + len); + guint32 fcs = crc32_802_tvb(tvb, 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, @@ -2931,7 +2931,7 @@ static int wep_decrypt(guint8 *buf, guint32 len, int key_override) { #if 0 printf("%02x\n", *dpos); #endif - crc = crc32_table[(crc ^ *dpos++) & 0xff] ^ (crc >> 8); + crc = crc32_ccitt_table[(crc ^ *dpos++) & 0xff] ^ (crc >> 8); } crc = ~crc; |