Change ICMPv6 checksum calculation to use IP_Hdr wrapper.

So that src/dst addresses used in pseudo-header are correct when
there's certain extension headers (routing/destination).

Add ICMP/ICMPv6 checksum unit tests.

src/ICMP.cc

@@ -62,7 +62,7 @@ void ICMP_Analyzer::DeliverPacket(int len, const u_char* data,
 			break;
 
 		case IPPROTO_ICMPV6:
-			chksum = icmp6_checksum(icmpp, ip->IP6_Hdr(), len);
+			chksum = icmp6_checksum(icmpp, ip, len);
 			break;
 
 		default:

src/net_util.cc

@@ -80,7 +80,7 @@ int mobility_header_checksum(const IP_Hdr* ip)
 	}
 #endif
 
-int icmp6_checksum(const struct icmp* icmpp, const struct ip6_hdr* ip6, int len)
+int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len)
 	{
 	// ICMP6 uses the same checksum function as ICMP4 but a different
 	// pseudo-header over which it is computed.
@@ -93,8 +93,8 @@ int icmp6_checksum(const struct icmp* icmpp, const struct ip6_hdr* ip6, int len)
 		sum = 0;
 
 	// Pseudo-header as for UDP over IPv6 above.
-	sum = ones_complement_checksum((void*) ip6->ip6_src.s6_addr, 16, sum);
+	sum = ones_complement_checksum(ip->SrcAddr(), sum);
-	sum = ones_complement_checksum((void*) ip6->ip6_dst.s6_addr, 16, sum);
+	sum = ones_complement_checksum(ip->DstAddr(), sum);
 	uint32 l = htonl(len);
 	sum = ones_complement_checksum((void*) &l, 4, sum);
 

src/net_util.h

@@ -65,18 +65,17 @@ inline int seq_delta(uint32 a, uint32 b)
 	}
 
 class IPAddr;
+class IP_Hdr;
 
 // Returns the ones-complement checksum of a chunk of b short-aligned bytes.
 extern int ones_complement_checksum(const void* p, int b, uint32 sum);
 
 extern int ones_complement_checksum(const IPAddr& a, uint32 sum);
 
-extern int icmp6_checksum(const struct icmp* icmpp, const struct ip6_hdr* ip6,
+extern int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len);
-				int len);
 extern int icmp_checksum(const struct icmp* icmpp, int len);
 
 #ifdef ENABLE_MOBILE_IPV6
-class IP_Hdr;
 extern int mobility_header_checksum(const IP_Hdr* ip);
 #endif
 

testing/btest/Baseline/core.checksums/bad.out

@@ -1,9 +1,13 @@
 1332784981.078396 weird: bad_IP_checksum
 1332784885.686428 weird: bad_TCP_checksum
 1332784933.501023 weird: bad_UDP_checksum
+1334075363.536871 weird: bad_ICMP_checksum
 1332785210.013051 weird: routing0_hdr
 1332785210.013051 weird: bad_TCP_checksum
 1332782580.798420 weird: routing0_hdr
 1332782580.798420 weird: bad_UDP_checksum
+1334075111.800086 weird: routing0_hdr
+1334075111.800086 weird: bad_ICMP_checksum
 1332785250.469132 weird: bad_TCP_checksum
 1332781342.923813 weird: bad_UDP_checksum
+1334074939.467194 weird: bad_ICMP_checksum

testing/btest/Baseline/core.checksums/good.out

@@ -1,2 +1,3 @@
 1332785125.596793 weird: routing0_hdr
 1332782508.592037 weird: routing0_hdr
+1334075027.053380 weird: routing0_hdr

testing/btest/core/checksums.test

@@ -1,15 +1,23 @@
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-tcp-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-udp-bad-chksum.pcap >>bad.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-icmp-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-tcp-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-udp-bad-chksum.pcap >>bad.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-icmp6-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-tcp-bad-chksum.pcap >>bad.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-udp-bad-chksum.pcap >>bad.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-icmp6-bad-chksum.pcap >>bad.out 2>&1
+
+
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-tcp-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-udp-good-chksum.pcap >>good.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip4-icmp-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-tcp-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-udp-good-chksum.pcap >>good.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-route0-icmp6-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-tcp-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-udp-good-chksum.pcap >>good.out 2>&1
+# @TEST-EXEC: bro -b -r $TRACES/chksums/ip6-icmp6-good-chksum.pcap >>good.out 2>&1
 # @TEST-EXEC: btest-diff bad.out
 # @TEST-EXEC: btest-diff good.out