From owner-svn-src-all@FreeBSD.ORG Sat Apr 26 22:32:04 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF510EB; Sat, 26 Apr 2014 22:32:04 +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 9197B1C22; Sat, 26 Apr 2014 22:32:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3QMW4su085572; Sat, 26 Apr 2014 22:32:04 GMT (envelope-from melifaro@svn.freebsd.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3QMW4pe085571; Sat, 26 Apr 2014 22:32:04 GMT (envelope-from melifaro@svn.freebsd.org) Message-Id: <201404262232.s3QMW4pe085571@svn.freebsd.org> From: "Alexander V. Chernikov" Date: Sat, 26 Apr 2014 22:32:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264987 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 22:32:04 -0000 Author: melifaro Date: Sat Apr 26 22:32:04 2014 New Revision: 264987 URL: http://svnweb.freebsd.org/changeset/base/264987 Log: Determine fibnum once in the beginning of route_output(). MFC after: 1 month Modified: head/sys/net/rtsock.c Modified: head/sys/net/rtsock.c ============================================================================== --- head/sys/net/rtsock.c Sat Apr 26 21:03:41 2014 (r264986) +++ head/sys/net/rtsock.c Sat Apr 26 22:32:04 2014 (r264987) @@ -526,7 +526,7 @@ route_output(struct mbuf *m, struct sock struct sockaddr_in6 *sin6; int i, rti_need_deembed = 0; #endif - int len, error = 0; + int len, error = 0, fibnum; struct ifnet *ifp = NULL; union sockaddr_union saun; sa_family_t saf = AF_UNSPEC; @@ -582,6 +582,8 @@ route_output(struct mbuf *m, struct sock senderr(error); } + fibnum = so->so_fibnum; + /* * The given gateway address may be an interface address. * For example, issuing a "route change" command on a route @@ -596,7 +598,7 @@ route_output(struct mbuf *m, struct sock bzero(&gw_ro, sizeof(gw_ro)); gw_ro.ro_dst = *info.rti_info[RTAX_GATEWAY]; - rtalloc_ign_fib(&gw_ro, 0, so->so_fibnum); + rtalloc_ign_fib(&gw_ro, 0, fibnum); /* * A host route through the loopback interface is * installed for each interface adddress. In pre 8.0 @@ -637,7 +639,7 @@ route_output(struct mbuf *m, struct sock break; } error = rtrequest1_fib(rtm->rtm_type, &info, &saved_nrt, - so->so_fibnum); + fibnum); if (error == 0 && saved_nrt != NULL) { #ifdef INET6 rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; @@ -663,8 +665,7 @@ route_output(struct mbuf *m, struct sock #endif break; } - error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, - so->so_fibnum); + error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, fibnum); if (error == 0) { RT_LOCK(saved_nrt); rt = saved_nrt; @@ -677,8 +678,7 @@ route_output(struct mbuf *m, struct sock break; case RTM_GET: - rnh = rt_tables_get_rnh(so->so_fibnum, - info.rti_info[RTAX_DST]->sa_family); + rnh = rt_tables_get_rnh(fibnum, saf); if (rnh == NULL) senderr(EAFNOSUPPORT); @@ -867,7 +867,7 @@ flush: m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len); } if (m) { - M_SETFIB(m, so->so_fibnum); + M_SETFIB(m, fibnum); m->m_flags |= RTS_FILTER_FIB; if (rp) { /*