From b71a332fe8d1272c3ed119456744872660952c19 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 30 Aug 2011 16:39:38 +0000 Subject: crc directory restoration step 2 of 2: Make a copy of epan/crc@38799. svn path=/trunk/; revision=38806 --- epan/crc/Makefile.am | 54 ++++++++++++++++++++++++ epan/crc/Makefile.common | 33 +++++++++++++++ epan/crc/Makefile.nmake | 31 ++++++++++++++ epan/crc/crc-16-plain.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++ epan/crc/crc-16-plain.h | 87 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 310 insertions(+) create mode 100644 epan/crc/Makefile.am create mode 100644 epan/crc/Makefile.common create mode 100644 epan/crc/Makefile.nmake create mode 100644 epan/crc/crc-16-plain.c create mode 100644 epan/crc/crc-16-plain.h diff --git a/epan/crc/Makefile.am b/epan/crc/Makefile.am new file mode 100644 index 0000000000..28ad880193 --- /dev/null +++ b/epan/crc/Makefile.am @@ -0,0 +1,54 @@ +# Makefile.am +# Automake file for crc routines for Wireshark +# +# $Id$ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +INCLUDES = -I$(top_srcdir) + +include Makefile.common + +if HAVE_WARNINGS_AS_ERRORS +AM_CFLAGS = -Werror +endif + +noinst_LTLIBRARIES = libcrc.la + +CLEANFILES = \ + libcrc.a \ + libcrc.la \ + *~ + +DISTCLEANFILES = + +MAINTAINERCLEANFILES = \ + Makefile.in + +libcrc_la_SOURCES = \ + $(CRC_SRC) \ + $(CRC_INCLUDES) + +EXTRA_DIST = \ + Makefile.common \ + Makefile.nmake + +checkapi: + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(CRC_SRC) diff --git a/epan/crc/Makefile.common b/epan/crc/Makefile.common new file mode 100644 index 0000000000..7aa9cb7512 --- /dev/null +++ b/epan/crc/Makefile.common @@ -0,0 +1,33 @@ +# Makefile.common +# Contains the stuff from Makefile.am and Makefile.nmake that is +# a) common to both files and +# b) portable between both files +# +# $Id$ +# +# Wireshark - Network traffic analyzer +# By Gerald Combs +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# crc-16-plain.c: pycrc.py --model crc-16 --algorithm table-driven --symbol-prefix crc16_plain_ --crc-type guint16 --include-file glib.h --generate c -o crc-16-plain.c +# crc-16-plain.h: pycrc.py --model crc-16 --algorithm table-driven --symbol-prefix crc16_plain_ --crc-type guint16 --include-file glib.h --generate h -o crc-16-plain.h + +CRC_SRC = \ + crc-16-plain.c + +CRC_INCLUDES = \ + crc-16-plain.h diff --git a/epan/crc/Makefile.nmake b/epan/crc/Makefile.nmake new file mode 100644 index 0000000000..9b336d8040 --- /dev/null +++ b/epan/crc/Makefile.nmake @@ -0,0 +1,31 @@ +## Makefile for building crc.lib with Microsoft C and nmake +## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake +# +# $Id$ + +include ..\..\config.nmake +include Makefile.common + +############### no need to modify below this line ######### + +CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ + /I../.. $(GLIB_CFLAGS) + +.c.obj:: + $(CC) $(CFLAGS) -Fd.\ -c $< + +CRC_OBJECTS = $(CRC_SRC:.c=.obj) + +crc.lib: $(CRC_OBJECTS) + link /lib /out:crc.lib $(CRC_OBJECTS) + +clean: + rm -f $(CRC_OBJECTS) crc.lib *.pdb + +distclean: clean + +maintainer-clean: distclean + +checkapi: + $(PERL) ../../tools/checkAPIs.pl -g termoutput \ + $(CRC_SRC) diff --git a/epan/crc/crc-16-plain.c b/epan/crc/crc-16-plain.c new file mode 100644 index 0000000000..863f939d4a --- /dev/null +++ b/epan/crc/crc-16-plain.c @@ -0,0 +1,105 @@ +/** + * \file crc-16-plain.c + * Functions and types for CRC checks. + * + * Generated on Wed Mar 18 14:12:09 2009, + * by pycrc v0.7, http://www.tty1.net/pycrc/ + * using the configuration: + * Width = 16 + * Poly = 0x8005 + * XorIn = 0x0000 + * ReflectIn = True + * XorOut = 0x0000 + * ReflectOut = True + * Algorithm = table-driven + * Direct = True + * + * Modified 2009-03-16 not to include as our Win32 environment + * appears not to have it; we're using GLib types, instead. + *****************************************************************************/ +#include "glib.h" +#include "crc-16-plain.h" +#include + +/** + * Static table used for the table_driven implementation. + *****************************************************************************/ +static const crc16_plain_t crc_table[256] = { + 0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241, + 0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440, + 0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40, + 0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841, + 0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40, + 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41, + 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641, + 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040, + 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240, + 0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441, + 0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41, + 0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840, + 0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41, + 0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40, + 0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640, + 0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041, + 0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240, + 0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441, + 0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41, + 0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840, + 0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41, + 0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40, + 0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640, + 0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041, + 0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241, + 0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440, + 0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40, + 0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841, + 0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40, + 0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41, + 0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641, + 0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040 +}; + +/** + * Reflect all bits of a \a data word of \a data_len bytes. + * + * \param data The data word to be reflected. + * \param data_len The width of \a data expressed in number of bits. + * \return The reflected data. + *****************************************************************************/ +long crc16_plain_reflect(long data, size_t data_len) +{ + unsigned int i; + long ret; + + ret = data & 0x01; + for (i = 1; i < data_len; i++) + { + data >>= 1; + ret = (ret << 1) | (data & 0x01); + } + return ret; +} + + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +crc16_plain_t crc16_plain_update(crc16_plain_t crc, const unsigned char *data, size_t data_len) +{ + unsigned int tbl_idx; + + while (data_len--) { + tbl_idx = (crc ^ *data) & 0xff; + crc = (crc_table[tbl_idx] ^ (crc >> 8)) & 0xffff; + + data++; + } + return crc & 0xffff; +} + + diff --git a/epan/crc/crc-16-plain.h b/epan/crc/crc-16-plain.h new file mode 100644 index 0000000000..2ad0217066 --- /dev/null +++ b/epan/crc/crc-16-plain.h @@ -0,0 +1,87 @@ +/** + * \file crc-16-plain.h + * Functions and types for CRC checks. + * + * Generated on Wed Mar 18 14:12:15 2009, + * by pycrc v0.7, http://www.tty1.net/pycrc/ + * using the configuration: + * Width = 16 + * Poly = 0x8005 + * XorIn = 0x0000 + * ReflectIn = True + * XorOut = 0x0000 + * ReflectOut = True + * Algorithm = table-driven + * Direct = True + * + * Modified 2009-03-16 not to include as our Win32 environment + * appears not to have it; we're using GLib types, instead. + *****************************************************************************/ +#ifndef __CRC____PLAIN_H__ +#define __CRC____PLAIN_H__ + +#include "glib.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The definition of the used algorithm. + *****************************************************************************/ +#define CRC_ALGO_TABLE_DRIVEN 1 + +/** + * The type of the CRC values. + * + * This type must be big enough to contain at least 16 bits. + *****************************************************************************/ +typedef guint16 crc16_plain_t; + +/** + * Reflect all bits of a \a data word of \a data_len bytes. + * + * \param data The data word to be reflected. + * \param data_len The width of \a data expressed in number of bits. + * \return The reflected data. + *****************************************************************************/ +long crc16_plain_reflect(long data, size_t data_len); + +/** + * Calculate the initial crc value. + * + * \return The initial crc value. + *****************************************************************************/ +static inline crc16_plain_t crc16_plain_init(void) +{ + return 0x0000; +} + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +crc16_plain_t crc16_plain_update(crc16_plain_t crc, const unsigned char *data, size_t data_len); + +/** + * Calculate the final crc value. + * + * \param crc The current crc value. + * \return The final crc value. + *****************************************************************************/ +static inline crc16_plain_t crc16_plain_finalize(crc16_plain_t crc) +{ + return crc ^ 0x0000; +} + + +#ifdef __cplusplus +} /* closing brace for extern "C" */ +#endif + +#endif /* __CRC____PLAIN_H__ */ -- cgit v1.2.3