diff options
| -rw-r--r-- | sys/kern/uipc_socket.c | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_divert.c | 1 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 9 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 8 |
4 files changed, 19 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index eb587fb..e712503 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2218,6 +2218,9 @@ sosetopt(struct socket *so, struct sockopt *sopt) if ((so->so_proto->pr_domain->dom_family == PF_INET) || (so->so_proto->pr_domain->dom_family == PF_ROUTE)) { so->so_fibnum = optval; + /* Note: ignore error */ + if (so->so_proto && so->so_proto->pr_ctloutput) + (*so->so_proto->pr_ctloutput)(so, sopt); } else { so->so_fibnum = 0; } diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index dc000cb..dd0445d 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -322,6 +322,7 @@ div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin, */ m->m_pkthdr.rcvif = NULL; m->m_nextpkt = NULL; + M_SETFIB(m, so->so_fibnum); if (control) m_freem(control); /* XXX */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 75ef09d..aa5d3e7 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -134,8 +134,10 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags, bzero(ro, sizeof (*ro)); } - if (inp != NULL) + if (inp != NULL) { + M_SETFIB(m, inp->inp_inc.inc_fibnum); INP_LOCK_ASSERT(inp); + } if (opt) { len = 0; @@ -824,6 +826,11 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt) error = optval = 0; if (sopt->sopt_level != IPPROTO_IP) { + if ((sopt->sopt_level == SOL_SOCKET) && + (sopt->sopt_name == SO_SETFIB)) { + inp->inp_inc.inc_fibnum = so->so_fibnum; + return (0); + } return (EINVAL); } diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index dfe902e..a84db95 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -450,8 +450,14 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt) struct inpcb *inp = sotoinpcb(so); int error, optval; - if (sopt->sopt_level != IPPROTO_IP) + if (sopt->sopt_level != IPPROTO_IP) { + if ((sopt->sopt_level == SOL_SOCKET) && + (sopt->sopt_name == SO_SETFIB)) { + inp->inp_inc.inc_fibnum = so->so_fibnum; + return (0); + } return (EINVAL); + } error = 0; switch (sopt->sopt_dir) { |
