From owner-svn-src-projects@FreeBSD.ORG Sun Nov 9 16:58:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43222E78; Sun, 9 Nov 2014 16:58:37 +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 155FDD72; Sun, 9 Nov 2014 16:58:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA9GwaIw072345; Sun, 9 Nov 2014 16:58:36 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA9Gwaab072343; Sun, 9 Nov 2014 16:58:36 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411091658.sA9Gwaab072343@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 9 Nov 2014 16:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274319 - projects/routing/sys/net 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: Sun, 09 Nov 2014 16:58:37 -0000 Author: melifaro Date: Sun Nov 9 16:58:36 2014 New Revision: 274319 URL: https://svnweb.freebsd.org/changeset/base/274319 Log: Remove net/route_internal header from if_disc and if_faith. Modified: projects/routing/sys/net/if_disc.c projects/routing/sys/net/if_faith.c Modified: projects/routing/sys/net/if_disc.c ============================================================================== --- projects/routing/sys/net/if_disc.c Sun Nov 9 16:57:31 2014 (r274318) +++ projects/routing/sys/net/if_disc.c Sun Nov 9 16:58:36 2014 (r274319) @@ -49,7 +49,6 @@ #include #include #include -#include #include #include Modified: projects/routing/sys/net/if_faith.c ============================================================================== --- projects/routing/sys/net/if_faith.c Sun Nov 9 16:57:31 2014 (r274318) +++ projects/routing/sys/net/if_faith.c Sun Nov 9 16:58:36 2014 (r274319) @@ -61,7 +61,6 @@ #include #include #include -#include #include #include @@ -81,6 +80,8 @@ #include #endif +#include + struct faith_softc { struct ifnet *sc_ifp; }; @@ -191,24 +192,32 @@ faithoutput(struct ifnet *ifp, struct mb { int isr; u_int32_t af; - struct rtentry *rt = NULL; + uint32_t nh_flags; M_ASSERTPKTHDR(m); + nh_flags = 0; + af = AF_UNSPEC; + if (ni != NULL && ni->ni_nh != NULL) { + nh_flags = ni->ni_nh->nh_flags; + af = ni->ni_family; + } else if (dst != NULL) + af = dst->sa_family; + /* BPF writes need to be handled specially. */ - if (dst->sa_family == AF_UNSPEC) + if (af == AF_UNSPEC && dst != NULL) bcopy(dst->sa_data, &af, sizeof(af)); - else - af = dst->sa_family; if (bpf_peers_present(ifp->if_bpf)) bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m); - if (rt && rt->rt_flags & (RTF_REJECT|RTF_BLACKHOLE)) { + + if (nh_flags & (NHF_REJECT | NHF_BLACKHOLE)) { m_freem(m); - return (rt->rt_flags & RTF_BLACKHOLE ? 0 : - rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH); + /* XXX: RTF_HOST */ + return (nh_flags & NHF_BLACKHOLE ? 0 : EHOSTUNREACH); } + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len); switch (af) { @@ -306,6 +315,8 @@ static int faithprefix(in6) struct in6_addr *in6; { + return (0); +#if 0 struct rtentry *rt; struct sockaddr_in6 sin6; int ret; @@ -326,5 +337,6 @@ faithprefix(in6) if (rt) RTFREE_LOCKED(rt); return ret; +#endif } #endif