Update calls to rtalloc1() to match.

6 files changed, 24 insertions, 22 deletions

diff --git a/sys/netccitt/if_x25subr.c b/sys/netccitt/if_x25subr.c
index 68812f4..c75cdd4 100644
--- a/sys/netccitt/if_x25subr.c
+++ b/sys/netccitt/if_x25subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_x25subr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: if_x25subr.c,v 1.2 1994/08/02 07:47:14 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -250,7 +250,7 @@ struct mbuf *m0;
 	register struct mbuf *m = m0->m_next; /* m0 has calling sockaddr_x25 */
 	void x25_rtrequest();
 
-	rt = rtalloc1(SA(&lcp->lcd_faddr), 0);
+	rt = rtalloc1(SA(&lcp->lcd_faddr), 0, 0UL);
 	if (rt == 0) {
 refuse: 	lcp->lcd_upper = 0;
 		pk_close(lcp);
@@ -260,7 +260,7 @@ refuse: 	lcp->lcd_upper = 0;
 	if ((nrt = RT(rt->rt_llinfo)) == 0 || rt_mask(rt) != x25_dgram_sockmask)
 		goto refuse;
 	if ((nrt->rt_flags & RTF_UP) == 0) {
-		rt->rt_llinfo = (caddr_t)rtalloc1(rt->rt_gateway, 0);
+		rt->rt_llinfo = (caddr_t)rtalloc1(rt->rt_gateway, 0, 0UL);
 		rtfree(nrt);
 		if ((nrt = RT(rt->rt_llinfo)) == 0)
 			goto refuse;
@@ -302,7 +302,7 @@ m = m0;
 			}
 			dst = rt->rt_gateway;
 		}
-		if ((rt = rtalloc1(dst, 1)) == 0)
+		if ((rt = rtalloc1(dst, 1, 0UL)) == 0)
 			senderr(EHOSTUNREACH);
 		rt->rt_refcnt--;
 	}
@@ -432,7 +432,7 @@ struct sockaddr *dst;
 		if (rt->rt_llinfo)
 			RTFREE((struct rtentry *)rt->rt_llinfo);
 		rt->rt_llinfo = (cmd == RTM_ADD) ? 
-			(caddr_t)rtalloc1(rt->rt_gateway, 1) : 0;
+			(caddr_t)rtalloc1(rt->rt_gateway, 1, 0UL) : 0;
 		return;
 	}
 	if ((rt->rt_flags & RTF_HOST) == 0)
@@ -488,7 +488,7 @@ register struct rtentry *rt;
 		return;
 	}
 	rt2 = rt;
-	if ((rt = rtalloc1(sa, 0)) == 0 ||
+	if ((rt = rtalloc1(sa, 0, 0UL)) == 0 ||
 	    (rt->rt_flags & RTF_PROTO2) == 0 ||
 	    rt->rt_llinfo != (caddr_t)rt2) {
 		printf("x25_rtchange: inverse route screwup\n");
@@ -648,7 +648,7 @@ register struct x25_ifaddr *ia;
 		 * This uses the X25 routing table to do inverse
 		 * lookup of x25 address to sockaddr.
 		 */
-		if (rt = rtalloc1(SA(dst), 0)) {
+		if (rt = rtalloc1(SA(dst), 0, 0UL)) {
 			sa = rt->rt_gateway;
 			rt->rt_refcnt--;
 		}
@@ -658,7 +658,7 @@ register struct x25_ifaddr *ia;
 	 * to callee by virtue of cloning magic and will allocate
 	 * space for local control block.
 	 */
-	if (sa && (rt = rtalloc1(sa, 1)))
+	if (sa && (rt = rtalloc1(sa, 1, 0UL)))
 		rt->rt_refcnt--;
 }
 int x25_startproto = 1;
@@ -724,7 +724,7 @@ struct mbuf *m0;
 	register struct pklcd *lcp = (struct pklcd *)so->so_pcb;
 	register struct mbuf *m = m0;
 	struct sockaddr *dst = mtod(m, struct sockaddr *);
-	register struct rtentry *rt = rtalloc1(dst, 0);
+	register struct rtentry *rt = rtalloc1(dst, 0, 0UL);
 	register struct llinfo_x25 *lx;
 	caddr_t cp;
 #define ROUNDUP(a) \
diff --git a/sys/netccitt/llc_input.c b/sys/netccitt/llc_input.c
index 94400c1..f3a06dd 100644
--- a/sys/netccitt/llc_input.c
+++ b/sys/netccitt/llc_input.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_input.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: llc_input.c,v 1.2 1994/08/02 07:47:16 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -179,7 +179,8 @@ llcintr()
 		 */
 		cmdrsp = (frame->llc_ssap & 0x01);
 		frame->llc_ssap &= ~0x01;
-		if (llrt = rtalloc1((struct sockaddr *)&sdlhdr->sdlhdr_src, 0))
+		if (llrt = rtalloc1((struct sockaddr *)&sdlhdr->sdlhdr_src, 0,
+				    0UL))
 			llrt->rt_refcnt--;
 #ifdef notyet
 		else llrt = npaidb_enter(&sdlhdr->sdlhdr_src, 0, 0, 0);
@@ -383,7 +384,7 @@ llc_ctlinput(int prc, struct sockaddr *addr, caddr_t info)
 		pcb = ctlinfo->dlcti_pcb;
 		nlrt = ctlinfo->dlcti_rt;
 
-		if ((llrt = rtalloc1(nlrt->rt_gateway, 0)))
+		if ((llrt = rtalloc1(nlrt->rt_gateway, 0, 0UL)))
 			llrt->rt_refcnt--;
 		else return 0;
 
diff --git a/sys/netccitt/llc_subr.c b/sys/netccitt/llc_subr.c
index dd604a3..3d241ce 100644
--- a/sys/netccitt/llc_subr.c
+++ b/sys/netccitt/llc_subr.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)llc_subr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: llc_subr.c,v 1.2 1994/08/02 07:47:20 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -282,7 +282,7 @@ llc_getsapinfo(u_char sap, struct ifnet *ifp)
 	si_addr.sdl_data[saploc] = sap;
 	si_addr.sdl_alen++;
 
-	if ((sirt = rtalloc1((struct sockaddr *)&si_addr, 0))) 	
+	if ((sirt = rtalloc1((struct sockaddr *)&si_addr, 0, 0UL))) 	
 		sirt->rt_refcnt--; 
 	else return(0);
 
diff --git a/sys/netccitt/pk_input.c b/sys/netccitt/pk_input.c
index 0438b84..ae11083 100644
--- a/sys/netccitt/pk_input.c
+++ b/sys/netccitt/pk_input.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_input.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: pk_input.c,v 1.2 1994/08/02 07:47:35 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -265,7 +265,7 @@ pk_ctlinput (code, src, addr)
 	case PRC_CONNECT_INDICATION: {
 		struct rtentry *llrt;
 
-		if ((llrt = rtalloc1(src, 0)) == 0)
+		if ((llrt = rtalloc1(src, 0, 0UL)) == 0)
 			return 0;
 		else llrt -> rt_refcnt--;
 		
diff --git a/sys/netccitt/pk_llcsubr.c b/sys/netccitt/pk_llcsubr.c
index 7269fb2..a1e18ad 100644
--- a/sys/netccitt/pk_llcsubr.c
+++ b/sys/netccitt/pk_llcsubr.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_llcsubr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: pk_llcsubr.c,v 1.2 1994/08/02 07:47:36 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -143,7 +143,8 @@ cons_rtrequest(int cmd, struct rtentry *rt, struct sockaddr *dst)
 		if (rt->rt_flags & RTF_GATEWAY) {
 			if (rt->rt_llinfo)
 				RTFREE((struct rtentry *)rt->rt_llinfo);
-			rt->rt_llinfo = (caddr_t) rtalloc1(rt->rt_gateway, 1);
+			rt->rt_llinfo = (caddr_t) rtalloc1(rt->rt_gateway, 1,
+							   0UL);
 			return(0);
 		}
 		/*
@@ -279,7 +280,7 @@ npaidb_enter(struct sockaddr_dl *key, struct sockaddr *value,
 
 	USES_AF_LINK_RTS;
 
-	if ((nprt = rtalloc1(SA(key), 0)) == 0) {
+	if ((nprt = rtalloc1(SA(key), 0, 0UL)) == 0) {
 		register u_int size = sizeof(struct npaidbentry);
 		register u_char saploc = LLSAPLOC(key, rt->rt_ifp);
 
@@ -321,7 +322,7 @@ npaidb_enrich(short type, caddr_t info, struct sockaddr_dl *sdl)
 
 	USES_AF_LINK_RTS;
 
-	if (rt = rtalloc1((struct sockaddr *)sdl, 0)) {
+	if (rt = rtalloc1((struct sockaddr *)sdl, 0, 0UL)) {
 		rt->rt_refcnt--;
 		switch (type) {
 		case NPAIDB_LINK:
diff --git a/sys/netccitt/pk_subr.c b/sys/netccitt/pk_subr.c
index ffbc857..bd99308 100644
--- a/sys/netccitt/pk_subr.c
+++ b/sys/netccitt/pk_subr.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pk_subr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: pk_subr.c,v 1.2 1994/08/02 07:47:41 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -486,7 +486,7 @@ register struct sockaddr_x25 *sa;
 	/*
 	 * Is the destination address known?
 	 */
-	if (!(rt = rtalloc1 ((struct sockaddr *)sa, 1)))
+	if (!(rt = rtalloc1 ((struct sockaddr *)sa, 1, 0UL)))
 		return (ENETUNREACH);
 
 	if (!(pkp = XTRACTPKP(rt)))