From owner-svn-src-user@FreeBSD.ORG Sat Nov 1 17:55:29 2008 Return-Path: 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 E46C41065679; Sat, 1 Nov 2008 17:55:29 +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 D28168FC0A; Sat, 1 Nov 2008 17:55:29 +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 mA1HtTuS015170; Sat, 1 Nov 2008 17:55:29 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA1HtTml015169; Sat, 1 Nov 2008 17:55:29 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200811011755.mA1HtTml015169@svn.freebsd.org> From: Kip Macy Date: Sat, 1 Nov 2008 17:55:29 +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: r184525 - user/kmacy/HEAD_fast_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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Nov 2008 17:55:30 -0000 Author: kmacy Date: Sat Nov 1 17:55:29 2008 New Revision: 184525 URL: http://svn.freebsd.org/changeset/base/184525 Log: - arpresolve gateway address for gateway routes - simplify gateway validation check to fix case where the fl entry lock wasn't getting droppd Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c ============================================================================== --- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Sat Nov 1 17:02:01 2008 (r184524) +++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c Sat Nov 1 17:55:29 2008 (r184525) @@ -534,9 +534,7 @@ route_to_rtentry_info(struct route *ro, if ((rt->rt_flags & RTF_GATEWAY) && !IN_MULTICAST(sin->sin_addr.s_addr)) memcpy(&ri->ri_dst, rt->rt_gateway, sizeof(struct sockaddr)); else - memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr)); - - ((struct sockaddr *)&ri->ri_dst)->sa_family = AF_INET; + memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr_in)); if (desten) { memcpy(ri->ri_desten, desten, ETHER_ADDR_LEN); @@ -565,6 +563,15 @@ flowtable_key_equal(struct flentry *fle, return (1); } +static __inline int +gw_valid(struct flentry *fle) +{ + return ((fle->f_rt->rt_flags & RTF_GATEWAY) == 0 || + ((fle->f_rt->rt_flags & RTF_GATEWAY) && + (fle->f_rt->rt_gwroute->rt_flags & RTF_UP))); +} + + int flowtable_lookup(struct flowtable *ft, struct mbuf *m, struct rtentry_info *ri) @@ -605,12 +612,8 @@ flowtable_lookup(struct flowtable *ft, s && flowtable_key_equal(fle, key, flags) && (proto == fle->f_proto) && (fle->f_rt->rt_flags & RTF_UP) - && (fle->f_uptime > fle->f_rt->rt_llinfo_uptime)) { - - if ((fle->f_rt->rt_flags & RTF_GATEWAY) && - ((fle->f_rt->rt_gwroute->rt_flags & RTF_UP) == 0)) - goto uncached; - + && (fle->f_uptime > fle->f_rt->rt_llinfo_uptime) + && gw_valid(fle)) { fle->f_uptime = time_uptime; fle->f_flags |= flags; fle->f_rt->rt_rmx.rmx_pksent++; @@ -637,8 +640,12 @@ uncached: if (ro.ro_rt == NULL) error = ENETUNREACH; else { - error = arpresolve(ro.ro_rt->rt_ifp, ro.ro_rt, NULL, - &ro.ro_dst, desten); + 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); + else + error = arpresolve(ro.ro_rt->rt_ifp, ro.ro_rt, + NULL, &ro.ro_dst, desten); route_to_rtentry_info(&ro, error ? NULL : desten, ri); if (error == 0 && cache)