 @@ -1,14 +1,14 @@
-/*	$NetBSD: nd6.c,v 1.143 2012/06/23 03:14:04 christos Exp $	*/
+/*	$NetBSD: nd6.c,v 1.144 2013/01/24 14:23:09 joerg 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.143 2012/06/23 03:14:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.144 2013/01/24 14:23:09 joerg 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>
 @@ -1134,27 +1134,27 @@ nd6_nud_hint(struct rtentry *rt, struct
 		    (long)ND_IFINFO(rt->rt_ifp)->reachable * hz);
+	}
+}
 void
 nd6_rtrequest(int req, struct rtentry *rt, const struct rt_addrinfo *info)
+{
 	struct sockaddr *gate = rt->rt_gateway;
 	struct llinfo_nd6 *ln = (struct llinfo_nd6 *)rt->rt_llinfo;
 	struct ifnet *ifp = rt->rt_ifp;
 	uint8_t namelen = strlen(ifp->if_xname), addrlen = ifp->if_addrlen;
 	struct ifaddr *ifa;
-	RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+	RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 	if (req == RTM_LLINFO_UPD) {
 		int rc;
 		struct in6_addr *in6;
 		struct in6_addr in6_all;
 		int anycast;
 		if ((ifa = info->rti_ifa) == NULL)
 			return;
 		in6 = &ifatoia6(ifa)->ia_addr.sin6_addr;
 		anycast = ifatoia6(ifa)->ia6_flags & IN6_IFF_ANYCAST;
 @@ -1169,62 +1169,62 @@ nd6_rtrequest(int req, struct rtentry *r
 		nd6_na_output(ifa->ifa_ifp, &in6_all, in6,
 		    (anycast ? 0 : ND_NA_FLAG_OVERRIDE)
 #if 0
 		    | (ip6_forwarding ? ND_NA_FLAG_ROUTER : 0)
 #endif
 		    , 1, NULL);
 		return;
+	}
 	if ((rt->rt_flags & RTF_GATEWAY) != 0)
 		return;
 	if (nd6_need_cache(ifp) == 0 && (rt->rt_flags & RTF_HOST) == 0) {
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * This is probably an interface direct route for a link
 		 * which does not need neighbor caches (e.g. fe80::%lo0/64).
 		 * We do not need special treatment below for such a route.
 		 * Moreover, the RTF_LLINFO flag which would be set below
 		 * would annoy the ndp(8) command.
 		 */
 		return;
+	}
 	if (req == RTM_RESOLVE &&
 	    (nd6_need_cache(ifp) == 0 || /* stf case */
 	     !nd6_is_addr_neighbor(satocsin6(rt_getkey(rt)), ifp))) {
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * FreeBSD and BSD/OS often make a cloned host route based
 		 * on a less-specific route (e.g. the default route).
 		 * If the less specific route does not have a "gateway"
 		 * (this is the case when the route just goes to a p2p or an
 		 * stf interface), we'll mistakenly make a neighbor cache for
 		 * the host route, and will see strange neighbor solicitation
 		 * for the corresponding destination.  In order to avoid the
 		 * confusion, we check if the destination of the route is
 		 * a neighbor in terms of neighbor discovery, and stop the
 		 * process if not.  Additionally, we remove the LLINFO flag
 		 * so that ndp(8) will not try to get the neighbor information
 		 * of the destination.
 		 */
 		rt->rt_flags &= ~RTF_LLINFO;
 		return;
+	}
 	switch (req) {
 	case RTM_ADD:
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * There is no backward compatibility :)
+		 *
 		 * if ((rt->rt_flags & RTF_HOST) == 0 &&
 		 *     SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff)
 		 *	   rt->rt_flags |= RTF_CLONING;
 		 */
 		if ((rt->rt_flags & RTF_CLONING) ||
 		    ((rt->rt_flags & RTF_LLINFO) && ln == NULL)) {
 			union {
 				struct sockaddr sa;
 				struct sockaddr_dl sdl;
 				struct sockaddr_storage ss;
 @@ -1234,34 +1234,34 @@ nd6_rtrequest(int req, struct rtentry *r
 			 * interface (RTF_CLONING case) or the route should be
 			 * treated as on-link but is currently not
 			 * (RTF_LLINFO && ln == NULL case).
 			 */
 			if (sockaddr_dl_init(&u.sdl, sizeof(u.ss),
 			    ifp->if_index, ifp->if_type,
 			    NULL, namelen, NULL, addrlen) == NULL) {
 				printf("%s.%d: sockaddr_dl_init(, %zu, ) "
 				    "failed on %s\n", __func__, __LINE__,
 				    sizeof(u.ss), if_name(ifp));
+			}
 			rt_setgate(rt, &u.sa);
 			gate = rt->rt_gateway;
-			RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+			RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 			if (ln != NULL)
 				nd6_llinfo_settimer(ln, 0);
-			RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+			RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 			if ((rt->rt_flags & RTF_CLONING) != 0)
 				break;
+		}
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * In IPv4 code, we try to annonuce new RTF_ANNOUNCE entry here.
 		 * We don't do that here since llinfo is not ready yet.
+		 *
 		 * There are also couple of other things to be discussed:
 		 * - unsolicited NA code needs improvement beforehand
 		 * - RFC2461 says we MAY send multicast unsolicited NA
 		 *   (7.2.6 paragraph 4), however, it also says that we
 		 *   SHOULD provide a mechanism to prevent multicast NA storm.
 		 *   we don't have anything like it right now.
 		 *   note that the mechanism needs a mutual agreement
 		 *   between proxies, which means that we need to implement
 		 *   a new protocol, or a new kludge.
 @@ -1272,81 +1272,81 @@ nd6_rtrequest(int req, struct rtentry *r
 		 */
 #if 0
 		/* XXX it does not work */
 		if (rt->rt_flags & RTF_ANNOUNCE)
 			nd6_na_output(ifp,
 			      &satocsin6(rt_getkey(rt))->sin6_addr,
 			      &satocsin6(rt_getkey(rt))->sin6_addr,
 			      ip6_forwarding ? ND_NA_FLAG_ROUTER : 0,
 , NULL);
 #endif
 		/* FALLTHROUGH */
 	case RTM_RESOLVE:
 		if ((ifp->if_flags & (IFF_POINTOPOINT | IFF_LOOPBACK)) == 0) {
-			RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+			RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 			/*
 			 * Address resolution isn't necessary for a point to
 			 * point link, so we can skip this test for a p2p link.
 			 */
 			if (gate->sa_family != AF_LINK ||
 			    gate->sa_len <
 			    sockaddr_dl_measure(namelen, addrlen)) {
 				log(LOG_DEBUG,
 				    "nd6_rtrequest: bad gateway value: %s\n",
 				    if_name(ifp));
 				break;
+			}
 			satosdl(gate)->sdl_type = ifp->if_type;
 			satosdl(gate)->sdl_index = ifp->if_index;
-			RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+			RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
+		}
 		if (ln != NULL)
 			break;	/* This happens on a route change */
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * Case 2: This route may come from cloning, or a manual route
 		 * add with a LL address.
 		 */
 		R_Malloc(ln, struct llinfo_nd6 *, sizeof(*ln));
 		rt->rt_llinfo = ln;
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		if (ln == NULL) {
 			log(LOG_DEBUG, "nd6_rtrequest: malloc failed\n");
 			break;
+		}
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		nd6_inuse++;
 		nd6_allocated++;
 		memset(ln, 0, sizeof(*ln));
 		ln->ln_rt = rt;
 		callout_init(&ln->ln_timer_ch, CALLOUT_MPSAFE);
 		/* this is required for "ndp" command. - shin */
 		if (req == RTM_ADD) {
 		        /*
 			 * gate should have some valid AF_LINK entry,
 			 * and ln->ln_expire should have some lifetime
 			 * which is specified by ndp command.
 			 */
 			ln->ln_state = ND6_LLINFO_REACHABLE;
 			ln->ln_byhint = 0;
 		} else {
 		        /*
 			 * When req == RTM_RESOLVE, rt is created and
 			 * initialized in rtrequest(), so rt_expire is 0.
 			 */
 			ln->ln_state = ND6_LLINFO_NOSTATE;
 			nd6_llinfo_settimer(ln, 0);
+		}
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		rt->rt_flags |= RTF_LLINFO;
 		ln->ln_next = llinfo_nd6.ln_next;
 		llinfo_nd6.ln_next = ln;
 		ln->ln_prev = &llinfo_nd6;
 		ln->ln_next->ln_prev = ln;
 		/*
 		 * If we have too many cache entries, initiate immediate
 		 * purging for some "less recently used" entries.  Note that
 		 * we cannot directly call nd6_free() here because it would
 		 * cause re-entering rtable related routines triggering an LOR
 		 * problem for FreeBSD.
 		 */
 @@ -1362,34 +1362,34 @@ nd6_rtrequest(int req, struct rtentry *r
 				LN_INSERTHEAD(ln_end);
 				if (ND6_LLINFO_PERMANENT(ln_end))
 					continue;
 				if (ln_end->ln_state > ND6_LLINFO_INCOMPLETE)
 					ln_end->ln_state = ND6_LLINFO_STALE;
 				else
 					ln_end->ln_state = ND6_LLINFO_PURGE;
 				nd6_llinfo_settimer(ln_end, 0);
+			}
+		}
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		/*
 		 * check if rt_getkey(rt) is an address assigned
 		 * to the interface.
 		 */
 		ifa = (struct ifaddr *)in6ifa_ifpwithaddr(ifp,
 		    &satocsin6(rt_getkey(rt))->sin6_addr);
-		RT_DPRINTF("rt->_rt_key = %p\n", (void *)rt->_rt_key);
+		RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
 		if (ifa != NULL) {
 			const void *mac;
 			nd6_llinfo_settimer(ln, -1);
 			ln->ln_state = ND6_LLINFO_REACHABLE;
 			ln->ln_byhint = 0;
 			if ((mac = nd6_ifptomac(ifp)) != NULL) {
 				/* XXX check for error */
 				if (sockaddr_dl_setaddr(satosdl(gate),
 				    gate->sa_len, mac,
 				    ifp->if_addrlen) == NULL) {
 					printf("%s.%d: "
 					    "sockaddr_dl_setaddr(, %d, ) "
 					    "failed on %s\n", __func__,