diff options
| -rw-r--r-- | crc32.c | 146 | ||||
| -rw-r--r-- | crc32.h | 4 | ||||
| -rw-r--r-- | packet-chdlc.c | 23 | ||||
| -rw-r--r-- | packet-eth.c | 4 | ||||
| -rw-r--r-- | packet-gtp.c | 4 | ||||
| -rw-r--r-- | packet-ieee80211.c | 4 | ||||
| -rw-r--r-- | packet-null.c | 3 | ||||
| -rw-r--r-- | packet-ppp.c | 350 | ||||
| -rw-r--r-- | packet-ppp.h | 9 | ||||
| -rw-r--r-- | packet-raw.c | 3 | ||||
| -rw-r--r-- | packet-vj.c | 3 |
11 files changed, 273 insertions, 280 deletions
@@ -1,7 +1,7 @@ /* crc32.c * CRC-32 routine * - * $Id: crc32.c,v 1.1 2003/08/26 05:09:55 guy Exp $ + * $Id: crc32.c,v 1.2 2003/08/26 05:52:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -32,76 +32,102 @@ #include <glib.h> #include "crc32.h" +/* + * Table for the AUTODIN/HDLC/802.x CRC. + * + * Polynomial is + * + * 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] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, + 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, + 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, + 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, + 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, + 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, + 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, + 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, + 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, + 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, + 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, + 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, + 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, + 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, + 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, + 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, + 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, + 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, + 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, + 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, + 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, + 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, + 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, + 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, + 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, + 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, + 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, + 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, + 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, + 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, + 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, + 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, + 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, + 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, + 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, + 0x2d02ef8d }; - guint32 crc32(const unsigned char* buf, unsigned int len) { unsigned int i; - guint32 crc32 = 0xFFFFFFFF, c_crc; + guint32 crc32 = 0xFFFFFFFF; for (i = 0; i < len; i++) crc32 = crc32_table[(crc32 ^ buf[i]) & 0xff] ^ (crc32 >> 8); + return ( ~crc32 ); +} + +/* + * IEEE 802.x version (Ethernet and 802.11, at least) - byte-swap + * the result of "crc32()". + * + * XXX - does this mean we should fetch the Ethernet and 802.11 + * FCS with "tvb_get_letohl()" rather than "tvb_get_ntohl()", + * or is fetching it big-endian and byte-swapping the CRC done + * to cope with 802.x sending stuff out in reverse bit order? + */ +guint32 +crc32_802(const unsigned char* buf, unsigned int len) +{ + guint32 c_crc; + + c_crc = crc32(buf, len); + /* Byte reverse. */ - c_crc = ((unsigned char)(crc32>>0)<<24) | - ((unsigned char)(crc32>>8)<<16) | - ((unsigned char)(crc32>>16)<<8) | - ((unsigned char)(crc32>>24)<<0); + c_crc = ((unsigned char)(c_crc>>0)<<24) | + ((unsigned char)(c_crc>>8)<<16) | + ((unsigned char)(c_crc>>16)<<8) | + ((unsigned char)(c_crc>>24)<<0); - return ( ~c_crc ); + return ( c_crc ); } @@ -1,7 +1,7 @@ /* crc32.h * Declaration of CRC-32 routine and table * - * $Id: crc32.h,v 1.1 2003/08/26 05:09:55 guy Exp $ + * $Id: crc32.h,v 1.2 2003/08/26 05:52:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,3 +27,5 @@ extern const guint32 crc32_table[256]; extern guint32 crc32(const unsigned char* buf, unsigned int len); +extern guint32 crc32_802(const unsigned char* buf, unsigned int len); + diff --git a/packet-chdlc.c b/packet-chdlc.c index 7b27352da4..582eb41805 100644 --- a/packet-chdlc.c +++ b/packet-chdlc.c @@ -1,7 +1,7 @@ /* packet-chdlc.c * Routines for Cisco HDLC packet disassembly * - * $Id: packet-chdlc.c,v 1.19 2003/01/27 19:28:52 guy Exp $ + * $Id: packet-chdlc.c,v 1.20 2003/08/26 05:52:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,9 +29,11 @@ #include <glib.h> #include <epan/packet.h> #include "etypes.h" +#include "prefs.h" #include "chdlctypes.h" #include <epan/resolv.h> #include "packet-chdlc.h" +#include "packet-ppp.h" #include "packet-ip.h" /* @@ -104,7 +106,7 @@ const value_string chdlc_vals[] = { void capture_chdlc( const guchar *pd, int offset, int len, packet_counts *ld ) { - if (!BYTES_ARE_IN_FRAME(offset, len, 2)) { + if (!BYTES_ARE_IN_FRAME(offset, len, 4)) { ld->other++; return; } @@ -140,6 +142,8 @@ chdlctype(guint16 chdlctype, tvbuff_t *tvb, int offset_after_chdlctype, } } +static gint chdlc_fcs_decode = 0; /* 0 = No FCS, 1 = 16 bit FCS, 2 = 32 bit FCS */ + static void dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -187,6 +191,8 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(fh_tree, hf_chdlc_addr, tvb, 0, 1, addr); } + decode_fcs(tvb, fh_tree, chdlc_fcs_decode, 2); + chdlctype(proto, tvb, 4, pinfo, tree, fh_tree, hf_chdlc_proto); } @@ -205,6 +211,8 @@ proto_register_chdlc(void) &ett_chdlc, }; + module_t *chdlc_module; + proto_chdlc = proto_register_protocol("Cisco HDLC", "CHDLC", "chdlc"); proto_register_field_array(proto_chdlc, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -214,6 +222,17 @@ proto_register_chdlc(void) "Cisco HDLC frame type", FT_UINT16, BASE_HEX); register_dissector("chdlc", dissect_chdlc, proto_chdlc); + + /* Register the preferences for the chdlc protocol */ + chdlc_module = prefs_register_protocol(proto_chdlc, NULL); + + prefs_register_enum_preference(chdlc_module, + "fcs_type", + "CHDLC Frame Checksum Type", + "The type of CHDLC frame checksum (none, 16-bit, 32-bit)", + &chdlc_fcs_decode, + fcs_options, FALSE); + } void diff --git a/packet-eth.c b/packet-eth.c index 9bd39edb14..75e469a911 100644 --- a/packet-eth.c +++ b/packet-eth.c @@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c,v 1.84 2003/08/26 05:09:55 guy Exp $ + * $Id: packet-eth.c,v 1.85 2003/08/26 05:52:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -342,7 +342,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_get_ptr(tvb, 0, tvb_length(tvb) - 4), + guint32 fcs = crc32_802(tvb_get_ptr(tvb, 0, tvb_length(tvb) - 4), tvb_length(tvb) - 4); if (fcs == sent_fcs) { proto_tree_add_text(fh_tree, trailer_tvb, trailer_length, 4, diff --git a/packet-gtp.c b/packet-gtp.c index 6125a72de9..9528e480f7 100644 --- a/packet-gtp.c +++ b/packet-gtp.c @@ -4,7 +4,7 @@ * Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com> * Nicolas Balkota <balkota@mac.com> * - * $Id: packet-gtp.c,v 1.55 2003/07/09 07:12:23 guy Exp $ + * $Id: packet-gtp.c,v 1.56 2003/08/26 05:52:45 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,10 +36,10 @@ #include <glib.h> #include <epan/packet.h> +#include "prefs.h" #include "packet-gtp.h" #include "packet-ipv6.h" #include "packet-ppp.h" -#include "prefs.h" static dissector_table_t ppp_subdissector_table; 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, diff --git a/packet-null.c b/packet-null.c index 548520c9b3..56256fbaa7 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.58 2003/07/02 00:08:17 guy Exp $ + * $Id: packet-null.c,v 1.59 2003/08/26 05:52:50 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -34,6 +34,7 @@ #include <epan/packet.h> #include "packet-null.h" #include <epan/atalk-utils.h> +#include "prefs.h" #include "packet-ip.h" #include "packet-ipx.h" #include "packet-osi.h" diff --git a/packet-ppp.c b/packet-ppp.c index 5913e49510..8e643316b3 100644 --- a/packet-ppp.c +++ b/packet-ppp.c @@ -2,7 +2,7 @@ * Routines for ppp packet disassembly * RFC 1661, RFC 1662 * - * $Id: packet-ppp.c,v 1.114 2003/07/11 09:30:48 guy Exp $ + * $Id: packet-ppp.c,v 1.115 2003/08/26 05:52:50 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 "crc32.h" #define ppp_min(a, b) ((a<b) ? a : b) @@ -168,6 +169,14 @@ static gint ppp_fcs_decode = 0; /* 0 = No FCS, 1 = 16 bit FCS, 2 = 32 bit FCS */ #define NO_FCS 0 #define FCS_16 1 #define FCS_32 2 + +const enum_val_t fcs_options[] = { + {"None", NO_FCS}, + {"16-Bit", FCS_16}, + {"32-Bit", FCS_32}, + {NULL, -1} +}; + gboolean ppp_vj_decomp = TRUE; /* Default to VJ header decompression */ /* @@ -1323,75 +1332,6 @@ static const ip_tcp_opt ipv6cp_opts[] = { #define N_IPV6CP_OPTS (sizeof ipv6cp_opts / sizeof ipv6cp_opts[0]) - -static const unsigned int fcstab_32[256] = - { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, - 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, - 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, - 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, - 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, - 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, - 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, - 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, - 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, - 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, - 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, - 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, - 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, - 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, - 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, - 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, - 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, - 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, - 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, - 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, - 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, - 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, - 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, - 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, - 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, - 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, - 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, - 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, - 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, - 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, - 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, - 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, - 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, - 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, - 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, - 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, - 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, - 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, - 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, - 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, - 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, - 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, - 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d - }; - static const unsigned short fcstab_16[256] = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, @@ -1457,21 +1397,145 @@ fcs16(register guint16 fcs, tvbuff_t * tvbuff) ******************************************************************************* */ static guint32 -fcs32(guint32 fcs, tvbuff_t * tvbuff) +fcs32(tvbuff_t * tvbuff) { - int offset = 0; guint len = tvb_length(tvbuff)-4; - guint8 val; /* Check for invalid Length */ if (len == 0) return (0x00000000); + return crc32(tvb_get_ptr(tvbuff, 0, len), len); +} - while (len--) { - val = tvb_get_guint8(tvbuff, offset++); - fcs = (((fcs) >> 8) ^ fcstab_32[((fcs) ^ (val)) & 0xff]); +tvbuff_t * +decode_fcs(tvbuff_t *tvb, proto_tree *fh_tree, int fcs_decode, int proto_offset) +{ + tvbuff_t *next_tvb; + gint len, reported_len; + int rx_fcs_offset; + guint32 rx_fcs_exp; + guint32 rx_fcs_got; + + /* + * Remove the FCS, if any, from the packet data. + */ + switch (fcs_decode) { + + case NO_FCS: + next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); + break; + + case FCS_16: + /* + * Do we have the entire packet, and does it include a 2-byte FCS? + */ + len = tvb_length_remaining(tvb, proto_offset); + reported_len = tvb_reported_length_remaining(tvb, proto_offset); + if (reported_len < 2 || len < 0) { + /* + * The packet is claimed not to even have enough data for a 2-byte FCS, + * or we're already past the end of the captured data. + * Don't slice anything off. + */ + next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); + } else if (len < reported_len) { + /* + * The packet is claimed to have enough data for a 2-byte FCS, but + * we didn't capture all of the packet. + * Slice off the 2-byte FCS from the reported length, and trim the + * captured length so it's no more than the reported length; that + * will slice off what of the FCS, if any, is in the captured + * length. + */ + reported_len -= 2; + if (len > reported_len) + len = reported_len; + next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + } else { + /* + * We have the entire packet, and it includes a 2-byte FCS. + * Slice it off. + */ + len -= 2; + reported_len -= 2; + next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + + /* + * Compute the FCS and put it into the tree. + */ + rx_fcs_offset = proto_offset + len; + rx_fcs_exp = fcs16(0xFFFF, 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, + "FCS 16: 0x%04x (incorrect, should be 0x%04x)", + rx_fcs_got, rx_fcs_exp); + } else { + proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2, + "FCS 16: 0x%04x (correct)", + rx_fcs_got); + } + } + break; + + case FCS_32: + /* + * Do we have the entire packet, and does it include a 4-byte FCS? + */ + len = tvb_length_remaining(tvb, proto_offset); + reported_len = tvb_reported_length_remaining(tvb, proto_offset); + if (reported_len < 4) { + /* + * The packet is claimed not to even have enough data for a 4-byte FCS. + * Just pass on the tvbuff as is. + */ + next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); + } else if (len < reported_len) { + /* + * The packet is claimed to have enough data for a 4-byte FCS, but + * we didn't capture all of the packet. + * Slice off the 4-byte FCS from the reported length, and trim the + * captured length so it's no more than the reported length; that + * will slice off what of the FCS, if any, is in the captured + * length. + */ + reported_len -= 4; + if (len > reported_len) + len = reported_len; + next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + } else { + /* + * We have the entire packet, and it includes a 4-byte FCS. + * Slice it off. + */ + len -= 4; + reported_len -= 4; + next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + + /* + * Compute the FCS and put it into the tree. + */ + rx_fcs_offset = proto_offset + len; + rx_fcs_exp = fcs32(tvb); + rx_fcs_got = tvb_get_letohl(tvb, rx_fcs_offset); + if (rx_fcs_got != rx_fcs_exp) { + proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, + "FCS 32: 0x%08x (incorrect, should be 0x%08x)", + rx_fcs_got, rx_fcs_exp); + } else { + proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, + "FCS 32: 0x%08x (correct)", + rx_fcs_got); + } } - return (fcs ^ 0xffffffff); + break; + + default: + g_assert_not_reached(); + next_tvb = NULL; + } + + return next_tvb; } void @@ -2827,11 +2891,7 @@ dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree *fh_tree = NULL; guint8 byte0; int proto_offset; - gint len, reported_len; tvbuff_t *next_tvb; - int rx_fcs_offset; - guint32 rx_fcs_exp; - guint32 rx_fcs_got; byte0 = tvb_get_guint8(tvb, 0); if (byte0 == CHDLC_ADDR_UNICAST || byte0 == CHDLC_ADDR_MULTICAST) { @@ -2892,124 +2952,7 @@ dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) } } - /* - * Remove the FCS, if any, from the packet data. - */ - switch (ppp_fcs_decode) { - - case NO_FCS: - next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); - break; - - case FCS_16: - /* - * Do we have the entire packet, and does it include a 2-byte FCS? - */ - len = tvb_length_remaining(tvb, proto_offset); - reported_len = tvb_reported_length_remaining(tvb, proto_offset); - if (reported_len < 2 || len < 0) { - /* - * The packet is claimed not to even have enough data for a 2-byte FCS, - * or we're already past the end of the captured data. - * Don't slice anything off. - */ - next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); - } else if (len < reported_len) { - /* - * The packet is claimed to have enough data for a 2-byte FCS, but - * we didn't capture all of the packet. - * Slice off the 2-byte FCS from the reported length, and trim the - * captured length so it's no more than the reported length; that - * will slice off what of the FCS, if any, is in the captured - * length. - */ - reported_len -= 2; - if (len > reported_len) - len = reported_len; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); - } else { - /* - * We have the entire packet, and it includes a 2-byte FCS. - * Slice it off. - */ - len -= 2; - reported_len -= 2; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); - - /* - * Compute the FCS and put it into the tree. - */ - rx_fcs_offset = proto_offset + len; - rx_fcs_exp = fcs16(0xFFFF, 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, - "FCS 16: 0x%04x (incorrect, should be 0x%04x)", - rx_fcs_got, rx_fcs_exp); - } else { - proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2, - "FCS 16: 0x%04x (correct)", - rx_fcs_got); - } - } - break; - - case FCS_32: - /* - * Do we have the entire packet, and does it include a 4-byte FCS? - */ - len = tvb_length_remaining(tvb, proto_offset); - reported_len = tvb_reported_length_remaining(tvb, proto_offset); - if (reported_len < 4) { - /* - * The packet is claimed not to even have enough data for a 4-byte FCS. - * Just pass on the tvbuff as is. - */ - next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1); - } else if (len < reported_len) { - /* - * The packet is claimed to have enough data for a 4-byte FCS, but - * we didn't capture all of the packet. - * Slice off the 4-byte FCS from the reported length, and trim the - * captured length so it's no more than the reported length; that - * will slice off what of the FCS, if any, is in the captured - * length. - */ - reported_len -= 4; - if (len > reported_len) - len = reported_len; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); - } else { - /* - * We have the entire packet, and it includes a 4-byte FCS. - * Slice it off. - */ - len -= 4; - reported_len -= 4; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); - - /* - * Compute the FCS and put it into the tree. - */ - rx_fcs_offset = proto_offset + len; - rx_fcs_exp = fcs32(0xFFFFFFFF, tvb); - rx_fcs_got = tvb_get_letohl(tvb, rx_fcs_offset); - if (rx_fcs_got != rx_fcs_exp) { - proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, - "FCS 32: 0x%08x (incorrect, should be 0x%08x)", - rx_fcs_got, rx_fcs_exp); - } else { - proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, - "FCS 32: 0x%08x (correct)", - rx_fcs_got); - } - } - break; - - default: - g_assert_not_reached(); - next_tvb = NULL; - } + next_tvb = decode_fcs(tvb, fh_tree, ppp_fcs_decode, proto_offset); dissect_ppp_common(next_tvb, pinfo, tree, fh_tree, ti); } @@ -3262,13 +3205,6 @@ proto_register_ppp(void) &ett_ppp, }; - static enum_val_t ppp_options[] = { - {"None", 0}, - {"16-Bit", 1}, - {"32-Bit", 2}, - {NULL, -1} - }; - module_t *ppp_module; proto_ppp = proto_register_protocol("Point-to-Point Protocol", "PPP", "ppp"); @@ -3291,7 +3227,7 @@ proto_register_ppp(void) "PPP Frame Checksum Type", "The type of PPP frame checksum (none, 16-bit, 32-bit)", &ppp_fcs_decode, - ppp_options, FALSE); + fcs_options, FALSE); prefs_register_bool_preference(ppp_module, "decompress_vj", "Decompress Van Jacobson-compressed frames", diff --git a/packet-ppp.h b/packet-ppp.h index 38922ed71f..b04ff23f56 100644 --- a/packet-ppp.h +++ b/packet-ppp.h @@ -1,6 +1,6 @@ /* packet-ppp.h * - * $Id: packet-ppp.h,v 1.13 2003/04/29 17:56:49 guy Exp $ + * $Id: packet-ppp.h,v 1.14 2003/08/26 05:52:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,9 +29,16 @@ extern gboolean ppp_vj_decomp;/* FALSE = No VJ header decompression, TRUE = Decompress VJ */ void capture_ppp_hdlc(const guchar *, int, int, packet_counts *); +tvbuff_t *decode_fcs(tvbuff_t *tvb, proto_tree *fh_tree, int fcs_decode, int proto_offset); + /* * Used by the GTP dissector as well. */ extern const value_string ppp_vals[]; +/* + * Used by CHDLC dissector as well. + */ +extern const enum_val_t fcs_options[]; + #endif diff --git a/packet-raw.c b/packet-raw.c index 448d54203d..9507f7ca4d 100644 --- a/packet-raw.c +++ b/packet-raw.c @@ -1,7 +1,7 @@ /* packet-raw.c * Routines for raw packet disassembly * - * $Id: packet-raw.c,v 1.35 2002/08/28 21:00:29 jmayer Exp $ + * $Id: packet-raw.c,v 1.36 2003/08/26 05:52:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -31,6 +31,7 @@ #include <string.h> #include <glib.h> #include <epan/packet.h> +#include "prefs.h" #include "packet-raw.h" #include "packet-ip.h" #include "packet-ppp.h" diff --git a/packet-vj.c b/packet-vj.c index aa540ff3af..ccdedea1f9 100644 --- a/packet-vj.c +++ b/packet-vj.c @@ -1,7 +1,7 @@ /* packet-vj.c * Routines for Van Jacobson header decompression. * - * $Id: packet-vj.c,v 1.16 2002/08/28 21:00:36 jmayer Exp $ + * $Id: packet-vj.c,v 1.17 2003/08/26 05:52:53 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -66,6 +66,7 @@ #include <glib.h> #include <string.h> #include <epan/packet.h> +#include "prefs.h" #include "packet-ppp.h" #include "ppptypes.h" #include "ipproto.h" |