Hi everyone,
Since checksum and CRC32 computations are fairly common, I have made a patch to
move those two from libnet to libc. There are no other changes than moving 4
functions from uspace/lib/net/generic/net_checksum.{c, h} to checksum.{c,h} in
libc.
Also, I have been told networking is under refactoring, so Jiri, any comments?
Regards,
Dominik Taborsky
=== modified file 'uspace/lib/c/Makefile'
--- uspace/lib/c/Makefile 2011-12-14 17:06:45 +0000
+++ uspace/lib/c/Makefile 2012-03-05 14:27:51 +0000
@@ -63,6 +63,7 @@
generic/as.c \
generic/cap.c \
generic/cfg.c \
+ generic/checksum.c \
generic/clipboard.c \
generic/devman.c \
generic/device/hw_res.c \
=== added file 'uspace/lib/c/generic/checksum.c'
--- uspace/lib/c/generic/checksum.c 1970-01-01 00:00:00 +0000
+++ uspace/lib/c/generic/checksum.c 2012-03-05 14:26:41 +0000
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <checksum.h>
+
+/** Computes CRC32 value in the big-endian environment.
+ *
+ * @param[in] seed Initial value. Often used as 0 or ~0.
+ * @param[in] data Pointer to the beginning of data to process.
+ * @param[in] length Length of the data in bits.
+ * @return The computed CRC32 of the length bits of the data.
+ */
+uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length)
+{
+ size_t index;
+
+ /* Process full bytes */
+ while (length >= 8) {
+ /* Add the data */
+ seed ^= (*data) << 24;
+
+ /* For each added bit */
+ for (index = 0; index < 8; ++index) {
+ /* If the first bit is set */
+ if (seed & 0x80000000) {
+ /* Shift and divide the checksum */
+ seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
+ } else {
+ /* Shift otherwise */
+ seed <<= 1;
+ }
+ }
+
+ /* Move to the next byte */
+ ++data;
+ length -= 8;
+ }
+
+ /* Process the odd bits */
+ if (length > 0) {
+ /* Add the data with zero padding */
+ seed ^= ((*data) & (0xff << (8 - length))) << 24;
+
+ /* For each added bit */
+ for (index = 0; index < length; ++index) {
+ /* If the first bit is set */
+ if (seed & 0x80000000) {
+ /* Shift and divide the checksum */
+ seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
+ } else {
+ /* Shift otherwise */
+ seed <<= 1;
+ }
+ }
+ }
+
+ return seed;
+}
+
+/** Computes CRC32 value in the little-endian environment.
+ *
+ * @param[in] seed Initial value. Often used as 0 or ~0.
+ * @param[in] data Pointer to the beginning of data to process.
+ * @param[in] length Length of the data in bits.
+ * @return The computed CRC32 of the length bits of the data.
+ */
+uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length)
+{
+ size_t index;
+
+ /* Process full bytes */
+ while (length >= 8) {
+ /* Add the data */
+ seed ^= (*data);
+
+ /* For each added bit */
+ for (index = 0; index < 8; ++index) {
+ /* If the last bit is set */
+ if (seed & 1) {
+ /* Shift and divide the checksum */
+ seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
+ } else {
+ /* Shift otherwise */
+ seed >>= 1;
+ }
+ }
+
+ /* Move to the next byte */
+ ++data;
+ length -= 8;
+ }
+
+ /* Process the odd bits */
+ if (length > 0) {
+ /* Add the data with zero padding */
+ seed ^= (*data) >> (8 - length);
+
+ for (index = 0; index < length; ++index) {
+ /* If the last bit is set */
+ if (seed & 1) {
+ /* Shift and divide the checksum */
+ seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
+ } else {
+ /* Shift otherwise */
+ seed >>= 1;
+ }
+ }
+ }
+
+ return seed;
+}
+
+/** Compacts the computed checksum to the 16 bit number adding the carries.
+ *
+ * @param[in] sum Computed checksum.
+ * @return Compacted computed checksum to the 16 bits.
+ */
+uint16_t compact_checksum(uint32_t sum)
+{
+ /* Shorten to the 16 bits */
+ while (sum >> 16)
+ sum = (sum & 0xffff) + (sum >> 16);
+
+ return (uint16_t) sum;
+}
+
+/** Computes sum of the 2 byte fields.
+ *
+ * Padds one zero (0) byte if odd.
+ *
+ * @param[in] seed Initial value. Often used as 0 or ~0.
+ * @param[in] data Pointer to the beginning of data to process.
+ * @param[in] length Length of the data in bytes.
+ * @return The computed checksum of the length bytes of the data.
+ */
+uint32_t compute_checksum(uint32_t seed, uint8_t *data, size_t length)
+{
+ size_t index;
+
+ /* Sum all the 16 bit fields */
+ for (index = 0; index + 1 < length; index += 2)
+ seed += (data[index] << 8) + data[index + 1];
+
+ /* Last odd byte with zero padding */
+ if (index + 1 == length)
+ seed += data[index] << 8;
+
+ return seed;
+}
+
+/** @}
+ */
=== added file 'uspace/lib/c/include/checksum.h'
--- uspace/lib/c/include/checksum.h 1970-01-01 00:00:00 +0000
+++ uspace/lib/c/include/checksum.h 2012-03-05 14:33:06 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_CHECKSUM_H_
+#define LIBC_CHECKSUM_H_
+
+#include <byteorder.h>
+#include <sys/types.h>
+
+/** Big-endian encoding CRC divider. */
+#define CRC_DIVIDER_BE 0x04c11db7
+
+/** Little-endian encoding CRC divider. */
+#define CRC_DIVIDER_LE 0xedb88320
+
+#ifdef __BE__
+
+#define compute_crc32(seed, data, length) \
+ compute_crc32_be(seed, (uint8_t *) data, length)
+
+#endif
+
+#ifdef __LE__
+
+#define compute_crc32(seed, data, length) \
+ compute_crc32_le(seed, (uint8_t *) data, length)
+
+#endif
+
+extern uint32_t compute_crc32_le(uint32_t, uint8_t *, size_t);
+extern uint32_t compute_crc32_be(uint32_t, uint8_t *, size_t);
+extern uint32_t compute_checksum(uint32_t, uint8_t *, size_t);
+extern uint16_t compact_checksum(uint32_t);
+
+#endif
+
+/** @}
+ */
=== modified file 'uspace/lib/net/generic/net_checksum.c'
--- uspace/lib/net/generic/net_checksum.c 2012-01-22 13:41:20 +0000
+++ uspace/lib/net/generic/net_checksum.c 2012-03-05 14:42:29 +0000
@@ -38,157 +38,6 @@
#include <net_checksum.h>
-/** Big-endian encoding CRC divider. */
-#define CRC_DIVIDER_BE 0x04c11db7
-
-/** Little-endian encoding CRC divider. */
-#define CRC_DIVIDER_LE 0xedb88320
-
-/** Compacts the computed checksum to the 16 bit number adding the carries.
- *
- * @param[in] sum Computed checksum.
- * @return Compacted computed checksum to the 16 bits.
- */
-uint16_t compact_checksum(uint32_t sum)
-{
- /* Shorten to the 16 bits */
- while (sum >> 16)
- sum = (sum & 0xffff) + (sum >> 16);
-
- return (uint16_t) sum;
-}
-
-/** Computes sum of the 2 byte fields.
- *
- * Padds one zero (0) byte if odd.
- *
- * @param[in] seed Initial value. Often used as 0 or ~0.
- * @param[in] data Pointer to the beginning of data to process.
- * @param[in] length Length of the data in bytes.
- * @return The computed checksum of the length bytes of the data.
- */
-uint32_t compute_checksum(uint32_t seed, uint8_t *data, size_t length)
-{
- size_t index;
-
- /* Sum all the 16 bit fields */
- for (index = 0; index + 1 < length; index += 2)
- seed += (data[index] << 8) + data[index + 1];
-
- /* Last odd byte with zero padding */
- if (index + 1 == length)
- seed += data[index] << 8;
-
- return seed;
-}
-
-/** Computes CRC32 value in the big-endian environment.
- *
- * @param[in] seed Initial value. Often used as 0 or ~0.
- * @param[in] data Pointer to the beginning of data to process.
- * @param[in] length Length of the data in bits.
- * @return The computed CRC32 of the length bits of the data.
- */
-uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length)
-{
- size_t index;
-
- /* Process full bytes */
- while (length >= 8) {
- /* Add the data */
- seed ^= (*data) << 24;
-
- /* For each added bit */
- for (index = 0; index < 8; ++index) {
- /* If the first bit is set */
- if (seed & 0x80000000) {
- /* Shift and divide the checksum */
- seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
- } else {
- /* Shift otherwise */
- seed <<= 1;
- }
- }
-
- /* Move to the next byte */
- ++data;
- length -= 8;
- }
-
- /* Process the odd bits */
- if (length > 0) {
- /* Add the data with zero padding */
- seed ^= ((*data) & (0xff << (8 - length))) << 24;
-
- /* For each added bit */
- for (index = 0; index < length; ++index) {
- /* If the first bit is set */
- if (seed & 0x80000000) {
- /* Shift and divide the checksum */
- seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
- } else {
- /* Shift otherwise */
- seed <<= 1;
- }
- }
- }
-
- return seed;
-}
-
-/** Computes CRC32 value in the little-endian environment.
- *
- * @param[in] seed Initial value. Often used as 0 or ~0.
- * @param[in] data Pointer to the beginning of data to process.
- * @param[in] length Length of the data in bits.
- * @return The computed CRC32 of the length bits of the data.
- */
-uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length)
-{
- size_t index;
-
- /* Process full bytes */
- while (length >= 8) {
- /* Add the data */
- seed ^= (*data);
-
- /* For each added bit */
- for (index = 0; index < 8; ++index) {
- /* If the last bit is set */
- if (seed & 1) {
- /* Shift and divide the checksum */
- seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
- } else {
- /* Shift otherwise */
- seed >>= 1;
- }
- }
-
- /* Move to the next byte */
- ++data;
- length -= 8;
- }
-
- /* Process the odd bits */
- if (length > 0) {
- /* Add the data with zero padding */
- seed ^= (*data) >> (8 - length);
-
- for (index = 0; index < length; ++index) {
- /* If the last bit is set */
- if (seed & 1) {
- /* Shift and divide the checksum */
- seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
- } else {
- /* Shift otherwise */
- seed >>= 1;
- }
- }
- }
-
- return seed;
-}
-
/** Returns or flips the checksum if zero.
*
* @param[in] checksum The computed checksum.
=== modified file 'uspace/lib/net/include/net_checksum.h'
--- uspace/lib/net/include/net_checksum.h 2012-01-22 13:41:20 +0000
+++ uspace/lib/net/include/net_checksum.h 2012-03-05 14:42:51 +0000
@@ -36,8 +36,7 @@
#ifndef LIBNET_CHECKSUM_H_
#define LIBNET_CHECKSUM_H_
-#include <byteorder.h>
-#include <sys/types.h>
+#include <checksum.h>
/** IP checksum value for computed zero checksum.
*
@@ -46,24 +45,6 @@
*/
#define IP_CHECKSUM_ZERO 0xffffU
-#ifdef __BE__
-
-#define compute_crc32(seed, data, length) \
- compute_crc32_be(seed, (uint8_t *) data, length)
-
-#endif
-
-#ifdef __LE__
-
-#define compute_crc32(seed, data, length) \
- compute_crc32_le(seed, (uint8_t *) data, length)
-
-#endif
-
-extern uint32_t compute_crc32_le(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_crc32_be(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_checksum(uint32_t, uint8_t *, size_t);
-extern uint16_t compact_checksum(uint32_t);
extern uint16_t flip_checksum(uint16_t);
extern uint16_t ip_checksum(uint8_t *, size_t);
_______________________________________________
HelenOS-devel mailing list
[email protected]
http://lists.modry.cz/cgi-bin/listinfo/helenos-devel
