 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtsock.c,v 1.115.2.2 2009/01/09 02:58:58 snj Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.115.2.3 2009/03/15 20:00:30 snj Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)rtsock.c	8.7 (Berkeley) 10/12/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.115.2.2 2009/01/09 02:58:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.115.2.3 2009/03/15 20:00:30 snj Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/sysctl.h>
 #include <sys/kauth.h>
 @@ -203,29 +203,29 @@ intern_netmask(const struct sockaddr *ma
 	return mask;
+}
 /*ARGSUSED*/
 int
 route_output(struct mbuf *m, ...)
+{
 	struct sockproto proto = { .sp_family = PF_ROUTE, };
 	struct rt_msghdr *rtm = NULL;
 	struct rt_msghdr *old_rtm = NULL;
 	struct rtentry *rt = NULL;
 	struct rtentry *saved_nrt = NULL;
 	struct rt_addrinfo info;
-	int len, error = 0, ifa_route = 0;
+	int len, error = 0;
 	struct ifnet *ifp = NULL;
-	struct ifaddr *ifa = NULL, *oifa;
+	struct ifaddr *ifa = NULL;
 	struct socket *so;
 	va_list ap;
 	sa_family_t family;
 	va_start(ap, m);
 	so = va_arg(ap, struct socket *);
 	va_end(ap);
 #define senderr(e) do { error = e; goto flush;} while (/*CONSTCOND*/ 0)
 	if (m == NULL || ((m->m_len < sizeof(int32_t)) &&
 	   (m = m_pullup(m, sizeof(int32_t))) == NULL))
 		return ENOBUFS;
 	if ((m->m_flags & M_PKTHDR) == 0)
 @@ -282,32 +282,26 @@ route_output(struct mbuf *m, ...)
 			senderr(EINVAL);
 		error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
 		if (error == 0 && saved_nrt) {
 			rt_setmetrics(rtm->rtm_inits,
 			    &rtm->rtm_rmx, &saved_nrt->rt_rmx);
 			saved_nrt->rt_refcnt--;
+		}
 		break;
 	case RTM_DELETE:
 		error = rtrequest1(rtm->rtm_type, &info, &saved_nrt);
 		if (error == 0) {
 			(rt = saved_nrt)->rt_refcnt++;
 			ifa = rt_get_ifa(rt);
 			/*
 			 * If deleting an automatic route, scrub the flag.
 			 */
 			if (ifa->ifa_flags & IFA_ROUTE)
 				ifa->ifa_flags &= ~IFA_ROUTE;
 			goto report;
+		}
 		break;
 	case RTM_GET:
 	case RTM_CHANGE:
 	case RTM_LOCK:
                 /* XXX This will mask info.rti_info[RTAX_DST] with
 		 * info.rti_info[RTAX_NETMASK] before
                  * searching.  It did not used to do that.  --dyoung
 		 */
 		error = rtrequest1(RTM_GET, &info, &rt);
 		if (error != 0)
 @@ -405,48 +399,33 @@ route_output(struct mbuf *m, ...)
 			    (ifa = ifa_ifwithnet(info.rti_info[RTAX_IFP])) &&
 			    (ifp = ifa->ifa_ifp) && (info.rti_info[RTAX_IFA] ||
 			    info.rti_info[RTAX_GATEWAY])) {
 				ifa = ifaof_ifpforaddr(info.rti_info[RTAX_IFA] ?
 				    info.rti_info[RTAX_IFA] :
 				    info.rti_info[RTAX_GATEWAY], ifp);
 			} else if ((info.rti_info[RTAX_IFA] &&
 			    (ifa = ifa_ifwithaddr(info.rti_info[RTAX_IFA]))) ||
 			    (info.rti_info[RTAX_GATEWAY] &&
 			    (ifa = ifa_ifwithroute(rt->rt_flags,
 			    rt_getkey(rt), info.rti_info[RTAX_GATEWAY])))) {
 				ifp = ifa->ifa_ifp;
+			}
 			oifa = rt->rt_ifa;
 			if (oifa && oifa->ifa_flags & IFA_ROUTE) {
 				/*
 				 * If changing an automatically added route,
 				 * remove the flag and store the fact.
 				 */
 				oifa->ifa_flags &= ~IFA_ROUTE;
 				ifa_route = 1;
 			if (ifa) {
 				struct ifaddr *oifa = rt->rt_ifa;
 				if (oifa != ifa) {
 					if (oifa && oifa->ifa_rtrequest) {
 						oifa->ifa_rtrequest(RTM_DELETE,
 						    rt, &info);
+					}
 					/*
 					 * If changing an automatically added
 					 * route, store this if not static.
 					 */
 					if (ifa_route &&
 					    !(rt->rt_flags & RTF_STATIC))
 						ifa->ifa_flags |= IFA_ROUTE;
 					rt_replace_ifa(rt, ifa);
 					rt->rt_ifp = ifp;
+				}
+			}
 			rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
 			    &rt->rt_rmx);
 			if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
 				rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, &info);
 			/*FALLTHROUGH*/
 		case RTM_LOCK:
 			rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
 			rt->rt_rmx.rmx_locks |=
 			    (rtm->rtm_inits & rtm->rtm_rmx.rmx_locks);