From: henning <henning@openbsd.org>
Date: Fri, 1 Aug 2008 05:08:07 +0000 (+0000)
Subject: force route priority to RTP_DEFAULT unconditionally, effectively disabling
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0d4d0aa2dfaf3ecbd643f2631acec69aa281f82d;p=openbsd

force route priority to RTP_DEFAULT unconditionally, effectively disabling
route prios. playing safe for 4.4-release, as not all parts of the system
deal correctly with route prios yet. ok claudio
---

diff --git a/sys/net/route.c b/sys/net/route.c
index cd73b910fe3..ce1358bd2df 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.94 2008/07/28 13:25:10 claudio Exp $	*/
+/*	$OpenBSD: route.c,v 1.95 2008/08/01 05:08:07 henning Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -721,6 +721,9 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 	struct sockaddr_rtlabel	*sa_rl;
 #define senderr(x) { error = x ; goto bad; }
 
+	/* XXX hack for 4.4-release */
+	prio = RTP_DEFAULT;
+
 	if ((rnh = rt_gettable(info->rti_info[RTAX_DST]->sa_family, tableid)) ==
 	    NULL)
 		senderr(EAFNOSUPPORT);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 19bb0ef661a..407fe72f1f5 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.74 2008/07/28 19:38:07 claudio Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.75 2008/08/01 05:08:08 henning Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -268,6 +268,9 @@ route_output(struct mbuf *m, ...)
 	else
 		prio = RTP_DEFAULT;
 
+	/* XXX hack for 4.4-release */
+	prio = RTP_DEFAULT;
+
 	bzero(&info, sizeof(info));
 	info.rti_addrs = rtm->rtm_addrs;
 	rt_xaddrs(rtm->rtm_hdrlen + (caddr_t)rtm, len + (caddr_t)rtm, &info);