From owner-svn-src-projects@FreeBSD.ORG Tue Nov 4 18:48:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87BAEC3; Tue, 4 Nov 2014 18:48:14 +0000 (UTC) Received: from svn.freebsd.org (svn.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 68D22C2A; Tue, 4 Nov 2014 18:48:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA4ImEqt038688; Tue, 4 Nov 2014 18:48:14 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA4ImDG0038682; Tue, 4 Nov 2014 18:48:13 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411041848.sA4ImDG0038682@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Tue, 4 Nov 2014 18:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274098 - in projects/routing/sys: net netinet netinet6 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.18-1 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: Tue, 04 Nov 2014 18:48:14 -0000 Author: melifaro Date: Tue Nov 4 18:48:13 2014 New Revision: 274098 URL: https://svnweb.freebsd.org/changeset/base/274098 Log: Convert gif and stf to use new routing api. Modified: projects/routing/sys/net/if_stf.c projects/routing/sys/netinet/in_gif.c projects/routing/sys/netinet6/in6_gif.c Modified: projects/routing/sys/net/if_stf.c ============================================================================== --- projects/routing/sys/net/if_stf.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/net/if_stf.c Tue Nov 4 18:48:13 2014 (r274098) @@ -116,6 +116,8 @@ #include +#include + #include #include @@ -572,26 +574,12 @@ stf_checkaddr4(sc, in, inifp) * perform ingress filter */ if (sc && (STF2IFP(sc)->if_flags & IFF_LINK2) == 0 && inifp) { - struct sockaddr_in sin; - struct rtentry *rt; + struct nhop4_basic nh4; - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr = *in; - rt = rtalloc1_fib((struct sockaddr *)&sin, 0, - 0UL, sc->sc_fibnum); - if (!rt || rt->rt_ifp != inifp) { -#if 0 - log(LOG_WARNING, "%s: packet from 0x%x dropped " - "due to ingress filter\n", if_name(STF2IFP(sc)), - (u_int32_t)ntohl(sin.sin_addr.s_addr)); -#endif - if (rt) - RTFREE_LOCKED(rt); - return -1; - } - RTFREE_LOCKED(rt); + if (fib4_lookup_nh_basic(sc->sc_fibnum, *in, 0, &nh4) != 0) + return (-1); + if (nh4.nh_ifp != inifp) + return (-1); } return 0; Modified: projects/routing/sys/netinet/in_gif.c ============================================================================== --- projects/routing/sys/netinet/in_gif.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/netinet/in_gif.c Tue Nov 4 18:48:13 2014 (r274098) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -68,6 +67,7 @@ __FBSDID("$FreeBSD$"); #endif #include +#include static int gif_validate4(const struct ip *, struct gif_softc *, struct ifnet *); @@ -188,22 +188,15 @@ gif_validate4(const struct ip *ip, struc /* ingress filters on outer source */ if ((GIF2IFP(sc)->if_flags & IFF_LINK2) == 0 && ifp) { - struct sockaddr_in sin; - struct rtentry *rt; + struct nhop4_basic nh4; + uint32_t fibnum; - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr = ip->ip_src; - /* XXX MRT check for the interface we would use on output */ - rt = in_rtalloc1((struct sockaddr *)&sin, 0, - 0UL, sc->gif_fibnum); - if (!rt || rt->rt_ifp != ifp) { - if (rt) - RTFREE_LOCKED(rt); + fibnum = sc->gif_fibnum; + + if (fib4_lookup_nh_basic(fibnum, ip->ip_src, 0, &nh4) != 0) + return (0); + if (nh4.nh_ifp != ifp) return (0); - } - RTFREE_LOCKED(rt); } return (32 * 2); } Modified: projects/routing/sys/netinet6/in6_gif.c ============================================================================== --- projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 18:22:33 2014 (r274097) +++ projects/routing/sys/netinet6/in6_gif.c Tue Nov 4 18:48:13 2014 (r274098) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #endif #include #ifdef INET6 @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #endif #include +#include VNET_DEFINE(int, ip6_gif_hlim) = GIF_HLIM; #define V_ip6_gif_hlim VNET(ip6_gif_hlim) @@ -195,23 +196,17 @@ gif_validate6(const struct ip6_hdr *ip6, /* ingress filters on outer source */ if ((GIF2IFP(sc)->if_flags & IFF_LINK2) == 0 && ifp) { - struct sockaddr_in6 sin6; - struct rtentry *rt; + struct nhop6_basic nh6; + struct in6_addr src; + uint32_t fibnum, scopeid; - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(struct sockaddr_in6); - sin6.sin6_addr = ip6->ip6_src; - sin6.sin6_scope_id = 0; /* XXX */ - - rt = in6_rtalloc1((struct sockaddr *)&sin6, 0, 0UL, - sc->gif_fibnum); - if (!rt || rt->rt_ifp != ifp) { - if (rt) - RTFREE_LOCKED(rt); + fibnum = sc->gif_fibnum; + in6_splitscope(&ip6->ip6_src, &src, &scopeid); + + if (fib6_lookup_nh_basic(fibnum, &src, scopeid, 0, &nh6) != 0) + return (0); + if (nh6.nh_ifp != ifp) return (0); - } - RTFREE_LOCKED(rt); } return (128 * 2);