Pull the plug on source-based routing until remaining bugs are eradicated.

No need to reconfig kernel or rebuild userland stuff.
requested deraadt@, help beck@

5 files changed, 33 insertions, 62 deletions

diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index dd9ac63edf4..06053e2f3cd 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.76 2004/06/06 16:49:09 cedric Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.77 2004/06/22 07:35:20 cedric Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -841,8 +841,7 @@ in_pcbrtentry(inp)
 				break;
 			ro->ro_dst.sa_family = AF_INET;
 			ro->ro_dst.sa_len = sizeof(ro->ro_dst);
-			satortin(&ro->ro_dst)->rtin_dst = inp->inp_faddr;
-			satortin(&ro->ro_dst)->rtin_src = inp->inp_laddr;
+			satosin(&ro->ro_dst)->sin_addr = inp->inp_faddr;
 			rtalloc(ro);
 			break;
 		}
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 15cf7cd391c..0b9889fa983 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.64 2004/06/06 16:49:09 cedric Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.65 2004/06/22 07:35:20 cedric Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -564,7 +564,7 @@ reflect:
 		icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
 		rt = NULL;
 		rtredirect(sintosa(&icmpsrc), sintosa(&icmpdst),
-		    (struct sockaddr *)&rt_defmask4, RTF_GATEWAY | RTF_HOST,
+		    (struct sockaddr *)0, RTF_GATEWAY | RTF_HOST,
 		    sintosa(&icmpgw), (struct rtentry **)&rt);
 		if (rt != NULL && icmp_redirtimeout != 0) {
 			(void)rt_timer_add(rt, icmp_redirect_timeout,
@@ -850,7 +850,7 @@ icmp_mtudisc_clone(struct sockaddr *dst)
 
 		error = rtrequest((int) RTM_ADD, dst,
 		    (struct sockaddr *) rt->rt_gateway,
-		    sroute_clone_mask4(rt_mask(rt), NULL),
+		    (struct sockaddr *) 0,
 		    RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC, &nrt);
 		if (error) {
 			rtfree(rt);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 4aba7e9e44c..bf47734098d 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.120 2004/06/21 19:26:01 mcbride Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.121 2004/06/22 07:35:20 cedric Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -1093,7 +1093,7 @@ ip_dooptions(m)
 			    if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0)
 				ia = (INA)ifa_ifwithnet((SA)&ipaddr);
 			} else
-				ia = ip_rtaddr(ipaddr.sin_addr, ip->ip_src);
+				ia = ip_rtaddr(ipaddr.sin_addr);
 			if (ia == 0) {
 				type = ICMP_UNREACH;
 				code = ICMP_UNREACH_SRCFAIL;
@@ -1132,8 +1132,7 @@ ip_dooptions(m)
 			 * use the incoming interface (should be same).
 			 */
 			if ((ia = (INA)ifa_ifwithaddr((SA)&ipaddr)) == 0 &&
-			    (ia = ip_rtaddr(ipaddr.sin_addr, ip->ip_src)) == 0)
-			{
+			    (ia = ip_rtaddr(ipaddr.sin_addr)) == 0) {
 				type = ICMP_UNREACH;
 				code = ICMP_UNREACH_HOST;
 				goto bad;
@@ -1212,22 +1211,21 @@ bad:
  * return internet address info of interface to be used to get there.
  */
 struct in_ifaddr *
-ip_rtaddr(struct in_addr dst, struct in_addr src)
+ip_rtaddr(dst)
+	 struct in_addr dst;
 {
-	struct sockaddr_rtin *rtin;
+	struct sockaddr_in *sin;
 
-	rtin = satortin(&ipforward_rt.ro_dst);
+	sin = satosin(&ipforward_rt.ro_dst);
 
-	if (ipforward_rt.ro_rt == 0 || dst.s_addr != rtin->rtin_dst.s_addr ||
-	    src.s_addr != rtin->rtin_src.s_addr) {
+	if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) {
 		if (ipforward_rt.ro_rt) {
 			RTFREE(ipforward_rt.ro_rt);
 			ipforward_rt.ro_rt = 0;
 		}
-		rtin->rtin_family = AF_INET;
-		rtin->rtin_len = sizeof(*rtin);
-		rtin->rtin_dst = dst;
-		rtin->rtin_src = src;
+		sin->sin_family = AF_INET;
+		sin->sin_len = sizeof(*sin);
+		sin->sin_addr = dst;
 
 		rtalloc(&ipforward_rt);
 	}
@@ -1275,7 +1273,6 @@ ip_weadvertise(addr)
 	sin.sin_len = sizeof(sin);
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = addr;
-	sin.sin_srcaddr.s_addr = 0;
 	sin.sin_other = SIN_PROXY;
 	rt = rtalloc1(sintosa(&sin), 0);
 	if (rt == 0)
@@ -1430,7 +1427,7 @@ ip_forward(m, srcrt)
 	int srcrt;
 {
 	struct ip *ip = mtod(m, struct ip *);
-	struct sockaddr_rtin *rtin;
+	struct sockaddr_in *sin;
 	struct rtentry *rt;
 	int error, type = 0, code = 0;
 	struct mbuf *mcopy;
@@ -1457,18 +1454,16 @@ ip_forward(m, srcrt)
 	}
 	ip->ip_ttl -= IPTTLDEC;
 
-	rtin = satortin(&ipforward_rt.ro_dst);
+	sin = satosin(&ipforward_rt.ro_dst);
 	if ((rt = ipforward_rt.ro_rt) == 0 ||
-	    ip->ip_dst.s_addr != rtin->rtin_dst.s_addr ||
-	    ip->ip_src.s_addr != rtin->rtin_src.s_addr) {
+	    ip->ip_dst.s_addr != sin->sin_addr.s_addr) {
 		if (ipforward_rt.ro_rt) {
 			RTFREE(ipforward_rt.ro_rt);
 			ipforward_rt.ro_rt = 0;
 		}
-		rtin->rtin_family = AF_INET;
-		rtin->rtin_len = sizeof(*rtin);
-		rtin->rtin_dst = ip->ip_dst;
-		rtin->rtin_src = ip->ip_src;
+		sin->sin_family = AF_INET;
+		sin->sin_len = sizeof(*sin);
+		sin->sin_addr = ip->ip_dst;
 
 		rtalloc(&ipforward_rt);
 		if (ipforward_rt.ro_rt == 0) {
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 69badd9337a..d70a966a448 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.166 2004/06/21 23:50:37 tholo Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.167 2004/06/22 07:35:20 cedric Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -98,7 +98,6 @@ ip_output(struct mbuf *m0, ...)
 	int len, error = 0;
 	struct route iproute;
 	struct sockaddr_in *dst;
-	struct sockaddr_rtin *rtin;
 	struct in_ifaddr *ia;
 	struct mbuf *opt;
 	struct route *ro;
@@ -175,7 +174,6 @@ ip_output(struct mbuf *m0, ...)
 			bzero((caddr_t)ro, sizeof (*ro));
 		}
 
-		rtin = satortin(&ro->ro_dst);
 		dst = satosin(&ro->ro_dst);
 
 		/*
@@ -183,17 +181,15 @@ ip_output(struct mbuf *m0, ...)
 		 * destination and is still up.  If not, free it and try again.
 		 */
 		if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
-				  rtin->rtin_dst.s_addr != ip->ip_dst.s_addr ||
-				  rtin->rtin_src.s_addr != ip->ip_src.s_addr)) {
+				  dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
 			RTFREE(ro->ro_rt);
 			ro->ro_rt = (struct rtentry *)0;
 		}
 
 		if (ro->ro_rt == 0) {
-			rtin->rtin_family = AF_INET;
-			rtin->rtin_len = sizeof(*rtin);
-			rtin->rtin_dst = ip->ip_dst;
-			rtin->rtin_src = ip->ip_src;
+			dst->sin_family = AF_INET;
+			dst->sin_len = sizeof(*dst);
+			dst->sin_addr = ip->ip_dst;
 		}
 
 		/*
@@ -234,14 +230,6 @@ ip_output(struct mbuf *m0, ...)
 
 			if (ro->ro_rt->rt_flags & RTF_GATEWAY)
 				dst = satosin(ro->ro_rt->rt_gateway);
-                        else if (rtin->rtin_src.s_addr) {
-                                if (ro != &iproute) {
-                                        iproute.ro_dst = ro->ro_dst;
-                                        rtin = satortin(&iproute.ro_dst);
-                                        dst = satosin(&iproute.ro_dst);
-                                }
-                                rtin->rtin_src.s_addr = 0;
-                        }
 		}
 
 		/* Set the source IP address */
@@ -353,7 +341,6 @@ ip_output(struct mbuf *m0, ...)
 			bzero((caddr_t)ro, sizeof (*ro));
 		}
 
-		rtin = satortin(&ro->ro_dst);
 		dst = satosin(&ro->ro_dst);
 
 		/*
@@ -361,17 +348,15 @@ ip_output(struct mbuf *m0, ...)
 		 * destination and is still up.  If not, free it and try again.
 		 */
 		if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
-				  rtin->rtin_dst.s_addr != ip->ip_dst.s_addr ||
-				  rtin->rtin_src.s_addr != ip->ip_src.s_addr)) {
+				  dst->sin_addr.s_addr != ip->ip_dst.s_addr)) {
 			RTFREE(ro->ro_rt);
 			ro->ro_rt = (struct rtentry *)0;
 		}
 
 		if (ro->ro_rt == 0) {
-			rtin->rtin_family = AF_INET;
-			rtin->rtin_len = sizeof(*rtin);
-			rtin->rtin_dst = ip->ip_dst;
-			rtin->rtin_src = ip->ip_src;
+			dst->sin_family = AF_INET;
+			dst->sin_len = sizeof(*dst);
+			dst->sin_addr = ip->ip_dst;
 		}
 
 		/*
@@ -412,14 +397,6 @@ ip_output(struct mbuf *m0, ...)
 
 			if (ro->ro_rt->rt_flags & RTF_GATEWAY)
 				dst = satosin(ro->ro_rt->rt_gateway);
-                        else if (rtin->rtin_src.s_addr) {
-                                if (ro != &iproute) {
-                                        iproute.ro_dst = ro->ro_dst;
-                                        rtin = satortin(&iproute.ro_dst);
-                                        dst = satosin(&iproute.ro_dst);
-                                }
-                                rtin->rtin_src.s_addr = 0;
-                        }
 		}
 
 		/* Set the source IP address */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index f14af1156bf..4697fe53824 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.31 2004/06/06 16:49:09 cedric Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.32 2004/06/22 07:35:20 cedric Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -183,7 +183,7 @@ struct mbuf *
 struct in_ifaddr *
 	 in_iawithaddr(struct in_addr, struct mbuf *);
 struct in_ifaddr *
-	 ip_rtaddr(struct in_addr, struct in_addr);
+	 ip_rtaddr(struct in_addr);
 u_int16_t
 	 ip_randomid(void);
 int	 ip_setmoptions(int, struct ip_moptions **, struct mbuf *);