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/netinet/ip_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.218.2.2
retrieving revision 1.234
diff -u -p -r1.218.2.2 -r1.234
--- src/sys/netinet/ip_input.c	2006/12/30 20:50:33	1.218.2.2
+++ src/sys/netinet/ip_input.c	2006/10/10 21:49:14	1.234
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.218.2.2 2006/12/30 20:50:33 yamt Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.234 2006/10/10 21:49:14 dogcow Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.218.2.2 2006/12/30 20:50:33 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.234 2006/10/10 21:49:14 dogcow Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -461,7 +461,7 @@ ipintr(void)
 	int s;
 	struct mbuf *m;
 
-	while (!IF_IS_EMPTY(&ipintrq)) {
+	while (1) {
 		s = splnet();
 		IF_DEQUEUE(&ipintrq, m);
 		splx(s);
@@ -1679,19 +1679,19 @@ ip_rtaddr(struct in_addr dst)
 
 	sin = satosin(&ipforward_rt.ro_dst);
 
-	if (!in_hosteq(dst, sin->sin_addr))
-		rtcache_free(&ipforward_rt);
-	else
-		rtcache_check(&ipforward_rt);
-	if (ipforward_rt.ro_rt == NULL) {
+	if (ipforward_rt.ro_rt == 0 || !in_hosteq(dst, sin->sin_addr)) {
+		if (ipforward_rt.ro_rt) {
+			RTFREE(ipforward_rt.ro_rt);
+			ipforward_rt.ro_rt = 0;
+		}
 		sin->sin_family = AF_INET;
 		sin->sin_len = sizeof(*sin);
 		sin->sin_addr = dst;
 
-		rtcache_init(&ipforward_rt);
-		if (ipforward_rt.ro_rt == NULL)
-			return NULL;
+		rtalloc(&ipforward_rt);
 	}
+	if (ipforward_rt.ro_rt == 0)
+		return ((struct in_ifaddr *)0);
 	return (ifatoia(ipforward_rt.ro_rt->rt_ifa));
 }
 
@@ -1728,10 +1728,10 @@ ip_srcroute(void)
 	struct mbuf *m;
 
 	if (ip_nhops == 0)
-		return NULL;
+		return ((struct mbuf *)0);
 	m = m_get(M_DONTWAIT, MT_SOOPTS);
 	if (m == 0)
-		return NULL;
+		return ((struct mbuf *)0);
 
 	MCLAIM(m, &inetdomain.dom_mowner);
 #define OPTSIZ	(sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt))
@@ -1873,22 +1873,23 @@ ip_forward(struct mbuf *m, int srcrt)
 	}
 
 	sin = satosin(&ipforward_rt.ro_dst);
-	if (!in_hosteq(ip->ip_dst, sin->sin_addr))
-		rtcache_free(&ipforward_rt);
-	else
-		rtcache_check(&ipforward_rt);
-	if (ipforward_rt.ro_rt == NULL) {
+	if ((rt = ipforward_rt.ro_rt) == 0 ||
+	    !in_hosteq(ip->ip_dst, sin->sin_addr)) {
+		if (ipforward_rt.ro_rt) {
+			RTFREE(ipforward_rt.ro_rt);
+			ipforward_rt.ro_rt = 0;
+		}
 		sin->sin_family = AF_INET;
 		sin->sin_len = sizeof(struct sockaddr_in);
 		sin->sin_addr = ip->ip_dst;
 
-		rtcache_init(&ipforward_rt);
-		if (ipforward_rt.ro_rt == NULL) {
+		rtalloc(&ipforward_rt);
+		if (ipforward_rt.ro_rt == 0) {
 			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, dest, 0);
 			return;
 		}
+		rt = ipforward_rt.ro_rt;
 	}
-	rt = ipforward_rt.ro_rt;
 
 	/*
 	 * Save at most 68 bytes of the packet in case
@@ -1934,7 +1935,7 @@ ip_forward(struct mbuf *m, int srcrt)
 		}
 	}
 
-	error = ip_output(m, NULL, &ipforward_rt,
+	error = ip_output(m, (struct mbuf *)0, &ipforward_rt,
 	    (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)),
 	    (struct ip_moptions *)NULL, (struct socket *)NULL);
 
@@ -1977,7 +1978,7 @@ ip_forward(struct mbuf *m, int srcrt)
 		type = ICMP_UNREACH;
 		code = ICMP_UNREACH_NEEDFRAG;
 #if !defined(IPSEC) && !defined(FAST_IPSEC)
-		if (ipforward_rt.ro_rt != NULL)
+		if (ipforward_rt.ro_rt)
 			destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu;
 #else
 		/*
@@ -1986,7 +1987,7 @@ ip_forward(struct mbuf *m, int srcrt)
 		 *	tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz
 		 * XXX quickhack!!!
 		 */
-		if (ipforward_rt.ro_rt != NULL) {
+		if (ipforward_rt.ro_rt) {
 			struct secpolicy *sp;
 			int ipsecerror;
 			size_t ipsechdr;