From owner-svn-src-projects@FreeBSD.ORG Mon Mar 5 22:36:51 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01409106564A; Mon, 5 Mar 2012 22:36:51 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C716D8FC12; Mon, 5 Mar 2012 22:36:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q25MaodY007795; Mon, 5 Mar 2012 22:36:50 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q25MaoHe007793; Mon, 5 Mar 2012 22:36:50 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201203052236.q25MaoHe007793@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 5 Mar 2012 22:36:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232575 - projects/multi-fibv6/7/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2012 22:36:51 -0000 Author: bz Date: Mon Mar 5 22:36:50 2012 New Revision: 232575 URL: http://svn.freebsd.org/changeset/base/232575 Log: Adjust rtalloc_ign() calls for multi-FIBv6 though not really supported. Use RT_DEFAULT_FIB rather than a magic 0 also for IPv4. Sponsored by: Cisco Systems, Inc. Modified: projects/multi-fibv6/7/sys/contrib/pf/net/pf.c Modified: projects/multi-fibv6/7/sys/contrib/pf/net/pf.c ============================================================================== --- projects/multi-fibv6/7/sys/contrib/pf/net/pf.c Mon Mar 5 20:59:34 2012 (r232574) +++ projects/multi-fibv6/7/sys/contrib/pf/net/pf.c Mon Mar 5 22:36:50 2012 (r232575) @@ -3201,7 +3201,7 @@ pf_calc_mss(struct pf_addr *addr, sa_fam #ifdef RTF_PRCLONING rtalloc_ign(&ro, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - in_rtalloc_ign(&ro, RTF_CLONING, 0); + in_rtalloc_ign(&ro, RTF_CLONING, RT_DEFAULT_FIB); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone(&ro, NO_CLONING); @@ -3222,7 +3222,7 @@ pf_calc_mss(struct pf_addr *addr, sa_fam rtalloc_ign((struct route *)&ro6, (RTF_CLONING | RTF_PRCLONING)); #else /* !RTF_PRCLONING */ - rtalloc_ign((struct route *)&ro6, RTF_CLONING); + in6_rtalloc_ign(&ro6, RTF_CLONING, RT_DEFAULT_FIB); #endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro6, NO_CLONING); @@ -6135,9 +6135,10 @@ pf_routable(struct pf_addr *addr, sa_fam #ifdef __FreeBSD__ /* XXX MRT not always INET */ /* stick with table 0 though */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, RTF_CLONING, + RT_DEFAULT_FIB); else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + in6_rtalloc_ign(&ro, RTF_CLONING, RT_DEFAULT_FIB); #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); #endif @@ -6217,9 +6218,12 @@ pf_rtlabel_match(struct pf_addr *addr, s rtalloc_ign((struct route *)&ro, (RTF_CLONING|RTF_PRCLONING)); # else /* !RTF_PRCLONING */ if (af == AF_INET) - in_rtalloc_ign((struct route *)&ro, RTF_CLONING, 0); + in_rtalloc_ign((struct route *)&ro, RTF_CLONING, + RT_DEFAULT_FIB); +#ifdef INET6 else - rtalloc_ign((struct route *)&ro, RTF_CLONING); + in6_rtalloc_ign(&ro, RTF_CLONING, RT_DEFAULT_FIB); +#endif # endif #else /* ! __FreeBSD__ */ rtalloc_noclone((struct route *)&ro, NO_CLONING); @@ -6299,7 +6303,7 @@ pf_route(struct mbuf **m, struct pf_rule dst->sin_addr = ip->ip_dst; if (r->rt == PF_FASTROUTE) { - in_rtalloc(ro, 0); + in_rtalloc(ro, RT_DEFAULT_FIB); if (ro->ro_rt == 0) { ipstat.ips_noroute++; goto bad;