Module Name: src Committed By: bouyer Date: Sat Aug 27 14:39:10 UTC 2016
Modified Files: src/sys/netinet [netbsd-6]: ip_carp.c Log Message: Pull up following revision(s) (requested by is in ticket #1394): sys/netinet/ip_carp.c: revision 1.76 Print the IPv6 or IPv4 source addresses of packets with wrong hash, to help debugging. To generate a diff of this commit: cvs rdiff -u -r1.47.4.3 -r1.47.4.4 src/sys/netinet/ip_carp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet/ip_carp.c diff -u src/sys/netinet/ip_carp.c:1.47.4.3 src/sys/netinet/ip_carp.c:1.47.4.4 --- src/sys/netinet/ip_carp.c:1.47.4.3 Tue Jun 3 15:34:00 2014 +++ src/sys/netinet/ip_carp.c Sat Aug 27 14:39:10 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.c,v 1.47.4.3 2014/06/03 15:34:00 msaitoh Exp $ */ +/* $NetBSD: ip_carp.c,v 1.47.4.4 2016/08/27 14:39:10 bouyer Exp $ */ /* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */ /* @@ -31,7 +31,7 @@ #include "opt_mbuftrace.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.47.4.3 2014/06/03 15:34:00 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.47.4.4 2016/08/27 14:39:10 bouyer Exp $"); /* * TODO: @@ -92,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v #include <netinet6/ip6_var.h> #include <netinet6/nd6.h> #include <netinet6/scope6_var.h> +#include <netinet6/in6_var.h> #endif #include <net/bpf.h> @@ -673,9 +674,29 @@ carp_proto_input_c(struct mbuf *m, struc /* verify the hash */ if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) { + struct ip *ip; + struct ip6_hdr *ip6; + CARP_STATINC(CARP_STAT_BADAUTH); sc->sc_if.if_ierrors++; - CARP_LOG(sc, ("incorrect hash")); + + switch(af) { + + case AF_INET: + ip = mtod(m, struct ip *); + CARP_LOG(sc, ("incorrect hash from %s", + in_fmtaddr(ip->ip_src))); + break; + + case AF_INET6: + ip6 = mtod(m, struct ip6_hdr *); + CARP_LOG(sc, ("incorrect hash from %s", + ip6_sprintf(&ip6->ip6_src))); + break; + + default: CARP_LOG(sc, ("incorrect hash")); + break; + } m_freem(m); return; }