svn commit: r185311 - in stable/7/sys: kern netinet

[Julian Elischer]

Author: julian
Date: Tue Nov 25 19:26:36 2008
New Revision: 185311
URL: http://svn.freebsd.org/changeset/base/185311

Log:
  MFC @ 185101
  Fix a scope problem in the multiple routing table code that
  stopped the SO_SETFIB socket option from working correctly.
  
  Approved by:	 re (kensmith, kostik)
  Obtained from:	Ironport

Modified:
  stable/7/sys/kern/uipc_socket.c
  stable/7/sys/netinet/ip_divert.c
  stable/7/sys/netinet/ip_output.c
  stable/7/sys/netinet/raw_ip.c

Modified: stable/7/sys/kern/uipc_socket.c
==============================================================================
--- stable/7/sys/kern/uipc_socket.c	Tue Nov 25 19:25:54 2008	(r185310)
+++ stable/7/sys/kern/uipc_socket.c	Tue Nov 25 19:26:36 2008	(r185311)
@@ -2218,6 +2218,9 @@ sosetopt(struct socket *so, struct socko
 			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;
 			}

Modified: stable/7/sys/netinet/ip_divert.c
==============================================================================
--- stable/7/sys/netinet/ip_divert.c	Tue Nov 25 19:25:54 2008	(r185310)
+++ stable/7/sys/netinet/ip_divert.c	Tue Nov 25 19:26:36 2008	(r185311)
@@ -314,6 +314,7 @@ div_output(struct socket *so, struct mbu
 	 */
 	m->m_pkthdr.rcvif = NULL;
 	m->m_nextpkt = NULL;
+	M_SETFIB(m, so->so_fibnum);
 
 	if (control)
 		m_freem(control);		/* XXX */

Modified: stable/7/sys/netinet/ip_output.c
==============================================================================
--- stable/7/sys/netinet/ip_output.c	Tue Nov 25 19:25:54 2008	(r185310)
+++ stable/7/sys/netinet/ip_output.c	Tue Nov 25 19:26:36 2008	(r185311)
@@ -125,8 +125,10 @@ ip_output(struct mbuf *m, struct mbuf *o
 		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;
@@ -808,6 +810,11 @@ ip_ctloutput(struct socket *so, struct s
 
 	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);
 	}
 

Modified: stable/7/sys/netinet/raw_ip.c
==============================================================================
--- stable/7/sys/netinet/raw_ip.c	Tue Nov 25 19:25:54 2008	(r185310)
+++ stable/7/sys/netinet/raw_ip.c	Tue Nov 25 19:26:36 2008	(r185311)
@@ -441,8 +441,14 @@ rip_ctloutput(struct socket *so, struct 
 	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) {