Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.94.2.5
retrieving revision 1.98
diff -u -p -r1.94.2.5 -r1.98
--- src/sys/netinet6/ip6_input.c	2007/05/17 13:41:51	1.94.2.5
+++ src/sys/netinet6/ip6_input.c	2007/03/07 22:20:04	1.98
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.94.2.5 2007/05/17 13:41:51 yamt Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.98 2007/03/07 22:20:04 liamjfoy 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.94.2.5 2007/05/17 13:41:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.98 2007/03/07 22:20:04 liamjfoy Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -183,7 +183,7 @@ ip6_init()
 
 	ip6_init2((void *)0);
 #ifdef GATEWAY
-	ip6flow_init(ip6_hashsize);
+	ip6flow_init();
 #endif
 
 #ifdef PFIL_HOOKS
@@ -237,23 +237,18 @@ ip6intr()
 	}
 }
 
-extern struct	route ip6_forward_rt;
+extern struct	route_in6 ip6_forward_rt;
 
 void
 ip6_input(struct mbuf *m)
 {
 	struct ip6_hdr *ip6;
-	int hit, off = sizeof(struct ip6_hdr), nest;
+	int off = sizeof(struct ip6_hdr), nest;
 	u_int32_t plen;
 	u_int32_t rtalert = ~0;
-	int nxt, ours = 0, rh_present = 0;
+	int nxt, ours = 0;
 	struct ifnet *deliverifp = NULL;
 	int srcrt = 0;
-	const struct rtentry *rt;
-	union {
-		struct sockaddr		dst;
-		struct sockaddr_in6	dst6;
-	} u;
 #ifdef FAST_IPSEC
 	struct m_tag *mtag;
 	struct tdb_ident *tdbi;
@@ -479,17 +474,31 @@ ip6_input(struct mbuf *m)
 		goto hbhcheck;
 	}
 
-	sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0);
-
 	/*
 	 *  Unicast check
 	 */
-	rt = rtcache_lookup2(&ip6_forward_rt, &u.dst, 1, &hit);
-	if (hit)
-		ip6stat.ip6s_forward_cachehit++;
+	if (!IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
+	    &((const struct sockaddr_in6 *)rtcache_getdst((const struct route *)&ip6_forward_rt))->sin6_addr))
+		rtcache_free((struct route *)&ip6_forward_rt);
 	else
+		rtcache_check((struct route *)&ip6_forward_rt);
+	if (ip6_forward_rt.ro_rt != NULL) {
+		/* XXX Revalidated route is accounted wrongly. */
+		ip6stat.ip6s_forward_cachehit++;
+	} else {
+		struct sockaddr_in6 *dst6;
+
 		ip6stat.ip6s_forward_cachemiss++;
 
+		dst6 = &ip6_forward_rt.ro_dst;
+		memset(dst6, 0, sizeof(*dst6));
+		dst6->sin6_len = sizeof(struct sockaddr_in6);
+		dst6->sin6_family = AF_INET6;
+		dst6->sin6_addr = ip6->ip6_dst;
+
+		rtcache_init((struct route *)&ip6_forward_rt);
+	}
+
 #define rt6_key(r) ((struct sockaddr_in6 *)((r)->rt_nodes->rn_key))
 
 	/*
@@ -501,19 +510,22 @@ ip6_input(struct mbuf *m)
 	 * But we think it's even useful in some situations, e.g. when using
 	 * a special daemon which wants to intercept the packet.
 	 */
-	if (rt != NULL &&
-	    (rt->rt_flags & (RTF_HOST|RTF_GATEWAY)) == RTF_HOST &&
-	    !(rt->rt_flags & RTF_CLONED) &&
+	if (ip6_forward_rt.ro_rt != NULL &&
+	    (ip6_forward_rt.ro_rt->rt_flags &
+	     (RTF_HOST|RTF_GATEWAY)) == RTF_HOST &&
+	    !(ip6_forward_rt.ro_rt->rt_flags & RTF_CLONED) &&
 #if 0
 	    /*
 	     * The check below is redundant since the comparison of
 	     * the destination and the key of the rtentry has
 	     * already done through looking up the routing table.
 	     */
-	    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &rt6_key(rt)->sin6_addr) &&
+	    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
+	    &rt6_key(ip6_forward_rt.ro_rt)->sin6_addr) &&
 #endif
-	    rt->rt_ifp->if_type == IFT_LOOP) {
-		struct in6_ifaddr *ia6 = (struct in6_ifaddr *)rt->rt_ifa;
+	    ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_LOOP) {
+		struct in6_ifaddr *ia6 =
+			(struct in6_ifaddr *)ip6_forward_rt.ro_rt->rt_ifa;
 		if (ia6->ia6_flags & IN6_IFF_ANYCAST)
 			m->m_flags |= M_ANYCAST6;
 		/*
@@ -541,11 +553,12 @@ ip6_input(struct mbuf *m)
 	 */
 #if defined(NFAITH) && 0 < NFAITH
 	if (ip6_keepfaith) {
-		if (rt != NULL && rt->rt_ifp != NULL &&
-		    rt->rt_ifp->if_type == IFT_FAITH) {
+		if (ip6_forward_rt.ro_rt != NULL &&
+		    ip6_forward_rt.ro_rt->rt_ifp != NULL &&
+		    ip6_forward_rt.ro_rt->rt_ifp->if_type == IFT_FAITH) {
 			/* XXX do we need more sanity checks? */
 			ours = 1;
-			deliverifp = rt->rt_ifp; /* faith */
+			deliverifp = ip6_forward_rt.ro_rt->rt_ifp; /* faith */
 			goto hbhcheck;
 		}
 	}
@@ -739,11 +752,9 @@ ip6_input(struct mbuf *m)
 	in6_ifstat_inc(deliverifp, ifs6_in_deliver);
 	nest = 0;
 
-	rh_present = 0;
 	while (nxt != IPPROTO_DONE) {
 		if (ip6_hdrnestlimit && (++nest > ip6_hdrnestlimit)) {
 			ip6stat.ip6s_toomanyhdr++;
-			in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr);
 			goto bad;
 		}
 
@@ -757,15 +768,6 @@ ip6_input(struct mbuf *m)
 			goto bad;
 		}
 
-		if (nxt == IPPROTO_ROUTING) {
-			if (rh_present++) {
-				in6_ifstat_inc(m->m_pkthdr.rcvif,
-				    ifs6_in_hdrerr);
-				ip6stat.ip6s_badoptions++;
-				goto bad;
-			}
-		}
-
 #ifdef IPSEC
 		/*
 		 * enforce IPsec policy checking if we are seeing last header.
@@ -1609,12 +1611,12 @@ ip6_delaux(m)
  * we could reduce this value, call ip6flow_reap();
  */
 static int
-sysctl_net_inet6_ip6_maxflows(SYSCTLFN_ARGS)
+sysctl_net_inet_ip6_maxflows(SYSCTLFN_ARGS)
 {  
         int s;
   
         s = sysctl_lookup(SYSCTLFN_CALL(rnode));
-        if (s || newp == NULL)
+        if (s)
                 return (s);
  
         s = splsoftnet();
@@ -1623,35 +1625,6 @@ sysctl_net_inet6_ip6_maxflows(SYSCTLFN_A
  
         return (0);
 }
-
-static int
-sysctl_net_inet6_ip6_hashsize(SYSCTLFN_ARGS)
-{  
-	int error, tmp;
-	struct sysctlnode node;
-
-	node = *rnode;
-	tmp = ip6_hashsize;
-	node.sysctl_data = &tmp;
-	error = sysctl_lookup(SYSCTLFN_CALL(&node));
-	if (error || newp == NULL)
-		return (error);
-
-	if ((tmp & (tmp - 1)) == 0 && tmp != 0) {
-		/*
-		 * Can only fail due to malloc()
-		 */
-		if (ip6flow_invalidate_all(tmp))
-			return ENOMEM;
-	} else {
-		/*
-		 * EINVAL if not a power of 2
-	         */
-		return EINVAL;
-	}	
-
-	return (0);
-}
 #endif /* GATEWAY */
 
 /*
@@ -1942,14 +1915,7 @@ SYSCTL_SETUP(sysctl_net_inet6_ip6_setup,
 			CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 			CTLTYPE_INT, "maxflows",
 			SYSCTL_DESCR("Number of flows for fast forwarding (IPv6)"),
-			sysctl_net_inet6_ip6_maxflows, 0, &ip6_maxflows, 0,
-			CTL_NET, PF_INET6, IPPROTO_IPV6,
-			CTL_CREATE, CTL_EOL);
-	sysctl_createv(clog, 0, NULL, NULL,
-			CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
-			CTLTYPE_INT, "hashsize",
-			SYSCTL_DESCR("Size of hash table for fast forwarding (IPv6)"),
-			sysctl_net_inet6_ip6_hashsize, 0, &ip6_hashsize, 0,
+			sysctl_net_inet_ip6_maxflows, 0, &ip6_maxflows, 0,
 			CTL_NET, PF_INET6, IPPROTO_IPV6,
 			CTL_CREATE, CTL_EOL);
 #endif