From owner-svn-src-projects@freebsd.org Sun Aug 23 18:14:31 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B30F9C1746 for ; Sun, 23 Aug 2015 18:14:31 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2BEF21C6C; Sun, 23 Aug 2015 18:14:31 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7NIEVBM042156; Sun, 23 Aug 2015 18:14:31 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7NIEVvJ042155; Sun, 23 Aug 2015 18:14:31 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201508231814.t7NIEVvJ042155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 23 Aug 2015 18:14:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r287046 - projects/routing/sys/contrib/ipfilter/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 23 Aug 2015 18:14:31 -0000 Author: melifaro Date: Sun Aug 23 18:14:30 2015 New Revision: 287046 URL: https://svnweb.freebsd.org/changeset/base/287046 Log: Convert ipfilter to use new routing API. Compile tested only Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Modified: projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sun Aug 23 18:13:27 2015 (r287045) +++ projects/routing/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sun Aug 23 18:14:30 2015 (r287046) @@ -71,6 +71,7 @@ static const char rcsid[] = "@(#)$Id$"; #ifdef USE_INET6 # include #endif +#include #include "netinet/ip_fil.h" #include "netinet/ip_nat.h" #include "netinet/ip_frag.h" @@ -712,16 +713,16 @@ ipf_fastroute(m0, mpp, fin, fdp) { register struct ip *ip, *mhip; register struct mbuf *m = *mpp; - register struct route *ro; int len, off, error = 0, hlen, code; + u_int fibnum; struct ifnet *ifp, *sifp; - struct sockaddr_in *dst; - struct route iproute; + struct in_addr dst; + struct nhop_data nhd, *pnhd; u_short ip_off; frdest_t node; frentry_t *fr; - ro = NULL; + pnhd = NULL; #ifdef M_WRITABLE /* @@ -766,11 +767,10 @@ ipf_fastroute(m0, mpp, fin, fdp) /* * Route packet. */ - ro = &iproute; - bzero(ro, sizeof (*ro)); - dst = (struct sockaddr_in *)&ro->ro_dst; - dst->sin_family = AF_INET; - dst->sin_addr = ip->ip_dst; + fibnum = M_GETFIB(m0); + dst = ip->ip_dst; + memset(&nhd, 0, sizeof(nhd)); + pnhd = &nhd; fr = fin->fin_fr; if ((fr != NULL) && !(fr->fr_flags & FR_KEEPSTATE) && (fdp != NULL) && @@ -790,25 +790,21 @@ ipf_fastroute(m0, mpp, fin, fdp) } if ((fdp != NULL) && (fdp->fd_ip.s_addr != 0)) - dst->sin_addr = fdp->fd_ip; + dst = fdp->fd_ip; - dst->sin_len = sizeof(*dst); - in_rtalloc(ro, M_GETFIB(m0)); - if ((ifp == NULL) && (ro->ro_rt != NULL)) - ifp = ro->ro_rt->rt_ifp; + error = fib4_lookup_prepend(fibnum, dst, m0, pnhd, NULL); - if ((ro->ro_rt == NULL) || (ifp == NULL)) { + if (error != 0) { + pnhd = NULL; if (in_localaddr(ip->ip_dst)) error = EHOSTUNREACH; else error = ENETUNREACH; goto bad; } - if (ro->ro_rt->rt_flags & RTF_GATEWAY) - dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway; - if (ro->ro_rt) - counter_u64_add(ro->ro_rt->rt_pksent, 1); + + ifp = NH_LIFP(pnhd); /* * For input packets which are being "fastrouted", they won't @@ -852,9 +848,7 @@ ipf_fastroute(m0, mpp, fin, fdp) if (ntohs(ip->ip_len) <= ifp->if_mtu) { if (!ip->ip_sum) ip->ip_sum = in_cksum(m, hlen); - error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, - ro - ); + error = fib4_sendmbuf(ifp, m, pnhd, dst); goto done; } /* @@ -934,10 +928,7 @@ sendorfree: m0 = m->m_act; m->m_act = 0; if (error == 0) - error = (*ifp->if_output)(ifp, m, - (struct sockaddr *)dst, - ro - ); + error = fib4_sendmbuf(ifp, m, pnhd, dst); else FREE_MB_T(m); } @@ -948,9 +939,8 @@ done: else ipfmain.ipf_frouteok[1]++; - if ((ro != NULL) && (ro->ro_rt != NULL)) { - RTFREE(ro->ro_rt); - } + if (pnhd != NULL) + fib4_free_nh(fibnum, pnhd); return 0; bad: if (error == EMSGSIZE) { @@ -971,18 +961,13 @@ int ipf_verifysrc(fin) fr_info_t *fin; { - struct sockaddr_in *dst; - struct route iproute; + struct nhop4_basic nh4; - bzero((char *)&iproute, sizeof(iproute)); - dst = (struct sockaddr_in *)&iproute.ro_dst; - dst->sin_len = sizeof(*dst); - dst->sin_family = AF_INET; - dst->sin_addr = fin->fin_src; - in_rtalloc(&iproute, 0); - if (iproute.ro_rt == NULL) - return 0; - return (fin->fin_ifp == iproute.ro_rt->rt_ifp); + memset(&nh4, 0, sizeof(nh4)); + if (fib4_lookup_nh_basic(RT_DEFAULT_FIB, fin->fin_src, 0, &nh4) != 0) + return (0); + + return (fin->fin_ifp == nh4.nh_ifp); }