Module Name: src
Committed By: ozaki-r
Date: Wed Apr 19 03:23:06 UTC 2017
Modified Files:
src/sys/netinet: ip_carp.c
Log Message:
Fix build without INET6
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 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.86 src/sys/netinet/ip_carp.c:1.87
--- src/sys/netinet/ip_carp.c:1.86 Tue Mar 14 09:03:08 2017
+++ src/sys/netinet/ip_carp.c Wed Apr 19 03:23:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.86 2017/03/14 09:03:08 ozaki-r Exp $ */
+/* $NetBSD: ip_carp.c,v 1.87 2017/04/19 03:23:06 ozaki-r Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.86 2017/03/14 09:03:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.87 2017/04/19 03:23:06 ozaki-r Exp $");
/*
* TODO:
@@ -712,9 +712,11 @@ 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;
+ char ipbuf[INET_ADDRSTRLEN];
+#ifdef INET6
struct ip6_hdr *ip6;
char ip6buf[INET6_ADDRSTRLEN];
- char ipbuf[INET_ADDRSTRLEN];
+#endif
CARP_STATINC(CARP_STAT_BADAUTH);
sc->sc_if.if_ierrors++;
@@ -726,11 +728,13 @@ carp_proto_input_c(struct mbuf *m, struc
in_fmtaddr(ipbuf, ip->ip_src)));
break;
+#ifdef INET6
case AF_INET6:
ip6 = mtod(m, struct ip6_hdr *);
CARP_LOG(sc, ("incorrect hash from %s",
IN6_PRINT(ip6buf, &ip6->ip6_src)));
break;
+#endif
default: CARP_LOG(sc, ("incorrect hash"));
break;
