Initial commit of NetBSD 960217 netiso.

all the rest is the fixes to the import by Niklas.

1 files changed, 479 insertions, 377 deletions

diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index e5c1479bef8..1db53269def 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: esis.c,v 1.11 1995/08/17 02:57:31 mycroft Exp $	*/
+/*	$OpenBSD: esis.c,v 1.2 1996/03/04 10:35:15 mickey Exp $	*/
+/*	$NetBSD: esis.c,v 1.12 1996/02/13 22:09:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,13 +41,13 @@
 
                       All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of IBM not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -89,25 +90,24 @@ SOFTWARE.
 #include <netiso/esis.h>
 #include <netiso/argo_debug.h>
 
+#include <machine/stdarg.h>
 /*
  *	Global variables to esis implementation
  *
  *	esis_holding_time - the holding time (sec) parameter for outgoing pdus
  *	esis_config_time  - the frequency (sec) that hellos are generated
- *	esis_esconfig_time - suggested es configuration time placed in the
- *						ish.
+ *	esis_esconfig_time - suggested es configuration time placed in the ish.
  *
  */
 LIST_HEAD(, rawcb) esis_pcb;
-void				esis_config(), snpac_age();
-int				esis_sendspace = 2048;
-int				esis_recvspace = 2048;
-short			esis_holding_time = ESIS_HT;
-short			esis_config_time = ESIS_CONFIG;
-short			esis_esconfig_time = ESIS_CONFIG;
-extern int		iso_systype;
-struct sockaddr_dl	esis_dl = { sizeof(esis_dl), AF_LINK };
-extern char		all_es_snpa[], all_is_snpa[];
+int             esis_sendspace = 2048;
+int             esis_recvspace = 2048;
+short           esis_holding_time = ESIS_HT;
+short           esis_config_time = ESIS_CONFIG;
+short           esis_esconfig_time = ESIS_CONFIG;
+extern int      iso_systype;
+struct sockaddr_dl esis_dl = {sizeof(esis_dl), AF_LINK};
+extern char     all_es_snpa[], all_is_snpa[];
 
 #define EXTEND_PACKET(m, mhdr, cp)\
 	if (((m)->m_next = m_getclr(M_DONTWAIT, MT_HEADER)) == NULL) {\
@@ -119,21 +119,16 @@ extern char		all_es_snpa[], all_is_snpa[];
 		(cp) = mtod((m), caddr_t);\
 	}
 
-void	esis_input(), isis_input();
-#ifdef	ISO_X25ESIS
-void	x25esis_input();
-#endif	/* ISO_X25ESIS */
-
 /*
  * FUNCTION:		esis_init
  *
- * PURPOSE:			Initialize the kernel portion of esis protocol
+ * PURPOSE:		Initialize the kernel portion of esis protocol
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
 esis_init()
@@ -142,36 +137,37 @@ esis_init()
 
 	LIST_INIT(&esis_pcb);
 
-	timeout(snpac_age, (caddr_t)0, hz);
-	timeout(esis_config, (caddr_t)0, hz);
+	timeout(snpac_age, (caddr_t) 0, hz);
+	timeout(esis_config, (caddr_t) 0, hz);
 
 	clnl_protox[ISO9542_ESIS].clnl_input = esis_input;
 	clnl_protox[ISO10589_ISIS].clnl_input = isis_input;
 #ifdef	ISO_X25ESIS
 	clnl_protox[ISO9542X25_ESIS].clnl_input = x25esis_input;
-#endif	/* ISO_X25ESIS */
+#endif				/* ISO_X25ESIS */
 }
 
 /*
  * FUNCTION:		esis_usrreq
  *
- * PURPOSE:			Handle user level esis requests
+ * PURPOSE:		Handle user level esis requests
  *
- * RETURNS:			0 or appropriate errno
+ * RETURNS:		0 or appropriate errno
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  */
-/*ARGSUSED*/
+/* ARGSUSED */
+int
 esis_usrreq(so, req, m, nam, control)
-struct socket	*so;		/* socket: used only to get to this code */
-int				req;		/* request */
-struct mbuf		*m;			/* data for request */
-struct mbuf		*nam;		/* optional name */
-struct mbuf		*control;	/* optional control */
+	struct socket  *so;	/* socket: used only to get to this code */
+	int             req;	/* request */
+	struct mbuf    *m;	/* data for request */
+	struct mbuf    *nam;	/* optional name */
+	struct mbuf    *control;/* optional control */
 {
-	struct rawcb *rp = sotorawcb(so);
-	int error = 0;
+	struct rawcb   *rp = sotorawcb(so);
+	int             error = 0;
 
 	if ((so->so_state & SS_PRIV) == 0) {
 		error = EACCES;
@@ -181,7 +177,6 @@ struct mbuf		*control;	/* optional control */
 		error = EINVAL;
 		goto release;
 	}
-
 	switch (req) {
 	case PRU_ATTACH:
 		if (rp != NULL) {
@@ -189,8 +184,8 @@ struct mbuf		*control;	/* optional control */
 			break;
 		}
 		MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
-		if (so->so_pcb = rp) {
-			bzero((caddr_t)so->so_pcb, sizeof(*rp));
+		if ((so->so_pcb = rp) != NULL) {
+			bzero(so->so_pcb, sizeof(*rp));
 			LIST_INSERT_HEAD(&esis_pcb, rp, rcb_list);
 			rp->rcb_socket = so;
 			error = soreserve(so, esis_sendspace, esis_recvspace);
@@ -204,7 +199,7 @@ struct mbuf		*control;	/* optional control */
 			break;
 		}
 		/* error checking here */
-		error = isis_output(mtod(nam,struct sockaddr_dl *), m);
+		error = isis_output(m, mtod(nam, struct sockaddr_dl *));
 		m = NULL;
 		break;
 
@@ -237,30 +232,40 @@ release:
 /*
  * FUNCTION:		esis_input
  *
- * PURPOSE:			Process an incoming esis packet
+ * PURPOSE:		Process an incoming esis packet
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
-esis_input(m0, shp)
-struct mbuf		*m0;		/* ptr to first mbuf of pkt */
-struct snpa_hdr	*shp;	/* subnetwork header */
+#if __STDC__
+esis_input(struct mbuf *m0, ...)
+#else
+esis_input(m0, va_alist)
+	struct mbuf    *m0;
+	va_dcl
+#endif
 {
-	register struct esis_fixed	*pdu = mtod(m0, struct esis_fixed *);
-	register int type;
+	struct snpa_hdr *shp;	/* subnetwork header */
+	register struct esis_fixed *pdu = mtod(m0, struct esis_fixed *);
+	register int    type;
+	va_list ap;
+
+	va_start(ap, m0);
+	shp = va_arg(ap, struct snpa_hdr *);
+	va_end(ap);
 
 	/*
 	 *	check checksum if necessary
 	 */
-	if (ESIS_CKSUM_REQUIRED(pdu) && iso_check_csum(m0, (int)pdu->esis_hdr_len)) {
+	if (ESIS_CKSUM_REQUIRED(pdu) &&
+	    iso_check_csum(m0, (int) pdu->esis_hdr_len)) {
 		esis_stat.es_badcsum++;
 		goto bad;
 	}
-
 	/* check version */
 	if (pdu->esis_vers != ESIS_VERSION) {
 		esis_stat.es_badvers++;
@@ -268,20 +273,20 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	}
 	type = pdu->esis_type & 0x1f;
 	switch (type) {
-		case ESIS_ESH:
-			esis_eshinput(m0, shp);
-			break;
+	case ESIS_ESH:
+		esis_eshinput(m0, shp);
+		break;
 
-		case ESIS_ISH:
-			esis_ishinput(m0, shp);
-			break;
+	case ESIS_ISH:
+		esis_ishinput(m0, shp);
+		break;
 
-		case ESIS_RD:
-			esis_rdinput(m0, shp);
-			break;
+	case ESIS_RD:
+		esis_rdinput(m0, shp);
+		break;
 
-		default:
-			esis_stat.es_badtype++;
+	default:
+		esis_stat.es_badtype++;
 	}
 
 bad:
@@ -294,29 +299,30 @@ bad:
 /*
  * FUNCTION:		esis_rdoutput
  *
- * PURPOSE:			Transmit a redirect pdu
+ * PURPOSE:		Transmit a redirect pdu
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			Assumes there is enough space for fixed part of header,
- *					DA, BSNPA and NET in first mbuf.
+ * NOTES:		Assumes there is enough space for fixed part of header,
+ *			DA, BSNPA and NET in first mbuf.
  */
+void
 esis_rdoutput(inbound_shp, inbound_m, inbound_oidx, rd_dstnsap, rt)
-struct snpa_hdr		*inbound_shp;	/* snpa hdr from incoming packet */
-struct mbuf			*inbound_m;		/* incoming pkt itself */
-struct clnp_optidx	*inbound_oidx;	/* clnp options assoc with incoming pkt */
-struct iso_addr		*rd_dstnsap;	/* ultimate destination of pkt */
-struct rtentry		*rt;			/* snpa cache info regarding next hop of
-										pkt */
+	struct snpa_hdr *inbound_shp;	/* snpa hdr from incoming packet */
+	struct mbuf    *inbound_m;	/* incoming pkt itself */
+	struct clnp_optidx *inbound_oidx;	/* clnp options assoc with
+						 * incoming pkt */
+	struct iso_addr *rd_dstnsap;	/* ultimate destination of pkt */
+	struct rtentry *rt;	/* snpa cache info regarding next hop of pkt */
 {
-	struct mbuf			*m, *m0;
-	caddr_t				cp;
-	struct esis_fixed	*pdu;
-	int					len, total_len = 0;
-	struct sockaddr_iso	siso;
-	struct ifnet 		*ifp = inbound_shp->snh_ifp;
+	struct mbuf    *m, *m0;
+	caddr_t         cp;
+	struct esis_fixed *pdu;
+	int             len;
+	struct sockaddr_iso siso;
+	struct ifnet   *ifp = inbound_shp->snh_ifp;
 	struct sockaddr_dl *sdl;
 	struct iso_addr *rd_gwnsap;
 
@@ -325,23 +331,29 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 		rt = rtalloc1(rt->rt_gateway, 0);
 	} else
 		rd_gwnsap = &satosiso(rt_key(rt))->siso_addr;
-	if (rt == 0 || (sdl = (struct sockaddr_dl *)rt->rt_gateway) == 0 ||
-		sdl->sdl_family != AF_LINK) {
-		/* maybe we should have a function that you
-		   could put in the iso_ifaddr structure
-		   which could translate iso_addrs into snpa's
-		   where there is a known mapping for that address type */
+	if (rt == 0 || (sdl = (struct sockaddr_dl *) rt->rt_gateway) == 0 ||
+	    sdl->sdl_family != AF_LINK) {
+		/*
+		 * maybe we should have a function that you could put in the
+		 * iso_ifaddr structure which could translate iso_addrs into
+		 * snpa's where there is a known mapping for that address
+		 * type
+		 */
 		esis_stat.es_badtype++;
 		return;
 	}
 	esis_stat.es_rdsent++;
-	IFDEBUG(D_ESISOUTPUT)
-		printf("esis_rdoutput: ifp x%x (%s%d), ht %d, m x%x, oidx x%x\n",
-			ifp, ifp->if_name, ifp->if_unit, esis_holding_time, inbound_m,
-			inbound_oidx);
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISOUTPUT]) {
+		printf(
+		"esis_rdoutput: ifp x%x (%s%d), ht %d, m x%x, oidx x%x\n",
+		       (unsigned int) ifp, ifp->if_name, ifp->if_unit,
+		       esis_holding_time,
+		       (unsigned int) inbound_m, (unsigned int) inbound_oidx);
 		printf("\tdestination: %s\n", clnp_iso_addrp(rd_dstnsap));
 		printf("\tredirected toward:%s\n", clnp_iso_addrp(rd_gwnsap));
-	ENDDEBUG
+	}
+#endif
 
 	if ((m0 = m = m_gethdr(M_DONTWAIT, MT_HEADER)) == NULL) {
 		esis_stat.es_nomem++;
@@ -350,7 +362,8 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 	bzero(mtod(m, caddr_t), MHLEN);
 
 	pdu = mtod(m, struct esis_fixed *);
-	cp = (caddr_t)(pdu + 1); /*pointer arith.; 1st byte after header */
+	cp = (caddr_t) (pdu + 1);	/* pointer arith.; 1st byte after
+					 * header */
 	len = sizeof(struct esis_fixed);
 
 	/*
@@ -370,19 +383,21 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 	cp += sdl->sdl_alen;
 	len += (sdl->sdl_alen + 1);
 
-	/* 
-	 *	If the next hop is not the destination, then it ought to be
-	 *	an IS and it should be inserted next. Else, set the
-	 *	NETL to 0
+	/*
+	 * If the next hop is not the destination, then it ought to be an IS
+	 * and it should be inserted next. Else, set the NETL to 0
 	 */
 	/* PHASE2 use mask from ifp of outgoing interface */
 	if (!iso_addrmatch1(rd_dstnsap, rd_gwnsap)) {
-		/* this should not happen: 
+#if 0
+		/* this should not happen: */
 		if ((nhop_sc->sc_flags & SNPA_IS) == 0) {
-			printf("esis_rdoutput: next hop is not dst and not an IS\n");
+			printf(
+		    "esis_rdoutput: next hop is not dst and not an IS\n");
 			m_freem(m0);
 			return;
-		} */
+		}
+#endif
 		(void) esis_insert_addr(&cp, &len, rd_gwnsap, m, 0);
 	} else {
 		*cp++ = 0;	/* NETL */
@@ -391,21 +406,22 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 	m->m_len = len;
 
 	/*
-	 *	PHASE2
-	 *	If redirect is to an IS, add an address mask. The mask to be
-	 *	used should be the mask present in the routing entry used to
-	 *	forward the original data packet.
+	 * PHASE2
+	 * If redirect is to an IS, add an address mask. The mask to be
+	 * used should be the mask present in the routing entry used to
+	 * forward the original data packet.
 	 */
-	
+
 	/*
-	 *	Copy Qos, priority, or security options present in original npdu
+	 * Copy Qos, priority, or security options present in original npdu
 	 */
 	if (inbound_oidx) {
 		/* THIS CODE IS CURRENTLY (mostly) UNTESTED */
-		int optlen = 0;
+		int             optlen = 0;
 		if (inbound_oidx->cni_qos_formatp)
 			optlen += (inbound_oidx->cni_qos_len + 2);
-		if (inbound_oidx->cni_priorp)	/* priority option is 1 byte long */
+		if (inbound_oidx->cni_priorp)	/* priority option is 1 byte
+						 * long */
 			optlen += 3;
 		if (inbound_oidx->cni_securep)
 			optlen += (inbound_oidx->cni_secure_len + 2);
@@ -415,65 +431,67 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 			/* assumes MLEN > optlen */
 		}
 		/* assume MLEN-len > optlen */
-		/* 
-		 *	When copying options, copy from ptr - 2 in order to grab
-		 *	the option code and length
+		/*
+		 * When copying options, copy from ptr - 2 in order to grab
+		 * the option code and length
 		 */
 		if (inbound_oidx->cni_qos_formatp) {
-			bcopy(mtod(inbound_m, caddr_t) + inbound_oidx->cni_qos_formatp - 2,
-				cp, (unsigned)(inbound_oidx->cni_qos_len + 2));
+			bcopy(mtod(inbound_m, caddr_t) +
+				inbound_oidx->cni_qos_formatp - 2,
+			      cp, (unsigned) (inbound_oidx->cni_qos_len + 2));
 			cp += inbound_oidx->cni_qos_len + 2;
 		}
 		if (inbound_oidx->cni_priorp) {
-			bcopy(mtod(inbound_m, caddr_t) + inbound_oidx->cni_priorp - 2,
-					cp, 3);
+			bcopy(mtod(inbound_m, caddr_t) +
+				inbound_oidx->cni_priorp - 2, cp, 3);
 			cp += 3;
 		}
 		if (inbound_oidx->cni_securep) {
-			bcopy(mtod(inbound_m, caddr_t) + inbound_oidx->cni_securep - 2, cp, 
-				(unsigned)(inbound_oidx->cni_secure_len + 2));
+			bcopy(mtod(inbound_m, caddr_t) +
+				inbound_oidx->cni_securep - 2, cp,
+			      (unsigned) (inbound_oidx->cni_secure_len + 2));
 			cp += inbound_oidx->cni_secure_len + 2;
 		}
 		m->m_len += optlen;
 		len += optlen;
 	}
-
 	pdu->esis_hdr_len = m0->m_pkthdr.len = len;
-	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int)pdu->esis_hdr_len);
+	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int) pdu->esis_hdr_len);
 
-	bzero((caddr_t)&siso, sizeof(siso));
+	bzero((caddr_t) & siso, sizeof(siso));
 	siso.siso_family = AF_ISO;
 	siso.siso_data[0] = AFI_SNA;
 	siso.siso_nlen = 6 + 1;	/* should be taken from snpa_hdr */
-										/* +1 is for AFI */
+	/* +1 is for AFI */
 	bcopy(inbound_shp->snh_shost, siso.siso_data + 1, 6);
-	(ifp->if_output)(ifp, m0, sisotosa(&siso), 0);
+	(ifp->if_output) (ifp, m0, sisotosa(&siso), 0);
 }
 
 /*
  * FUNCTION:		esis_insert_addr
  *
- * PURPOSE:			Insert an iso_addr into a buffer
+ * PURPOSE:		Insert an iso_addr into a buffer
  *
- * RETURNS:			true if buffer was big enough, else false
+ * RETURNS:		true if buffer was big enough, else false
  *
  * SIDE EFFECTS:	Increment buf & len according to size of iso_addr
  *
- * NOTES:			Plus 1 here is for length byte
+ * NOTES:		Plus 1 here is for length byte
  */
+int
 esis_insert_addr(buf, len, isoa, m, nsellen)
-register caddr_t			*buf;		/* ptr to buffer to put address into */
-int							*len;		/* ptr to length of buffer so far */
-register struct iso_addr	*isoa;		/* ptr to address */
-register struct mbuf		*m;			/* determine if there remains space */
-int							nsellen;
+	register caddr_t *buf;	/* ptr to buffer to put address into */
+	int            *len;	/* ptr to length of buffer so far */
+	register struct iso_addr *isoa;	/* ptr to address */
+	register struct mbuf *m;/* determine if there remains space */
+	int             nsellen;
 {
-	register int newlen, result = 0;
+	register int    newlen, result = 0;
 
 	isoa->isoa_len -= nsellen;
 	newlen = isoa->isoa_len + 1;
-	if (newlen <=  M_TRAILINGSPACE(m)) {
-		bcopy((caddr_t)isoa, *buf, newlen);
+	if (newlen <= M_TRAILINGSPACE(m)) {
+		bcopy((caddr_t) isoa, *buf, newlen);
 		*len += newlen;
 		*buf += newlen;
 		m->m_len += newlen;
@@ -487,31 +505,31 @@ int							nsellen;
 	    if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
 #define ESIS_NEXT_OPTION(b)	{ b += (2 + b[1]); \
 	    if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
-int ESHonly = 0;
-/*
- 
+int             ESHonly = 0;
+
 /*
  * FUNCTION:		esis_eshinput
  *
- * PURPOSE:			Process an incoming ESH pdu
+ * PURPOSE:		Process an incoming ESH pdu
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
+void
 esis_eshinput(m, shp)
-struct mbuf		*m;	/* esh pdu */
-struct snpa_hdr	*shp;	/* subnetwork header */
+	struct mbuf    *m;	/* esh pdu */
+	struct snpa_hdr *shp;	/* subnetwork header */
 {
-	struct	esis_fixed	*pdu = mtod(m, struct esis_fixed *);
-	u_short				ht;		/* holding time */
-	struct	iso_addr	*nsap;
-	int					naddr;
-	u_char				*buf = (u_char *)(pdu + 1);
-	u_char				*buflim = pdu->esis_hdr_len + (u_char *)pdu;
-	int					new_entry = 0;
+	struct esis_fixed *pdu = mtod(m, struct esis_fixed *);
+	u_short         ht;	/* holding time */
+	struct iso_addr *nsap = NULL;
+	int             naddr;
+	u_char         *buf = (u_char *) (pdu + 1);
+	u_char         *buflim = pdu->esis_hdr_len + (u_char *) pdu;
+	int             new_entry = 0;
 
 	esis_stat.es_eshrcvd++;
 
@@ -523,54 +541,70 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	if (naddr == 1) {
 		ESIS_EXTRACT_ADDR(nsap, buf);
 		new_entry = snpac_add(shp->snh_ifp,
-								 nsap, shp->snh_shost, SNPA_ES, ht, 0);
+				      nsap, shp->snh_shost, SNPA_ES, ht, 0);
 	} else {
-		int nsellength = 0, nlen = 0;
-		{
-		/* See if we want to compress out multiple nsaps differing
-		   only by nsel */
-			register struct ifaddr *ifa;
-			for (ifa = shp->snh_ifp->if_addrlist.tqh_first; ifa != 0;
-			    ifa = ifa->ifa_list.tqe_next)
-				if (ifa->ifa_addr->sa_family == AF_ISO) {
-					nsellength = ((struct iso_ifaddr *)ifa)->ia_addr.siso_tlen;
-					break;
+		int             nsellength = 0, nlen = 0;
+		struct ifaddr *ifa;
+		/*
+		 * See if we want to compress out multiple nsaps
+		 * differing only by nsel
+		 */
+		for (ifa = shp->snh_ifp->if_addrlist.tqh_first; ifa != 0;
+		     ifa = ifa->ifa_list.tqe_next)
+			if (ifa->ifa_addr->sa_family == AF_ISO) {
+				nsellength =
+				((struct iso_ifaddr *) ifa)->ia_addr.siso_tlen;
+				break;
 			}
+#ifdef ARGO_DEBUG
+		if (argo_debug[D_ESISINPUT]) {
+			printf(
+			"esis_eshinput: esh: ht %d, naddr %d nsellength %d\n",
+			       ht, naddr, nsellength);
 		}
-		IFDEBUG(D_ESISINPUT)
-			printf("esis_eshinput: esh: ht %d, naddr %d nsellength %d\n",
-					ht, naddr, nsellength);
-		ENDDEBUG
+#endif
 		while (naddr-- > 0) {
-			struct iso_addr *nsap2; u_char *buf2;
+			struct iso_addr *nsap2;
+			u_char         *buf2;
 			ESIS_EXTRACT_ADDR(nsap, buf);
-			/* see if there is at least one more nsap in ESH differing
-			   only by nsel */
-			if (nsellength != 0) for (buf2 = buf; buf2 < buflim;) {
-				ESIS_EXTRACT_ADDR(nsap2, buf2);
-				IFDEBUG(D_ESISINPUT)
-					printf("esis_eshinput: comparing %s ", 
-						clnp_iso_addrp(nsap));
-					printf("and %s\n", clnp_iso_addrp(nsap2));
-				ENDDEBUG
-				if (Bcmp(nsap->isoa_genaddr, nsap2->isoa_genaddr,
-						 nsap->isoa_len - nsellength) == 0) {
-					nlen = nsellength;
-					break;
+			/*
+			 * see if there is at least one more nsap in ESH
+			 * differing only by nsel
+			 */
+			if (nsellength != 0)
+				for (buf2 = buf; buf2 < buflim;) {
+					ESIS_EXTRACT_ADDR(nsap2, buf2);
+#ifdef ARGO_DEBUG
+					if (argo_debug[D_ESISINPUT]) {
+						printf(
+						"esis_eshinput: comparing %s ",
+						       clnp_iso_addrp(nsap));
+						printf("and %s\n",
+						       clnp_iso_addrp(nsap2));
+					}
+#endif
+					if (Bcmp(nsap->isoa_genaddr,
+						 nsap2->isoa_genaddr,
+						 nsap->isoa_len - nsellength)
+					     == 0) {
+						nlen = nsellength;
+						break;
+					}
 				}
-			}
 			new_entry |= snpac_add(shp->snh_ifp,
-									nsap, shp->snh_shost, SNPA_ES, ht, nlen);
+				   nsap, shp->snh_shost, SNPA_ES, ht, nlen);
 			nlen = 0;
 		}
 	}
-	IFDEBUG(D_ESISINPUT)
-		printf("esis_eshinput: nsap %s is %s\n", 
-			clnp_iso_addrp(nsap), new_entry ? "new" : "old");
-	ENDDEBUG
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISINPUT]) {
+		printf("esis_eshinput: nsap %s is %s\n",
+		       clnp_iso_addrp(nsap), new_entry ? "new" : "old");
+	}
+#endif
 	if (new_entry && (iso_systype & SNPA_IS))
 		esis_shoutput(shp->snh_ifp, ESIS_ISH, esis_holding_time,
-						shp->snh_shost, 6, (struct iso_addr *)0);
+			      shp->snh_shost, 6, (struct iso_addr *) 0);
 bad:
 	return;
 }
@@ -578,31 +612,34 @@ bad:
 /*
  * FUNCTION:		esis_ishinput
  *
- * PURPOSE:			process an incoming ISH pdu
+ * PURPOSE:		process an incoming ISH pdu
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
+void
 esis_ishinput(m, shp)
-struct mbuf		*m;	/* esh pdu */
-struct snpa_hdr	*shp;	/* subnetwork header */
+	struct mbuf    *m;	/* esh pdu */
+	struct snpa_hdr *shp;	/* subnetwork header */
 {
-	struct esis_fixed	*pdu = mtod(m, struct esis_fixed *);
-	u_short				ht, newct;			/* holding time */
-	struct iso_addr		*nsap; 				/* Network Entity Title */
-	register u_char		*buf = (u_char *) (pdu + 1);
-	register u_char		*buflim = pdu->esis_hdr_len + (u_char *)pdu;
-	int					new_entry;
+	struct esis_fixed *pdu = mtod(m, struct esis_fixed *);
+	u_short         ht, newct;	/* holding time */
+	struct iso_addr *nsap;	/* Network Entity Title */
+	register u_char *buf = (u_char *) (pdu + 1);
+	register u_char *buflim = pdu->esis_hdr_len + (u_char *) pdu;
+	int             new_entry;
 
 	esis_stat.es_ishrcvd++;
 	CTOH(pdu->esis_ht_msb, pdu->esis_ht_lsb, ht);
 
-	IFDEBUG(D_ESISINPUT)
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISINPUT]) {
 		printf("esis_ishinput: ish: ht %d\n", ht);
-	ENDDEBUG
+	}
+#endif
 	if (ESHonly)
 		goto bad;
 
@@ -616,28 +653,31 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 			if (buf[1] != 2)
 				goto bad;
 			CTOH(buf[2], buf[3], newct);
-			if (esis_config_time != newct) {
-				untimeout(esis_config,0);
+			if ((u_short) esis_config_time != newct) {
+				untimeout(esis_config, 0);
 				esis_config_time = newct;
-				esis_config();
+				esis_config(NULL);
 			}
 			break;
-		
+
 		default:
 			printf("Unknown ISH option: %x\n", *buf);
 		}
 		ESIS_NEXT_OPTION(buf);
 	}
-	new_entry = snpac_add(shp->snh_ifp, nsap, shp->snh_shost, SNPA_IS, ht, 0);
-	IFDEBUG(D_ESISINPUT)
-		printf("esis_ishinput: nsap %s is %s\n", 
-			clnp_iso_addrp(nsap), new_entry ? "new" : "old");
-	ENDDEBUG
+	new_entry = snpac_add(shp->snh_ifp, nsap, shp->snh_shost, SNPA_IS,
+			      ht, 0);
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISINPUT]) {
+		printf("esis_ishinput: nsap %s is %s\n",
+		       clnp_iso_addrp(nsap), new_entry ? "new" : "old");
+	}
+#endif
 
 	if (new_entry)
-		esis_shoutput(shp->snh_ifp, 
-			iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
-			esis_holding_time, shp->snh_shost, 6, (struct iso_addr *)0);
+		esis_shoutput(shp->snh_ifp,
+			      iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
+		esis_holding_time, shp->snh_shost, 6, (struct iso_addr *) 0);
 bad:
 	return;
 }
@@ -645,24 +685,25 @@ bad:
 /*
  * FUNCTION:		esis_rdinput
  *
- * PURPOSE:			Process an incoming RD pdu
+ * PURPOSE:		Process an incoming RD pdu
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
+void
 esis_rdinput(m0, shp)
-struct mbuf		*m0;	/* esh pdu */
-struct snpa_hdr	*shp;	/* subnetwork header */
+	struct mbuf    *m0;	/* esh pdu */
+	struct snpa_hdr *shp;	/* subnetwork header */
 {
-	struct esis_fixed	*pdu = mtod(m0, struct esis_fixed *);
-	u_short				ht;		/* holding time */
-	struct iso_addr		*da, *net = 0, *netmask = 0, *snpamask = 0;
+	struct esis_fixed *pdu = mtod(m0, struct esis_fixed *);
+	u_short         ht;	/* holding time */
+	struct iso_addr *da, *net = 0, *netmask = 0, *snpamask = 0;
 	register struct iso_addr *bsnpa;
-	register u_char		*buf = (u_char *)(pdu + 1);
-	register u_char		*buflim = pdu->esis_hdr_len + (u_char *)pdu;
+	register u_char *buf = (u_char *) (pdu + 1);
+	register u_char *buflim = pdu->esis_hdr_len + (u_char *) pdu;
 
 	esis_stat.es_rdrcvd++;
 
@@ -685,24 +726,23 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	/* Extract NET if present */
 	if (buf < buflim) {
 		if (*buf == 0)
-			buf++; /* no NET present, skip NETL anyway */
+			buf++;	/* no NET present, skip NETL anyway */
 		else
 			ESIS_EXTRACT_ADDR(net, buf);
 	}
-
 	/* process options */
 	while (buf < buflim) {
 		switch (*buf) {
 		case ESISOVAL_SNPAMASK:
-			if (snpamask) /* duplicate */
+			if (snpamask)	/* duplicate */
 				return;
-			snpamask = (struct iso_addr *)(buf + 1);
+			snpamask = (struct iso_addr *) (buf + 1);
 			break;
 
 		case ESISOVAL_NETMASK:
-			if (netmask) /* duplicate */
+			if (netmask)	/* duplicate */
 				return;
-			netmask = (struct iso_addr *)(buf + 1);
+			netmask = (struct iso_addr *) (buf + 1);
 			break;
 
 		default:
@@ -711,76 +751,80 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 		ESIS_NEXT_OPTION(buf);
 	}
 
-	IFDEBUG(D_ESISINPUT)
-		printf("esis_rdinput: rd: ht %d, da %s\n", ht, clnp_iso_addrp(da));
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISINPUT]) {
+		printf("esis_rdinput: rd: ht %d, da %s\n", ht,
+		       clnp_iso_addrp(da));
 		if (net)
 			printf("\t: net %s\n", clnp_iso_addrp(net));
-	ENDDEBUG
+	}
+#endif
 	/*
-	 *	If netl is zero, then redirect is to an ES. We need to add an entry
-	 *	to the snpa cache for (destination, better snpa).
-	 *	If netl is not zero, then the redirect is to an IS. In this
-	 *	case, add an snpa cache entry for (net, better snpa).
+	 * If netl is zero, then redirect is to an ES. We need to add an entry
+	 * to the snpa cache for (destination, better snpa).
+	 * If netl is not zero, then the redirect is to an IS. In this
+	 * case, add an snpa cache entry for (net, better snpa).
 	 *
-	 *	If the redirect is to an IS, add a route entry towards that
-	 *	IS.
+	 * If the redirect is to an IS, add a route entry towards that
+	 * IS.
 	 */
 	if (net == 0 || net->isoa_len == 0 || snpamask) {
 		/* redirect to an ES */
 		snpac_add(shp->snh_ifp, da,
-				bsnpa->isoa_genaddr, SNPA_ES, ht, 0);
+			  bsnpa->isoa_genaddr, SNPA_ES, ht, 0);
 	} else {
 		snpac_add(shp->snh_ifp, net,
-				bsnpa->isoa_genaddr, SNPA_IS, ht, 0);
+			  bsnpa->isoa_genaddr, SNPA_IS, ht, 0);
 		snpac_addrt(shp->snh_ifp, da, net, netmask);
 	}
-bad: ;    /* Needed by ESIS_NEXT_OPTION */
+bad:	;	/* Needed by ESIS_NEXT_OPTION */
 }
 
 /*
  * FUNCTION:		esis_config
  *
- * PURPOSE:			Report configuration
+ * PURPOSE:		Report configuration
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			Called every esis_config_time seconds
+ * NOTES:		Called every esis_config_time seconds
  */
+/*ARGSUSED*/
 void
-esis_config()
+esis_config(v)
+	void *v;
 {
-	register struct ifnet	*ifp;
+	register struct ifnet *ifp;
 
-	timeout(esis_config, (caddr_t)0, hz * esis_config_time);
+	timeout(esis_config, (caddr_t) 0, hz * esis_config_time);
 
-	/* 
-	 *	Report configuration for each interface that 
-	 *	- is UP
-	 *	- has BROADCAST capability
-	 *	- has an ISO address
+	/*
+	 * Report configuration for each interface that - is UP - has
+	 * BROADCAST capability - has an ISO address
 	 */
-	/* Todo: a better way would be to construct the esh or ish
-	 * once and copy it out for all devices, possibly calling
-	 * a method in the iso_ifaddr structure to encapsulate and
-	 * transmit it.  This could work to advantage for non-broadcast media
+	/*
+	 * Todo: a better way would be to construct the esh or ish once and
+	 * copy it out for all devices, possibly calling a method in the
+	 * iso_ifaddr structure to encapsulate and transmit it.  This could
+	 * work to advantage for non-broadcast media
 	 */
-	
+
 	for (ifp = ifnet.tqh_first; ifp != 0; ifp = ifp->if_list.tqe_next) {
 		if ((ifp->if_flags & IFF_UP) &&
 		    (ifp->if_flags & IFF_BROADCAST)) {
 			/* search for an ISO address family */
-			struct ifaddr *ifa;
+			struct ifaddr  *ifa;
 
 			for (ifa = ifp->if_addrlist.tqh_first; ifa != 0;
-			    ifa = ifa->ifa_list.tqe_next) {
+			     ifa = ifa->ifa_list.tqe_next) {
 				if (ifa->ifa_addr->sa_family == AF_ISO) {
-					esis_shoutput(ifp, 
-						iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
-						esis_holding_time,
-						(caddr_t)(iso_systype & SNPA_ES ? all_is_snpa : 
-						all_es_snpa), 6, (struct iso_addr *)0);
+					esis_shoutput(ifp,
+			      iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
+			      esis_holding_time,
+			      (caddr_t) (iso_systype & SNPA_ES ? all_is_snpa :
+				     all_es_snpa), 6, (struct iso_addr *) 0);
 					break;
 				}
 			}
@@ -791,48 +835,53 @@ esis_config()
 /*
  * FUNCTION:		esis_shoutput
  *
- * PURPOSE:			Transmit an esh or ish pdu
+ * PURPOSE:		Transmit an esh or ish pdu
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
+void
 esis_shoutput(ifp, type, ht, sn_addr, sn_len, isoa)
-struct ifnet	*ifp;
-int				type;
-short			ht;
-caddr_t 		sn_addr;
-int				sn_len;
-struct	iso_addr *isoa;
+	struct ifnet   *ifp;
+	int             type;
+	short           ht;
+	caddr_t         sn_addr;
+	int             sn_len;
+	struct iso_addr *isoa;
 {
-	struct mbuf			*m, *m0;
-	caddr_t				cp, naddrp;
-	int					naddr = 0;
-	struct esis_fixed	*pdu;
-	struct iso_ifaddr	*ia;
-	int					len;
-	struct sockaddr_iso	siso;
+	struct mbuf    *m, *m0;
+	caddr_t         cp, naddrp;
+	int             naddr = 0;
+	struct esis_fixed *pdu;
+	struct iso_ifaddr *ia;
+	int             len;
+	struct sockaddr_iso siso;
 
 	if (type == ESIS_ESH)
 		esis_stat.es_eshsent++;
-	else if (type == ESIS_ISH) 
+	else if (type == ESIS_ISH)
 		esis_stat.es_ishsent++;
 	else {
 		printf("esis_shoutput: bad pdu type\n");
 		return;
 	}
 
-	IFDEBUG(D_ESISOUTPUT)
-		int	i;
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ESISOUTPUT]) {
+		int             i;
 		printf("esis_shoutput: ifp x%x (%s%d), %s, ht %d, to: [%d] ",
-			ifp, ifp->if_name, ifp->if_unit, type == ESIS_ESH ? "esh" : "ish",
-			ht, sn_len);
-		for (i=0; i<sn_len; i++)
-			printf("%x%c", *(sn_addr+i), i < (sn_len-1) ? ':' : ' ');
+		       (unsigned int) ifp, ifp->if_name, ifp->if_unit,
+		       type == ESIS_ESH ? "esh" : "ish",
+		       ht, sn_len);
+		for (i = 0; i < sn_len; i++)
+			printf("%x%c", *(sn_addr + i),
+			       i < (sn_len - 1) ? ':' : ' ');
 		printf("\n");
-	ENDDEBUG
+	}
+#endif
 
 	if ((m0 = m = m_gethdr(M_DONTWAIT, MT_HEADER)) == NULL) {
 		esis_stat.es_nomem++;
@@ -841,7 +890,7 @@ struct	iso_addr *isoa;
 	bzero(mtod(m, caddr_t), MHLEN);
 
 	pdu = mtod(m, struct esis_fixed *);
-	naddrp = cp = (caddr_t)(pdu + 1);
+	naddrp = cp = (caddr_t) (pdu + 1);
 	len = sizeof(struct esis_fixed);
 
 	/*
@@ -856,7 +905,6 @@ struct	iso_addr *isoa;
 		cp++;
 		len++;
 	}
-
 	m->m_len = len;
 	if (isoa) {
 		/*
@@ -865,36 +913,44 @@ struct	iso_addr *isoa;
 		 * It is possible that we did not specifically advertise this
 		 * NSAP, even though it is ours, so we will respond
 		 * directly to the sender that we are here.  If we do have
-		 * multiple NSEL's we'll tack them on so he can compress them out.
+		 * multiple NSEL's we'll tack them on so he can compress
+		 * them out.
 		 */
 		(void) esis_insert_addr(&cp, &len, isoa, m, 0);
 		naddr = 1;
 	}
 	for (ia = iso_ifaddr.tqh_first; ia != 0; ia = ia->ia_list.tqe_next) {
-		int nsellen = (type == ESIS_ISH ? ia->ia_addr.siso_tlen : 0); 
+		int nsellen = (type == ESIS_ISH ? ia->ia_addr.siso_tlen : 0);
 		int n = ia->ia_addr.siso_nlen;
 		register struct iso_ifaddr *ia2;
 
 		if (type == ESIS_ISH && naddr > 0)
 			break;
-		for (ia2 = iso_ifaddr.tqh_first; ia2 != ia; ia2 = ia2->ia_list.tqe_next)
-			if (Bcmp(ia->ia_addr.siso_data, ia2->ia_addr.siso_data, n) == 0)
+		for (ia2 = iso_ifaddr.tqh_first; ia2 != ia;
+		     ia2 = ia2->ia_list.tqe_next)
+			if (Bcmp(ia->ia_addr.siso_data,
+				 ia2->ia_addr.siso_data, n) == 0)
 				break;
 		if (ia2 != ia)
-			continue;	/* Means we have previously copied this nsap */
-		if (isoa && Bcmp(ia->ia_addr.siso_data, isoa->isoa_genaddr, n) == 0) {
+			continue;	/* Means we have previously copied
+					 * this nsap */
+		if (isoa && Bcmp(ia->ia_addr.siso_data,
+				 isoa->isoa_genaddr, n) == 0) {
 			isoa = 0;
 			continue;	/* Ditto */
 		}
-		IFDEBUG(D_ESISOUTPUT)
-			printf("esis_shoutput: adding NSAP %s\n", 
-				clnp_iso_addrp(&ia->ia_addr.siso_addr));
-		ENDDEBUG
+#ifdef ARGO_DEBUG
+		if (argo_debug[D_ESISOUTPUT]) {
+			printf("esis_shoutput: adding NSAP %s\n",
+			       clnp_iso_addrp(&ia->ia_addr.siso_addr));
+		}
+#endif
 		if (!esis_insert_addr(&cp, &len,
-							  &ia->ia_addr.siso_addr, m, nsellen)) {
+				      &ia->ia_addr.siso_addr, m, nsellen)) {
 			EXTEND_PACKET(m, m0, cp);
-			(void) esis_insert_addr(&cp, &len, &ia->ia_addr.siso_addr, m,
-									nsellen);
+			(void) esis_insert_addr(&cp, &len,
+						&ia->ia_addr.siso_addr, m,
+						nsellen);
 		}
 		naddr++;
 	}
@@ -909,165 +965,211 @@ struct	iso_addr *isoa;
 		}
 		*cp++ = ESISOVAL_ESCT;
 		*cp++ = 2;
-		HTOC(*cp, *(cp+1), esis_esconfig_time);
+		HTOC(*cp, *(cp + 1), esis_esconfig_time);
 		len += 4;
 		m->m_len += 4;
-		IFDEBUG(D_ESISOUTPUT)
+#ifdef ARGO_DEBUG
+		if (argo_debug[D_ESISOUTPUT]) {
 			printf("m0 0x%x, m 0x%x, data 0x%x, len %d, cp 0x%x\n",
-			m0, m, m->m_data, m->m_len, cp);
-		ENDDEBUG
+			       (unsigned int) m0, (unsigned int) m,
+			       (unsigned int) m->m_data, m->m_len,
+			       (unsigned int) cp);
+		}
+#endif
 	}
 
 	m0->m_pkthdr.len = len;
 	pdu->esis_hdr_len = len;
-	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int)pdu->esis_hdr_len);
+	iso_gen_csum(m0, ESIS_CKSUM_OFF, (int) pdu->esis_hdr_len);
 
-	bzero((caddr_t)&siso, sizeof(siso));
+	bzero((caddr_t) & siso, sizeof(siso));
 	siso.siso_family = AF_ISO;
 	siso.siso_data[0] = AFI_SNA;
 	siso.siso_nlen = sn_len + 1;
-	bcopy(sn_addr, siso.siso_data + 1, (unsigned)sn_len);
-	(ifp->if_output)(ifp, m0, sisotosa(&siso), 0);
+	bcopy(sn_addr, siso.siso_data + 1, (unsigned) sn_len);
+	(ifp->if_output) (ifp, m0, sisotosa(&siso), 0);
 }
 
 /*
  * FUNCTION:		isis_input
  *
- * PURPOSE:			Process an incoming isis packet
+ * PURPOSE:		Process an incoming isis packet
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
-isis_input(m0, shp)
-struct mbuf		*m0;		/* ptr to first mbuf of pkt */
-struct snpa_hdr	*shp;	/* subnetwork header */
+#if __STDC__
+isis_input(struct mbuf *m0, ...)
+#else
+isis_input(m0, va_alist)
+	struct mbuf    *m0;
+	va_dcl
+#endif
 {
-	register int type;
+	struct snpa_hdr *shp;	/* subnetwork header */
 	register struct rawcb *rp, *first_rp = 0;
-	struct ifnet *ifp = shp->snh_ifp;
-	char workbuf[16];
-	struct mbuf *mm;
-
-	IFDEBUG(D_ISISINPUT)
-		int i;
-
-		printf("isis_input: pkt on ifp x%x (%s%d): from:", ifp, 
-			ifp->if_name, ifp->if_unit);
-		for (i=0; i<6; i++)
-			printf("%x%c", shp->snh_shost[i]&0xff, (i<5) ? ':' : ' ');
+	struct ifnet   *ifp;
+	struct mbuf    *mm;
+	va_list ap;
+
+	va_start(ap, m0);
+	shp = va_arg(ap, struct snpa_hdr *);
+	va_end(ap);
+	ifp = shp->snh_ifp;
+
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ISISINPUT]) {
+		int             i;
+
+		printf("isis_input: pkt on ifp x%x (%s%d): from:",
+		       (unsigned int) ifp,
+		       ifp->if_name, ifp->if_unit);
+		for (i = 0; i < 6; i++)
+			printf("%x%c", shp->snh_shost[i] & 0xff,
+			       (i < 5) ? ':' : ' ');
 		printf(" to:");
-		for (i=0; i<6; i++)
-			printf("%x%c", shp->snh_dhost[i]&0xff, (i<5) ? ':' : ' ');
+		for (i = 0; i < 6; i++)
+			printf("%x%c", shp->snh_dhost[i] & 0xff, 
+			       (i < 5) ? ':' : ' ');
 		printf("\n");
-	ENDDEBUG
+	}
+#endif
 	esis_dl.sdl_alen = ifp->if_addrlen;
 	esis_dl.sdl_index = ifp->if_index;
-	bcopy(shp->snh_shost, (caddr_t)esis_dl.sdl_data, esis_dl.sdl_alen);
+	bcopy(shp->snh_shost, (caddr_t) esis_dl.sdl_data, esis_dl.sdl_alen);
 	for (rp = esis_pcb.lh_first; rp != 0; rp = rp->rcb_list.le_next) {
 		if (first_rp == 0) {
 			first_rp = rp;
 			continue;
 		}
-		if (mm = m_copy(m0, 0, M_COPYALL)) { /*can't block at interrupt level */
+		/* can't block at interrupt level */
+		if ((mm = m_copy(m0, 0, M_COPYALL)) != NULL) {
 			if (sbappendaddr(&rp->rcb_socket->so_rcv,
-			    (struct sockaddr *)&esis_dl, mm,
-			    (struct mbuf *)0) != 0) {
+					 (struct sockaddr *) & esis_dl, mm,
+					 (struct mbuf *) 0) != 0) {
 				sorwakeup(rp->rcb_socket);
-			 } else {
-				IFDEBUG(D_ISISINPUT)
-					printf("Error in sbappenaddr, mm = 0x%x\n", mm);
-				ENDDEBUG
+			} else {
+#ifdef ARGO_DEBUG
+				if (argo_debug[D_ISISINPUT]) {
+					printf(
+				    "Error in sbappenaddr, mm = 0x%x\n",
+				    (unsigned int) mm);
+				}
+#endif
 				m_freem(mm);
 			}
 		}
 	}
 	if (first_rp && sbappendaddr(&first_rp->rcb_socket->so_rcv,
-	    (struct sockaddr *)&esis_dl, m0, (struct mbuf *)0) != 0) {
+	       (struct sockaddr *) & esis_dl, m0, (struct mbuf *) 0) != 0) {
 		sorwakeup(first_rp->rcb_socket);
 		return;
 	}
 	m_freem(m0);
 }
 
-isis_output(sdl, m)
-register struct sockaddr_dl	*sdl;
-struct mbuf *m;
+int
+#if __STDC__
+isis_output(struct mbuf *m, ...)
+#else
+isis_output(m, va_alist)
+	struct mbuf    *m;
+	va_dcl
+#endif
 {
+	register struct sockaddr_dl *sdl;
 	register struct ifnet *ifp;
-	struct ifaddr *ifa, *ifa_ifwithnet();
+	struct ifaddr  *ifa;
 	struct sockaddr_iso siso;
-	int error = 0;
-	unsigned sn_len;
+	int             error = 0;
+	unsigned        sn_len;
+	va_list ap;
 
-	ifa = ifa_ifwithnet((struct sockaddr *)sdl);	/* get ifp from sdl */
+	va_start(ap, m);
+	sdl = va_arg(ap, struct sockaddr_dl *);
+	va_end(ap);
+
+	ifa = ifa_ifwithnet((struct sockaddr *) sdl);	/* get ifp from sdl */
 	if (ifa == 0) {
-		IFDEBUG(D_ISISOUTPUT)
+#ifdef ARGO_DEBUG
+		if (argo_debug[D_ISISOUTPUT]) {
 			printf("isis_output: interface not found\n");
-		ENDDEBUG
+		}
+#endif
 		error = EINVAL;
 		goto release;
 	}
 	ifp = ifa->ifa_ifp;
 	sn_len = sdl->sdl_alen;
-	IFDEBUG(D_ISISOUTPUT)
-		u_char *cp = (u_char *)LLADDR(sdl), *cplim = cp + sn_len;
+#ifdef ARGO_DEBUG
+	if (argo_debug[D_ISISOUTPUT]) {
+		u_char *cp = (u_char *) LLADDR(sdl), *cplim = cp + sn_len;
 		printf("isis_output: ifp 0x%x (%s%d), to: ",
-			ifp, ifp->if_name, ifp->if_unit);
+		       (unsigned int) ifp, ifp->if_name, ifp->if_unit);
 		while (cp < cplim) {
 			printf("%x", *cp++);
 			printf("%c", (cp < cplim) ? ':' : ' ');
 		}
 		printf("\n");
-	ENDDEBUG
-	bzero((caddr_t)&siso, sizeof(siso));
-	siso.siso_family = AF_ISO; /* This convention may be useful for X.25 */
+	}
+#endif
+	bzero((caddr_t) & siso, sizeof(siso));
+	siso.siso_family = AF_ISO;	/* This convention may be useful for
+					 * X.25 */
 	siso.siso_data[0] = AFI_SNA;
 	siso.siso_nlen = sn_len + 1;
 	bcopy(LLADDR(sdl), siso.siso_data + 1, sn_len);
-	error = (ifp->if_output)(ifp, m, sisotosa(&siso), 0);
+	error = (ifp->if_output) (ifp, m, sisotosa(&siso), 0);
 	if (error) {
-		IFDEBUG(D_ISISOUTPUT)
-			printf("isis_output: error from ether_output is %d\n", error);
-		ENDDEBUG
+#ifdef ARGO_DEBUG
+		if (argo_debug[D_ISISOUTPUT]) {
+			printf("isis_output: error from ether_output is %d\n",
+			       error);
+		}
+#endif
 	}
 	return (error);
 
 release:
 	if (m != NULL)
 		m_freem(m);
-	return(error);
+	return (error);
 }
 
 
 /*
  * FUNCTION:		esis_ctlinput
  *
- * PURPOSE:			Handle the PRC_IFDOWN transition
+ * PURPOSE:		Handle the PRC_IFDOWN transition
  *
- * RETURNS:			nothing
+ * RETURNS:		nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			Calls snpac_flush for interface specified.
- *					The loop through iso_ifaddr is stupid because
- *					back in if_down, we knew the ifp...
+ * NOTES:		Calls snpac_flush for interface specified.
+ *			The loop through iso_ifaddr is stupid because
+ *			back in if_down, we knew the ifp...
  */
-void
-esis_ctlinput(req, siso)
-int						req;		/* request: we handle only PRC_IFDOWN */
-struct sockaddr_iso		*siso;		/* address of ifp */
+void *
+esis_ctlinput(req, siso, dummy)
+	int             req;	/* request: we handle only PRC_IFDOWN */
+	struct sockaddr *siso;	/* address of ifp */
+	void *dummy;
 {
 	register struct iso_ifaddr *ia;	/* scan through interface addresses */
 
 	if (req == PRC_IFDOWN)
-		for (ia = iso_ifaddr.tqh_first; ia != 0; ia = ia->ia_list.tqe_next) {
-			if (iso_addrmatch(IA_SIS(ia), siso))
+		for (ia = iso_ifaddr.tqh_first; ia != 0;
+		     ia = ia->ia_list.tqe_next) {
+			if (iso_addrmatch(IA_SIS(ia),
+					  (struct sockaddr_iso *) siso))
 				snpac_flushifp(ia->ia_ifp);
 		}
+	return NULL;
 }
 
-#endif	/* ISO */
+#endif /* ISO */