[src/netbsd-1-5]: src/sys pullup (approved by releng-1-5)

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d172ebc77918
branches:  netbsd-1-5
changeset: 489136:d172ebc77918
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Aug 18 06:38:45 2000 +0000

description:
pullup (approved by releng-1-5)
sys/netinet6/in6.c 1.33 -> 1.34
sys/netinet/in.c 1.61 -> 1.62

 > inhibit error code from rtinit().  this happens when we try to assign
 > multiple addresses from same prefix, onto single interface.  PR 10427.

diffstat:

 sys/netinet/in.c   |  5 ++++-
 sys/netinet6/in6.c |  5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 87c5ea5b73e6 -r d172ebc77918 sys/netinet/in.c
--- a/sys/netinet/in.c  Thu Aug 17 18:52:55 2000 +0000
+++ b/sys/netinet/in.c  Fri Aug 18 06:38:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.61 2000/05/06 02:41:32 mycroft Exp $  */
+/*     $NetBSD: in.c,v 1.61.4.1 2000/08/18 06:38:45 itojun Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -878,6 +878,9 @@
        error = rtinit(&ia->ia_ifa, (int)RTM_ADD, flags);
        if (!error)
                ia->ia_flags |= IFA_ROUTE;
+       /* XXX check if the subnet route points to the same interface */
+       if (error == EEXIST)
+               error = 0;
        /*
         * If the interface supports multicast, join the "all hosts"
         * multicast group on that interface.
diff -r 87c5ea5b73e6 -r d172ebc77918 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Thu Aug 17 18:52:55 2000 +0000
+++ b/sys/netinet6/in6.c        Fri Aug 18 06:38:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.c,v 1.32.4.1 2000/07/13 14:59:50 itojun Exp $      */
+/*     $NetBSD: in6.c,v 1.32.4.2 2000/08/18 06:38:46 itojun Exp $      */
 /*     $KAME: in6.c,v 1.99 2000/07/11 17:00:58 jinmei Exp $    */
 
 /*
@@ -1264,6 +1264,9 @@
        }
        if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD, flags)) == 0)
                ia->ia_flags |= IFA_ROUTE;
+       /* XXX check if the subnet route points to the same interface */
+       if (error == EEXIST)
+               error = 0;
 
        /* Add ownaddr as loopback rtentry, if necessary(ex. on p2p link). */
        in6_ifaddloop(&(ia->ia_ifa));