Module Name: src
Committed By: is
Date: Sat Jul 23 13:33:32 UTC 2016
Modified Files:
src/sys/netinet [netbsd-7]: ip_carp.c
Log Message:
backout last change (wrong branch).
To generate a diff of this commit:
cvs rdiff -u -r1.59.2.1 -r1.59.2.2 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.59.2.1 src/sys/netinet/ip_carp.c:1.59.2.2
--- src/sys/netinet/ip_carp.c:1.59.2.1 Sat Jul 23 13:24:40 2016
+++ src/sys/netinet/ip_carp.c Sat Jul 23 13:33:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $ */
+/* $NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is 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.59.2.1 2016/07/23 13:24:40 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $");
/*
* TODO:
@@ -92,7 +92,6 @@ __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>
@@ -676,29 +675,9 @@ 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++;
-
- 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;
- }
+ CARP_LOG(sc, ("incorrect hash"));
m_freem(m);
return;
}
