--- libelwix/inc/elwix/acrc.h 2014/01/29 14:16:53 1.3 +++ libelwix/inc/elwix/acrc.h 2019/12/30 17:56:54 1.6.28.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: acrc.h,v 1.3 2014/01/29 14:16:53 misho Exp $ +* $Id: acrc.h,v 1.6.28.2 2019/12/30 17:56:54 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -64,7 +64,7 @@ typedef struct tagCRCPoly crcPoly_t; * * @crcNum = Number for reflection * @crcBits = Number width bits - * return: -1 error, !=-1 reflecting number + * return: reflecting number */ unsigned int crcReflect(unsigned int crcNum, unsigned char crcBits); /* @@ -76,26 +76,63 @@ unsigned int crcReflect(unsigned int crcNum, unsigned * @RevOpts = Options for computation (REVOPTS_REVERTBYTE, REVOPTS_REVERTCRC) * @initCRC = Initial CRC value * @xorCRC = Last xor CRC value - * return: -1 error, !=-1 CRC checksum + * return: CRC checksum */ unsigned int crcCalc(unsigned char * __restrict psBuf, unsigned int bufLen, unsigned char crcBits, unsigned char RevOpts, unsigned int initCRC, unsigned int xorCRC); /* + * crc16() - Checksum calculation in X/Y modem communication + * + * @buf = Data for calculation + * @bufLen = Length of data + * return: Checksum + */ +unsigned short crc16(unsigned char * __restrict buf, int bufLen); +/* + * crc16_ext() - Checksum ver.2 calculation in X/Y modem communication + * + * @buf = Data for calculation + * @bufLen = Length of data + * return: Checksum + */ +unsigned short crc16_ext(unsigned char * __restrict buf, int bufLen); +/* * crcIP() - Checksum in IP communication * * @buf = Data for calculation * @bufLen = Length of data - * return: -1 error, !=-1 Checksum + * return: Checksum */ unsigned short crcIP(unsigned char * __restrict buf, int bufLen); /* + * crcTCP() - Checksum for TCP v4 communication + * + * @buf = Data for calculation + * @bufLen = Length of data + * @th = TCP header + * return: Checksum + */ +unsigned short crcTCP(struct in_addr src, struct in_addr dst, + unsigned char * __restrict th); +/* + * crcUDP() - Checksum for UDP v4 communication + * + * @buf = Data for calculation + * @bufLen = Length of data + * @uh = UDP header + * return: Checksum + */ +unsigned short crcUDP(struct in_addr src, struct in_addr dst, + unsigned char * __restrict uh); + +/* * crcFletcher16() - Fletcher-16 Checksum computing * * @nBuf = Data for calculation * @bufLen = Length of data - * return: -1 error, !=-1 Checksum + * return: Checksum */ unsigned short crcFletcher16(unsigned short * __restrict nBuf, int bufLen); /* @@ -103,7 +140,7 @@ unsigned short crcFletcher16(unsigned short * __restri * * @nBuf = Data for calculation * @bufLen = Length of data - * return: -1 error, !=-1 Checksum + * return: Checksum */ unsigned int crcFletcher(unsigned short * __restrict nBuf, int bufLen); /* @@ -111,7 +148,7 @@ unsigned int crcFletcher(unsigned short * __restrict n * * @psBuf = Data for calculation * @bufLen = Length of data - * return: -1 error, !=-1 Checksum + * return: Checksum */ unsigned int crcAdler(unsigned char * __restrict psBuf, int bufLen); @@ -120,19 +157,19 @@ unsigned int crcAdler(unsigned char * __restrict psBuf * * @psBuf = Data for calculation * @bufLen = Length of data - * return: -1 error, !=-1 Checksum + * return: Checksum */ #define crcEther(psBuf, bufLen) crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF) /* - * crc32() - CRC32 calculation from table + * crc_32() - CRC32 calculation from table * * @crc = Initial crc value * @buf = Data for calculation * @len = Length of data * return: calculated CRC32 */ -unsigned int crc32(unsigned int crc, const unsigned char * __restrict buf, unsigned int len); +unsigned int crc_32(unsigned int crc, const unsigned char * __restrict buf, unsigned int len); /* * crcPelco() - Calculate Pelco D/P CRC