 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6.c,v 1.134 2009/08/31 12:37:59 yamt Exp $	*/
+/*	$NetBSD: nd6.c,v 1.135 2009/11/06 20:41:22 dyoung Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.134 2009/08/31 12:37:59 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.135 2009/11/06 20:41:22 dyoung Exp $");
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sockio.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 @@ -162,32 +162,31 @@ nd6_ifattach(struct ifnet *ifp)
+{
 	struct nd_ifinfo *nd;
 	nd = (struct nd_ifinfo *)malloc(sizeof(*nd), M_IP6NDP, M_WAITOK);
 	memset(nd, 0, sizeof(*nd));
 	nd->initialized = 1;
 	nd->chlim = IPV6_DEFHLIM;
 	nd->basereachable = REACHABLE_TIME;
 	nd->reachable = ND_COMPUTE_RTIME(nd->basereachable);
 	nd->retrans = RETRANS_TIMER;
 	/*
-	 * Note that the default value of ip6_accept_rtadv is 0, which means
+	 * Note that the default value of ip6_accept_rtadv is 0.
-	 * we won't accept RAs by default even if we set ND6_IFF_ACCEPT_RTADV
+	 * Because we do not set ND6_IFF_OVERRIDE_RTADV here, we won't
-	 * here.
+	 * accept RAs by default.
 	 */
-	nd->flags = (ND6_IFF_PERFORMNUD |
+	nd->flags = ND6_IFF_PERFORMNUD | ND6_IFF_ACCEPT_RTADV;
 		(ip6_accept_rtadv ? ND6_IFF_ACCEPT_RTADV : 0));
 	/* XXX: we cannot call nd6_setmtu since ifp is not fully initialized */
 	nd6_setmtu0(ifp, nd);
 	return nd;
+}
 void
 nd6_ifdetach(struct nd_ifinfo *nd)
+{
 	free(nd, M_IP6NDP);
+}
 @@ -694,26 +693,41 @@ regen_tmpaddr(struct in6_ifaddr *ia6)
 		 * we do not need additional delay (3rd arg to in6_tmpifadd).
 		 */
 		if ((e = in6_tmpifadd(public_ifa6, 0, 0)) != 0) {
 			log(LOG_NOTICE, "regen_tmpaddr: failed to create a new"
 			    " tmp addr, errno=%d\n", e);
 			return -1;
+		}
 		return 0;
+	}
 	return -1;
+}
 bool
 nd6_accepts_rtadv(const struct nd_ifinfo *ndi)
+{
 	switch (ndi->flags & (ND6_IFF_ACCEPT_RTADV|ND6_IFF_OVERRIDE_RTADV)) {
 	case ND6_IFF_OVERRIDE_RTADV|ND6_IFF_ACCEPT_RTADV:
 		return true;
 	case ND6_IFF_ACCEPT_RTADV:
 		return ip6_accept_rtadv != 0;
 	case ND6_IFF_OVERRIDE_RTADV:
 	case 0:
 	default:
 		return false;
+	}
+}
 /*
  * Nuke neighbor cache/prefix/default router management table, right before
  * ifp goes away.
  */
 void
 nd6_purge(struct ifnet *ifp)
+{
 	struct nd_ifinfo *ndi = ND_IFINFO(ifp);
 	struct llinfo_nd6 *ln, *nln;
 	struct nd_defrouter *dr, *ndr;
 	struct nd_prefix *pr, *npr;
 	/*
 @@ -757,27 +771,27 @@ nd6_purge(struct ifnet *ifp)
 			 * which removes all the associated interface addresses
 			 * by itself.
 			 * (jinmei@kame.net 20010129)
 			 */
 			prelist_remove(pr);
+		}
+	}
 	/* cancel default outgoing interface setting */
 	if (nd6_defifindex == ifp->if_index)
 		nd6_setdefaultiface(0);
 	/* XXX: too restrictive? */
-	if (!ip6_forwarding && ndi && (ndi->flags & ND6_IFF_ACCEPT_RTADV)) {
+	if (!ip6_forwarding && ndi && nd6_accepts_rtadv(ndi)) {
 		/* refresh default router list */
 		defrouter_select();
+	}
 	/*
 	 * Nuke neighbor cache entries for the ifp.
 	 * Note that rt->rt_ifp may not be the same as ifp,
 	 * due to KAME goto ours hack.  See RTM_RESOLVE case in
 	 * nd6_rtrequest(), and ip6_input().
 	 */
 	ln = llinfo_nd6.ln_next;
 	while (ln != NULL && ln != &llinfo_nd6) {
 		struct rtentry *rt;
 @@ -1875,27 +1889,27 @@ fail:
 	 * created, it might affect the selection policy.
 	 * Question: can we restrict the first condition to the "is_newentry"
 	 * case?
 	 * XXX: when we hear an RA from a new router with the link-layer
 	 * address option, defrouter_select() is called twice, since
 	 * defrtrlist_update called the function as well.  However, I believe
 	 * we can compromise the overhead, since it only happens the first
 	 * time.
 	 * XXX: although defrouter_select() should not have a bad effect
 	 * for those are not autoconfigured hosts, we explicitly avoid such
 	 * cases for safety.
 	 */
 	if (do_update && ln->ln_router && !ip6_forwarding &&
-		(ndi->flags & ND6_IFF_ACCEPT_RTADV))
+	    nd6_accepts_rtadv(ndi))
 		defrouter_select();
 	return rt;
+}
 static void
 nd6_slowtimo(void *ignored_arg)
+{
 	struct nd_ifinfo *nd6if;
 	struct ifnet *ifp;
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6.h,v 1.52 2009/01/15 18:20:48 christos Exp $	*/
+/*	$NetBSD: nd6.h,v 1.53 2009/11/06 20:41:22 dyoung Exp $	*/
 /*	$KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -80,32 +80,55 @@ struct nd_ifinfo {
 	u_int32_t basereachable;	/* BaseReachableTime */
 	u_int32_t reachable;		/* Reachable Time */
 	u_int32_t retrans;		/* Retrans Timer */
 	u_int32_t flags;		/* Flags */
 	int recalctm;			/* BaseReacable re-calculation timer */
 	u_int8_t chlim;			/* CurHopLimit */
 	u_int8_t initialized; /* Flag to see the entry is initialized */
 	/* the following 3 members are for privacy extension for addrconf */
 	u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
 	u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */
 	u_int8_t randomid[8];	/* current random ID */
 };
-#define ND6_IFF_PERFORMNUD	0x1
+#define ND6_IFF_PERFORMNUD	0x01
-#define ND6_IFF_ACCEPT_RTADV	0x2
+#define ND6_IFF_ACCEPT_RTADV	0x02	/* See "RTADV Key", below. */
-#define ND6_IFF_PREFER_SOURCE	0x4 /* XXX: not related to ND. */
+#define ND6_IFF_PREFER_SOURCE	0x04	/* XXX: not related to ND. */
-#define ND6_IFF_IFDISABLED	0x8 /* IPv6 operation is disabled due to
+#define ND6_IFF_IFDISABLED	0x08	/* IPv6 operation is disabled due to
-				     * DAD failure.  (XXX: not ND-specific)
+					 * DAD failure.  (XXX: not ND-specific)
-				     */
+					 */
 #define	ND6_IFF_OVERRIDE_RTADV	0x10	/* See "RTADV Key", below. */
 /*
  * RTADV Key
+ *
  * The flags ND6_IFF_ACCEPT_RTADV and ND6_IFF_OVERRIDE_RTADV form a
  * tri-state variable.  (There are actually four different states, but
  * two of the states are functionally identical.)
+ *
  * ND6_IFF_OVERRIDE_RTADV or 0:	This interface does not accept
  *				Router Advertisements.
+ *
  * ND6_IFF_OVERRIDE_RTADV|
  * ND6_IFF_ACCEPT_RTADV:	This interface accepts Router
  *				Advertisements regardless of the
  *				global setting, ip6_accept_rtadv.
+ *
  * ND6_IFF_ACCEPT_RTADV:	This interface follows the global setting,
  *				ip6_accept_rtadv.  If ip6_accept_rtadv == 0,
  *				this interface does not accept Router
  *				Advertisements.  If ip6_accept_rtadv != 0,
  *				this interface does accept them.
  */
 #ifdef _KERNEL
 #define ND_IFINFO(ifp) \
 	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->nd_ifinfo)
 #define IN6_LINKMTU(ifp) \
 	((ND_IFINFO(ifp)->linkmtu && ND_IFINFO(ifp)->linkmtu < (ifp)->if_mtu) \
 	    ? ND_IFINFO(ifp)->linkmtu \
 	    : ((ND_IFINFO(ifp)->maxmtu && ND_IFINFO(ifp)->maxmtu < (ifp)->if_mtu) \
 		? ND_IFINFO(ifp)->maxmtu : (ifp)->if_mtu))
 #endif
 struct in6_nbrinfo {
 	char ifname[IFNAMSIZ];	/* if name, e.g. "en0" */
 @@ -427,17 +450,18 @@ void defrouter_select(void);
 void defrtrlist_del(struct nd_defrouter *);
 void prelist_remove(struct nd_prefix *);
 int nd6_prelist_add(struct nd_prefixctl *, struct nd_defrouter *,
 	struct nd_prefix **);
 int nd6_prefix_onlink(struct nd_prefix *);
 int nd6_prefix_offlink(struct nd_prefix *);
 void pfxlist_onlink_check(void);
 struct nd_defrouter *defrouter_lookup(const struct in6_addr *, struct ifnet *);
 struct nd_prefix *nd6_prefix_lookup(struct nd_prefixctl *);
 int in6_ifdel(struct ifnet *, struct in6_addr *);
 void rt6_flush(struct in6_addr *, struct ifnet *);
 int nd6_setdefaultiface(int);
 int in6_tmpifadd(const struct in6_ifaddr *, int, int);
 bool nd6_accepts_rtadv(const struct nd_ifinfo *);
 #endif /* _KERNEL */
 #endif /* !_NETINET6_ND6_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6_rtr.c,v 1.79 2009/07/25 23:12:09 tonnerre Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.80 2009/11/06 20:41:22 dyoung Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -21,27 +21,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.79 2009/07/25 23:12:09 tonnerre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.80 2009/11/06 20:41:22 dyoung Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 @@ -112,27 +112,27 @@ int ip6_temp_regen_advance = TEMPADDR_RE
 void
 nd6_rs_input(struct mbuf *m, int off, int icmp6len)
+{
 	struct ifnet *ifp = m->m_pkthdr.rcvif;
 	struct nd_ifinfo *ndi = ND_IFINFO(ifp);
 	struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
 	struct nd_router_solicit *nd_rs;
 	struct in6_addr saddr6 = ip6->ip6_src;
 	char *lladdr = NULL;
 	int lladdrlen = 0;
 	union nd_opts ndopts;
 	/* If I'm not a router, ignore it. */
-	if ((ndi->flags & ND6_IFF_ACCEPT_RTADV) || !ip6_forwarding)
+	if (nd6_accepts_rtadv(ndi) || !ip6_forwarding)
 		goto freeit;
 	/* Sanity checks */
 	if (ip6->ip6_hlim != 255) {
 		nd6log((LOG_ERR,
 		    "nd6_rs_input: invalid hlim (%d) from %s to %s on %s\n",
 		    ip6->ip6_hlim, ip6_sprintf(&ip6->ip6_src),
 		    ip6_sprintf(&ip6->ip6_dst), if_name(ifp)));
 		goto bad;
+	}
 	/*
 	 * Don't update the neighbor cache, if src = ::.
 @@ -200,27 +200,27 @@ nd6_ra_input(struct mbuf *m, int off, in
 	int flags; /* = nd_ra->nd_ra_flags_reserved; */
 	int is_managed = ((flags & ND_RA_FLAG_MANAGED) != 0);
 	int is_other = ((flags & ND_RA_FLAG_OTHER) != 0);
 #endif
 	int mcast = 0;
 	union nd_opts ndopts;
 	struct nd_defrouter *dr;
 	/*
 	 * We only accept RAs only when
 	 * the system-wide variable allows the acceptance, and
 	 * per-interface variable allows RAs on the receiving interface.
 	 */
-	if (!(ndi->flags & ND6_IFF_ACCEPT_RTADV))
+	if (!nd6_accepts_rtadv(ndi))
 		goto freeit;
 	if (ip6->ip6_hlim != 255) {
 		nd6log((LOG_ERR,
 		    "nd6_ra_input: invalid hlim (%d) from %s to %s on %s\n",
 		    ip6->ip6_hlim, ip6_sprintf(&ip6->ip6_src),
 		    ip6_sprintf(&ip6->ip6_dst), if_name(ifp)));
 		goto bad;
+	}
 	if (!IN6_IS_ADDR_LINKLOCAL(&saddr6)) {
 		nd6log((LOG_ERR,
 		    "nd6_ra_input: src %s is not link-local\n",
 @@ -480,27 +480,27 @@ defrouter_lookup(const struct in6_addr *
 void
 defrtrlist_del(struct nd_defrouter *dr)
+{
 	struct nd_ifinfo *ndi = ND_IFINFO(dr->ifp);
 	struct nd_defrouter *deldr = NULL;
 	struct nd_prefix *pr;
 	/*
 	 * Flush all the routing table entries that use the router
 	 * as a next hop.
 	 */
 	/* XXX: better condition? */
-	if (!ip6_forwarding && (ndi->flags & ND6_IFF_ACCEPT_RTADV))
+	if (!ip6_forwarding && nd6_accepts_rtadv(ndi))
 		rt6_flush(&dr->rtaddr, dr->ifp);
 	if (dr->installed) {
 		deldr = dr;
 		defrouter_delreq(dr);
+	}
 	TAILQ_REMOVE(&nd_defrouter, dr, dr_entry);
 	/*
 	 * Also delete all the pointers to the router in each prefix lists.
 	 */
 	LIST_FOREACH(pr, &nd_prefix, ndpr_entry) {
 		struct nd_pfxrouter *pfxrtr;
 @@ -636,27 +636,27 @@ defrouter_select(void)
 	if (!TAILQ_FIRST(&nd_defrouter)) {
 		splx(s);
 		return;
+	}
 	/*
 	 * Search for a (probably) reachable router from the list.
 	 * We just pick up the first reachable one (if any), assuming that
 	 * the ordering rule of the list described in defrtrlist_update().
 	 */
 	for (dr = TAILQ_FIRST(&nd_defrouter); dr;
 	     dr = TAILQ_NEXT(dr, dr_entry)) {
 		ndi = ND_IFINFO(dr->ifp);
-		if ((ndi->flags & ND6_IFF_ACCEPT_RTADV))
+		if (nd6_accepts_rtadv(ndi))
 			continue;
 		if (selected_dr == NULL &&
 		    (rt = nd6_lookup(&dr->rtaddr, 0, dr->ifp)) != NULL &&
 		    (ln = (struct llinfo_nd6 *)rt->rt_llinfo) != NULL &&
 		    ND6_IS_LLINFO_PROBREACH(ln)) {
 			selected_dr = dr;
+		}
 		if (dr->installed && !installed_dr)
 			installed_dr = dr;
 		else if (dr->installed && installed_dr) {
 			/* this should not happen.  warn for diagnosis. */