From f0ea4ef8cf23aa81988847e208663d0bb542671e Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 26 Jun 2004 09:48:12 +0000 Subject: 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()". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11245 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-ieee80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packet-ieee80211.c') 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 @@ -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; -- cgit v1.2.3