Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.310.2.1
retrieving revision 1.319.4.2
diff -u -p -r1.310.2.1 -r1.319.4.2
--- src/sys/netinet/ip_input.c	2014/08/10 06:56:25	1.310.2.1
+++ src/sys/netinet/ip_input.c	2015/06/06 14:40:25	1.319.4.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.310.2.1 2014/08/10 06:56:25 tls Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.319.4.2 2015/06/06 14:40:25 skrll Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.310.2.1 2014/08/10 06:56:25 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.319.4.2 2015/06/06 14:40:25 skrll Exp $");
 
 #include "opt_inet.h"
 #include "opt_compat_netbsd.h"
@@ -593,11 +593,13 @@ ip_input(struct mbuf *m)
 	 *
 	 * Traditional 4.4BSD did not consult IFF_UP at all.
 	 * The behavior here is to treat addresses on !IFF_UP interface
-	 * as not mine.
+	 * or IN_IFF_NOTREADY addresses as not mine.
 	 */
 	downmatch = 0;
 	LIST_FOREACH(ia, &IN_IFADDR_HASH(ip->ip_dst.s_addr), ia_hash) {
 		if (in_hosteq(ia->ia_addr.sin_addr, ip->ip_dst)) {
+			if (ia->ia4_flags & IN_IFF_NOTREADY)
+				continue;
 			if (checkif && ia->ia_ifp != ifp)
 				continue;
 			if ((ia->ia_ifp->if_flags & IFF_UP) != 0)
@@ -613,6 +615,8 @@ ip_input(struct mbuf *m)
 			if (ifa->ifa_addr->sa_family != AF_INET)
 				continue;
 			ia = ifatoia(ifa);
+			if (ia->ia4_flags & IN_IFF_NOTREADY)
+				continue;
 			if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) ||
 			    in_hosteq(ip->ip_dst, ia->ia_netbroadcast) ||
 			    /*
@@ -1189,6 +1193,7 @@ ip_forward(struct mbuf *m, int srcrt)
 		struct sockaddr		dst;
 		struct sockaddr_in	dst4;
 	} u;
+	uint64_t *ips;
 
 	KASSERTMSG(cpu_softintr_p(), "ip_forward: not in the software "
 	    "interrupt handler; synchronization assumptions violated");
@@ -1269,27 +1274,34 @@ ip_forward(struct mbuf *m, int srcrt)
 	    (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)),
 	    NULL, NULL);
 
-	if (error)
+	if (error) {
 		IP_STATINC(IP_STAT_CANTFORWARD);
-	else {
-		uint64_t *ips = IP_STAT_GETREF();
-		ips[IP_STAT_FORWARD]++;
-		if (type) {
-			ips[IP_STAT_REDIRECTSENT]++;
-			IP_STAT_PUTREF();
-		} else {
-			IP_STAT_PUTREF();
-			if (mcopy) {
+		goto error;
+	}
+
+	ips = IP_STAT_GETREF();
+	ips[IP_STAT_FORWARD]++;
+
+	if (type) {
+		ips[IP_STAT_REDIRECTSENT]++;
+		IP_STAT_PUTREF();
+		goto redirect;
+	}
+
+	IP_STAT_PUTREF();
+	if (mcopy) {
 #ifdef GATEWAY
-				if (mcopy->m_flags & M_CANFASTFWD)
-					ipflow_create(&ipforward_rt, mcopy);
+		if (mcopy->m_flags & M_CANFASTFWD)
+			ipflow_create(&ipforward_rt, mcopy);
 #endif
-				m_freem(mcopy);
-			}
-			SOFTNET_UNLOCK();
-			return;
-		}
+		m_freem(mcopy);
 	}
+
+	SOFTNET_UNLOCK();
+	return;
+
+redirect:
+error:
 	if (mcopy == NULL) {
 		SOFTNET_UNLOCK();
 		return;
@@ -1633,6 +1645,16 @@ sysctl_net_inet_ip_setup(struct sysctllo
 		       sysctl_net_inet_ip_stats, 0, NULL, 0,
 		       CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS,
 		       CTL_EOL);
+#if NARP
+	sysctl_createv(clog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		       CTLTYPE_INT, "dad_count",
+		       SYSCTL_DESCR("Number of Duplicate Address Detection "
+				    "probes to send"),
+		       NULL, 0, &ip_dad_count, 0,
+		       CTL_NET, PF_INET, IPPROTO_IP,
+		       IPCTL_DAD_COUNT, CTL_EOL);
+#endif
 
 	/* anonportalgo RFC6056 subtree */
 	const struct sysctlnode *portalgo_node;