Module Name: src
Committed By: roy
Date: Fri Aug 30 08:40:25 UTC 2019
Modified Files:
src/doc: CHANGES
src/sys/netinet6: nd6_nbr.c
Log Message:
inet6: Revert prior
It's not needed, listing to RA is enough as discussed on tech-net.
To generate a diff of this commit:
cvs rdiff -u -r1.2574 -r1.2575 src/doc/CHANGES
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet6/nd6_nbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2574 src/doc/CHANGES:1.2575
--- src/doc/CHANGES:1.2574 Thu Aug 29 17:54:32 2019
+++ src/doc/CHANGES Fri Aug 30 08:40:25 2019
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2574 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2575 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -32,5 +32,3 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
usbnet(9): Port kue(4) and upl(4). [mrg 20190818]
boot(8): GPT and RAIDframe support for x86 bootstrap [manu 20190818]
dhcpcd(8): Import dhcpcd-8.0.3 [roy 20190821]
- inet6: Announce Router to Host via RTM_CHANGE without a lladdr.
- dhcpcd no longer needs to parse NA messages. [roy 20190829]
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.170 src/sys/netinet6/nd6_nbr.c:1.171
--- src/sys/netinet6/nd6_nbr.c:1.170 Thu Aug 29 16:26:43 2019
+++ src/sys/netinet6/nd6_nbr.c Fri Aug 30 08:40:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.170 2019/08/29 16:26:43 roy Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.171 2019/08/30 08:40:25 roy Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.170 2019/08/29 16:26:43 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.171 2019/08/30 08:40:25 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -856,25 +856,6 @@ nd6_na_input(struct mbuf *m, int off, in
*/
const struct in6_addr *in6 = &ln->r_l3addr.addr6;
struct nd_defrouter *dr;
- struct sockaddr_in6 sin6;
-
- /*
- * Userland really has no business with NA messages.
- * However, RFC 4861 6.2.5 only says departing routers
- * *SHOULD* send RA with lifetime of zero and *MUST*
- * send all subsequent NA messages if the router flag
- * unset.
- *
- * To help userland avoid the expensive process of
- * parsing NA messages, send RTM_CHANGE without a
- * lladdr in the gateway.
- * This is different from the intial RTM_ADD also
- * without a lladdr in the gateway and RTM_DELETE.
- */
- sockaddr_in6_init(&sin6, in6, 0, 0, 0);
- rt_clonedmsg(RTM_CHANGE, sin6tosa(&sin6), NULL,
- ln->lle_tbl->llt_ifp);
- rt_announce = true;
ND6_WLOCK();
dr = nd6_defrouter_lookup(in6, ln->lle_tbl->llt_ifp);