From owner-svn-src-user@FreeBSD.ORG  Sat Nov 15 05:49:15 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91010106567F;
	Sat, 15 Nov 2008 05:49:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B1928FC14;
	Sat, 15 Nov 2008 05:49:15 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAF5nFLW011834;
	Sat, 15 Nov 2008 05:49:15 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAF5nF6X011833;
	Sat, 15 Nov 2008 05:49:15 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200811150549.mAF5nF6X011833@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 15 Nov 2008 05:49:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184982 - user/kmacy/HEAD_fast_multi_xmit/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Nov 2008 05:49:15 -0000

Author: kmacy
Date: Sat Nov 15 05:49:15 2008
New Revision: 184982
URL: http://svn.freebsd.org/changeset/base/184982

Log:
  - validate flows on LLINFO
  - don't cache cloning routes

Modified:
  user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c	Sat Nov 15 05:22:06 2008	(r184981)
+++ user/kmacy/HEAD_fast_multi_xmit/sys/net/flowtable.c	Sat Nov 15 05:49:15 2008	(r184982)
@@ -459,10 +459,13 @@ flow_stale(struct flowtable *ft, struct 
 	time_t idle_time;
 
 	if ((fle->f_fhash == 0)
-	    || ((fle->f_rt->rt_flags & RTF_UP) == 0)
+	    || ((fle->f_rt->rt_flags & RTF_HOST) &&
+		((fle->f_rt->rt_flags & (RTF_UP|RTF_LLINFO))
+		    != (RTF_UP|RTF_LLINFO)))
 	    || (fle->f_uptime <= fle->f_rt->rt_llinfo_uptime)
 	    || ((fle->f_rt->rt_flags & RTF_GATEWAY) &&
-		((fle->f_rt->rt_gwroute->rt_flags & RTF_UP) == 0)))
+		((fle->f_rt->rt_gwroute->rt_flags & (RTF_UP|RTF_LLINFO))
+		    != (RTF_UP|RTF_LLINFO))))
 		return (1);
 
 	idle_time = time_uptime - fle->f_uptime;
@@ -671,6 +674,8 @@ uncached:
 	if (ro.ro_rt == NULL) 
 		error = ENETUNREACH;
 	else {
+		int finsert = 0;
+		
 		if (ro.ro_rt->rt_flags & RTF_GATEWAY)
 			error = arpresolve(ro.ro_rt->rt_ifp, ro.ro_rt,
 			    NULL, ro.ro_rt->rt_gateway, desten);
@@ -696,12 +701,14 @@ uncached:
 #endif
 		route_to_rtentry_info(&ro, error ? NULL : desten, ri);
 		ro.ro_rt->rt_rmx.rmx_pksent++;
-		if (error == 0 && cache) {
+		finsert = (error == 0 && cache
+		    && !(ro.ro_rt->rt_flags & RTF_CLONING));
+		
+		if (finsert) 
 			error = flowtable_insert(ft, hash, key, proto,
 			    ro.ro_rt, desten, flags);
 				
-		} 
-		if (error || !cache)
+		if (error || !finsert)
 			RTFREE(ro.ro_rt);
 		error = 0;
 	}