d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Determine fibnum once in the beginning of route_output().

Browse Source 
MFC after:	1 month
This commit is contained in:
melifaro 2014-04-26 22:32:04 +00:00
parent e815654815
commit 78166405b1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net/rtsock.c
View File

@ -526,7 +526,7 @@ route_output(struct mbuf *m, struct socket *so)
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
int i, rti_need_deembed = 0; int i, rti_need_deembed = 0;
#endif #endif
int len, error = 0; int len, error = 0, fibnum;
struct ifnet *ifp = NULL; struct ifnet *ifp = NULL;
union sockaddr_union saun; union sockaddr_union saun;
sa_family_t saf = AF_UNSPEC; sa_family_t saf = AF_UNSPEC;
@ -582,6 +582,8 @@ route_output(struct mbuf *m, struct socket *so)
senderr(error); senderr(error);
} }
fibnum = so->so_fibnum;
/* /*
* The given gateway address may be an interface address. * The given gateway address may be an interface address.
* For example, issuing a "route change" command on a route * For example, issuing a "route change" command on a route
@ -596,7 +598,7 @@ route_output(struct mbuf *m, struct socket *so)
bzero(&gw_ro, sizeof(gw_ro)); bzero(&gw_ro, sizeof(gw_ro));
gw_ro.ro_dst = *info.rti_info[RTAX_GATEWAY]; 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 * A host route through the loopback interface is
* installed for each interface adddress. In pre 8.0 * installed for each interface adddress. In pre 8.0
@ -637,7 +639,7 @@ route_output(struct mbuf *m, struct socket *so)
break; break;
} }
error = rtrequest1_fib(rtm->rtm_type, &info, &saved_nrt, error = rtrequest1_fib(rtm->rtm_type, &info, &saved_nrt,
so->so_fibnum); fibnum);
if (error == 0 && saved_nrt != NULL) { if (error == 0 && saved_nrt != NULL) {
#ifdef INET6 #ifdef INET6
rti_need_deembed = (V_deembed_scopeid) ? 1 : 0; rti_need_deembed = (V_deembed_scopeid) ? 1 : 0;
@ -663,8 +665,7 @@ route_output(struct mbuf *m, struct socket *so)
#endif #endif
break; break;
} }
error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, error = rtrequest1_fib(RTM_DELETE, &info, &saved_nrt, fibnum);
so->so_fibnum);
if (error == 0) { if (error == 0) {
RT_LOCK(saved_nrt); RT_LOCK(saved_nrt);
rt = saved_nrt; rt = saved_nrt;
@ -677,8 +678,7 @@ route_output(struct mbuf *m, struct socket *so)
break; break;
case RTM_GET: case RTM_GET:
rnh = rt_tables_get_rnh(so->so_fibnum, rnh = rt_tables_get_rnh(fibnum, saf);
info.rti_info[RTAX_DST]->sa_family);
if (rnh == NULL) if (rnh == NULL)
senderr(EAFNOSUPPORT); senderr(EAFNOSUPPORT);
@ -867,7 +867,7 @@ route_output(struct mbuf *m, struct socket *so)
m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len); m_adj(m, rtm->rtm_msglen - m->m_pkthdr.len);
} }
if (m) { if (m) {
M_SETFIB(m, so->so_fibnum); M_SETFIB(m, fibnum);
m->m_flags |= RTS_FILTER_FIB; m->m_flags |= RTS_FILTER_FIB;
if (rp) { if (rp) {
/* /*