Module Name: src
Committed By: martin
Date: Fri Aug 4 14:28:02 UTC 2023
Modified Files:
src/sys/netinet6 [netbsd-10]: in6.c ip6_output.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #310):
sys/netinet6/in6.c: revision 1.289
sys/netinet6/ip6_output.c: revision 1.234
in6: clear ND6_IFF_IFDISABLED to allow DAD again on link-up
in6: don't send any IPv6 packets over a disabled interface
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.288.2.1 src/sys/netinet6/in6.c
cvs rdiff -u -r1.231.2.1 -r1.231.2.2 src/sys/netinet6/ip6_output.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/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.288 src/sys/netinet6/in6.c:1.288.2.1
--- src/sys/netinet6/in6.c:1.288 Mon Oct 24 14:15:19 2022
+++ src/sys/netinet6/in6.c Fri Aug 4 14:28:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.288 2022/10/24 14:15:19 msaitoh Exp $ */
+/* $NetBSD: in6.c,v 1.288.2.1 2023/08/04 14:28:01 martin Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.288 2022/10/24 14:15:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.288.2.1 2023/08/04 14:28:01 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2293,6 +2293,10 @@ in6_if_link_down(struct ifnet *ifp)
}
pserialize_read_exit(s);
curlwp_bindx(bound);
+
+ /* Clear ND6_IFF_IFDISABLED to allow DAD again on link-up. */
+ if (ifp->if_afdata[AF_INET6] != NULL)
+ ND_IFINFO(ifp)->flags &= ~ND6_IFF_IFDISABLED;
}
void
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.231.2.1 src/sys/netinet6/ip6_output.c:1.231.2.2
--- src/sys/netinet6/ip6_output.c:1.231.2.1 Thu Mar 23 12:03:04 2023
+++ src/sys/netinet6/ip6_output.c Fri Aug 4 14:28:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.231.2.1 2023/03/23 12:03:04 martin Exp $ */
+/* $NetBSD: ip6_output.c,v 1.231.2.2 2023/08/04 14:28:01 martin Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.231.2.1 2023/03/23 12:03:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.231.2.2 2023/08/04 14:28:01 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -171,6 +171,12 @@ ip6_if_output(struct ifnet * const ifp,
}
}
+ /* discard the packet if IPv6 operation is disabled on the interface */
+ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED)) {
+ m_freem(m);
+ return ENETDOWN; /* better error? */
+ }
+
if ((ifp->if_flags & IFF_LOOPBACK) != 0)
error = if_output_lock(ifp, origifp, m, sin6tocsa(dst), rt);
else
