Module Name: src
Committed By: martin
Date: Thu Apr 18 16:22:28 UTC 2024
Modified Files:
src/sys/netinet [netbsd-10]: sctp_asconf.c
src/sys/netinet6 [netbsd-10]: in6_ifattach.c nd6.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #659):
sys/netinet6/in6_ifattach.c: revision 1.122
sys/netinet/sctp_asconf.c: revision 1.14
sys/netinet6/nd6.c: revision 1.282
Fix invalid IPv6 route when ipsecif(4) is deleted tunnel. Pointed out by
ohishi@IIJ.
The pointed bug is fixed by modification in nd6_need_cache().
Others are similar bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.28.1 src/sys/netinet/sctp_asconf.c
cvs rdiff -u -r1.120 -r1.120.12.1 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.279.4.1 -r1.279.4.2 src/sys/netinet6/nd6.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/sctp_asconf.c
diff -u src/sys/netinet/sctp_asconf.c:1.12 src/sys/netinet/sctp_asconf.c:1.12.28.1
--- src/sys/netinet/sctp_asconf.c:1.12 Tue Jun 25 15:33:56 2019
+++ src/sys/netinet/sctp_asconf.c Thu Apr 18 16:22:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_asconf.c,v 1.12 2019/06/25 15:33:56 rjs Exp $ */
+/* $NetBSD: sctp_asconf.c,v 1.12.28.1 2024/04/18 16:22:28 martin Exp $ */
/* $KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.12 2019/06/25 15:33:56 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.12.28.1 2024/04/18 16:22:28 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1540,6 +1540,7 @@ sctp_is_desired_interface_type(struct if
case IFT_XETHER:
case IFT_SLIP:
case IFT_GIF:
+ case IFT_IPSEC:
result = 1;
break;
default:
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.120 src/sys/netinet6/in6_ifattach.c:1.120.12.1
--- src/sys/netinet6/in6_ifattach.c:1.120 Mon May 17 04:07:43 2021
+++ src/sys/netinet6/in6_ifattach.c Thu Apr 18 16:22:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.120 2021/05/17 04:07:43 yamaguchi Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.120.12.1 2024/04/18 16:22:28 martin Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.120 2021/05/17 04:07:43 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.120.12.1 2024/04/18 16:22:28 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,6 +262,7 @@ in6_get_hw_ifid(struct ifnet *ifp, struc
break;
case IFT_GIF:
+ case IFT_IPSEC:
#ifdef IFT_STF
case IFT_STF:
#endif
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.279.4.1 src/sys/netinet6/nd6.c:1.279.4.2
--- src/sys/netinet6/nd6.c:1.279.4.1 Sun Dec 10 13:06:16 2023
+++ src/sys/netinet6/nd6.c Thu Apr 18 16:22:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.279.4.1 2023/12/10 13:06:16 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.279.4.2 2024/04/18 16:22:28 martin Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.279.4.1 2023/12/10 13:06:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.279.4.2 2024/04/18 16:22:28 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1655,6 +1655,7 @@ nd6_need_cache(struct ifnet *ifp)
case IFT_IEEE1394:
case IFT_CARP:
case IFT_GIF: /* XXX need more cases? */
+ case IFT_IPSEC:
case IFT_PPP:
case IFT_TUNNEL:
return 1;
