Go with Wireshark's Internet checksum routine.

The Wireshark routine is based on the BSD in-kernel portable checksum
routine (thus BSD-licensed); it takes a vector of pointers and lengths
and checksums the concatenation of the buffers in question (just as the
BSD in-kernel routine checksums a chain of mbufs).

This simplifies the "with a pseudo-header" checksums; hopefully it'll
fix up the problems being seen on some big-endian platforms, which might
be due to hand-calculating some or all of the checksum and doing so
incorrectly.  It also gets rid of some code that might be dereferencing
unaligned pointers.

1 files changed, 0 insertions, 14 deletions

diff --git a/ip6.h b/ip6.h
index 0a80f394..c54b5b2e 100644
--- a/ip6.h
+++ b/ip6.h
@@ -88,20 +88,6 @@ struct ip6_hdr {
 	struct in6_addr ip6_dst;	/* destination address */
 } UNALIGNED;
 
-/*
- * Pseudo header, used for higher layer checksumming.
- */
-union ip6_pseudo_hdr {
-    struct {
-	struct in6_addr ph_src;
-	struct in6_addr ph_dst;
-	u_int32_t	ph_len;
-	u_int8_t	ph_zero[3];
-	u_int8_t	ph_nxt;
-    } ph;
-    u_int16_t pa[20];
-} UNALIGNED;
-
 #define ip6_vfc		ip6_ctlun.ip6_un2_vfc
 #define ip6_flow	ip6_ctlun.ip6_un1.ip6_un1_flow
 #define ip6_plen	ip6_ctlun.ip6_un1.ip6_un1_plen