Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Attempt to restore v6 networking. Not 100% ce...



details:   https://anonhg.NetBSD.org/src/rev/a302ae3b6356
branches:  trunk
changeset: 828050:a302ae3b6356
user:      kre <kre%NetBSD.org@localhost>
date:      Sat Nov 25 13:18:02 2017 +0000

description:
Attempt to restore v6 networking.   Not 100% certain that these
changes are all that is needed, but they're certainly a big part of it
(especially the ip6_input.c change.)

diffstat:

 sys/netinet6/ip6_input.c  |  6 +++---
 sys/netinet6/ip6_output.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 58d4f7f74dc6 -r a302ae3b6356 sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Sat Nov 25 09:41:45 2017 +0000
+++ b/sys/netinet6/ip6_input.c  Sat Nov 25 13:18:02 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_input.c,v 1.184 2017/11/24 14:03:25 roy Exp $      */
+/*     $NetBSD: ip6_input.c,v 1.185 2017/11/25 13:18:02 kre Exp $      */
 /*     $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $     */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.184 2017/11/24 14:03:25 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.185 2017/11/25 13:18:02 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -526,7 +526,7 @@
                        addrok = (ifa_ifwithaddr(sin6tosa(&sin6)) != NULL);
                        pserialize_read_exit(s);
                } else
-                       addrok = 0;
+                       addrok = 1;
                if (addrok) {
                        /* this address is ready */
                        ours = 1;
diff -r 58d4f7f74dc6 -r a302ae3b6356 sys/netinet6/ip6_output.c
--- a/sys/netinet6/ip6_output.c Sat Nov 25 09:41:45 2017 +0000
+++ b/sys/netinet6/ip6_output.c Sat Nov 25 13:18:02 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_output.c,v 1.194 2017/11/24 14:03:25 roy Exp $     */
+/*     $NetBSD: ip6_output.c,v 1.195 2017/11/25 13:18:02 kre 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.194 2017/11/24 14:03:25 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.195 2017/11/25 13:18:02 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -3388,7 +3388,7 @@
        else if (ia6->ia6_flags & IN6_IFF_TENTATIVE)
                error = 1;
        else if (ia6->ia6_flags & IN6_IFF_DETACHED &&
-           ifa_ifwithaddr(sin6tosa(&dst)) == NULL)
+           (sin6.sin6_addr = *dst, ifa_ifwithaddr(sin6tosa(&sin6)) == NULL))
                /* Allow internal traffic to DETACHED addresses */
                error = 1;
        else



Home | Main Index | Thread Index | Old Index