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.231.2.2
retrieving revision 1.238
diff -u -p -r1.231.2.2 -r1.238
--- src/sys/netinet/ip_input.c	2006/12/10 07:19:10	1.231.2.2
+++ src/sys/netinet/ip_input.c	2006/12/06 00:39:56	1.238
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.231.2.2 2006/12/10 07:19:10 yamt Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.238 2006/12/06 00:39:56 dyoung 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.231.2.2 2006/12/10 07:19:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.238 2006/12/06 00:39:56 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -1679,18 +1679,20 @@ ip_rtaddr(struct in_addr dst)
 
 	sin = satosin(&ipforward_rt.ro_dst);
 
-	if (ipforward_rt.ro_rt == NULL || !in_hosteq(dst, sin->sin_addr)) {
-		if (ipforward_rt.ro_rt != NULL)
-			rtflush(&ipforward_rt);
+	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;
 
 		rtalloc(&ipforward_rt);
 	}
-	if (ipforward_rt.ro_rt == NULL)
-		return NULL;
-	return ifatoia(ipforward_rt.ro_rt->rt_ifa);
+	if (ipforward_rt.ro_rt == 0)
+		return ((struct in_ifaddr *)0);
+	return (ifatoia(ipforward_rt.ro_rt->rt_ifa));
 }
 
 /*
@@ -1871,16 +1873,18 @@ ip_forward(struct mbuf *m, int srcrt)
 	}
 
 	sin = satosin(&ipforward_rt.ro_dst);
-	if ((rt = 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 != NULL)
-			rtflush(&ipforward_rt);
+		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;
 
 		rtalloc(&ipforward_rt);
-		if (ipforward_rt.ro_rt == NULL) {
+		if (ipforward_rt.ro_rt == 0) {
 			icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, dest, 0);
 			return;
 		}