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
retrieving revision 1.236.4.2
retrieving revision 1.237
diff -u -p -r1.236.4.2 -r1.237
--- src/sys/netinet/ip_input.c	2008/06/03 20:47:41	1.236.4.2
+++ src/sys/netinet/ip_input.c	2006/12/06 00:38:16	1.237
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.236.4.2 2008/06/03 20:47:41 skrll Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.237 2006/12/06 00:38:16 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.236.4.2 2008/06/03 20:47:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.237 2006/12/06 00:38:16 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_gateway.h"
@@ -1013,6 +1013,7 @@ found:
 			/* XXX error stat??? */
 			error = EINVAL;
 DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/
+			goto bad;
 		}
 		splx(s);
 		if (error)
@@ -1727,10 +1728,10 @@ ip_srcroute(void)
 	struct mbuf *m;
 
 	if (ip_nhops == 0)
-		return ((struct mbuf *)0);
+		return NULL;
 	m = m_get(M_DONTWAIT, MT_SOOPTS);
 	if (m == 0)
-		return ((struct mbuf *)0);
+		return NULL;
 
 	MCLAIM(m, &inetdomain.dom_mowner);
 #define OPTSIZ	(sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt))
@@ -1976,17 +1977,17 @@ ip_forward(struct mbuf *m, int srcrt)
 	case EMSGSIZE:
 		type = ICMP_UNREACH;
 		code = ICMP_UNREACH_NEEDFRAG;
-
+#if !defined(IPSEC) && !defined(FAST_IPSEC)
+		if (ipforward_rt.ro_rt)
+			destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu;
+#else
+		/*
+		 * If the packet is routed over IPsec tunnel, tell the
+		 * originator the tunnel MTU.
+		 *	tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz
+		 * XXX quickhack!!!
+		 */
 		if (ipforward_rt.ro_rt) {
-
-#if defined(IPSEC) || defined(FAST_IPSEC)
-			/*
-			 * If the packet is routed over IPsec tunnel, tell the
-			 * originator the tunnel MTU.
-			 *	tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz
-			 * XXX quickhack!!!
-			 */
-
 			struct secpolicy *sp;
 			int ipsecerror;
 			size_t ipsechdr;
@@ -1995,11 +1996,10 @@ ip_forward(struct mbuf *m, int srcrt)
 			sp = ipsec4_getpolicybyaddr(mcopy,
 			    IPSEC_DIR_OUTBOUND, IP_FORWARDING,
 			    &ipsecerror);
-#endif
 
-			destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu;
-#if defined(IPSEC) || defined(FAST_IPSEC)
-			if (sp != NULL) {
+			if (sp == NULL)
+				destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu;
+			else {
 				/* count IPsec header size */
 				ipsechdr = ipsec4_hdrsiz(mcopy,
 				    IPSEC_DIR_OUTBOUND, NULL);
@@ -2028,8 +2028,8 @@ ip_forward(struct mbuf *m, int srcrt)
 				KEY_FREESP(&sp);
 #endif
 			}
-#endif /*defined(IPSEC) || defined(FAST_IPSEC)*/
 		}
+#endif /*IPSEC*/
 		ipstat.ips_cantfrag++;
 		break;