Rename rtrequest1() to rtrequest().

OK mpi@

10 files changed, 34 insertions, 34 deletions

diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index ca3ecbb75ae..dc6c09da70c 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_enc.c,v 1.62 2015/10/22 17:48:34 mpi Exp $	*/
+/*	$OpenBSD: if_enc.c,v 1.63 2015/10/30 09:39:42 bluhm Exp $	*/
 
 /*
  * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -98,7 +98,7 @@ enc_clone_create(struct if_clone *ifc, int unit)
 	if (unit == 0)
 		if_addgroup(ifp, ifc->ifc_name);
 	/*
-	 * enc(4) does not have a link-layer address but rtrequest1()
+	 * enc(4) does not have a link-layer address but rtrequest()
 	 * wants an ifa for every route entry.  So let's setup a fake
 	 * and empty ifa of type AF_LINK for this purpose.
 	 */
diff --git a/sys/net/route.c b/sys/net/route.c
index f2c945733aa..e38e442e95f 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.265 2015/10/25 16:25:23 mpi Exp $	*/
+/*	$OpenBSD: route.c,v 1.266 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -220,7 +220,7 @@ rtalloc(struct sockaddr *dst, int flags, unsigned int tableid)
 	if (rt != NULL) {
 		if ((rt->rt_flags & RTF_CLONING) && ISSET(flags, RT_RESOLVE)) {
 			rt0 = rt;
-			error = rtrequest1(RTM_RESOLVE, &info, RTP_DEFAULT,
+			error = rtrequest(RTM_RESOLVE, &info, RTP_DEFAULT,
 			    &rt, tableid);
 			if (error) {
 				rt0->rt_use++;
@@ -487,7 +487,7 @@ create:
 			info.rti_ifa = ifa;
 			info.rti_flags = flags;
 			rt = NULL;
-			error = rtrequest1(RTM_ADD, &info, RTP_DEFAULT, &rt,
+			error = rtrequest(RTM_ADD, &info, RTP_DEFAULT, &rt,
 			    rdomain);
 			if (error == 0)
 				flags = rt->rt_flags;
@@ -545,7 +545,7 @@ rtdeletemsg(struct rtentry *rt, u_int tableid)
 	info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 	info.rti_flags = rt->rt_flags;
 	ifidx = rt->rt_ifidx;
-	error = rtrequest1(RTM_DELETE, &info, rt->rt_priority, &rt, tableid);
+	error = rtrequest(RTM_DELETE, &info, rt->rt_priority, &rt, tableid);
 	rt_missmsg(RTM_DELETE, &info, info.rti_flags, ifidx, error, tableid);
 	if (error == 0)
 		rtfree(rt);
@@ -711,7 +711,7 @@ rt_getifa(struct rt_addrinfo *info, u_int rtid)
 }
 
 int
-rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
+rtrequest(int req, struct rt_addrinfo *info, u_int8_t prio,
     struct rtentry **ret_nrt, u_int tableid)
 {
 	struct rtentry		*rt, *crt;
@@ -910,7 +910,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio,
 			 * route.
 			 */
 			if ((*ret_nrt)->rt_ifa->ifa_ifp == NULL) {
-				printf("rtrequest1 RTM_RESOLVE: wrong ifa (%p) "
+				printf("rtrequest RTM_RESOLVE: wrong ifa (%p) "
 				    "was (%p)\n", ifa, (*ret_nrt)->rt_ifa);
 				(*ret_nrt)->rt_ifp->if_rtrequest(rt->rt_ifp,
 				    RTM_DELETE, *ret_nrt);
@@ -1128,7 +1128,7 @@ rt_ifa_add(struct ifaddr *ifa, int flags, struct sockaddr *dst)
 	if (flags & RTF_CONNECTED)
 		prio = RTP_CONNECTED;
 
-	error = rtrequest1(RTM_ADD, &info, prio, &rt, rtableid);
+	error = rtrequest(RTM_ADD, &info, prio, &rt, rtableid);
 	if (error == 0) {
 		/*
 		 * A local route is created for every address configured
@@ -1188,7 +1188,7 @@ rt_ifa_del(struct ifaddr *ifa, int flags, struct sockaddr *dst)
 	if (flags & RTF_CONNECTED)
 		prio = RTP_CONNECTED;
 
-	error = rtrequest1(RTM_DELETE, &info, prio, &rt, rtableid);
+	error = rtrequest(RTM_DELETE, &info, prio, &rt, rtableid);
 	if (error == 0) {
 		rt_sendmsg(rt, RTM_DELETE, rtableid);
 		if (flags & RTF_LOCAL)
@@ -1315,7 +1315,7 @@ static int			rt_init_done = 0;
 		struct rt_addrinfo info;			\
 		bzero(&info, sizeof(info));			\
 		info.rti_info[RTAX_DST] = rt_key(r->rtt_rt);	\
-		rtrequest1(RTM_DELETE, &info,			\
+		rtrequest(RTM_DELETE, &info,			\
 		    r->rtt_rt->rt_priority, NULL, r->rtt_tableid);	\
 	}							\
 }
diff --git a/sys/net/route.h b/sys/net/route.h
index de9ea49f758..5b7103e6edf 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.117 2015/10/25 10:05:09 bluhm Exp $	*/
+/*	$OpenBSD: route.h,v 1.118 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -393,7 +393,7 @@ int	 rtioctl(u_long, caddr_t, struct proc *);
 void	 rtredirect(struct sockaddr *, struct sockaddr *,
 			 struct sockaddr *, int, struct sockaddr *,
 			 struct rtentry **, u_int);
-int	 rtrequest1(int, struct rt_addrinfo *, u_int8_t, struct rtentry **,
+int	 rtrequest(int, struct rt_addrinfo *, u_int8_t, struct rtentry **,
 	     u_int);
 void	 rt_if_remove(struct ifnet *);
 #ifndef SMALL_KERNEL
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index b9b9cd4d12f..47bd30138ce 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.179 2015/10/25 14:41:09 claudio Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.180 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -597,7 +597,7 @@ route_output(struct mbuf *m, ...)
 			error = EINVAL;
 			goto flush;
 		}
-		error = rtrequest1(RTM_ADD, &info, prio, &saved_nrt, tableid);
+		error = rtrequest(RTM_ADD, &info, prio, &saved_nrt, tableid);
 		if (error == 0) {
 			rt_setmetrics(rtm->rtm_inits, &rtm->rtm_rmx,
 			    &saved_nrt->rt_rmx);
@@ -609,7 +609,7 @@ route_output(struct mbuf *m, ...)
 		}
 		break;
 	case RTM_DELETE:
-		error = rtrequest1(RTM_DELETE, &info, prio, &rt, tableid);
+		error = rtrequest(RTM_DELETE, &info, prio, &rt, tableid);
 		if (error == 0)
 			goto report;
 		break;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 8930c49f74b..006fdf3fdb8 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.187 2015/10/25 10:05:09 bluhm Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.188 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -638,7 +638,7 @@ in_losing(struct inpcb *inp)
 		rt_missmsg(RTM_LOSING, &info, rt->rt_flags, rt->rt_ifidx, 0,
 		    inp->inp_rtableid);
 		if (rt->rt_flags & RTF_DYNAMIC)
-			(void)rtrequest1(RTM_DELETE, &info, rt->rt_priority,
+			(void)rtrequest(RTM_DELETE, &info, rt->rt_priority,
 			    NULL, inp->inp_rtableid);
 		/*
 		 * A new route can be allocated
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index d14317d0db9..285916d4701 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.144 2015/10/22 10:31:02 mpi Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.145 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -952,7 +952,7 @@ icmp_mtudisc_clone(struct in_addr dst, u_int rtableid)
 		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 		info.rti_flags = RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC;
 
-		error = rtrequest1(RTM_ADD, &info, RTP_DEFAULT, &nrt, rtableid);
+		error = rtrequest(RTM_ADD, &info, RTP_DEFAULT, &nrt, rtableid);
 		if (error) {
 			rtfree(rt);
 			return (NULL);
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index d87678240fa..027bbcdc25e 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.175 2015/10/28 12:14:25 florian Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.176 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -1922,7 +1922,7 @@ icmp6_mtudisc_clone(struct sockaddr *dst, u_int rdomain)
 		info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 
 		s = splsoftnet();
-		error = rtrequest1(RTM_ADD, &info, rt->rt_priority, &nrt,
+		error = rtrequest(RTM_ADD, &info, rt->rt_priority, &nrt,
 		    rdomain);
 		splx(s);
 		if (error) {
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 65cc151cbc4..423c0f620e3 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.c,v 1.176 2015/10/25 11:58:11 mpi Exp $	*/
+/*	$OpenBSD: in6.c,v 1.177 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $	*/
 
 /*
@@ -808,7 +808,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 			info.rti_info[RTAX_IFA] = sin6tosa(&ia6->ia_addr);
 			/* XXX: we need RTF_CLONING to fake nd6_rtrequest */
 			info.rti_flags = RTF_CLONING;
-			error = rtrequest1(RTM_ADD, &info, RTP_CONNECTED, NULL,
+			error = rtrequest(RTM_ADD, &info, RTP_CONNECTED, NULL,
 			    ifp->if_rdomain);
 			if (error)
 				goto cleanup;
@@ -864,7 +864,7 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 			info.rti_info[RTAX_NETMASK] = sin6tosa(&mltmask);
 			info.rti_info[RTAX_IFA] = sin6tosa(&ia6->ia_addr);
 			info.rti_flags = RTF_CLONING;
-			error = rtrequest1(RTM_ADD, &info, RTP_CONNECTED, NULL,
+			error = rtrequest(RTM_ADD, &info, RTP_CONNECTED, NULL,
 			    ifp->if_rdomain);
 			if (error)
 				goto cleanup;
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 9ae16db1ee3..5a2bdd42600 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.166 2015/10/29 14:28:34 mpi Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.167 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -631,13 +631,13 @@ nd6_lookup(struct in6_addr *addr6, int create, struct ifnet *ifp,
 			 * Create a new route.  RTF_LLINFO is necessary
 			 * to create a Neighbor Cache entry for the
 			 * destination in nd6_rtrequest which will be
-			 * called in rtrequest1.
+			 * called in rtrequest.
 			 */
 			bzero(&info, sizeof(info));
 			info.rti_flags = RTF_HOST | RTF_LLINFO;
 			info.rti_info[RTAX_DST] = sin6tosa(&sin6);
 			info.rti_info[RTAX_GATEWAY] = sdltosa(ifp->if_sadl);
-			error = rtrequest1(RTM_ADD, &info, RTP_CONNECTED, &rt,
+			error = rtrequest(RTM_ADD, &info, RTP_CONNECTED, &rt,
 			    rtableid);
 			if (error)
 				return (NULL);
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index e5533a513e7..cc36508bd3d 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6_rtr.c,v 1.130 2015/10/28 12:14:25 florian Exp $	*/
+/*	$OpenBSD: nd6_rtr.c,v 1.131 2015/10/30 09:39:42 bluhm Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $	*/
 
 /*
@@ -599,7 +599,7 @@ defrouter_addreq(struct nd_defrouter *new)
 	info.rti_info[RTAX_NETMASK] = sin6tosa(&mask);
 
 	s = splsoftnet();
-	error = rtrequest1(RTM_ADD, &info, RTP_DEFAULT, &rt,
+	error = rtrequest(RTM_ADD, &info, RTP_DEFAULT, &rt,
 	    new->ifp->if_rdomain);
 	if (error == 0) {
 		rt_sendmsg(rt, RTM_ADD, new->ifp->if_rdomain);
@@ -704,7 +704,7 @@ defrouter_delreq(struct nd_defrouter *dr)
 	info.rti_info[RTAX_GATEWAY] = sin6tosa(&gw);
 	info.rti_info[RTAX_NETMASK] = sin6tosa(&mask);
 
-	error = rtrequest1(RTM_DELETE, &info, RTP_DEFAULT, &rt,
+	error = rtrequest(RTM_DELETE, &info, RTP_DEFAULT, &rt,
 	    dr->ifp->if_rdomain);
 	if (error == 0) {
 		rt_sendmsg(rt, RTM_DELETE, dr->ifp->if_rdomain);
@@ -1773,7 +1773,7 @@ nd6_prefix_onlink(struct nd_prefix *pr)
 	info.rti_info[RTAX_GATEWAY] = ifa->ifa_addr;
 	info.rti_info[RTAX_NETMASK] = sin6tosa(&mask6);
 
-	error = rtrequest1(RTM_ADD, &info, RTP_CONNECTED, &rt, ifp->if_rdomain);
+	error = rtrequest(RTM_ADD, &info, RTP_CONNECTED, &rt, ifp->if_rdomain);
 	if (error == 0) {
 		pr->ndpr_stateflags |= NDPRF_ONLINK;
 		rt_sendmsg(rt, RTM_ADD, ifp->if_rdomain);
@@ -1817,7 +1817,7 @@ nd6_prefix_offlink(struct nd_prefix *pr)
 	info.rti_info[RTAX_DST] = sin6tosa(&sa6);
 	info.rti_info[RTAX_NETMASK] = sin6tosa(&mask6);
 
-	error = rtrequest1(RTM_DELETE, &info, RTP_CONNECTED, &rt,
+	error = rtrequest(RTM_DELETE, &info, RTP_CONNECTED, &rt,
 	    ifp->if_rdomain);
 	if (error == 0) {
 		pr->ndpr_stateflags &= ~NDPRF_ONLINK;
@@ -2121,5 +2121,5 @@ rt6_deleteroute(struct rtentry *rt, void *arg, unsigned int id)
 	info.rti_info[RTAX_DST] = rt_key(rt);
 	info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
 	info.rti_info[RTAX_NETMASK] = rt_mask(rt);
-	return (rtrequest1(RTM_DELETE, &info, RTP_ANY, NULL, id));
+	return (rtrequest(RTM_DELETE, &info, RTP_ANY, NULL, id));
 }