From owner-svn-src-head@freebsd.org Mon Aug 10 20:50:33 2015 Return-Path: Delivered-To: svn-src-head@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 BDE4A99D857; Mon, 10 Aug 2015 20:50:33 +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 AE85DE50; Mon, 10 Aug 2015 20:50:33 +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 t7AKoXUl030787; Mon, 10 Aug 2015 20:50:33 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7AKoWdG030780; Mon, 10 Aug 2015 20:50:32 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201508102050.t7AKoWdG030780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 10 Aug 2015 20:50:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286594 - in head/sys: net netinet netinet6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2015 20:50:33 -0000 Author: melifaro Date: Mon Aug 10 20:50:31 2015 New Revision: 286594 URL: https://svnweb.freebsd.org/changeset/base/286594 Log: Rename rt_foreach_fib() to rt_foreach_fib_walk(). Suggested by: julian Modified: head/sys/net/route.c head/sys/net/route.h head/sys/netinet/in_rmx.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/nd6_rtr.c Modified: head/sys/net/route.c ============================================================================== --- head/sys/net/route.c Mon Aug 10 20:34:46 2015 (r286593) +++ head/sys/net/route.c Mon Aug 10 20:50:31 2015 (r286594) @@ -813,8 +813,16 @@ rtrequest_fib(int req, } +/* + * Iterates over all existing fibs in system calling + * @setwa_f function prior to traversing each fib. + * Calls @wa_f function for each element in current fib. + * If af is not AF_UNSPEC, iterates over fibs in particular + * address family. + */ void -rt_foreach_fib(int af, rt_setwarg_t *setwa_f, rt_walktree_f_t *wa_f, void *arg) +rt_foreach_fib_walk(int af, rt_setwarg_t *setwa_f, rt_walktree_f_t *wa_f, + void *arg) { struct radix_node_head *rnh; uint32_t fibnum; @@ -899,7 +907,7 @@ void rt_flushifroutes(struct ifnet *ifp) { - rt_foreach_fib(AF_UNSPEC, NULL, rt_ifdelroute, ifp); + rt_foreach_fib_walk(AF_UNSPEC, NULL, rt_ifdelroute, ifp); } /* Modified: head/sys/net/route.h ============================================================================== --- head/sys/net/route.h Mon Aug 10 20:34:46 2015 (r286593) +++ head/sys/net/route.h Mon Aug 10 20:50:31 2015 (r286594) @@ -382,7 +382,7 @@ void rt_updatemtu(struct ifnet *); typedef int rt_walktree_f_t(struct rtentry *, void *); typedef void rt_setwarg_t(struct radix_node_head *, uint32_t, int, void *); -void rt_foreach_fib(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); +void rt_foreach_fib_walk(int af, rt_setwarg_t *, rt_walktree_f_t *, void *); void rt_flushifroutes(struct ifnet *ifp); /* XXX MRT COMPAT VERSIONS THAT SET UNIVERSE to 0 */ Modified: head/sys/netinet/in_rmx.c ============================================================================== --- head/sys/netinet/in_rmx.c Mon Aug 10 20:34:46 2015 (r286593) +++ head/sys/netinet/in_rmx.c Mon Aug 10 20:50:31 2015 (r286594) @@ -213,7 +213,7 @@ in_ifadown(struct ifaddr *ifa, int delet arg.ifa = ifa; arg.del = delete; - rt_foreach_fib(AF_INET, in_setifarnh, in_ifadownkill, &arg); + rt_foreach_fib_walk(AF_INET, in_setifarnh, in_ifadownkill, &arg); ifa->ifa_flags &= ~IFA_ROUTE; /* XXXlocking? */ } Modified: head/sys/netinet6/in6_rmx.c ============================================================================== --- head/sys/netinet6/in6_rmx.c Mon Aug 10 20:34:46 2015 (r286593) +++ head/sys/netinet6/in6_rmx.c Mon Aug 10 20:50:31 2015 (r286594) @@ -207,7 +207,8 @@ in6_mtuexpire(struct rtentry *rt, void * #define MTUTIMO_DEFAULT (60*1) static void -in6_mtutimo_setwa(struct radix_node_head *rnh, uint32_t fibum, int af, void *_arg) +in6_mtutimo_setwa(struct radix_node_head *rnh, uint32_t fibum, int af, + void *_arg) { struct mtuex_arg *arg; @@ -223,7 +224,7 @@ in6_mtutimo(void *rock) struct timeval atv; struct mtuex_arg arg; - rt_foreach_fib(AF_INET6, in6_mtutimo_setwa, in6_mtuexpire, &arg); + rt_foreach_fib_walk(AF_INET6, in6_mtutimo_setwa, in6_mtuexpire, &arg); atv.tv_sec = MTUTIMO_DEFAULT; atv.tv_usec = 0; Modified: head/sys/netinet6/nd6_rtr.c ============================================================================== --- head/sys/netinet6/nd6_rtr.c Mon Aug 10 20:34:46 2015 (r286593) +++ head/sys/netinet6/nd6_rtr.c Mon Aug 10 20:50:31 2015 (r286594) @@ -2073,7 +2073,7 @@ rt6_flush(struct in6_addr *gateway, stru return; /* XXX Do we really need to walk any but the default FIB? */ - rt_foreach_fib(AF_INET6, NULL, rt6_deleteroute, (void *)gateway); + rt_foreach_fib_walk(AF_INET6, NULL, rt6_deleteroute, (void *)gateway); } static int