--- libaitcrc/src/aitcrc.c	2011/04/28 20:28:20	1.4
+++ libaitcrc/src/aitcrc.c	2011/09/14 14:33:56	1.4.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcrc.c,v 1.4 2011/04/28 20:28:20 misho Exp $
+* $Id: aitcrc.c,v 1.4.2.2 2011/09/14 14:33:56 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -77,19 +77,22 @@ const crcPoly_t crc_Poly[] = {
 //
 
 // crc_GetErrno() Get error code of last operation
-inline int crc_GetErrno()
+inline int
+crc_GetErrno()
 {
 	return crc_Errno;
 }
 
 // crc_GetError() Get error text of last operation
-inline const char *crc_GetError()
+inline const char *
+crc_GetError()
 {
 	return crc_Error;
 }
 
 // crcSetErr() Set error to variables for internal use!!!
-inline void crcSetErr(int eno, char *estr, ...)
+inline void
+crcSetErr(int eno, char *estr, ...)
 {
 	va_list lst;
 
@@ -229,23 +232,28 @@ crcCalc(u_char * __restrict psBuf, u_int bufLen, u_cha
 
 /*
  * crcIP() Checksum in IP communication
- * @nBuf = Data for calculation
+ * @buf = Data for calculation
  * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum
  */
 inline u_short
-crcIP(u_short * __restrict nBuf, int bufLen)
+crcIP(u_char * __restrict buf, int bufLen)
 {
 	register u_int sum;
+	u_short last = 0, *nBuf = (u_short*) buf;
 
-	if (!nBuf) {
+	if (!buf) {
 		crc_Errno = 1;
 		strlcpy(crc_Error, "crcIP(): Invalid parameters!", MAX_STR + 1);
 		return -1;
 	}
 
-	for (sum = 0; bufLen; bufLen--)
+	for (sum = 0; bufLen && bufLen > 1; bufLen -= 2)
 		sum += *nBuf++;
+	if (bufLen == 1) {
+		*(u_char*)(&last) += *(u_char*) nBuf;
+		sum += last;
+	}
 
 	sum = (sum >> 16) + (sum & 0xFFFF);
 	sum += sum >> 16;