forked from osmocom/wireshark
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
This commit is contained in:
Guy Harris
parent
a0414ee1ab
commit
d88cd5d6dd
12
crc32.c
12
crc32.c
|
|
@ -1,7 +1,7 @@
|
|||
/* crc32.c
|
||||
* CRC-32 routine
|
||||
*
|
||||
* $Id: crc32.c,v 1.3 2003/08/26 06:18:16 guy Exp $
|
||||
* $Id: crc32.c,v 1.4 2004/06/26 09:48:11 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
* x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^8 + x^7 +
|
||||
* x^5 + x^4 + x^2 + x + 1
|
||||
*/
|
||||
const guint32 crc32_table[256] = {
|
||||
const guint32 crc32_ccitt_table[256] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
|
||||
0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
|
||||
0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
|
||||
|
|
@ -97,14 +97,14 @@ const guint32 crc32_table[256] = {
|
|||
};
|
||||
|
||||
guint32
|
||||
crc32_tvb(tvbuff_t *tvb, unsigned int len)
|
||||
crc32_ccitt_tvb(tvbuff_t *tvb, unsigned int len)
|
||||
{
|
||||
unsigned int i;
|
||||
const unsigned char* buf = tvb_get_ptr(tvb, 0, len);
|
||||
guint32 crc32 = 0xFFFFFFFF;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
crc32 = crc32_table[(crc32 ^ buf[i]) & 0xff] ^ (crc32 >> 8);
|
||||
crc32 = crc32_ccitt_table[(crc32 ^ buf[i]) & 0xff] ^ (crc32 >> 8);
|
||||
|
||||
return ( ~crc32 );
|
||||
}
|
||||
|
|
@ -119,11 +119,11 @@ crc32_tvb(tvbuff_t *tvb, unsigned int len)
|
|||
* to cope with 802.x sending stuff out in reverse bit order?
|
||||
*/
|
||||
guint32
|
||||
crc32_tvb_802(tvbuff_t *tvb, unsigned int len)
|
||||
crc32_802_tvb(tvbuff_t *tvb, unsigned int len)
|
||||
{
|
||||
guint32 c_crc;
|
||||
|
||||
c_crc = crc32_tvb(tvb, len);
|
||||
c_crc = crc32_ccitt_tvb(tvb, len);
|
||||
|
||||
/* Byte reverse. */
|
||||
c_crc = ((unsigned char)(c_crc>>0)<<24) |
|
||||
|
|
|
|||
9
crc32.h
9
crc32.h
|
|
@ -1,7 +1,7 @@
|
|||
/* crc32.h
|
||||
* Declaration of CRC-32 routine and table
|
||||
*
|
||||
* $Id: crc32.h,v 1.3 2003/08/26 06:18:17 guy Exp $
|
||||
* $Id: crc32.h,v 1.4 2004/06/26 09:48:11 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -24,8 +24,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
extern const guint32 crc32_table[256];
|
||||
|
||||
extern guint32 crc32_tvb(tvbuff_t *tvb, unsigned int len);
|
||||
extern guint32 crc32_tvb_802(tvbuff_t *tvb, unsigned int len);
|
||||
extern const guint32 crc32_ccitt_table[256];
|
||||
|
||||
extern guint32 crc32_ccitt_tvb(tvbuff_t *tvb, unsigned int len);
|
||||
extern guint32 crc32_802_tvb(tvbuff_t *tvb, unsigned int len);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet-eth.c
|
||||
* Routines for ethernet packet disassembly
|
||||
*
|
||||
* $Id: packet-eth.c,v 1.89 2004/02/03 23:19:54 guy Exp $
|
||||
* $Id: packet-eth.c,v 1.90 2004/06/26 09:48:11 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -365,7 +365,7 @@ add_ethernet_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb,
|
|||
}
|
||||
if (has_fcs) {
|
||||
guint32 sent_fcs = tvb_get_ntohl(trailer_tvb, trailer_length);
|
||||
guint32 fcs = crc32_tvb_802(tvb, tvb_length(tvb) - 4);
|
||||
guint32 fcs = crc32_802_tvb(tvb, tvb_length(tvb) - 4);
|
||||
if (fcs == sent_fcs) {
|
||||
proto_tree_add_text(fh_tree, trailer_tvb, trailer_length, 4,
|
||||
"Frame check sequence: 0x%08x (correct)",
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
54
packet-ppp.c
54
packet-ppp.c
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for ppp packet disassembly
|
||||
* RFC 1661, RFC 1662
|
||||
*
|
||||
* $Id: packet-ppp.c,v 1.119 2004/05/24 02:25:19 guy Exp $
|
||||
* $Id: packet-ppp.c,v 1.120 2004/06/26 09:48:12 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -43,6 +43,7 @@
|
|||
#include "packet-ipx.h"
|
||||
#include "packet-vines.h"
|
||||
#include "nlpid.h"
|
||||
#include "crc16.h"
|
||||
#include "crc32.h"
|
||||
|
||||
#define ppp_min(a, b) ((a<b) ? a : b)
|
||||
|
|
@ -1360,63 +1361,20 @@ static const ip_tcp_opt ipv6cp_opts[] = {
|
|||
|
||||
#define N_IPV6CP_OPTS (sizeof ipv6cp_opts / sizeof ipv6cp_opts[0])
|
||||
|
||||
static const unsigned short fcstab_16[256] = {
|
||||
0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
|
||||
0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
|
||||
0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
|
||||
0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
|
||||
0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
|
||||
0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
|
||||
0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
|
||||
0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
|
||||
0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
|
||||
0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
|
||||
0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
|
||||
0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
|
||||
0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
|
||||
0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
|
||||
0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
|
||||
0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
|
||||
0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
|
||||
0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
|
||||
0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
|
||||
0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
|
||||
0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
|
||||
0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
|
||||
0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
|
||||
0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
|
||||
0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
|
||||
0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
|
||||
0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
|
||||
0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
|
||||
0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
|
||||
0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
|
||||
0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
|
||||
0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
|
||||
};
|
||||
|
||||
/*
|
||||
*******************************************************************************
|
||||
* DETAILS : Calculate a new FCS-16 given the current FCS-16 and the new data.
|
||||
*******************************************************************************
|
||||
*/
|
||||
static guint16
|
||||
fcs16(register guint16 fcs, tvbuff_t * tvbuff)
|
||||
fcs16(tvbuff_t * tvbuff)
|
||||
{
|
||||
int offset = 0;
|
||||
guint len = tvb_length(tvbuff)-2;
|
||||
guint8 val;
|
||||
|
||||
/* Check for Invalid Length */
|
||||
if (len == 0)
|
||||
return (0x0000);
|
||||
while (len--) {
|
||||
val = tvb_get_guint8(tvbuff, offset++);
|
||||
fcs = (guint16)((fcs >> 8) & 0x00ff) ^
|
||||
fcstab_16[((guint16)(fcs ^ (guint16)((val) & 0x00ff)) & 0x00ff)];
|
||||
}
|
||||
|
||||
return (fcs ^ 0xffff);
|
||||
return crc16_ccitt_tvb(tvbuff, len);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1432,7 +1390,7 @@ fcs32(tvbuff_t * tvbuff)
|
|||
/* Check for invalid Length */
|
||||
if (len == 0)
|
||||
return (0x00000000);
|
||||
return crc32_tvb(tvbuff, len);
|
||||
return crc32_ccitt_tvb(tvbuff, len);
|
||||
}
|
||||
|
||||
tvbuff_t *
|
||||
|
|
@ -1492,7 +1450,7 @@ decode_fcs(tvbuff_t *tvb, proto_tree *fh_tree, int fcs_decode, int proto_offset)
|
|||
* Compute the FCS and put it into the tree.
|
||||
*/
|
||||
rx_fcs_offset = proto_offset + len;
|
||||
rx_fcs_exp = fcs16(0xFFFF, tvb);
|
||||
rx_fcs_exp = fcs16(tvb);
|
||||
rx_fcs_got = tvb_get_letohs(tvb, rx_fcs_offset);
|
||||
if (rx_fcs_got != rx_fcs_exp) {
|
||||
proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2,
|
||||
|
|
|
|||
Loading…
Reference in New Issue