Remove trailing whitespace.

72 files changed, 1716 insertions, 1716 deletions

diff --git a/sys/netiso/argo_debug.h b/sys/netiso/argo_debug.h
index 6adcd52..e87da1c 100644
--- a/sys/netiso/argo_debug.h
+++ b/sys/netiso/argo_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)argo_debug.h	8.1 (Berkeley) 6/10/93
- * $Id: argo_debug.h,v 1.2 1994/08/02 07:49:31 davidg Exp $
+ * $Id: argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp $
  */
 
 #ifndef _NETISO_ARGO_DEBUG_H_
@@ -42,13 +42,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
@@ -63,8 +63,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
- * $Header: /home/ncvs/src/sys/netiso/argo_debug.h,v 1.2 1994/08/02 07:49:31 davidg Exp $
+/*
+ * $Header: /home/ncvs/src/sys/netiso/argo_debug.h,v 1.3 1994/08/21 06:14:11 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/argo_debug.h,v $
  */
 
@@ -75,8 +75,8 @@ SOFTWARE.
  * Lint stuff
  **********************************************/
 #if	defined(lint)
-/* 
- * lint can't handle the flaky vacuous definitions 
+/*
+ * lint can't handle the flaky vacuous definitions
  * of IFDEBUG, ENDDEBUG, etc.
  */
 #endif	/* defined(lint) */
@@ -103,7 +103,7 @@ SOFTWARE.
 unsigned char	argo_debug[128];
 
 #define IFDEBUG(ascii) \
-	if(argo_debug[ascii]) { 
+	if(argo_debug[ascii]) {
 #define ENDDEBUG  ; }
 
 #else  /* ARGO_DEBUG */
@@ -121,7 +121,7 @@ unsigned char	argo_debug[128];
 #endif /* ARGO_DEBUG */
 
 /***********************************************
- * ASSERT 
+ * ASSERT
  **********************************************/
 #ifdef ARGO_DEBUG
 
@@ -162,19 +162,19 @@ if( !(phrase) ) printf("ASSERTION NOT VALID at line %d file %s\n",__LINE__,__FIL
 /* clnp over token ring */
 #define D_ADCOM			'\12'
 /* clnp over the adcom */
-#define D_ISO			'\13'	
+#define D_ISO			'\13'
 /* iso address family */
 #define	D_FORWARD		'\14'
 /* clnp forwarding */
 #define	D_DUMPOUT		'\15'
 /* dump clnp outgoing packets */
-#define	D_DUMPIN		'\16'	
+#define	D_DUMPIN		'\16'
 /* dump clnp input packets */
-#define D_DISCARD		'\17'	
+#define D_DISCARD		'\17'
 /* debug clnp packet discard/er function */
-#define D_FRAG			'\20'	
+#define D_FRAG			'\20'
 /* clnp fragmentation */
-#define	D_REASS			'\21'	
+#define	D_REASS			'\21'
 /* clnp reassembly */
 
 char *clnp_iso_addrp();
@@ -295,4 +295,4 @@ void dump_mbuf();
 
 #endif /* ARGO_DEBUG */
 
-#endif 
+#endif
diff --git a/sys/netiso/clnl.h b/sys/netiso/clnl.h
index 2bc739e..65c536a 100644
--- a/sys/netiso/clnl.h
+++ b/sys/netiso/clnl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnl.h	8.1 (Berkeley) 6/10/93
- * $Id: clnl.h,v 1.2 1994/08/02 07:49:33 davidg Exp $
+ * $Id: clnl.h,v 1.3 1994/08/21 06:14:12 paul Exp $
  */
 
 #ifndef _NETISO_CLNL_H_
@@ -42,13 +42,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
diff --git a/sys/netiso/clnp.h b/sys/netiso/clnp.h
index be162f3..646b6b8 100644
--- a/sys/netiso/clnp.h
+++ b/sys/netiso/clnp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp.h	8.2 (Berkeley) 4/16/94
- * $Id: clnp.h,v 1.2 1994/08/02 07:49:34 davidg Exp $
+ * $Id: clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $
  */
 
 #ifndef _NETISO_CLNP_H_
@@ -42,13 +42,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
@@ -63,7 +63,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.2 1994/08/02 07:49:34 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp.h,v 1.3 1994/08/21 06:14:13 paul Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp.h,v $ */
 
 /* should be config option but cpp breaks with too many #defines */
@@ -129,9 +129,9 @@ struct clnp_segment {
 /*
  *	Clnp fragment reassembly structures:
  *
- *	All packets undergoing reassembly are linked together in 
+ *	All packets undergoing reassembly are linked together in
  *	clnp_fragl structures. Each clnp_fragl structure contains a
- *	pointer to the original clnp packet header, as well as a 
+ *	pointer to the original clnp packet header, as well as a
  *	list of packet fragments. Each packet fragment
  *	is headed by a clnp_frag structure. This structure contains the
  *	offset of the first and last byte of the fragment, as well as
@@ -142,10 +142,10 @@ struct clnp_segment {
  *	NOTE:
  *		The clnp_frag structure is stored in an mbuf immedately preceeding
  *	the fragment data. Since there are words in this struct,
- *	it must be word aligned. 
+ *	it must be word aligned.
  *
  *	NOTE:
- *		All the fragment code assumes that the entire clnp header is 
+ *		All the fragment code assumes that the entire clnp header is
  *	contained in the first mbuf.
  */
 struct clnp_frag {
@@ -237,9 +237,9 @@ struct clnp_optidx {
 #define CLNPSRCRT_CADDR(oidx, options)\
 	((caddr_t)(CLNP_OFFTOOPT(options, oidx->cni_srcrt_s) + CLNPSRCRT_OFF(oidx, options)))
 
-/* 
+/*
  *	return true if the src route has run out of routes
- *	this is true if the offset of next route is greater than the end of the rt 
+ *	this is true if the offset of next route is greater than the end of the rt
  */
 #define	CLNPSRCRT_TERM(oidx, options)\
 	(CLNPSRCRT_OFF(oidx, options) > oidx->cni_srcrt_len)
@@ -274,7 +274,7 @@ struct clnp_optidx {
 #define CLNPOVAL_COMPRT		0x01	/* complete source routing */
 
 /*
- *	Clnp flags used in a control block flags field. 
+ *	Clnp flags used in a control block flags field.
  *	NOTE: these must be out of the range of bits defined in ../net/raw_cb.h
  */
 #define	CLNP_NO_SEG		0x010	/* segmentation not permitted */
@@ -289,7 +289,7 @@ struct clnp_optidx {
 #define CLNP_VFLAGS		(CLNP_SEND_RAW|CLNP_NO_SEG|CLNP_NO_ER|CLNP_NO_CKSUM\
 	|CLNP_ECHO|CLNP_NOCACHE|CLNP_ECHOR)
 
-/* 
+/*
  *	Constants used by clnp
  */
 #define	CLNP_HDR_MIN	(sizeof (struct clnp_fixed))
diff --git a/sys/netiso/clnp_debug.c b/sys/netiso/clnp_debug.c
index d389834..52d6f04 100644
--- a/sys/netiso/clnp_debug.c
+++ b/sys/netiso/clnp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.1.1.1 1994/05/24 10:07:26 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_debug.c,v 1.2 1994/08/02 07:49:35 davidg Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_debug.c,v $ */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ SOFTWARE.
 #ifdef	TESTDEBUG
 #ifdef notdef
 struct addr_37 u_37 = {
-	{0x00, 0x02, 0x00, 0x10, 0x20, 0x30, 0x35}, 
+	{0x00, 0x02, 0x00, 0x10, 0x20, 0x30, 0x35},
 	{0x01, 0x02, 0x03, 0x04, 0x50, 0x60, 0x70, 0x80, 0x90}
 };
 struct addr_osinet u_osinet = {
@@ -156,7 +156,7 @@ char	*where;		/* where to put data */
 }
 
 /*
- *	Return a ptr to a human readable form of an iso addr 
+ *	Return a ptr to a human readable form of an iso addr
  */
 static char iso_addr_b[50];
 #define	DELIM	'.';
@@ -187,7 +187,7 @@ struct iso_addr *isoa;
 			*cp++ = DELIM;
 			cp = clnp_hexp(isoa->t37_dsp, ADDR37_DSP_LEN, cp);
 			break;
-		
+
 /* 		case AFI_OSINET:*/
 		case AFI_RFC986: {
 			u_short	idi;
@@ -212,7 +212,7 @@ struct iso_addr *isoa;
 				cp = clnp_hexp(&o986->o986_vers, 1, cp);
 				*cp++ = DELIM;
 #ifdef  vax
-				sprintf(cp, "%d.%d.%d.%d.%d", 
+				sprintf(cp, "%d.%d.%d.%d.%d",
 				o986->o986_inetaddr[0] & 0xff,
 				o986->o986_inetaddr[1] & 0xff,
 				o986->o986_inetaddr[2] & 0xff,
@@ -231,7 +231,7 @@ struct iso_addr *isoa;
 				cp = clnp_hexp(&o986->o986_upid, 1, cp);
 #endif /* vax */
 			}
-			
+
 		} break;
 
 		default:
@@ -240,7 +240,7 @@ struct iso_addr *isoa;
 	}
 #endif /* notdef */
 	*cp = (char)0;
-	
+
 	return(iso_addr_b);
 }
 
diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c
index 8d70c48..ca12308 100644
--- a/sys/netiso/clnp_er.c
+++ b/sys/netiso/clnp_er.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_er.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_er.c,v 1.2 1994/08/02 07:49:36 davidg Exp $
+ * $Id: clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_er.c,v 1.2 1994/08/02 07:49:36 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_er.c,v 1.3 1994/11/15 14:26:10 bde Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_er.c,v $ */
 
 #include <sys/param.h>
@@ -98,11 +98,11 @@ static struct clnp_fixed er_template = {
  *
  * PURPOSE:			Process an ER pdu.
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_er_input(m, src, reason)
 struct mbuf		*m;		/* ptr to packet itself */
@@ -113,7 +113,7 @@ u_char			reason;	/* reason code of er */
 	extern u_char clnp_protox[];
 
 	IFDEBUG(D_CTLINPUT)
-		printf("clnp_er_input: m x%x, src %s, reason x%x\n", m, 
+		printf("clnp_er_input: m x%x, src %s, reason x%x\n", m,
 			clnp_iso_addrp(src), reason);
 	ENDDEBUG
 
@@ -122,29 +122,29 @@ u_char			reason;	/* reason code of er */
 		case GEN_NOREAS:
 		case GEN_PROTOERR:
 			break;
-		case GEN_BADCSUM:		
+		case GEN_BADCSUM:
 			cmd = PRC_PARAMPROB;
 			break;
-		case GEN_CONGEST:		
+		case GEN_CONGEST:
 			cmd = PRC_QUENCH;
 			break;
-		case GEN_HDRSYNTAX:		
+		case GEN_HDRSYNTAX:
 			cmd = PRC_PARAMPROB;
 			break;
-		case GEN_SEGNEEDED:		
-			cmd = PRC_MSGSIZE; 
+		case GEN_SEGNEEDED:
+			cmd = PRC_MSGSIZE;
 			break;
-		case GEN_INCOMPLETE:	
-			cmd = PRC_PARAMPROB; 		
+		case GEN_INCOMPLETE:
+			cmd = PRC_PARAMPROB;
 			break;
-		case GEN_DUPOPT:		
-			cmd = PRC_PARAMPROB;		
+		case GEN_DUPOPT:
+			cmd = PRC_PARAMPROB;
 			break;
-		case ADDR_DESTUNREACH:	
-			cmd = PRC_UNREACH_HOST; 	
+		case ADDR_DESTUNREACH:
+			cmd = PRC_UNREACH_HOST;
 			break;
-		case ADDR_DESTUNKNOWN:	
-			cmd = PRC_UNREACH_PROTOCOL; 
+		case ADDR_DESTUNKNOWN:
+			cmd = PRC_UNREACH_PROTOCOL;
 			break;
 		case SRCRT_UNSPECERR:
 		case SRCRT_SYNTAX:
@@ -152,20 +152,20 @@ u_char			reason;	/* reason code of er */
 		case SRCRT_BADPATH:
 			cmd = PRC_UNREACH_SRCFAIL;
 			break;
-		case TTL_EXPTRANSIT:	
-			cmd = PRC_TIMXCEED_INTRANS;	
+		case TTL_EXPTRANSIT:
+			cmd = PRC_TIMXCEED_INTRANS;
 			break;
-		case TTL_EXPREASS:		
-			cmd = PRC_TIMXCEED_REASS;	
+		case TTL_EXPREASS:
+			cmd = PRC_TIMXCEED_REASS;
 			break;
 		case DISC_UNSUPPOPT:
 		case DISC_UNSUPPVERS:
 		case DISC_UNSUPPSECURE:
 		case DISC_UNSUPPSRCRT:
 		case DISC_UNSUPPRECRT:
-			cmd = PRC_PARAMPROB; 
+			cmd = PRC_PARAMPROB;
 			break;
-		case REASS_INTERFERE:	
+		case REASS_INTERFERE:
 			cmd = PRC_TIMXCEED_REASS;
 			break;
 	}
@@ -224,7 +224,7 @@ char					reason;	/* reason for discard */
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Takes responsibility for freeing mbuf passed
  *					This function may be called with a packet that
@@ -260,7 +260,7 @@ char					reason;	/* reason for discard */
 		(clnp->cnf_hdr_len > CLNP_HDR_MAX) ||
 		(clnp->cnf_hdr_len > m->m_len))
 		goto bad;
-	
+
 	/* extract src, dest address */
 	hend = (caddr_t)clnp + clnp->cnf_hdr_len;
 	hoff = (caddr_t)clnp + sizeof(struct clnp_fixed);
@@ -272,14 +272,14 @@ char					reason;	/* reason for discard */
 	if (hoff == (caddr_t)0) {
 		goto bad;
 	}
-	
+
 	/*
 	 *	Do not send ER if we generated the packet.
 	 */
 	if (clnp_ours(&src))
 		goto bad;
 
-	/* 
+	/*
 	 *	Trim mbuf to hold only the header.
 	 *	This mbuf will be the 'data' of the er pdu
 	 */
@@ -308,7 +308,7 @@ char					reason;	/* reason for discard */
 	ENDDEBUG
 
 	IFDEBUG(D_DISCARD)
-		printf("clnp_emit_er: packet routed to %s\n", 
+		printf("clnp_emit_er: packet routed to %s\n",
 			clnp_iso_addrp(&((struct sockaddr_iso *)first_hop)->siso_addr));
 	ENDDEBUG
 
@@ -316,7 +316,7 @@ char					reason;	/* reason for discard */
 	MGET(m0, M_DONTWAIT, MT_HEADER);
 	if (m0 == 0)
 		goto bad;
-	
+
 	m0->m_next = m;
 	er = mtod(m0, struct clnp_fixed *);
 	*er = er_template;
@@ -349,7 +349,7 @@ char					reason;	/* reason for discard */
 	/* trim packet if too large for interface */
 	if (total_len > ifp->if_mtu)
 		m_adj(m0, -(total_len - ifp->if_mtu));
-	
+
 	/* send packet */
 	INCSTAT(cns_er_outhist[clnp_er_index(reason)]);
 	(void) (*ifp->if_output)(ifp, m0, first_hop, route.ro_rt);
diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c
index 50e13d4..69c92a5 100644
--- a/sys/netiso/clnp_frag.c
+++ b/sys/netiso/clnp_frag.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_frag.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.1.1.1 1994/05/24 10:07:25 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_frag.c,v 1.2 1994/08/02 07:49:37 davidg Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_frag.c,v $ */
 
 #include <sys/param.h>
@@ -96,12 +96,12 @@ struct mbuf	*clnp_comp_pdu();
  * RETURNS:			success - 0
  *					failure - unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			If there is an error sending the packet, clnp_discard
  *					is called to discard the packet and send an ER. If
  *					clnp_fragment was called from clnp_output, then
- *					we generated the packet, and should not send an 
+ *					we generated the packet, and should not send an
  *					ER -- clnp_emit_er will check for this. Otherwise,
  *					the packet was fragmented during forwarding. In this
  *					case, we ought to send an ER back.
@@ -153,20 +153,20 @@ struct rtentry *rt;			/* route if direct ether */
 				int tot_mlen = 0;
 				printf("clnp_fragment: total_len %d:\n", total_len);
 				while (mdump != NULL) {
-					printf("\tmbuf x%x, m_len %d\n", 
+					printf("\tmbuf x%x, m_len %d\n",
 						mdump, mdump->m_len);
 					tot_mlen += mdump->m_len;
 					mdump = mdump->m_next;
 				}
 				printf("clnp_fragment: sum of mbuf chain %d:\n", tot_mlen);
 			ENDDEBUG
-			
+
 			frag_size = min(total_len, frag_size);
 			if ((remaining = total_len - frag_size) == 0)
 				last_frag = 1;
 			else {
 				/*
-				 *  If this fragment will cause the last one to 
+				 *  If this fragment will cause the last one to
 				 *	be less than 8 bytes, shorten this fragment a bit.
 				 *  The obscure test on frag_size above ensures that
 				 *  frag_size will be positive.
@@ -175,17 +175,17 @@ struct rtentry *rt;			/* route if direct ether */
 				if (remaining < 8)
 						frag_size -= 8;
 			}
-			
+
 
 			IFDEBUG(D_FRAG)
-				printf("clnp_fragment: seg off %d, size %d, remaining %d\n", 
+				printf("clnp_fragment: seg off %d, size %d, remaining %d\n",
 					ntohs(seg_part.cng_off), frag_size, total_len-frag_size);
 				if (last_frag)
 					printf("clnp_fragment: last fragment\n");
 			ENDDEBUG
 
 			if (last_frag) {
-				/* 
+				/*
 				 *	this is the last fragment; we don't need to get any other
 				 *	mbufs.
 				 */
@@ -210,7 +210,7 @@ struct rtentry *rt;			/* route if direct ether */
 
 			if (!last_frag)
 				clnp->cnf_type |= CNF_MORE_SEGS;
-			
+
 			/* link together */
 			m_cat(frag_hdr, frag_data);
 
@@ -248,7 +248,7 @@ struct rtentry *rt;			/* route if direct ether */
 #endif	/* TROLL */
 
 			/*
-			 *	Tough situation: if the error occured on the last 
+			 *	Tough situation: if the error occured on the last
 			 *	fragment, we can not send an ER, as the if_output
 			 *	routine consumed the packet. If the error occured
 			 *	on any intermediate packets, we can send an ER
@@ -256,7 +256,7 @@ struct rtentry *rt;			/* route if direct ether */
 			 */
 			if (error) {
 				if (frag_hdr != hdr) {
-					/* 
+					/*
 					 *	The error was not on the last fragment. We must
 					 *	free hdr and m before returning
 					 */
@@ -278,7 +278,7 @@ struct rtentry *rt;			/* route if direct ether */
 			if ((trollctl.tr_ops & TR_DUPEND) && (!last_frag)) {
 				int num_bytes = frag_size;
 
-				if (trollctl.tr_dup_size > 0) 
+				if (trollctl.tr_dup_size > 0)
 					num_bytes *= trollctl.tr_dup_size;
 				else
 					num_bytes *= troll_random();
@@ -309,16 +309,16 @@ struct rtentry *rt;			/* route if direct ether */
  *					are present), then return a pointer to an mbuf chain
  *					containing the reassembled packet. This packet will
  *					appear in the mbufs as if it had just arrived in
- *					one piece. 
+ *					one piece.
  *
  *					If reassembly fails, then save this fragment and
  *					return 0.
  *
  * RETURNS:			Ptr to assembled packet, or 0
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  *		clnp_slowtimo can not affect this code because clnpintr, and thus
  *		this code, is called at a higher priority than clnp_slowtimo.
  */
@@ -334,7 +334,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 	/* look for other fragments of this datagram */
 	for (cfh = clnp_frags; cfh != NULL; cfh = cfh->cfl_next) {
 		if (seg->cng_id == cfh->cfl_id &&
-		    iso_addrmatch1(src, &cfh->cfl_src) && 
+		    iso_addrmatch1(src, &cfh->cfl_src) &&
 			iso_addrmatch1(dst, &cfh->cfl_dst)) {
 			IFDEBUG(D_REASS)
 				printf("clnp_reass: found packet\n");
@@ -379,7 +379,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
  *
  * RETURNS:			non-zero if it succeeds, zero if fails.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Failure is only due to insufficient resources.
  */
@@ -392,10 +392,10 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 	register struct clnp_fragl		*cfh;
 	register struct clnp_fixed		*clnp;
 	struct mbuf 					*m0;
-	
+
 	clnp = mtod(m, struct clnp_fixed *);
 
-	/* 
+	/*
 	 *	Allocate new clnp fragl structure to act as header of all fragments
 	 *	for this datagram.
 	 */
@@ -405,7 +405,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 	}
 	cfh = mtod(m0, struct clnp_fragl *);
 
-	/* 
+	/*
 	 *	Duplicate the header of this fragment, and save in cfh.
 	 *	Free m0 and return if m_copy does not succeed.
 	 */
@@ -413,7 +413,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 		m_freem(m0);
 		return (0);
 	}
-	
+
 	/* Fill in rest of fragl structure */
 	bcopy((caddr_t)src, (caddr_t)&cfh->cfl_src, sizeof(struct iso_addr));
 	bcopy((caddr_t)dst, (caddr_t)&cfh->cfl_dst, sizeof(struct iso_addr));
@@ -439,7 +439,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			This is the 'guts' of the reassembly algorithm.
  *					Each fragment in this list contains a clnp_frag
@@ -459,7 +459,7 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 	u_short						first;	/* offset of first byte of initial pdu*/
 	u_short						last;	/* offset of last byte of initial pdu */
 	u_short						fraglen;/* length of fragment */
-	
+
 	clnp = mtod(m, struct clnp_fixed *);
 	first = seg->cng_off;
 	CTOH(clnp->cnf_seglen_msb, clnp->cnf_seglen_lsb, fraglen);
@@ -490,12 +490,12 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 			printf("clnp_insert_frag: Previous frag is ");
 			if (cf_prev == NULL)
 				printf("NULL\n");
-			else 
+			else
 				printf("[%d ... %d]\n", cf_prev->cfr_first, cf_prev->cfr_last);
 			printf("clnp_insert_frag: Subsequent frag is ");
 			if (cf_sub == NULL)
 				printf("NULL\n");
-			else 
+			else
 				printf("[%d ... %d]\n", cf_sub->cfr_first, cf_sub->cfr_last);
 		ENDDEBUG
 
@@ -569,10 +569,10 @@ struct clnp_segment	*seg;	/* segment part of fragment header */
 	/*
 	 *	Insert the new fragment beween cf_prev and cf_sub
 	 *
-	 *	Note: the clnp hdr is still in the mbuf. 
+	 *	Note: the clnp hdr is still in the mbuf.
 	 *	If the data of the mbuf is not word aligned, shave off enough
 	 *	so that it is. Then, cast the clnp_frag structure on top
-	 *	of the clnp header. 
+	 *	of the clnp header.
 	 *	The clnp_hdr will not be used again (as we already have
 	 *	saved a copy of it).
 	 *
@@ -655,7 +655,7 @@ struct clnp_fragl	*cfh;		/* fragment header */
 
 		IFDEBUG(D_REASS)
 			printf("clnp_comp_pdu: comparing: [%d ... %d] to [%d ... %d]\n",
-				cf->cfr_first, cf->cfr_last, cf_next->cfr_first, 
+				cf->cfr_first, cf->cfr_last, cf_next->cfr_first,
 				cf_next->cfr_last);
 		ENDDEBUG
 
@@ -677,7 +677,7 @@ struct clnp_fragl	*cfh;		/* fragment header */
 				struct mbuf *mdump;
 				int l;
 				printf("clnp_comp_pdu: merging fragments\n");
-				printf("clnp_comp_pdu: 1st: [%d ... %d] (bytes %d)\n", 
+				printf("clnp_comp_pdu: 1st: [%d ... %d] (bytes %d)\n",
 					cf->cfr_first, cf->cfr_last, cf->cfr_bytes);
 				mdump = cf->cfr_data;
 				l = 0;
@@ -687,7 +687,7 @@ struct clnp_fragl	*cfh;		/* fragment header */
 					mdump = mdump->m_next;
 				}
 				printf("\ttotal len: %d\n", l);
-				printf("clnp_comp_pdu: 2nd: [%d ... %d] (bytes %d)\n", 
+				printf("clnp_comp_pdu: 2nd: [%d ... %d] (bytes %d)\n",
 					cf_next->cfr_first, cf_next->cfr_last, cf_next->cfr_bytes);
 				mdump = cf_next->cfr_data;
 				l = 0;
@@ -705,7 +705,7 @@ struct clnp_fragl	*cfh;		/* fragment header */
 			 *	have adjusted the clnp_frag structure away...
 			 */
 			IFDEBUG(D_REASS)
-				printf("clnp_comp_pdu: shaving off %d bytes\n", 
+				printf("clnp_comp_pdu: shaving off %d bytes\n",
 					cf_next_hdr.cfr_bytes);
 			ENDDEBUG
 			m_adj(cf_next_hdr.cfr_data, (int)cf_next_hdr.cfr_bytes);
@@ -792,7 +792,7 @@ static int troll_cnt;
  *
  * RETURNS:			the random number
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			This is based on the clock.
  */
@@ -816,7 +816,7 @@ float troll_random()
  *
  * RETURNS:			0, or unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			The operation of this procedure is regulated by the
  *					troll control structure (Troll).
diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c
index b04ba3b..c67df92 100644
--- a/sys/netiso/clnp_input.c
+++ b/sys/netiso/clnp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_input.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_input.c,v 1.4 1995/03/16 18:15:20 bde Exp $
+ * $Id: clnp_input.c,v 1.5 1995/05/11 00:13:20 wollman Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /a/ncvs/src/sys/netiso/clnp_input.c,v 1.4 1995/03/16 18:15:20 bde Exp $ */
-/* $Source: /a/ncvs/src/sys/netiso/clnp_input.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_input.c,v 1.5 1995/05/11 00:13:20 wollman Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/clnp_input.c,v $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,7 +114,7 @@ int	x25esis_input();
  * SIDE EFFECTS:	fills in clnp_protox table with correct offsets into
  *					the isosw table.
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_init()
 {
@@ -148,9 +148,9 @@ clnp_init()
  *
  * RETURNS:			nothing.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
 clnlintr(void)
@@ -238,7 +238,7 @@ next:
 	/*
 	 *	Drop packet if the length of the header is not reasonable.
 	 */
-	if ((clnl->cnf_hdr_len < CLNP_HDR_MIN) || 
+	if ((clnl->cnf_hdr_len < CLNP_HDR_MIN) ||
 		(clnl->cnf_hdr_len > CLNP_HDR_MAX)) {
 		INCSTAT(cns_badhlen);	/* TODO: use clnl stats */
 		m_freem(m);
@@ -279,9 +279,9 @@ NETISR_SET(NETISR_ISO, clnlintr);
  * RETURNS:			nothing
  *
  * SIDE EFFECTS:	increments fields of clnp_stat structure.
- *					
+ *
  * NOTES:
- *	TODO: I would like to make seg_part a pointer into the mbuf, but 
+ *	TODO: I would like to make seg_part a pointer into the mbuf, but
  *	will it be correctly aligned?
  */
 clnp_input(m, shp)
@@ -301,14 +301,14 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	struct clnp_optidx			oidx, *oidxp = NULL;	/* option index */
 	extern int 					iso_systype;	/* used by ESIS config resp */
 	extern struct sockaddr_iso	blank_siso;		/* used for initializing */
-	int							need_afrin = 0; 
+	int							need_afrin = 0;
 										/* true if congestion experienced */
 										/* which means you need afrin nose */
 										/* spray. How clever! */
 
 	IFDEBUG(D_INPUT)
 		printf(
-		   "clnp_input: proccessing dg; First mbuf m_len %d, m_type x%x, %s\n", 
+		   "clnp_input: proccessing dg; First mbuf m_len %d, m_type x%x, %s\n",
 			m->m_len, m->m_type, IS_CLUSTER(m) ? "cluster" : "normal");
 	ENDDEBUG
 	need_afrin = 0;
@@ -321,7 +321,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 		clnp_discard(m, ADDR_DESTUNREACH);
 		return;
 	}
-	
+
 	INCSTAT(cns_total);
 	clnp = mtod(m, struct clnp_fixed *);
 
@@ -359,11 +359,11 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	CTOH(clnp->cnf_seglen_msb, clnp->cnf_seglen_lsb, seg_len);
 	if ((m = clnp_data_ck(m, seg_len)) == 0)
 		return;
-	
+
 	clnp = mtod(m, struct clnp_fixed *);
 	hend = (caddr_t)clnp + clnp->cnf_hdr_len;
 
-	/* 
+	/*
 	 *	extract the source and destination address
 	 *	drop packet on failure
 	 */
@@ -426,7 +426,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 			errcode = DISC_UNSUPPSECURE;
 
 		/* the er option is valid with ER pdus only */
-		if ((errcode == 0) && (oidxp->cni_er_reason != ER_INVALREAS) && 
+		if ((errcode == 0) && (oidxp->cni_er_reason != ER_INVALREAS) &&
 			((clnp->cnf_type & CNF_TYPE) != CLNP_ER))
 			errcode = DISC_UNSUPPOPT;
 
@@ -452,7 +452,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 			return;
 		}
 	}
-	
+
 	/*
 	 *	check if this packet is for us. if not, then forward
 	 */
@@ -497,7 +497,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 			return;
 		}
 	}
-	
+
 	/*
 	 *	give the packet to the higher layer
 	 *
diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c
index de44ff0..bac8b5b 100644
--- a/sys/netiso/clnp_options.c
+++ b/sys/netiso/clnp_options.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_options.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_options.c,v 1.1.1.1 1994/05/24 10:07:23 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_options.c,v 1.2 1994/08/02 07:49:40 davidg Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_options.c,v $ */
 
 #ifdef ISO
@@ -90,7 +90,7 @@ SOFTWARE.
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			If source routing has been terminated, do nothing.
  */
@@ -111,9 +111,9 @@ struct clnp_optidx	*oidx;		/* ptr to option index */
 	len = CLNPSRCRT_CLEN(oidx, options);
 	bcopy(CLNPSRCRT_CADDR(oidx, options), (caddr_t)&isoa, len);
 	isoa.isoa_len = len;
-		
+
 	IFDEBUG(D_OPTIONS)
-		printf("clnp_update_srcrt: current src rt: %s\n", 
+		printf("clnp_update_srcrt: current src rt: %s\n",
 			clnp_iso_addrp(&isoa));
 	ENDDEBUG
 
@@ -137,9 +137,9 @@ struct clnp_optidx	*oidx;		/* ptr to option index */
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_dooptions(options, oidx, ifp, isoa)
 struct mbuf			*options;	/* ptr to options mbuf */
@@ -173,7 +173,7 @@ struct iso_addr		*isoa;		/* ptr to our address for this ifp */
 		/* proceed only if recording has not been terminated */
 		if (off != 0xff) {
 			int new_addrlen = isoa->isoa_len + 1;
-			/* 
+			/*
 			 *	if there is insufficient room to store the next address,
 			 *	then terminate recording. Plus 1 on isoa_len is for the
 			 *	length byte itself
@@ -211,9 +211,9 @@ struct iso_addr		*isoa;		/* ptr to our address for this ifp */
  *
  * RETURNS:			unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_set_opts(options, data)
 struct mbuf	**options;	/* target for option information */
@@ -239,7 +239,7 @@ struct mbuf	**data;		/* source of option information */
 		 *
 		 *	The QOS parameter is checked for the DECBIT.
 		 */
-		if ((clnp_opt_sanity(*data, mtod(*data, caddr_t), (*data)->m_len, 
+		if ((clnp_opt_sanity(*data, mtod(*data, caddr_t), (*data)->m_len,
 			&dummy) != 0) ||
 				(dummy.cni_securep) ||
 				(dummy.cni_priorp) ||
@@ -257,13 +257,13 @@ struct mbuf	**data;		/* source of option information */
  * FUNCTION:		clnp_opt_sanity
  *
  * PURPOSE:			Check the options (beginning at opts for len bytes) for
- *					sanity. In addition, fill in the option index structure 
+ *					sanity. In addition, fill in the option index structure
  *					in with information about each option discovered.
  *
  * RETURNS:			success (options check out) - 0
  *					failure - an ER pdu error code describing failure
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Each pointer field of the option index is filled in with
  *					the offset from the beginning of the mbuf data, not the
@@ -280,7 +280,7 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 	caddr_t	opts_end;		/* ptr to end of options */
 	u_char	pad = 0, secure = 0, srcrt = 0, recrt = 0, qos = 0, prior = 0;
 							/* flags for catching duplicate options */
-	
+
 	IFDEBUG(D_OPTIONS)
 		printf("clnp_opt_sanity: checking %d bytes of data:\n", len);
 		dump_buf(opts, len);
@@ -302,7 +302,7 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 		/* must have at least 2 bytes per option (opcode and len) */
 		if (opts + 2 > opts_end)
 			return(GEN_INCOMPLETE);
-		
+
 		opcode = *opts++;
 		oplen = *opts++;
 		IFDEBUG(D_OPTIONS)
@@ -381,17 +381,17 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 
 				if (srcrt++)					/* duplicate ? */
 					return(GEN_DUPOPT);
-				/* 
+				/*
 				 *	source route: There must be 2 bytes following the length
 				 *	field: type and offset. The type must be either
 				 *	partial route or complete route. The offset field must
 				 *	be within the option. A single exception is made, however.
-				 *	The offset may be 1 greater than the length. This case 
-				 *	occurs when the last source route record is consumed. 
+				 *	The offset may be 1 greater than the length. This case
+				 *	occurs when the last source route record is consumed.
 				 *	In this case, we ignore the source route option.
 				 *	RAH? You should be able to set offset to 'ff' like in record
 				 *	route!
-				 *	Following this is a series of address fields. 
+				 *	Following this is a series of address fields.
 				 *	Each address field is composed of a (length, address) pair.
 				 *	Insure that the offset and each address length is reasonable
 				 */
@@ -407,13 +407,13 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 				/* type must be partial or complete */
 				if (!((type == CLNPOVAL_PARTRT) || (type == CLNPOVAL_COMPRT)))
 					return(SRCRT_SYNTAX);
-				
+
 				oidx->cni_srcrt_s = CLNP_OPTTOOFF(m, opts);
 				oidx->cni_srcrt_len = oplen;
 
 				opts += offset-1;	/*set opts to first addr in rt */
 
-				/* 
+				/*
 				 *	Offset must be reasonable:
 				 *	less than end of options, or equal to end of options
 				 */
@@ -423,7 +423,7 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 							printf("clnp_opt_sanity: end of src route info\n");
 						ENDDEBUG
 						break;
-					} else 
+					} else
 						return(SRCRT_SYNTAX);
 				}
 
@@ -461,7 +461,7 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 				/* type must be partial or complete */
 				if (!((type == CLNPOVAL_PARTRT) || (type == CLNPOVAL_COMPRT)))
 					return(GEN_HDRSYNTAX);
-				
+
 				/* offset must be reasonable */
 				if ((offset < 0xff) && (opts + offset > record_end))
 					return(GEN_HDRSYNTAX);
@@ -481,10 +481,10 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 				 *	remaining octets indicate actual qos.
 				 */
 				if (((format & 0xc0) == 0) ||	/* high 2 bits zero ? */
-					(((format & 0xc0) != CLNPOVAL_GLOBAL) && 
+					(((format & 0xc0) != CLNPOVAL_GLOBAL) &&
 						((format & 0x3f) > 0))) /* not global,low bits used ? */
 					return(GEN_HDRSYNTAX);
-				
+
 				oidx->cni_qos_formatp = CLNP_OPTTOOFF(m, opts);
 				oidx->cni_qos_len = oplen;
 
@@ -499,7 +499,7 @@ struct clnp_optidx	*oidx;	/* RETURN: filled in with option idx info */
 				 */
 				if (oplen != 1)
 					return(GEN_HDRSYNTAX);
-				
+
 				oidx->cni_priorp = CLNP_OPTTOOFF(m, opts);
 
 				opts += oplen;
diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c
index aa18f89..579d923 100644
--- a/sys/netiso/clnp_output.c
+++ b/sys/netiso/clnp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_output.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_output.c,v 1.2 1994/08/02 07:49:42 davidg Exp $
+ * $Id: clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_output.c,v 1.2 1994/08/02 07:49:42 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_output.c,v 1.3 1994/11/15 14:26:12 bde Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_output.c,v $ */
 
 #include <sys/param.h>
@@ -124,7 +124,7 @@ static struct clnp_fixed echor_template = {
 };
 
 #ifdef	DECBIT
-u_char qos_option[] = {CLNPOVAL_QOS, 1, 
+u_char qos_option[] = {CLNPOVAL_QOS, 1,
 	CLNPOVAL_GLOBAL|CLNPOVAL_SEQUENCING|CLNPOVAL_LOWDELAY};
 #endif	/* DECBIT */
 
@@ -135,7 +135,7 @@ int				clnp_id = 0;		/* id for segmented dgrams */
  *
  * PURPOSE:			output the data in the mbuf as a clnp datagram
  *
- *					The data specified by m0 is sent as a clnp datagram. 
+ *					The data specified by m0 is sent as a clnp datagram.
  *					The mbuf chain m0 will be freed when this routine has
  *					returned.
  *
@@ -144,12 +144,12 @@ int				clnp_id = 0;		/* id for segmented dgrams */
  *					be formatted in the mbuf according to clnp rules. Options
  *					will not be freed.
  *
- *					Datalen specifies the length of the data in m0. 
+ *					Datalen specifies the length of the data in m0.
  *
- *					Src and dst are the addresses for the packet. 
+ *					Src and dst are the addresses for the packet.
  *
- *					If route is non-null, it is used as the route for 
- *					the packet. 
+ *					If route is non-null, it is used as the route for
+ *					the packet.
  *
  *					By default, a DT is sent. However, if flags & CNLP_SEND_ER
  *					then an ER will be sent. If flags & CLNP_SEND_RAW, then
@@ -160,7 +160,7 @@ int				clnp_id = 0;		/* id for segmented dgrams */
  *
  * SIDE EFFECTS:	none
  *
- * NOTES:			
+ * NOTES:
  *					Flags are interpretated as follows:
  *						CLNP_NO_SEG - do not allow this pkt to be segmented.
  *						CLNP_NO_ER  - have pkt request ER suppression.
@@ -207,14 +207,14 @@ int					flags;		/* flags */
 	IFDEBUG(D_OUTPUT)
 		printf("clnp_output: to %s", clnp_iso_addrp(dst));
 		printf(" from %s of %d bytes\n", clnp_iso_addrp(src), datalen);
-		printf("\toptions x%x, flags x%x, isop_clnpcache x%x\n", 
+		printf("\toptions x%x, flags x%x, isop_clnpcache x%x\n",
 			isop->isop_options, flags, isop->isop_clnpcache);
 	ENDDEBUG
 
 	if (isop->isop_clnpcache != NULL) {
 		clcp = mtod(isop->isop_clnpcache, struct clnp_cache *);
 	}
-	
+
 	/*
 	 *	Check if cache is valid ...
 	 */
@@ -354,7 +354,7 @@ int					flags;		/* flags */
 		 *	Don't allow funny lengths on dst; src may be zero in which
 		 *	case we insert the source address based upon the interface
 		 */
-		if ((src->isoa_len > sizeof(struct iso_addr)) || 
+		if ((src->isoa_len > sizeof(struct iso_addr)) ||
 			(dst->isoa_len == 0) ||
 			(dst->isoa_len > sizeof(struct iso_addr))) {
 			m_freem(m0);
@@ -405,7 +405,7 @@ int					flags;		/* flags */
 		} else {
 			IFDEBUG(D_OUTPUT)
 			ENDDEBUG
-			error = clnp_route(dst, &isop->isop_route, flags, 
+			error = clnp_route(dst, &isop->isop_route, flags,
 				&clcp->clc_firsthop, &clcp->clc_ifa);
 		}
 		if (error || (clcp->clc_ifa == 0)) {
@@ -420,13 +420,13 @@ int					flags;		/* flags */
 		clcp->clc_ifp = clcp->clc_ifa->ia_ifp;  /* XXX */
 
 		IFDEBUG(D_OUTPUT)
-			printf("clnp_output: packet routed to %s\n", 
+			printf("clnp_output: packet routed to %s\n",
 				clnp_iso_addrp(
 					&((struct sockaddr_iso *)clcp->clc_firsthop)->siso_addr));
 		ENDDEBUG
-		
+
 		/*
-		 *	If src address is not yet specified, use address of 
+		 *	If src address is not yet specified, use address of
 		 *	interface. NOTE: this will now update the laddr field in
 		 *	the isopcb. Is this desirable? RAH?
 		 */
@@ -514,7 +514,7 @@ int					flags;		/* flags */
 		seg_part.cng_id = htons(clnp_id++);
 		seg_part.cng_off = htons(0);
 		seg_part.cng_tot_len = htons(total_len);
-		(void) bcopy((caddr_t)&seg_part, (caddr_t) clnp + clcp->clc_segoff, 
+		(void) bcopy((caddr_t)&seg_part, (caddr_t) clnp + clcp->clc_segoff,
 			sizeof(seg_part));
 	}
 	if (total_len <= SN_MTU(clcp->clc_ifp, clcp->clc_rt)) {
diff --git a/sys/netiso/clnp_raw.c b/sys/netiso/clnp_raw.c
index df6878c..ade1ba2 100644
--- a/sys/netiso/clnp_raw.c
+++ b/sys/netiso/clnp_raw.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_raw.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.1.1.1 1994/05/24 10:07:22 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_raw.c,v 1.2 1994/08/02 07:49:44 davidg Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_raw.c,v $ */
 
 #include <sys/param.h>
@@ -94,7 +94,7 @@ struct sockproto	rclnp_proto	= { PF_ISO, 0 };
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			The protocol field of rclnp_proto is set to zero indicating
  *					no protocol.
@@ -125,9 +125,9 @@ int					hdrlen; /* length (in bytes) of clnp header */
  * RETURNS:			success - 0
  *					failure - an appropriate error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 rclnp_output(m0, so)
 struct mbuf		*m0;		/* packet to send */
@@ -172,7 +172,7 @@ bad:
  * FUNCTION:		rclnp_ctloutput
  *
  * PURPOSE:			Raw clnp socket option processing
- *					All options are stored inside an mbuf. 
+ *					All options are stored inside an mbuf.
  *
  * RETURNS:			success - 0
  *					failure - unix error code
@@ -180,7 +180,7 @@ bad:
  * SIDE EFFECTS:	If the options mbuf does not exist, it the mbuf passed
  *					is used.
  *
- * NOTES:			
+ * NOTES:
  */
 rclnp_ctloutput(op, so, level, optname, m)
 int				op;				/* type of operation */
@@ -212,14 +212,14 @@ struct mbuf		**m;			/* ptr to ptr to option data */
 			switch (optname) {
 				case CLNPOPT_FLAGS: {
 					u_short	usr_flags;
-					/* 
-					 *	Insure that the data passed has exactly one short in it 
+					/*
+					 *	Insure that the data passed has exactly one short in it
 					 */
 					if ((*m == NULL) || ((*m)->m_len != sizeof(short))) {
 						error = EINVAL;
 						break;
 					}
-					 
+
 					/*
 					 *	Don't allow invalid flags to be set
 					 */
@@ -231,18 +231,18 @@ struct mbuf		**m;			/* ptr to ptr to option data */
 						rp->risop_flags |= usr_flags;
 
 					} break;
-			
+
 				case CLNPOPT_OPTS:
 					if (error = clnp_set_opts(&rp->risop_isop.isop_options, m))
 						break;
 					rp->risop_isop.isop_optindex = m_get(M_WAIT, MT_SOOPTS);
-					(void) clnp_opt_sanity(rp->risop_isop.isop_options, 
+					(void) clnp_opt_sanity(rp->risop_isop.isop_options,
 						mtod(rp->risop_isop.isop_options, caddr_t),
-						rp->risop_isop.isop_options->m_len, 
+						rp->risop_isop.isop_options->m_len,
 						mtod(rp->risop_isop.isop_optindex,
 							struct clnp_optidx *));
 					break;
-			} 
+			}
 			break;
 
 		case PRCO_GETOPT:
@@ -264,7 +264,7 @@ struct mbuf		**m;			/* ptr to ptr to option data */
 		m_freem(*m);
 		*m = NULL;
 	}
-	
+
 	return error;
 }
 
@@ -301,7 +301,7 @@ clnp_usrreq(so, req, m, nam, control)
 			rp->risop_rcb.rcb_laddr = 0;
 		/* free clnp cached hdr if necessary */
 		if (rp->risop_isop.isop_clnpcache != NULL) {
-			struct clnp_cache *clcp = 
+			struct clnp_cache *clcp =
 				mtod(rp->risop_isop.isop_clnpcache, struct clnp_cache *);
 			if (clcp->clc_hdr != NULL) {
 				m_free(clcp->clc_hdr);
diff --git a/sys/netiso/clnp_stat.h b/sys/netiso/clnp_stat.h
index 3361342..a6cdd04 100644
--- a/sys/netiso/clnp_stat.h
+++ b/sys/netiso/clnp_stat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_stat.h	8.1 (Berkeley) 6/10/93
- * $Id: clnp_stat.h,v 1.2 1994/08/02 07:49:47 davidg Exp $
+ * $Id: clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp $
  */
 
 #ifndef _NETISO_CLNP_STAT_H_
@@ -42,13 +42,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
@@ -63,7 +63,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.2 1994/08/02 07:49:47 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_stat.h,v 1.3 1994/08/21 06:14:13 paul Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_stat.h,v $ */
 
 struct clnp_stat {
@@ -100,4 +100,4 @@ struct clnp_stat {
 #endif /* INCSTAT */
 #define INCSTAT(x) clnp_stat./**/x/**/++
 
-#endif 
+#endif
diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c
index 29a2ab1..138871e 100644
--- a/sys/netiso/clnp_subr.c
+++ b/sys/netiso/clnp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.1.1.1 1994/05/24 10:07:20 rgrimes Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_subr.c,v 1.2 1994/08/02 07:49:50 davidg Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_subr.c,v $ */
 
 #ifdef ISO
@@ -97,9 +97,9 @@ SOFTWARE.
  * RETURNS:			success - ptr to mbuf chain
  *					failure - 0
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 struct mbuf *
 clnp_data_ck(m, length)
@@ -139,13 +139,13 @@ int						length;	/* length (in bytes) of packet */
  *					supplied buffer. Place them in the supplied address buffers.
  *					If insufficient data is supplied, then fail.
  *
- * RETURNS:			success - Address of first byte in the packet past 
+ * RETURNS:			success - Address of first byte in the packet past
  *						the address part.
  *					failure - 0
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 caddr_t
 clnp_extract_addr(bufp, buflen, srcp, destp)
@@ -156,7 +156,7 @@ register struct iso_addr	*destp;		/* ptr to destination address buffer */
  {
 	int	len;		/* argument to bcopy */
 
-	/* 
+	/*
 	 *	check that we have enough data. Plus1 is for length octet
 	 */
 	if ((u_char)*bufp + 1 > buflen) {
@@ -167,7 +167,7 @@ register struct iso_addr	*destp;		/* ptr to destination address buffer */
 	buflen -= len;
 	bufp += len;
 
-	/* 
+	/*
 	 *	check that we have enough data. Plus1 is for length octet
 	 */
 	if ((u_char)*bufp + 1 > buflen) {
@@ -196,9 +196,9 @@ register struct iso_addr	*destp;		/* ptr to destination address buffer */
  * RETURNS:			packet is for us - 1
  *					packet is not for us - 0
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_ours(dst)
 register struct iso_addr *dst;		/* ptr to destination address */
@@ -207,7 +207,7 @@ register struct iso_addr *dst;		/* ptr to destination address */
 
 	for (ia = iso_ifaddr; ia; ia = ia->ia_next) {
 		IFDEBUG(D_ROUTE)
-			printf("clnp_ours: ia_sis x%x, dst x%x\n", &ia->ia_addr, 
+			printf("clnp_ours: ia_sis x%x, dst x%x\n", &ia->ia_addr,
 				dst);
 		ENDDEBUG
 		/*
@@ -237,9 +237,9 @@ int congest_threshold = 0;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_forward(m, len, dst, oidx, seg_off, inbound_shp)
 struct mbuf			*m;		/* pkt to forward */
@@ -313,7 +313,7 @@ struct snpa_hdr		*inbound_shp;	/* subnetwork header of inbound packet */
 	ifp = ia->ia_ifp;
 
 	IFDEBUG(D_FORWARD)
-		printf("clnp_forward: packet routed to %s\n", 
+		printf("clnp_forward: packet routed to %s\n",
 			clnp_iso_addrp(&((struct sockaddr_iso *)next_hop)->siso_addr));
 	ENDDEBUG
 
@@ -322,10 +322,10 @@ struct snpa_hdr		*inbound_shp;	/* subnetwork header of inbound packet */
 	/*
 	 *	If we are an intermediate system and
 	 *	we are routing outbound on the same ifp that the packet
-	 *	arrived upon, and we know the next hop snpa, 
+	 *	arrived upon, and we know the next hop snpa,
 	 *	then generate a redirect request
 	 */
-	if ((iso_systype & SNPA_IS) && (inbound_shp) && 
+	if ((iso_systype & SNPA_IS) && (inbound_shp) &&
 		(ifp == inbound_shp->snh_ifp))
 		    esis_rdoutput(inbound_shp, m, oidx, dst, route.ro_rt);
 	/*
@@ -365,7 +365,7 @@ struct snpa_hdr		*inbound_shp;	/* subnetwork header of inbound packet */
 		}
 	}
 #endif	/* DECBIT */
-	
+
 	/*
 	 *	Dispatch the datagram if it is small enough, otherwise fragment
 	 */
@@ -375,7 +375,7 @@ struct snpa_hdr		*inbound_shp;	/* subnetwork header of inbound packet */
 	} else {
 		(void) clnp_fragment(ifp, m, next_hop, len, seg_off, /* flags */0, route.ro_rt);
 	}
-	
+
 done:
 	/*
 	 *	Free route
@@ -393,7 +393,7 @@ done:
  *
  * RETURNS:			Address of first byte after address part in datagram.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Assume that there is enough space for the address part.
  */
@@ -419,7 +419,7 @@ register struct iso_addr	*dstp;	/* ptr to dst addr */
 /*
  * FUNCTION:		clnp_route
  *
- * PURPOSE:			Route a clnp datagram to the first hop toward its 
+ * PURPOSE:			Route a clnp datagram to the first hop toward its
  *					destination. In many cases, the first hop will be
  *					the destination. The address of a route
  *					is specified. If a routing entry is present in
@@ -430,7 +430,7 @@ register struct iso_addr	*dstp;	/* ptr to dst addr */
  * RETURNS:			route found - 0
  *					unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			It is up to the caller to free the routing entry
  *					allocated in route.
@@ -525,7 +525,7 @@ clnp_route(dst, ro, flags, first_hop, ifa)
  *
  * RETURNS:			0 or unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Remember that option index pointers are really
  *					offsets from the beginning of the mbuf.
@@ -542,7 +542,7 @@ struct iso_addr		*final_dst;		/* final destination */
 	int				error = 0;	/* return code */
 
 	/*
-	 *	Check if we have run out of routes 
+	 *	Check if we have run out of routes
 	 *	If so, then try to route on destination.
 	 */
 	if CLNPSRCRT_TERM(oidx, options) {
@@ -562,7 +562,7 @@ struct iso_addr		*final_dst;		/* final destination */
 	error = clnp_route(&dst, ro, 0, first_hop, ifa);
 	if (error != 0)
 		return error;
-	
+
 	/*
 	 *	If complete src rt, first hop must be equal to dst
 	 */
@@ -573,7 +573,7 @@ struct iso_addr		*final_dst;		/* final destination */
 		ENDDEBUG
 		return EHOSTUNREACH; /* RAH? would like ESRCRTFAILED */
 	}
-	
+
 	return error;
 }
 
@@ -584,7 +584,7 @@ struct iso_addr		*final_dst;		/* final destination */
  *
  * RETURNS:			result of clnp_output
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  */
 clnp_echoreply(ec_m, ec_len, ec_src, ec_dst, ec_oidxp)
 struct mbuf			*ec_m;		/* echo request */
@@ -644,7 +644,7 @@ char *file;			/* where the dirty deed occured */
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			No attempt has been made to make this efficient
  */
diff --git a/sys/netiso/clnp_timer.c b/sys/netiso/clnp_timer.c
index f104f52..401d358 100644
--- a/sys/netiso/clnp_timer.c
+++ b/sys/netiso/clnp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clnp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: clnp_timer.c,v 1.2 1994/08/02 07:49:52 davidg Exp $
+ * $Id: clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.2 1994/08/02 07:49:52 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/clnp_timer.c,v 1.3 1994/11/15 14:26:13 bde Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/clnp_timer.c,v $ */
 
 #include <sys/param.h>
@@ -89,9 +89,9 @@ extern struct clnp_fragl *clnp_frags;
  *
  * RETURNS:			pointer to next fragment in list of fragments
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  *			TODO: send ER back to source
  */
 struct clnp_fragl *
@@ -136,14 +136,14 @@ register struct clnp_fragl	*cfh;	/* fragment header to delete */
 /*
  * FUNCTION:		clnp_slowtimo
  *
- * PURPOSE:			clnp timer processing; if the ttl expires on a 
+ * PURPOSE:			clnp timer processing; if the ttl expires on a
  *					packet on the reassembly queue, discard it.
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 clnp_slowtimo()
 {
@@ -168,9 +168,9 @@ clnp_slowtimo()
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  *	TODO: should send back ER
  */
 clnp_drain()
diff --git a/sys/netiso/cltp_usrreq.c b/sys/netiso/cltp_usrreq.c
index ef4c703..7b95f93 100644
--- a/sys/netiso/cltp_usrreq.c
+++ b/sys/netiso/cltp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cltp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: cltp_usrreq.c,v 1.2 1994/08/02 07:49:55 davidg Exp $
+ * $Id: cltp_usrreq.c,v 1.3 1994/11/15 14:26:14 bde Exp $
  */
 
 #ifndef CLTPOVAL_SRC /* XXX -- till files gets changed */
@@ -104,7 +104,7 @@ cltp_input(m0, srcsa, dstsa, cons_channel, output)
 		bcopy((caddr_t)up + 2, TSEL(src), up[1]);
 		up += 2 + src->siso_tlen;
 		continue;
-	
+
 	case CLTPOVAL_DST:
 		dtsap = 2 + (caddr_t)up;
 		dlen = up[1];
diff --git a/sys/netiso/cons.h b/sys/netiso/cons.h
index 60b4996..ecaa374 100644
--- a/sys/netiso/cons.h
+++ b/sys/netiso/cons.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons.h	8.1 (Berkeley) 6/10/93
- * $Id: cons.h,v 1.2 1994/08/02 07:50:00 davidg Exp $
+ * $Id: cons.h,v 1.3 1994/08/21 06:14:15 paul Exp $
  */
 
 #ifndef _NETISO_CONS_H_
@@ -42,13 +42,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
@@ -64,7 +64,7 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/cons.h,v 1.2 1994/08/02 07:50:00 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/cons.h,v 1.3 1994/08/21 06:14:15 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/cons.h,v $
  *
  * interface between TP and CONS
diff --git a/sys/netiso/cons_pcb.h b/sys/netiso/cons_pcb.h
index 95ac89f..7a3b52f 100644
--- a/sys/netiso/cons_pcb.h
+++ b/sys/netiso/cons_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cons_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: cons_pcb.h,v 1.2 1994/08/02 07:50:03 davidg Exp $
+ * $Id: cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp $
  */
 
 #ifndef _NETISO_CONS_PCB_H_
@@ -42,13 +42,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
@@ -63,7 +63,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.2 1994/08/02 07:50:03 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/cons_pcb.h,v 1.3 1994/08/21 06:14:16 paul Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/cons_pcb.h,v $ */
 
 /*
@@ -102,13 +102,13 @@ struct cons_pcb {
 #define	co_negchanmask _co_isopcb.isop_negchanmask
 #define	co_x25crud _co_isopcb.isop_x25crud
 #define	co_x25crud_len _co_isopcb.isop_x25crud_len
-	u_short 		co_state; 
-	u_char 			co_flags; 
+	u_short 		co_state;
+	u_char 			co_flags;
 	u_short			co_ttl; /* time to live timer */
 	u_short			co_init_ttl; /* initial value of ttl  */
 	int 			co_channel; /* logical channel */
 	struct ifnet *	co_ifp; /* interface */
-	struct protosw *co_proto; 
+	struct protosw *co_proto;
 
 	struct ifqueue 	co_pending; /* queue data to send when connection
 						completes*/
@@ -118,7 +118,7 @@ struct cons_pcb {
 };
 
 /*
- * X.25 Packet types 
+ * X.25 Packet types
  */
 #define XPKT_DATA		1
 #define XPKT_INTERRUPT	2
@@ -184,7 +184,7 @@ struct cons_stat {
 
 u_char x25_error_stats[CONL_ERROR_MAX + 1];
 
-struct ifqueue consintrq; 
+struct ifqueue consintrq;
 
 /* reasons for clear are in a data mbuf chained to a clear ecn_request */
 struct e_clear_data 				{
diff --git a/sys/netiso/eonvar.h b/sys/netiso/eonvar.h
index edbc46d..8b00532 100644
--- a/sys/netiso/eonvar.h
+++ b/sys/netiso/eonvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eonvar.h	8.1 (Berkeley) 6/10/93
- * $Id: eonvar.h,v 1.2 1994/08/02 07:50:06 davidg Exp $
+ * $Id: eonvar.h,v 1.3 1994/08/21 06:14:17 paul Exp $
  */
 
 #ifndef _NETISO_EONVAR_H_
@@ -42,13 +42,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
@@ -73,9 +73,9 @@ SOFTWARE.
 #define E_LINK	2
 #define E_ES 	3
 #define E_IS 	4
- 
 
-/* 
+
+/*
  * this overlays a sockaddr_iso
  */
 
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index 8860932..f62de5d 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.c	8.1 (Berkeley) 6/10/93
- * $Id: esis.c,v 1.2 1994/08/02 07:50:09 davidg Exp $
+ * $Id: esis.c,v 1.3 1994/12/13 22:33:03 wollman Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -124,9 +124,9 @@ extern char		all_es_snpa[], all_is_snpa[];
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_init()
 {
@@ -156,7 +156,7 @@ esis_init()
  *
  * RETURNS:			0 or appropriate errno
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  */
 /*ARGSUSED*/
@@ -238,9 +238,9 @@ release:
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_input(m0, shp)
 struct mbuf		*m0;		/* ptr to first mbuf of pkt */
@@ -294,7 +294,7 @@ bad:
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Assumes there is enough space for fixed part of header,
  *					DA, BSNPA and NET in first mbuf.
@@ -366,14 +366,14 @@ 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
 	 */
 	/* PHASE2 use mask from ifp of outgoing interface */
 	if (!iso_addrmatch1(rd_dstnsap, rd_gwnsap)) {
-		/* this should not happen: 
+		/* 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");
 			m_freem(m0);
@@ -392,7 +392,7 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 	 *	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
 	 */
@@ -411,7 +411,7 @@ 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
 		 */
@@ -426,7 +426,7 @@ struct rtentry		*rt;			/* snpa cache info regarding next hop of
 			cp += 3;
 		}
 		if (inbound_oidx->cni_securep) {
-			bcopy(mtod(inbound_m, caddr_t) + inbound_oidx->cni_securep - 2, cp, 
+			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;
 		}
@@ -485,7 +485,7 @@ int							nsellen;
 	    if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
 int ESHonly = 0;
 /*
- 
+
 /*
  * FUNCTION:		esis_eshinput
  *
@@ -493,9 +493,9 @@ int ESHonly = 0;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_eshinput(m, shp)
 struct mbuf		*m;	/* esh pdu */
@@ -544,7 +544,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 			if (nsellength != 0) for (buf2 = buf; buf2 < buflim;) {
 				ESIS_EXTRACT_ADDR(nsap2, buf2);
 				IFDEBUG(D_ESISINPUT)
-					printf("esis_eshinput: comparing %s ", 
+					printf("esis_eshinput: comparing %s ",
 						clnp_iso_addrp(nsap));
 					printf("and %s\n", clnp_iso_addrp(nsap2));
 				ENDDEBUG
@@ -560,7 +560,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 		}
 	}
 	IFDEBUG(D_ESISINPUT)
-		printf("esis_eshinput: nsap %s is %s\n", 
+		printf("esis_eshinput: nsap %s is %s\n",
 			clnp_iso_addrp(nsap), new_entry ? "new" : "old");
 	ENDDEBUG
 	if (new_entry && (iso_systype & SNPA_IS))
@@ -575,11 +575,11 @@ bad:
  *
  * PURPOSE:			process an incoming ISH pdu
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_ishinput(m, shp)
 struct mbuf		*m;	/* esh pdu */
@@ -617,7 +617,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 				esis_config();
 			}
 			break;
-		
+
 		default:
 			printf("Unknown ISH option: %x\n", *buf);
 		}
@@ -625,12 +625,12 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	}
 	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", 
+		printf("esis_ishinput: nsap %s is %s\n",
 			clnp_iso_addrp(nsap), new_entry ? "new" : "old");
 	ENDDEBUG
 
 	if (new_entry)
-		esis_shoutput(shp->snh_ifp, 
+		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:
@@ -642,11 +642,11 @@ bad:
  *
  * PURPOSE:			Process an incoming RD pdu
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_rdinput(m0, shp)
 struct mbuf		*m0;	/* esh pdu */
@@ -737,9 +737,9 @@ bad: ;    /* Needed by ESIS_NEXT_OPTION */
  *
  * PURPOSE:			Report configuration
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Called every esis_config_time seconds
  */
@@ -750,8 +750,8 @@ esis_config()
 
 	timeout(esis_config, (caddr_t)0, hz * esis_config_time);
 
-	/* 
-	 *	Report configuration for each interface that 
+	/*
+	 *	Report configuration for each interface that
 	 *	- is UP
 	 *	- has BROADCAST capability
 	 *	- has an ISO address
@@ -761,7 +761,7 @@ esis_config()
 	 * a method in the iso_ifaddr structure to encapsulate and
 	 * transmit it.  This could work to advantage for non-broadcast media
 	 */
-	
+
 	for (ifp = ifnet; ifp; ifp = ifp->if_next) {
 		if ((ifp->if_flags & IFF_UP) &&
 		    (ifp->if_flags & IFF_BROADCAST)) {
@@ -770,10 +770,10 @@ esis_config()
 
 			for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
 				if (ia->ifa_addr->sa_family == AF_ISO) {
-					esis_shoutput(ifp, 
+					esis_shoutput(ifp,
 						iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
 						esis_holding_time,
-						(caddr_t)(iso_systype & SNPA_ES ? all_is_snpa : 
+						(caddr_t)(iso_systype & SNPA_ES ? all_is_snpa :
 						all_es_snpa), 6, (struct iso_addr *)0);
 					break;
 				}
@@ -789,9 +789,9 @@ esis_config()
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 esis_shoutput(ifp, type, ht, sn_addr, sn_len, isoa)
 struct ifnet	*ifp;
@@ -811,7 +811,7 @@ struct	iso_addr *isoa;
 
 	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");
@@ -865,7 +865,7 @@ struct	iso_addr *isoa;
 		naddr = 1;
 	}
 	for (ia = iso_ifaddr; ia; ia = ia->ia_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;
 
@@ -881,7 +881,7 @@ struct	iso_addr *isoa;
 			continue;	/* Ditto */
 		}
 		IFDEBUG(D_ESISOUTPUT)
-			printf("esis_shoutput: adding NSAP %s\n", 
+			printf("esis_shoutput: adding NSAP %s\n",
 				clnp_iso_addrp(&ia->ia_addr.siso_addr));
 		ENDDEBUG
 		if (!esis_insert_addr(&cp, &len,
@@ -931,9 +931,9 @@ struct	iso_addr *isoa;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 isis_input(m0, shp)
 struct mbuf		*m0;		/* ptr to first mbuf of pkt */
@@ -948,7 +948,7 @@ struct snpa_hdr	*shp;	/* subnetwork header */
 	IFDEBUG(D_ISISINPUT)
 		int i;
 
-		printf("isis_input: pkt on ifp x%x (%s%d): from:", ifp, 
+		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) ? ':' : ' ');
@@ -1042,7 +1042,7 @@ release:
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Calls snpac_flush for interface specified.
  *					The loop through iso_ifaddr is stupid because
diff --git a/sys/netiso/esis.h b/sys/netiso/esis.h
index 1b864c9..400d120 100644
--- a/sys/netiso/esis.h
+++ b/sys/netiso/esis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)esis.h	8.1 (Berkeley) 6/10/93
- * $Id: esis.h,v 1.2 1994/08/02 07:50:11 davidg Exp $
+ * $Id: esis.h,v 1.3 1994/08/21 06:14:18 paul Exp $
  */
 
 #ifndef _NETISO_ESIS_H_
@@ -42,13 +42,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
@@ -64,7 +64,7 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- *	$Header: /home/ncvs/src/sys/netiso/esis.h,v 1.2 1994/08/02 07:50:11 davidg Exp $
+ *	$Header: /home/ncvs/src/sys/netiso/esis.h,v 1.3 1994/08/21 06:14:18 paul Exp $
  *	$Source: /home/ncvs/src/sys/netiso/esis.h,v $
  */
 
diff --git a/sys/netiso/idrp_usrreq.c b/sys/netiso/idrp_usrreq.c
index b551231..8e3a3d2 100644
--- a/sys/netiso/idrp_usrreq.c
+++ b/sys/netiso/idrp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idrp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: idrp_usrreq.c,v 1.2 1994/08/02 07:50:16 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -79,7 +79,7 @@ idrp_init()
  * FUNCTION and ARGUMENTS:
  * Take a packet (m) from clnp, strip off the clnp header
  * and mke suitable for the idrp socket.
- * No return value.  
+ * No return value.
  */
 idrp_input(m, src, dst)
 	register struct mbuf *m;
diff --git a/sys/netiso/if_cons.c b/sys/netiso/if_cons.c
index 8c519ed..28559b7 100644
--- a/sys/netiso/if_cons.c
+++ b/sys/netiso/if_cons.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_cons.c	8.1 (Berkeley) 6/10/93
- * $Id: if_cons.c,v 1.2 1994/08/02 07:50:20 davidg Exp $
+ * $Id: if_cons.c,v 1.3 1994/12/13 22:33:04 wollman Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -61,18 +61,18 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/if_cons.c,v 1.2 1994/08/02 07:50:20 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/if_cons.c,v 1.3 1994/12/13 22:33:04 wollman Exp $
  * $Source: /home/ncvs/src/sys/netiso/if_cons.c,v $
  *
  * cons.c - Connection Oriented Network Service:
- * including support for a) user transport-level service, 
+ * including support for a) user transport-level service,
  *	b) COSNS below CLNP, and c) CONS below TP.
  */
 
 #ifdef TPCONS
 #ifdef KERNEL
 #ifdef ARGO_DEBUG
-#define Static  
+#define Static
 unsigned LAST_CALL_PCB;
 #else /* ARGO_DEBUG */
 #define Static static
@@ -121,7 +121,7 @@ unsigned LAST_CALL_PCB;
 
 #define DONTCLEAR	 -1
 
-/*********************************************************************	
+/*********************************************************************
  * cons.c - CONS interface to the x.25 layer
  *
  * TODO: figure out what resources we might run out of besides mbufs.
@@ -129,21 +129,21 @@ unsigned LAST_CALL_PCB;
  *  lru x% of the connections, for some parameter x.
  *
  * There are 2 interfaces from above:
- * 1) from TP0: 
+ * 1) from TP0:
  *    cons CO network service
  *    TP associates a transport connection with a network connection.
- * 	  cons_output( isop, m, len, isdgm==0 ) 
+ * 	  cons_output( isop, m, len, isdgm==0 )
  *        co_flags == 0
  * 2) from TP4:
  *	  It's a datagram service, like clnp is. - even though it calls
- *			cons_output( isop, m, len, isdgm==1 ) 
+ *			cons_output( isop, m, len, isdgm==1 )
  *	  it eventually goes through
  *			cosns_output(ifp, m, dst).
- *    TP4 permits multiplexing (reuse, possibly simultaneously) of the 
+ *    TP4 permits multiplexing (reuse, possibly simultaneously) of the
  *	  network connections.
  *    This means that many sockets (many tpcbs) may be associated with
  *    this pklcd, hence cannot have a back ptr from pklcd to a tpcb.
- *        co_flags & CONSF_DGM 
+ *        co_flags & CONSF_DGM
  *    co_socket is null since there may be many sockets that use this pklcd.
  *
 NOTE:
@@ -151,7 +151,7 @@ NOTE:
 NOTE:
 	PVCs could be handled by config-ing a cons with an address and with the
 	IFF_POINTTOPOINT flag on.  This code would then have to skip the
-	connection setup stuff for pt-to-pt links.  
+	connection setup stuff for pt-to-pt links.
 
 
  *********************************************************************/
@@ -205,7 +205,7 @@ nibble_copy(src_octet, src_nibble, dst_octet, dst_nibble, len)
 	register 	unsigned dshift, sshift;
 
 	IFDEBUG(D_CADDR)
-		printf("nibble_copy ( 0x%x, 0x%x, 0x%x, 0x%x 0x%x)\n", 
+		printf("nibble_copy ( 0x%x, 0x%x, 0x%x, 0x%x 0x%x)\n",
 		 src_octet, src_nibble, dst_octet, dst_nibble, len);
 	ENDDEBUG
 #define SHIFT 0x4
@@ -252,7 +252,7 @@ nibble_match( src_octet, src_nibble, dst_octet, dst_nibble, len)
 	u_char		nibble_a, nibble_b;
 
 	IFDEBUG(D_CADDR)
-		printf("nibble_match ( 0x%x, 0x%x, 0x%x, 0x%x 0x%x)\n", 
+		printf("nibble_match ( 0x%x, 0x%x, 0x%x, 0x%x 0x%x)\n",
 		 src_octet, src_nibble, dst_octet, dst_nibble, len);
 	ENDDEBUG
 #define SHIFT 0x4
@@ -294,7 +294,7 @@ cons_init()
 	int tp_incoming(), clnp_incoming();
 
 
-	CLNP_proto = pffindproto(AF_ISO, ISOPROTO_CLNP, SOCK_DGRAM); 
+	CLNP_proto = pffindproto(AF_ISO, ISOPROTO_CLNP, SOCK_DGRAM);
 	X25_proto = pffindproto(AF_ISO, ISOPROTO_X25, SOCK_STREAM);
 	TP_proto = pffindproto(AF_ISO, ISOPROTO_TP0, SOCK_SEQPACKET);
 	IFDEBUG(D_CCONS)
@@ -375,7 +375,7 @@ struct pklcd *lcp;
 			cmd = PRC_ROUTEDEAD;
 		}
 		tpcons_ctlinput(cmd, isop->isop_faddr, isop);
-		if (cmd = PRC_ROUTEDEAD && isop->isop_refcnt == 0) 
+		if (cmd = PRC_ROUTEDEAD && isop->isop_refcnt == 0)
 			iso_pcbdetach(isop);
 	}
 }
@@ -383,7 +383,7 @@ struct pklcd *lcp;
 /*
  * NAME:	cons_connect()
  * CALLED FROM:
- *	tpcons_pcbconnect() when opening a new connection.  
+ *	tpcons_pcbconnect() when opening a new connection.
  * FUNCTION anD ARGUMENTS:
  *  Figures out which device to use, finding a route if one doesn't
  *  already exist.
@@ -411,8 +411,8 @@ cons_connect(isop)
 	IFDEBUG(D_CCONN)
 		printf(
 		"calling make_partial_x25_packet( 0x%x, 0x%x, 0x%x)\n",
-			&lcp->lcd_faddr, &lcp->lcd_laddr, 
-			isop->isop_socket->so_proto->pr_protocol); 
+			&lcp->lcd_faddr, &lcp->lcd_laddr,
+			isop->isop_socket->so_proto->pr_protocol);
 	ENDDEBUG
 	if ((error = make_partial_x25_packet(isop, lcp, m)) == 0)
 		error = pk_connect(lcp, &lcp->lcd_faddr);
@@ -424,7 +424,7 @@ cons_connect(isop)
  */
 
 
-/* 
+/*
  * NAME:	cons_ctlinput()
  * CALLED FROM:
  *  lower layer when ECN_CLEAR occurs : this routine is here
@@ -486,8 +486,8 @@ find_error_reason( xp )
 			case 0x0d:
 			case 0x95: /* RPOA out of order */
 			case 0x15:
-				/* take out bit 8 
-				 * so we don't have to have so many perror entries 
+				/* take out bit 8
+				 * so we don't have to have so many perror entries
 				 */
 				error = (CONL_ERROR_MASK | 0x100 | (cause & ~0x80));
 				goto done;
@@ -497,8 +497,8 @@ find_error_reason( xp )
 
 				error = (CONL_ERROR_MASK | 0x100 | cause);
 				goto done;
-		} 
-	} 
+		}
+	}
 	/* otherwise, a *hopefully* valid perror exists in the e_reason field */
 	error = xp->packet_data;
 	if (error = 0) {
@@ -506,7 +506,7 @@ find_error_reason( xp )
 			pk_decode(xp),
 			cause);
 		error = E_CO_HLI_DISCA;
-	} 
+	}
 
 done:
 	return error;
@@ -530,9 +530,9 @@ done:
  *	  m+1		facil param len (for >2-byte facilities) in octets
  *	  m+2..p	facil param field
  *  q			user data (protocol identification octet)
- * 
  *
- * RETURNS: 
+ *
+ * RETURNS:
  *  0 if OK
  *  E* if failed.
  *
@@ -541,7 +541,7 @@ done:
  * routine knows where to look for it.
  */
 
-#ifdef X25_1984 
+#ifdef X25_1984
 int cons_use_facils = 1;
 #else /* X25_1984  */
 int cons_use_facils = 0;
@@ -589,14 +589,14 @@ make_partial_x25_packet(isop, lcp)
 		return ENOBUFS;
 	buf = mtod(m, caddr_t);
 	ptr = buf;
-	
+
 	/* ptr now points to facil length (len of whole facil field in OCTETS */
 	facil_len = ptr ++;
 	m->m_len = 0;
 	pk_build_facilities(m, &lcp->lcd_faddr, 0);
 
 	IFDEBUG(D_CADDR)
-		printf("make_partial  calling: ptr 0x%x, len 0x%x\n", ptr, 
+		printf("make_partial  calling: ptr 0x%x, len 0x%x\n", ptr,
 				isop->isop_laddr->siso_addr.isoa_len);
 	ENDDEBUG
 	if (cons_use_facils) {
@@ -615,7 +615,7 @@ make_partial_x25_packet(isop, lcp)
 		ptr += len;
 
 		IFDEBUG(D_CADDR)
-			printf("make_partial  called: ptr 0x%x, len 0x%x\n", ptr, 
+			printf("make_partial  called: ptr 0x%x, len 0x%x\n", ptr,
 					isop->isop_faddr->siso_addr.isoa_len);
 		ENDDEBUG
 		*ptr = 0xc9; /* called facility code */
@@ -641,7 +641,7 @@ make_partial_x25_packet(isop, lcp)
 	IFDEBUG(D_CDUMP_REQ)
 		register int i;
 
-		printf("ECN_CONNECT DATA buf 0x%x len %d (0x%x)\n", 
+		printf("ECN_CONNECT DATA buf 0x%x len %d (0x%x)\n",
 			buf, buflen, buflen);
 		for( i=0; i < buflen; ) {
 			printf("+%d: %x %x %x %x    %x %x %x %x\n",
@@ -652,7 +652,7 @@ make_partial_x25_packet(isop, lcp)
 		}
 	ENDDEBUG
 	IFDEBUG(D_CADDR)
-		printf("make_partial returns buf 0x%x size 0x%x bytes\n", 
+		printf("make_partial returns buf 0x%x size 0x%x bytes\n",
 			mtod(m, caddr_t), buflen);
 	ENDDEBUG
 
@@ -668,7 +668,7 @@ make_partial_x25_packet(isop, lcp)
  * NAME:	NSAPtoDTE()
  * CALLED FROM:
  *  make_partial_x25_packet()
- * FUNCTION and ARGUMENTS: 
+ * FUNCTION and ARGUMENTS:
  *  get a DTE address from an NSAP-address (struct sockaddr_iso)
  *  (dst_octet) is the octet into which to begin stashing the DTE addr
  *  (dst_nibble) takes 0 or 1.  1 means begin filling in the DTE addr
@@ -761,7 +761,7 @@ FACILtoNSAP(addr, buf)
 	u_char		buf_len = (len_in_nibbles + 1) >> 1;; /* in bytes */
 
 	IFDEBUG(D_CADDR)
-		printf("FACILtoNSAP( 0x%x, 0x%x, 0x%x )\n", 
+		printf("FACILtoNSAP( 0x%x, 0x%x, 0x%x )\n",
 			buf, buf_len, addr );
 	ENDDEBUG
 
@@ -807,7 +807,7 @@ register struct sockaddr_iso *siso;
  * FUNCTION and ARGUMENTS:
  *  Creates a type 37 NSAP in the sockaddr_iso (addr)
  * 	from a DTE address found in a sockaddr_x25.
- *  
+ *
  * RETURNS:
  *  0 if ok; E* otherwise.
  */
@@ -867,15 +867,15 @@ parse_facil(lcp, isop, buf, buf_len)
 	int 			facil_param_len, facil_len;
 
 	IFDEBUG(D_CADDR)
-		printf("parse_facil(0x%x, 0x%x, 0x%x, 0x%x)\n", 
+		printf("parse_facil(0x%x, 0x%x, 0x%x, 0x%x)\n",
 			lcp, isop, buf, buf_len);
 		dump_buf(buf, buf_len);
 	ENDDEBUG
 
-	/* find the beginnings of the facility fields in buf 
+	/* find the beginnings of the facility fields in buf
 	 * by skipping over the called & calling DTE addresses
 	 * i <- # nibbles in called + # nibbles in calling
-	 * i += 1 so that an odd nibble gets rounded up to even  
+	 * i += 1 so that an odd nibble gets rounded up to even
 	 * before dividing by 2, then divide by two to get # octets
 	 */
 	i = (int)(*ptr >> 4) + (int)(*ptr&0xf);
@@ -919,7 +919,7 @@ parse_facil(lcp, isop, buf, buf_len)
 			case 0x02:  /* throughput class */
 			case 0x03:  case 0x47:  /* CUG shit */
 			case 0x0b:  /* expedited data negot */
-			case 0x01:  /* Fast select or reverse charging 
+			case 0x01:  /* Fast select or reverse charging
 						(example of intelligent protocol design) */
 			case 0x04: 	/* charging info : requesting service */
 			case 0x08: 	/* called line addr modified notification */
@@ -951,7 +951,7 @@ parse_facil(lcp, isop, buf, buf_len)
 		}
 		if (facil_param_len == -1)
 			return E_CO_REG_ICDA;
-		if (facil_param_len == 0) /* variable length */ 
+		if (facil_param_len == 0) /* variable length */
 			facil_param_len = (int)*ptr++; /* 1 + the real facil param */
 		ptr += facil_param_len;
 	}
diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c
index a7cba8e..c8ac599 100644
--- a/sys/netiso/if_eon.c
+++ b/sys/netiso/if_eon.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_eon.c	8.1 (Berkeley) 6/10/93
- * $Id: if_eon.c,v 1.2 1994/08/02 07:50:23 davidg Exp $
+ * $Id: if_eon.c,v 1.3 1995/04/26 18:10:57 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -61,10 +61,10 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/if_eon.c,v 1.2 1994/08/02 07:50:23 davidg Exp $ 
- * $Source: /home/ncvs/src/sys/netiso/if_eon.c,v $ 
+ * $Header: /home/ncvs/src/sys/netiso/if_eon.c,v 1.3 1995/04/26 18:10:57 pst Exp $
+ * $Source: /home/ncvs/src/sys/netiso/if_eon.c,v $
  *
- *	EON rfc 
+ *	EON rfc
  *  Layer between IP and CLNL
  *
  * TODO:
@@ -144,7 +144,7 @@ eonattach()
 	ENDDEBUG
 	ifp->if_unit = 0;
 	ifp->if_name = "eon";
-	ifp->if_mtu = ETHERMTU; 
+	ifp->if_mtu = ETHERMTU;
 		/* since everything will go out over ether or token ring */
 
 	ifp->if_init = eoninit;
@@ -156,7 +156,7 @@ eonattach()
 	ifp->if_flags = IFF_BROADCAST;
 	if_attach(ifp);
 	eonioctl(ifp, SIOCSIFADDR, (caddr_t)ifp->if_addrlist);
-	eon_llinfo.el_qhdr.link = 
+	eon_llinfo.el_qhdr.link =
 		eon_llinfo.el_qhdr.rlink = &(eon_llinfo.el_qhdr);
 
 	IFDEBUG(D_EON)
@@ -169,7 +169,7 @@ eonattach()
  * FUNCTION:		eonioctl
  *
  * PURPOSE:			io controls - ifconfig
- *				need commands to 
+ *				need commands to
  *					link-UP (core addr) (flags: ES, IS)
  *					link-DOWN (core addr) (flags: ES, IS)
  *				must be callable from kernel or user
@@ -237,7 +237,7 @@ caddr_t loc;
 		ro->ro_rt->rt_use++;
 	hdr->ei_ip.ip_dst = sin->sin_addr;
 	hdr->ei_ip.ip_p = IPPROTO_EON;
-	hdr->ei_ip.ip_ttl = MAXTTL;	
+	hdr->ei_ip.ip_ttl = MAXTTL;
 	hdr->ei_eh.eonh_class = class;
 	hdr->ei_eh.eonh_vers = EON_VERSION;
 	hdr->ei_eh.eonh_csum = 0;
@@ -245,12 +245,12 @@ caddr_t loc;
 	mhead.m_len = sizeof(struct eon_hdr);
 	mhead.m_next = 0;
 	IFDEBUG(D_EON)
-		printf("eonoutput : gen csum (0x%x, offset %d, datalen %d)\n", 
+		printf("eonoutput : gen csum (0x%x, offset %d, datalen %d)\n",
 			&mhead,
-			_offsetof(struct eon_hdr, eonh_csum), sizeof(struct eon_hdr)); 
+			_offsetof(struct eon_hdr, eonh_csum), sizeof(struct eon_hdr));
 	ENDDEBUG
-	iso_gen_csum(&mhead, 
-		_offsetof(struct eon_hdr, eonh_csum), sizeof(struct eon_hdr)); 
+	iso_gen_csum(&mhead,
+		_offsetof(struct eon_hdr, eonh_csum), sizeof(struct eon_hdr));
 }
 /*
  * FUNCTION:		eonrtrequest
@@ -343,7 +343,7 @@ eoninit(unit)
  *
  * RETURNS:			unix error code
  *
- * NOTES:			
+ * NOTES:
  *
  */
 eonoutput(ifp, m, dst, rt)
@@ -494,7 +494,7 @@ drop:
 		goto drop;
 	}
 	m->m_data -= sizeof(struct ip);
-		
+
 	IFDEBUG(D_EON)
 		printf("eoninput csum ok class 0x%x\n", eonhdr->eonh_class );
 		printf("eoninput: eon header:\n");
@@ -546,9 +546,9 @@ drop:
 			return;
 		}
 		IF_ENQUEUE(ifq, m);
-		IFDEBUG(D_EON) 
+		IFDEBUG(D_EON)
 			printf(
-	"0x%x enqueued on clnp Q: m_len 0x%x m_type 0x%x m_data 0x%x\n", 
+	"0x%x enqueued on clnp Q: m_len 0x%x m_type 0x%x m_data 0x%x\n",
 				m, m->m_len, m->m_type, m->m_data);
 			dump_buf(mtod(m, caddr_t), m->m_len);
 		ENDDEBUG
diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c
index ce2a573..447fb21 100644
--- a/sys/netiso/iso.c
+++ b/sys/netiso/iso.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.c	8.2 (Berkeley) 11/15/93
- * $Id: iso.c,v 1.2 1994/08/02 07:50:26 davidg Exp $
+ * $Id: iso.c,v 1.3 1995/04/26 18:10:58 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -61,8 +61,8 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/iso.c,v 1.2 1994/08/02 07:50:26 davidg Exp $ 
- * $Source: /home/ncvs/src/sys/netiso/iso.c,v $ 
+ * $Header: /home/ncvs/src/sys/netiso/iso.c,v 1.3 1995/04/26 18:10:58 pst Exp $
+ * $Source: /home/ncvs/src/sys/netiso/iso.c,v $
  *
  * iso.c: miscellaneous routines to support the iso address family
  */
@@ -103,9 +103,9 @@ void	llc_rtrequest();
  *
  * RETURNS:			true if the addrs match, false if they do not
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 iso_addrmatch1(isoaa, isoab)
 register struct iso_addr *isoaa, *isoab;		/* addresses to check */
@@ -127,14 +127,14 @@ register struct iso_addr *isoaa, *isoab;		/* addresses to check */
 		ENDDEBUG
 		return 0;
 	}
-	
+
 #ifdef notdef
 	/* TODO : generalize this to all afis with masks */
 	if(	isoaa->isoa_afi == AFI_37 ) {
 		/* must not compare 2 least significant digits, or for
 		 * that matter, the DSP
 		 */
-		compare_len = ADDR37_IDI_LEN - 1; 
+		compare_len = ADDR37_IDI_LEN - 1;
 	}
 #endif
 
@@ -166,9 +166,9 @@ register struct iso_addr *isoaa, *isoab;		/* addresses to check */
  *
  * RETURNS:			true if the addrs match, false if they do not
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 iso_addrmatch(sisoa, sisob)
 struct sockaddr_iso	*sisoa, *sisob;		/* addresses to check */
@@ -184,9 +184,9 @@ struct sockaddr_iso	*sisoa, *sisob;		/* addresses to check */
  *
  * RETURNS:			true if same net, false if not
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 iso_netmatch(sisoa, sisob)
 struct sockaddr_iso *sisoa, *sisob;
@@ -218,10 +218,10 @@ struct sockaddr_iso *sisoa, *sisob;
  *
  * RETURNS:			The hash value.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			The hash is achieved by exclusive ORing 4 byte
- *					quantities. 
+ *					quantities.
  */
 u_long
 iso_hashchar(buf, len)
@@ -257,7 +257,7 @@ register int		len;		/* length of buffer */
 
 		h ^= l;
 	}
-	
+
 	h ^= (u_long) (len % 4);
 
 	return(h);
@@ -270,9 +270,9 @@ register int		len;		/* length of buffer */
  *
  * RETURNS:			none
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 iso_hash(siso, hp)
 struct sockaddr_iso	*siso;		/* address to perform hash on */
@@ -291,12 +291,12 @@ struct afhash		*hp;		/* RETURN: hash info here */
 		printf("iso_hash: iso_netof: bufsize = %d\n", bufsize);
 	ENDDEBUG
 
-	hp->afh_hosthash = iso_hashchar((caddr_t)&siso->siso_addr, 
+	hp->afh_hosthash = iso_hashchar((caddr_t)&siso->siso_addr,
 		siso->siso_addr.isoa_len);
 
 	IFDEBUG(D_ROUTE)
 		printf("iso_hash: %s: nethash = x%x, hosthash = x%x\n",
-			clnp_iso_addrp(&siso->siso_addr), hp->afh_nethash, 
+			clnp_iso_addrp(&siso->siso_addr), hp->afh_nethash,
 			hp->afh_hosthash);
 	ENDDEBUG
 }
@@ -307,7 +307,7 @@ struct afhash		*hp;		/* RETURN: hash info here */
  *					The network portion of the iso address varies depending
  *					on the type of address. The network portion of the
  *					address will include the IDP. The network portion is:
- *			
+ *
  *						TYPE			DESC
  *					t37					The AFI and x.121 (IDI)
  *					osinet				The AFI, orgid, snetid
@@ -316,7 +316,7 @@ struct afhash		*hp;		/* RETURN: hash info here */
  *
  * RETURNS:			number of bytes placed into buf.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Buf is assumed to be big enough
  */
@@ -350,7 +350,7 @@ caddr_t			buf;		/* RESULT: network portion of address here */
  *	Network portion of OSINET address can only be the IDI. Clearly,
  *	with one x25 interface, one could get to several orgids, and
  *	several snetids.
-				len += (ADDROSINET_IDI_LEN + OVLOSINET_ORGID_LEN + 
+				len += (ADDROSINET_IDI_LEN + OVLOSINET_ORGID_LEN +
 						OVLOSINET_SNETID_LEN);
  */
 				len += ADDROSINET_IDI_LEN;
@@ -692,7 +692,7 @@ iso_ifwithidi(addr)
 				&(((struct sockaddr_iso *)addr)->siso_addr));
 			ENDDEBUG
 
-			if (iso_eqtype(&(IFA_SIS(ifa)->siso_addr), 
+			if (iso_eqtype(&(IFA_SIS(ifa)->siso_addr),
 				&(((struct sockaddr_iso *)addr)->siso_addr))) {
 				IFDEBUG(D_ROUTE)
 					printf("ifa_ifwithidi: ifa found\n");
@@ -711,12 +711,12 @@ iso_ifwithidi(addr)
 /*
  * FUNCTION:		iso_ck_addr
  *
- * PURPOSE:			return true if the iso_addr passed is 
+ * PURPOSE:			return true if the iso_addr passed is
  *					within the legal size limit for an iso address.
  *
  * RETURNS:			true or false
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  */
 iso_ck_addr(isoa)
@@ -737,7 +737,7 @@ struct iso_addr	*isoa;	/* address to check */
  *
  * RETURNS:			true if the addresses are the same type
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			By type, I mean rfc986, t37, or osinet
  *
@@ -751,7 +751,7 @@ struct iso_addr	*isoab;		/* other addr to check */
 	if (isoaa->isoa_afi == isoab->isoa_afi) {
 		if (isoaa->isoa_afi == AFI_37)
 			return(1);
-		else 
+		else
 			return (!bcmp(&isoaa->isoa_u, &isoab->isoa_u, 2));
 	}
 	return(0);
@@ -763,11 +763,11 @@ struct iso_addr	*isoab;		/* other addr to check */
  * PURPOSE:			Find an interface addresss having a given destination
  *					or at least matching the net.
  *
- * RETURNS:			ptr to an interface address 
+ * RETURNS:			ptr to an interface address
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 struct iso_ifaddr *
 iso_localifa(siso)
@@ -820,7 +820,7 @@ iso_localifa(siso)
  *
  * RETURNS:			E*
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			This could embody some of the functions of
  *					rclnp_ctloutput and cons_ctloutput.
@@ -891,7 +891,7 @@ struct mbuf	*m;			/* data for set, buffer for get */
  *
  * PURPOSE:			debugging
  *
- * RETURNS:			nada 
+ * RETURNS:			nada
  *
  */
 dump_isoaddr(s)
@@ -907,7 +907,7 @@ dump_isoaddr(s)
 		/* hack */
 		struct sockaddr_in *sin = (struct sockaddr_in *)s;
 
-		printf("%d.%d.%d.%d: %d", 
+		printf("%d.%d.%d.%d: %d",
 			(sin->sin_addr.s_addr>>24)&0xff,
 			(sin->sin_addr.s_addr>>16)&0xff,
 			(sin->sin_addr.s_addr>>8)&0xff,
diff --git a/sys/netiso/iso.h b/sys/netiso/iso.h
index 089d85e..1ac1f13 100644
--- a/sys/netiso/iso.h
+++ b/sys/netiso/iso.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.1 (Berkeley) 6/10/93
- * $Id: iso.h,v 1.2 1994/08/02 07:50:28 davidg Exp $
+ * $Id: iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $
  */
 
 #ifndef _NETISO_ISO_H_
@@ -42,13 +42,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
@@ -63,19 +63,19 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.2 1994/08/02 07:50:28 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso.h,v 1.3 1994/08/21 06:14:19 paul Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/iso.h,v $ */
 
 /*
  *	Return true if this is a multicast address
- *	This assumes that the bit transmission is lsb first. This 
+ *	This assumes that the bit transmission is lsb first. This
  *	assumption is valid for 802.3 but not 802.5. There is a
  *	kludge to get around this for 802.5 -- see if_lan.c
  *	where subnetwork header is setup.
  */
 #define	IS_MULTICAST(snpa)\
 	((snpa)[0] & 0x01)
-	
+
 /*
  * Protocols
  */
@@ -171,7 +171,7 @@ struct sockaddr_iso {
 #ifdef KERNEL
 
 extern int iso_netmatch();
-extern int iso_hash(); 
+extern int iso_hash();
 extern int iso_addrmatch();
 extern struct iso_ifaddr *iso_iaonnetof();
 extern	struct domain isodomain;
@@ -194,4 +194,4 @@ __END_DECLS
 
 #define _offsetof(t, m) ((int)((caddr_t)&((t *)0)->m))
 
-#endif 
+#endif
diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c
index c95a9b7..19a3b65 100644
--- a/sys/netiso/iso_chksum.c
+++ b/sys/netiso/iso_chksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_chksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
- * $Header: /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.1.1.1 1994/05/24 10:07:12 rgrimes Exp $
+/*
+ * $Header: /home/ncvs/src/sys/netiso/iso_chksum.c,v 1.2 1994/08/02 07:50:31 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/iso_chksum.c,v $
  *
  * ISO CHECKSUM
@@ -73,7 +73,7 @@ SOFTWARE.
  * chains.
  * Furthermore, there is the possibility of wraparound in the running
  * sums after adding up 4102 octets.  In order to avoid doing a mod
- * operation after EACH add, we have restricted this implementation to 
+ * operation after EACH add, we have restricted this implementation to
  * negotiating a maximum of 4096-octets per TPDU (for the transport layer).
  * The routine iso_check_csum doesn't need to know where the checksum
  * octets are.
@@ -111,7 +111,7 @@ SOFTWARE.
  *				 a horrible thing to fiddle with anyway, it probably
  *				 isn't worth it.
  */
-int 
+int
 iso_check_csum(m, len)
 	struct mbuf *m;
 	int len;
@@ -153,7 +153,7 @@ iso_check_csum(m, len)
 	}
 	if ( ((int)c0 % 255) || ((int)c1 % 255) ) {
 		IFDEBUG(D_CHKSUM)
-			printf("BAD iso_check_csum l 0x%x cum 0x%x len 0x%x, i 0x%x", 
+			printf("BAD iso_check_csum l 0x%x cum 0x%x len 0x%x, i 0x%x",
 				l, cum, len, i);
 		ENDDEBUG
 		return ((int)c0 % 255)<<8 | ((int)c1 % 255);
@@ -165,9 +165,9 @@ iso_check_csum(m, len)
  * FUNCTION:	iso_gen_csum
  *
  * PURPOSE:		To generate the checksum of the packet in the mbuf chain (m).
- * 				The first of the 2 (logically) adjacent checksum bytes 
+ * 				The first of the 2 (logically) adjacent checksum bytes
  *				(x and y) go at offset (n).
- * 				(n) is an offset relative to the beginning of the data, 
+ * 				(n) is an offset relative to the beginning of the data,
  *				not the beginning of the mbuf.
  * 				(l) is the length of the total mbuf chain's data.
  * 				Called from tp_emit(), tp_error_emit()
@@ -235,7 +235,7 @@ iso_gen_csum(m,n,l)
 		while(i < cum) {
 			c0 = (c0 + *p);
 			c1 += c0 ;
-			i++; 
+			i++;
 			p++;
 		}
 		m = m->m_next;
@@ -265,13 +265,13 @@ iso_gen_csum(m,n,l)
  *
  * SIDE EFFECTS: none
  *
- * NOTES:		
+ * NOTES:
  */
 
 int
 m_datalen (m)
 	register struct mbuf *m;
-{ 	
+{
 	register int datalen;
 
 	for (datalen = 0; m; m = m->m_next)
@@ -301,7 +301,7 @@ m_compress(in, out)
 			printf("m_compress returning -1: B\n");
 		ENDDEBUG
 		splx(s);
-		return -1; 
+		return -1;
 	}
 	(*out)->m_len = 0;
 	(*out)->m_act = MNULL;
@@ -310,7 +310,7 @@ m_compress(in, out)
 		IFDEBUG(D_REQUEST)
 			printf("m_compress in 0x%x *out 0x%x\n", in, *out);
 			printf("m_compress in: len 0x%x, off 0x%x\n", in->m_len, in->m_data);
-			printf("m_compress *out: len 0x%x, off 0x%x\n", (*out)->m_len, 
+			printf("m_compress *out: len 0x%x, off 0x%x\n", (*out)->m_len,
 				(*out)->m_data);
 		ENDDEBUG
 		if (in->m_flags & M_EXT) {
diff --git a/sys/netiso/iso_errno.h b/sys/netiso/iso_errno.h
index 5c2c3c7..7f03492 100644
--- a/sys/netiso/iso_errno.h
+++ b/sys/netiso/iso_errno.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_errno.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_errno.h,v 1.3 1994/08/21 06:14:20 paul Exp $
+ * $Id: iso_errno.h,v 1.4 1994/11/27 20:58:30 ats Exp $
  */
 
 #ifndef _NETISO_ISO_ERRNO_H_
@@ -42,13 +42,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
@@ -67,7 +67,7 @@ SOFTWARE.
 #define ISO_ERROR_MASK 	0x8000
 #define BSD_ERROR_MASK 	0x0000
 #define	TP_ERROR_MASK	0x8800	/* transport layer */
-#define	CONL_ERROR_MASK	0x8400	/* co network layer */ 
+#define	CONL_ERROR_MASK	0x8400	/* co network layer */
 #define	CLNL_ERROR_MASK	0x8200	/* cl network layer */
 #define TP_ERROR_SNDC	0x10000	/* kludge to force DC's on certain errors */
 
@@ -251,7 +251,7 @@ SOFTWARE.
 #define E_CO_RPOAOOO		(CONL_ERROR_MASK | 0x115)  /* RPOA out of order */
 #define E_CO_NOREVCHG		(CONL_ERROR_MASK | 0x119) /* Revs chg not accepted*/
 #define E_CO_INCOMPAT		(CONL_ERROR_MASK | 0x121) /* Incompatible dest */
-#define E_CO_NOFASTSEL		(CONL_ERROR_MASK | 0x129) 
+#define E_CO_NOFASTSEL		(CONL_ERROR_MASK | 0x129)
 	/* Fast select accpt not subscribed */
 #define E_CO_NOSHIP			(CONL_ERROR_MASK | 0x139)  /* ship absent */
 #define E_CO_GWPROCERR		(CONL_ERROR_MASK | 0x1c1)  /* Gateway-detected err*/
@@ -272,4 +272,4 @@ SOFTWARE.
 
 #define CONL_ERROR_MAX 0x1c3
 
-#endif 
+#endif
diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c
index ad91ff4..613f2c4 100644
--- a/sys/netiso/iso_pcb.c
+++ b/sys/netiso/iso_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -61,7 +61,7 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.1.1.1 1994/05/24 10:07:10 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/iso_pcb.c,v 1.2 1994/08/02 07:50:37 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/iso_pcb.c,v $
  *
  * Iso address family net-layer(s) pcb stuff. NEH 1/29/87
@@ -102,7 +102,7 @@ struct	iso_addr zeroiso_addr = {
  * FUNCTION:		iso_pcballoc
  *
  * PURPOSE:			creates an isopcb structure in an mbuf,
- *					with socket (so), and 
+ *					with socket (so), and
  *					puts it in the queue with head (head)
  *
  * RETURNS:			0 if OK, ENOBUFS if can't alloc the necessary mbuf
@@ -128,7 +128,7 @@ iso_pcballoc(so, head)
 		so->so_pcb = (caddr_t)isop;
 	return 0;
 }
-	
+
 /*
  * FUNCTION:		iso_pcbbind
  *
@@ -144,7 +144,7 @@ iso_pcballoc(so, head)
  *
  * SIDE EFFECTS:	increments head->isop_lport if it allocates a port #
  *
- * NOTES:			
+ * NOTES:
  */
 #define	satosiso(sa)	((struct sockaddr_iso *)(sa))
 int
@@ -200,12 +200,12 @@ iso_pcbbind(isop, nam)
 		IFDEBUG(D_ISO)
 			printf("iso_pcbbind: bind to NOT zeroisoaddr\n");
 		ENDDEBUG
-		for (ia = iso_ifaddr; ia; ia = ia->ia_next) 
+		for (ia = iso_ifaddr; ia; ia = ia->ia_next)
 			if (SAME_ISOADDR(siso, &ia->ia_addr))
 				break;
 		if (ia == 0)
 			return EADDRNOTAVAIL;
-	} 
+	}
 	if (siso->siso_len <= sizeof (isop->isop_sladdr)) {
 		isop->isop_laddr = &isop->isop_sladdr;
 	} else {
@@ -250,14 +250,14 @@ noname:
  * FUNCTION:		iso_pcbconnect
  *
  * PURPOSE:			Make the isopcb (isop) look like it's connected.
- *					In other words, give it the peer address given in 
+ *					In other words, give it the peer address given in
  *					the mbuf * (nam).   Make sure such a combination
  *					of local, peer addresses doesn't already exist
  *					for this protocol.  Internet mentality prevails here,
  *					wherein a src,dst pair uniquely identifies a connection.
- * 					Both net address and port must be specified in argument 
+ * 					Both net address and port must be specified in argument
  *					(nam).
- * 					If we don't have a local address for this socket yet, 
+ * 					If we don't have a local address for this socket yet,
  *					we pick one by calling iso_pcbbind().
  *
  * RETURNS:			errno E* or 0 if ok.
@@ -265,7 +265,7 @@ noname:
  * SIDE EFFECTS:	Looks up a route, which may cause one to be left
  *					in the isopcb.
  *
- * NOTES:			
+ * NOTES:
  */
 int
 iso_pcbconnect(isop, nam)
@@ -283,7 +283,7 @@ iso_pcbconnect(isop, nam)
 		dump_isoaddr(siso);
 	ENDDEBUG
 	if (nam->m_len < siso->siso_len)
-		return EINVAL; 
+		return EINVAL;
 	if (siso->siso_family != AF_ISO)
 		return EAFNOSUPPORT;
 	if (siso->siso_nlen == 0) {
@@ -302,7 +302,7 @@ iso_pcbconnect(isop, nam)
 	 * particular local interface.  So, if we want to send somebody
 	 * we need to choose a return address.
 	 */
-	local_zero = 
+	local_zero =
 		((isop->isop_laddr == 0) || (isop->isop_laddr->siso_nlen == 0));
 	if (local_zero) {
 		int flags;
@@ -310,7 +310,7 @@ iso_pcbconnect(isop, nam)
 		IFDEBUG(D_ISO)
 			printf("iso_pcbconnect localzero 1\n");
 		ENDDEBUG
-		/* 
+		/*
 		 * If route is known or can be allocated now,
 		 * our src addr is taken from the i/f, else punt.
 		 */
@@ -325,7 +325,7 @@ iso_pcbconnect(isop, nam)
 		ENDDEBUG
 	}
 	IFDEBUG(D_ISO)
-		printf("in iso_pcbconnect before lookup isop 0x%x isop->sock 0x%x\n", 
+		printf("in iso_pcbconnect before lookup isop 0x%x isop->sock 0x%x\n",
 			isop, isop->isop_socket);
 	ENDDEBUG
 	if (local_zero) {
@@ -361,7 +361,7 @@ iso_pcbconnect(isop, nam)
 		siso = mtod(nam, struct sockaddr_iso *);
 	}
 	IFDEBUG(D_ISO)
-		printf("in iso_pcbconnect before bcopy isop 0x%x isop->sock 0x%x\n", 
+		printf("in iso_pcbconnect before bcopy isop 0x%x isop->sock 0x%x\n",
 			isop, isop->isop_socket);
 	ENDDEBUG
 	/*
@@ -384,7 +384,7 @@ iso_pcbconnect(isop, nam)
 	}
 	bcopy((caddr_t)siso, (caddr_t)isop->isop_faddr, siso->siso_len);
 	IFDEBUG(D_ISO)
-		printf("in iso_pcbconnect after bcopy isop 0x%x isop->sock 0x%x\n", 
+		printf("in iso_pcbconnect after bcopy isop 0x%x isop->sock 0x%x\n",
 			isop, isop->isop_socket);
 		printf("iso_pcbconnect connected to addr:\n");
 		dump_isoaddr(isop->isop_faddr);
@@ -406,7 +406,7 @@ iso_pcbconnect(isop, nam)
  *
  * SIDE EFFECTS:	May detach the pcb.
  *
- * NOTES:			
+ * NOTES:
  */
 void
 iso_pcbdisconnect(isop)
@@ -442,9 +442,9 @@ iso_pcbdisconnect(isop)
  *
  * RETURNS:			Nada.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
 iso_pcbdetach(isop)
@@ -453,7 +453,7 @@ iso_pcbdetach(isop)
 	struct socket *so = isop->isop_socket;
 
 	IFDEBUG(D_ISO)
-		printf("iso_pcbdetach(isop 0x%x socket 0x%x so 0x%x)\n", 
+		printf("iso_pcbdetach(isop 0x%x socket 0x%x so 0x%x)\n",
 			isop, isop->isop_socket, so);
 	ENDDEBUG
 #ifdef TPCONS
@@ -471,7 +471,7 @@ iso_pcbdetach(isop)
 #endif
 	if (so) { /* in the x.25 domain, we sometimes have no socket */
 		so->so_pcb = 0;
-		sofree(so); 
+		sofree(so);
 	}
 	IFDEBUG(D_ISO)
 		printf("iso_pcbdetach 2 \n");
@@ -490,13 +490,13 @@ iso_pcbdetach(isop)
 		struct clnp_cache *clcp =
 			mtod(isop->isop_clnpcache, struct clnp_cache *);
 		IFDEBUG(D_ISO)
-			printf("iso_pcbdetach 3.2: clcp 0x%x freeing clc_hdr x%x\n", 
+			printf("iso_pcbdetach 3.2: clcp 0x%x freeing clc_hdr x%x\n",
 				clcp, clcp->clc_hdr);
 		ENDDEBUG
 		if (clcp->clc_hdr != NULL)
 			m_free(clcp->clc_hdr);
 		IFDEBUG(D_ISO)
-			printf("iso_pcbdetach 3.3: freeing cache x%x\n", 
+			printf("iso_pcbdetach 3.3: freeing cache x%x\n",
 				isop->isop_clnpcache);
 		ENDDEBUG
 		m_free(isop->isop_clnpcache);
@@ -523,7 +523,7 @@ iso_pcbdetach(isop)
  *
  * RETURNS:			Rien.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			(notify) is called at splimp!
  */
@@ -550,7 +550,7 @@ iso_pcbnotify(head, siso, errno, notify)
 			ENDDEBUG
 			continue;
 		}
-		if (errno) 
+		if (errno)
 			isop->isop_socket->so_error = errno;
 		if (notify)
 			(*notify)(isop);
@@ -572,9 +572,9 @@ iso_pcbnotify(head, siso, errno, notify)
  * RETURNS:			ptr to the isopcb if it finds a connection matching
  *					these arguments, o.w. returns zero.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 struct isopcb *
 iso_pcblookup(head, fportlen, fport, laddr)
@@ -588,7 +588,7 @@ iso_pcblookup(head, fportlen, fport, laddr)
 	unsigned int llen = laddr->siso_tlen;
 
 	IFDEBUG(D_ISO)
-		printf("iso_pcblookup(head 0x%x laddr 0x%x fport 0x%x)\n", 
+		printf("iso_pcblookup(head 0x%x laddr 0x%x fport 0x%x)\n",
 			head, laddr, fport);
 	ENDDEBUG
 	for (isop = head->isop_next; isop != head; isop = isop->isop_next) {
diff --git a/sys/netiso/iso_pcb.h b/sys/netiso/iso_pcb.h
index 1431363..80fc29a 100644
--- a/sys/netiso/iso_pcb.h
+++ b/sys/netiso/iso_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_pcb.h,v 1.2 1994/08/02 07:50:40 davidg Exp $
+ * $Id: iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp $
  */
 
 #ifndef _NETISO_ISO_PCB_H_
@@ -42,13 +42,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
@@ -63,7 +63,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.2 1994/08/02 07:50:40 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso_pcb.h,v 1.3 1994/08/21 06:14:20 paul Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/iso_pcb.h,v $ */
 
 #define	MAXX25CRUDLEN	16	/* 16 bytes of call request user data */
@@ -73,7 +73,7 @@ SOFTWARE.
  */
 struct isopcb {
 	struct	isopcb			*isop_next,*isop_prev; /* pointers to other pcb's */
-	struct	isopcb			*isop_head;	/* pointer back to chain of pcbs for 
+	struct	isopcb			*isop_head;	/* pointer back to chain of pcbs for
 								this protocol */
 	struct	socket			*isop_socket;	/* back pointer to socket */
 	struct	sockaddr_iso	*isop_laddr;
diff --git a/sys/netiso/iso_proto.c b/sys/netiso/iso_proto.c
index 17afcc0..86d6cf2 100644
--- a/sys/netiso/iso_proto.c
+++ b/sys/netiso/iso_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_proto.c,v 1.2 1994/08/02 07:50:42 davidg Exp $
+ * $Id: iso_proto.c,v 1.3 1995/05/11 00:13:20 wollman Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,8 +60,8 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_proto.c,v 1.2 1994/08/02 07:50:42 davidg Exp $ 
- * $Source: /home/ncvs/src/sys/netiso/iso_proto.c,v $ 
+/* $Header: /home/ncvs/src/sys/netiso/iso_proto.c,v 1.3 1995/05/11 00:13:20 wollman Exp $
+ * $Source: /home/ncvs/src/sys/netiso/iso_proto.c,v $
  *
  * iso_proto.c : protocol switch tables in the ISO domain
  *
@@ -95,8 +95,8 @@ int	idrp_input(), idrp_init(), idrp_usrreq();
 int	cltp_input(), cltp_ctlinput(), cltp_init(), cltp_usrreq(), cltp_output();
 
 #ifdef TUBA
-int	tuba_usrreq(), tuba_ctloutput(), tuba_init(), tuba_tcpinput(); 
-int	tuba_slowtimo(), tuba_fasttimo(); 
+int	tuba_usrreq(), tuba_ctloutput(), tuba_init(), tuba_tcpinput();
+int	tuba_slowtimo(), tuba_fasttimo();
 #endif
 
 struct protosw isosw[] = {
diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c
index fd9b529..3650231 100644
--- a/sys/netiso/iso_snpac.c
+++ b/sys/netiso/iso_snpac.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.c	8.1 (Berkeley) 6/10/93
- * $Id: iso_snpac.c,v 1.2 1994/08/02 07:50:44 davidg Exp $
+ * $Id: iso_snpac.c,v 1.3 1994/12/13 22:33:05 wollman Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,7 +60,7 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.2 1994/08/02 07:50:44 davidg Exp $ */
+/* $Header: /home/ncvs/src/sys/netiso/iso_snpac.c,v 1.3 1994/12/13 22:33:05 wollman Exp $ */
 /* $Source: /home/ncvs/src/sys/netiso/iso_snpac.c,v $ */
 
 #ifdef ISO
@@ -269,7 +269,7 @@ iso_setmcasts(ifp, req)
  * RETURNS:			0 if addr is resolved
  *					errno if addr is unknown
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			Now that we have folded the snpa cache into the routing
  *					table, we know there is no snpa address known for this
@@ -294,7 +294,7 @@ int		*snpa_len;			/* RESULT: length of snpa */
 
 	/*
 	 *	This hack allows us to send esis packets that have the destination snpa
-	 *	addresss embedded in the destination nsap address 
+	 *	addresss embedded in the destination nsap address
 	 */
 	if (dest->siso_data[0] == AFI_SNA) {
 		/*
@@ -305,7 +305,7 @@ int		*snpa_len;			/* RESULT: length of snpa */
 		ENDDEBUG
 		addrlen = dest->siso_nlen - 1;	/* subtract size of AFI */
 		found_snpa = (caddr_t) dest->siso_data + 1;
-	/* 
+	/*
 	 * If we are an IS, we can't do much with the packet;
 	 *	Check if we know about an IS.
 	 */
@@ -317,7 +317,7 @@ int		*snpa_len;			/* RESULT: length of snpa */
 		found_snpa = LLADDR(sdl);
 		addrlen = sdl->sdl_alen;
 	} else if (ifp->if_flags & IFF_BROADCAST) {
-		/* 
+		/*
 		 *	no IS, no match. Return "all es" multicast address for this
 		 *	interface, as per Query Configuration Function (9542 sec 6.5)
 		 *
@@ -342,7 +342,7 @@ int		*snpa_len;			/* RESULT: length of snpa */
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			If there is a route entry associated with cache
  *					entry, then delete that as well
@@ -369,9 +369,9 @@ register struct llinfo_llc *lc;		/* entry to free */
  *
  * PURPOSE:			Add an entry to the snpa cache
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			If entry already exists, then update holding time.
  */
@@ -481,9 +481,9 @@ snpac_fixdstandmask(nsellength)
  *
  * RETURNS:			0 on success, or unix error code
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 snpac_ioctl (so, cmd, data)
 struct socket *so;
@@ -537,9 +537,9 @@ caddr_t	data;	/* data for the cmd */
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 snpac_logdefis(sc)
 register struct rtentry *sc;
@@ -560,7 +560,7 @@ register struct rtentry *sc;
 		rtrequest(RTM_ADD, S(zsi), rt_key(sc), S(zmk),
 						RTF_DYNAMIC|RTF_GATEWAY, 0);
 	else {
-		if ((rt->rt_flags & RTF_DYNAMIC) && 
+		if ((rt->rt_flags & RTF_DYNAMIC) &&
 		    (rt->rt_flags & RTF_GATEWAY) && rt_mask(rt)->sa_len == 0)
 			rt_setgate(rt, rt_key(rt), rt_key(sc));
 	}
@@ -571,9 +571,9 @@ register struct rtentry *sc;
  *
  * PURPOSE:			Time out snpac entries
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			When encountering an entry for the first time, snpac_age
  *					may delete up to SNPAC_AGE too many seconds. Ie.
@@ -613,9 +613,9 @@ snpac_age()
  *
  * RETURNS:			true or false
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			Used by interface drivers when not in eavesdrop mode 
+ * NOTES:			Used by interface drivers when not in eavesdrop mode
  *					as interm kludge until
  *					real multicast addresses can be configured
  */
@@ -636,9 +636,9 @@ u_int	len;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 snpac_flushifp(ifp)
 struct ifnet	*ifp;
@@ -658,7 +658,7 @@ struct ifnet	*ifp;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			In the future, this should make a request of a user
  *					level routing daemon.
@@ -679,7 +679,7 @@ struct rtentry	**ret_nrt;
 			printf("add");
 		else if (req == RTM_DELETE)
 			printf("delete");
-		else 
+		else
 			printf("unknown command");
 		printf(" dst: %s\n", clnp_iso_addrp(host));
 		printf("\tgateway: %s\n", clnp_iso_addrp(gateway));
@@ -705,7 +705,7 @@ struct rtentry	**ret_nrt;
  *
  * RETURNS:			nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:			If a cache entry exists for gateway, then
  *					make a routing entry (host, gateway) and associate
@@ -714,7 +714,7 @@ struct rtentry	**ret_nrt;
  *					If a route already exists and is different, first delete
  *					it.
  *
- *					This could be made more efficient by checking 
+ *					This could be made more efficient by checking
  *					the existing route before adding a new one.
  */
 snpac_addrt(ifp, host, gateway, netmask)
diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h
index 429ac37..e817b81 100644
--- a/sys/netiso/iso_snpac.h
+++ b/sys/netiso/iso_snpac.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_snpac.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_snpac.h,v 1.3 1994/08/21 06:14:21 paul Exp $
+ * $Id: iso_snpac.h,v 1.4 1995/03/28 07:57:14 bde Exp $
  */
 
 #ifndef _NETISO_ISO_SNPAC_H_
@@ -42,13 +42,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
@@ -69,7 +69,7 @@ SOFTWARE.
 struct snpa_req {
 	struct iso_addr	sr_isoa;		/* nsap address */
 	u_char			sr_len;			/* length of snpa */
-	u_char			sr_snpa[MAX_SNPALEN];	/* snpa associated 
+	u_char			sr_snpa[MAX_SNPALEN];	/* snpa associated
 												with nsap address */
 	u_char			sr_flags;		/* true if entry is valid */
 	u_short			sr_ht;			/* holding time */
diff --git a/sys/netiso/iso_var.h b/sys/netiso/iso_var.h
index bee5422..b874995 100644
--- a/sys/netiso/iso_var.h
+++ b/sys/netiso/iso_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_var.h	8.1 (Berkeley) 6/10/93
- * $Id: iso_var.h,v 1.3 1994/08/21 06:14:22 paul Exp $
+ * $Id: iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $
  */
 
 #ifndef _NETISO_ISO_VAR_H_
@@ -42,13 +42,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
@@ -63,12 +63,12 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.3 1994/08/21 06:14:22 paul Exp $
+/* $Header: /home/ncvs/src/sys/netiso/iso_var.h,v 1.4 1995/03/16 18:15:21 bde Exp $
  * $Source: /home/ncvs/src/sys/netiso/iso_var.h,v $
  */
 
 /*
- *	Interface address, iso version. One of these structures is 
+ *	Interface address, iso version. One of these structures is
  *	allocated for each interface with an osi address. The ifaddr
  *	structure conatins the protocol-independent part
  *	of the structure, and is assumed to be first.
diff --git a/sys/netiso/tp_clnp.h b/sys/netiso/tp_clnp.h
index 528e3f0..7e54a67 100644
--- a/sys/netiso/tp_clnp.h
+++ b/sys/netiso/tp_clnp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_clnp.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_clnp.h,v 1.2 1994/08/02 07:50:54 davidg Exp $
+ * $Id: tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp $
  */
 
 #ifndef _NETISO_TP_CLNP_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.2 1994/08/02 07:50:54 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_clnp.h,v 1.3 1994/08/21 06:14:23 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_clnp.h,v $
  *
  * AF_ISO net-dependent structures and include files
@@ -88,7 +88,7 @@ SOFTWARE.
 #endif
 #include <netiso/iso_var.h>
 
-struct isopcb tp_isopcb;	
+struct isopcb tp_isopcb;
 	/* queue of active inpcbs for tp ; for tp with dod ip */
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_cons.c b/sys/netiso/tp_cons.c
index 76e5775..ca2dc32 100644
--- a/sys/netiso/tp_cons.c
+++ b/sys/netiso/tp_cons.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_cons.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_cons.c,v 1.2 1994/08/02 07:50:56 davidg Exp $
+ * $Id: tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,16 +60,16 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_cons.c,v 1.2 1994/08/02 07:50:56 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_cons.c,v 1.3 1994/11/15 14:26:15 bde Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_cons.c,v $
  *
  * Here is where you find the iso- and cons-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
  * out of the tp source, and everthing here is reached indirectly
- * through a switch table (struct nl_protosw *) tpcb->tp_nlproto 
- * (see tp_pcb.c). 
+ * through a switch table (struct nl_protosw *) tpcb->tp_nlproto
+ * (see tp_pcb.c).
  * The routines here are:
  *	tpcons_input: pullup and call tp_input w/ correct arguments
  *	tpcons_output: package a pkt for cons given an isopcb & some data
@@ -136,7 +136,7 @@ register struct mbuf *nam;
 		/* oh, dear, throw packet away */
 		pk_disconnect((struct pklcd *)isop->isop_chan);
 		isop->isop_chan = 0;
-	} else 
+	} else
 		isop->isop_refcnt = 1;
 	return error;
 }
@@ -150,7 +150,7 @@ register struct mbuf *nam;
  */
 ProtoHook
 tpcons_ctlinput(cmd, siso, isop)
-	int cmd; 
+	int cmd;
 	struct sockaddr_iso *siso;
 	struct isopcb *isop;
 {
@@ -173,7 +173,7 @@ tpcons_ctlinput(cmd, siso, isop)
 				register SeqNum	seq =  SEQ_ADD(tpcb, tpcb->tp_snduna, 1);
 
 				IFTRACE(D_DATA)
-					tptrace(TPPTmisc, "FAKE ACK seq cdt 1", 
+					tptrace(TPPTmisc, "FAKE ACK seq cdt 1",
 						seq, 0,0,0);
 				ENDTRACE
 				IFDEBUG(D_DATA)
@@ -207,8 +207,8 @@ tpcons_ctlinput(cmd, siso, isop)
  * 	cons's intr routine
  * FUNCTION and ARGUMENTS:
  * Take a packet (m) from cons, pullup m as required by tp,
- *  ignore the socket argument, and call tp_input. 
- * No return value.  
+ *  ignore the socket argument, and call tp_input.
+ * No return value.
  */
 ProtoHook
 tpcons_input(m, faddr, laddr, channel)
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index ead2c89..5c42447 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: tp_driver.c,v 1.2 1994/08/02 07:50:59 davidg Exp $
  */
 #define _XEBEC_PG static
 
@@ -42,9 +42,9 @@ int 	tp_emit(),
 		tp_goodack(),				tp_goodXack(),
 		tp_stash()
 ;
-void	tp_indicate(),				tp_getoptions(),	
+void	tp_indicate(),				tp_getoptions(),
 		tp_soisdisconnecting(), 	tp_soisdisconnected(),
-		tp_recycle_tsuffix(),		
+		tp_recycle_tsuffix(),
 #ifdef TP_DEBUG_TIMERS
 		tp_etimeout(),				tp_euntimeout(),
 		tp_ctimeout(),				tp_cuntimeout(),
@@ -70,12 +70,12 @@ tp_PCB_ *p;
 {
 switch(a) {
 case -1:  return tp_protocol_error(e,p);
-case 0x1: 
+case 0x1:
 		{
 		(void) tp_emit(DC_TPDU_type, p, 0, 0, MNULL);
 	}
 		 break;
-case 0x2: 
+case 0x2:
 		{
 #		ifdef TP_DEBUG
 		if( e->ev_number != AK_TPDU )
@@ -83,7 +83,7 @@ case 0x2:
 #		endif TP_DEBUG
 	}
 		 break;
-case 0x3: 
+case 0x3:
 		{
 		/* oh, man is this grotesque or what? */
 		(void) tp_goodack(p, e->ev_union.EV_AK_TPDU.e_cdt, e->ev_union.EV_AK_TPDU.e_seq,  e->ev_union.EV_AK_TPDU.e_subseq);
@@ -93,17 +93,17 @@ case 0x3:
 		 */
 	}
 		 break;
-case 0x4: 
+case 0x4:
 		{
 		tp_detach(p);
 	}
 		 break;
-case 0x5: 
+case 0x5:
 		{
 		p->tp_refstate = REF_OPEN; /* has timers ??? */
 	}
 		 break;
-case 0x6: 
+case 0x6:
 		{
 		IFTRACE(D_CONN)
 			tptrace(TPPTmisc, "CR datalen data", e->ev_union.EV_CR_TPDU.e_datalen, e->ev_union.EV_CR_TPDU.e_data,0,0);
@@ -116,13 +116,13 @@ case 0x6:
 
 		if (e->ev_union.EV_CR_TPDU.e_datalen > 0) {
 			/* n/a for class 0 */
-			ASSERT(p->tp_Xrcv.sb_cc == 0); 
+			ASSERT(p->tp_Xrcv.sb_cc == 0);
 			sbappendrecord(&p->tp_Xrcv, e->ev_union.EV_CR_TPDU.e_data);
-			e->ev_union.EV_CR_TPDU.e_data = MNULL; 
-		} 
+			e->ev_union.EV_CR_TPDU.e_data = MNULL;
+		}
 	}
 		 break;
-case 0x7: 
+case 0x7:
 		{
 		IncStat(ts_tp0_conn);
 		IFTRACE(D_CONN)
@@ -136,7 +136,7 @@ case 0x7:
 		p->tp_fcredit = 1;
 	}
 		 break;
-case 0x8: 
+case 0x8:
 		{
 		IncStat(ts_tp4_conn); /* even though not quite open */
 		IFTRACE(D_CONN)
@@ -153,7 +153,7 @@ case 0x8:
 		tp_ctimeout(p, TM_retrans, (int)p->tp_cc_ticks);
 	}
 		 break;
-case 0x9: 
+case 0x9:
 		{
 		IFDEBUG(D_CONN)
 			printf("event: CR_TPDU emit CC failed done " );
@@ -164,7 +164,7 @@ case 0x9:
 		tp_detach(p);
 	}
 		 break;
-case 0xa: 
+case 0xa:
 		{
 		int error;
 		struct mbuf *data = MNULL;
@@ -176,7 +176,7 @@ case 0xa:
 		data =  MCPY(p->tp_ucddata, M_WAIT);
 		if (data) {
 			IFDEBUG(D_CONN)
-				printf("T_CONN_req.trans m_copy cc 0x%x\n", 
+				printf("T_CONN_req.trans m_copy cc 0x%x\n",
 					p->tp_ucddata);
 				dump_mbuf(data, "sosnd @ T_CONN_req");
 			ENDDEBUG
@@ -184,7 +184,7 @@ case 0xa:
 
 		if (error = tp_emit(CR_TPDU_type, p, 0, 0, data) )
 			return error; /* driver WON'T change state; will return error */
-		
+
 		p->tp_refstate = REF_OPEN; /* has timers */
 		if(p->tp_class != TP_CLASS_0) {
 			p->tp_retrans = p->tp_Nretrans;
@@ -192,13 +192,13 @@ case 0xa:
 		}
 	}
 		 break;
-case 0xb: 
+case 0xb:
 		{
 		sbflush(&p->tp_Xrcv); /* purge non-delivered data data */
 		if (e->ev_union.EV_DR_TPDU.e_datalen > 0) {
 			sbappendrecord(&p->tp_Xrcv, e->ev_union.EV_DR_TPDU.e_data);
 			e->ev_union.EV_DR_TPDU.e_data = MNULL;
-		} 
+		}
 		if (p->tp_state == TP_OPEN)
 			tp_indicate(T_DISCONNECT, p, 0);
 		else {
@@ -219,53 +219,53 @@ case 0xb:
 				p->tp_flags &= ~TPF_DELACK;
 			}
 			tp_cuntimeout(p, TM_retrans);
-			if( e->ev_union.EV_DR_TPDU.e_sref !=  0 ) 
+			if( e->ev_union.EV_DR_TPDU.e_sref !=  0 )
 				(void) tp_emit(DC_TPDU_type, p, 0, 0, MNULL);
 		}
 	}
 		 break;
-case 0xc: 
+case 0xc:
 		{
 		if( e->ev_union.EV_DR_TPDU.e_sref != 0 )
-			(void) tp_emit(DC_TPDU_type, p, 0, 0, MNULL); 
+			(void) tp_emit(DC_TPDU_type, p, 0, 0, MNULL);
 		/* reference timer already set - reset it to be safe (???) */
 		tp_euntimeout(p, TM_reference); /* all */
 		tp_etimeout(p, TM_reference, (int)p->tp_refer_ticks);
 	}
 		 break;
-case 0xd: 
-		{	
+case 0xd:
+		{
 		tp_cuntimeout(p, TM_retrans);
 		tp_indicate(ER_TPDU, p, e->ev_union.EV_ER_TPDU.e_reason);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0xe: 
-		{	 
+case 0xe:
+		{
 		tp_cuntimeout(p, TM_retrans);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0xf: 
-		{	 
+case 0xf:
+		{
 		tp_indicate(ER_TPDU, p, e->ev_union.EV_ER_TPDU.e_reason);
 		tp_cuntimeout(p, TM_retrans);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0x10: 
-		{	 
+case 0x10:
+		{
 		tp_cuntimeout(p, TM_retrans);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0x11: 
+case 0x11:
 		{	/* don't ask me why we have to do this - spec says so */
 		(void) tp_emit(DR_TPDU_type, p, 0, E_TP_NO_SESSION, MNULL);
 		/* don't bother with retransmissions of the DR */
 	}
 		 break;
-case 0x12: 
+case 0x12:
 		{
 		tp_soisdisconnecting(p->tp_sock);
 		tp_indicate(ER_TPDU, p, e->ev_union.EV_ER_TPDU.e_reason);
@@ -273,7 +273,7 @@ case 0x12:
 		tp_netcmd( p, CONN_CLOSE );
 	}
 		 break;
-case 0x13: 
+case 0x13:
 		{
 		if (p->tp_state == TP_OPEN) {
 			tp_euntimeout(p, TM_data_retrans); /* all */
@@ -287,18 +287,18 @@ case 0x13:
 		(void) tp_emit(DR_TPDU_type, p, 0, E_TP_PROTO_ERR, MNULL);
 	}
 		 break;
-case 0x14: 
-		{	
+case 0x14:
+		{
 		tp_cuntimeout(p, TM_retrans);
 		IncStat(ts_tp0_conn);
 		p->tp_fcredit = 1;
 		soisconnected(p->tp_sock);
 	}
 		 break;
-case 0x15: 
-		{	
+case 0x15:
+		{
 		IFDEBUG(D_CONN)
-			printf("trans: CC_TPDU in CRSENT state flags 0x%x\n", 
+			printf("trans: CC_TPDU in CRSENT state flags 0x%x\n",
 				(int)p->tp_flags);
 		ENDDEBUG
 		IncStat(ts_tp4_conn);
@@ -327,7 +327,7 @@ case 0x15:
 		tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
 	}
 		 break;
-case 0x16: 
+case 0x16:
 		{
 		struct mbuf *data = MNULL;
 		int error;
@@ -351,16 +351,16 @@ case 0x16:
 		tp_ctimeout(p, TM_retrans, (int)p->tp_cr_ticks);
 	}
 		 break;
-case 0x17: 
-		{ 	
+case 0x17:
+		{
 		IncStat(ts_conn_gaveup);
 		p->tp_sock->so_error = ETIMEDOUT;
 		tp_indicate(T_DISCONNECT, p, ETIMEDOUT);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0x18: 
-		{	
+case 0x18:
+		{
 		int error;
 		struct mbuf *data = MCPY(p->tp_ucddata, M_WAIT);
 
@@ -371,7 +371,7 @@ case 0x18:
 		tp_ctimeout(p, TM_retrans, (int)p->tp_cc_ticks);
 	}
 		 break;
-case 0x19: 
+case 0x19:
 		{
 		int doack;
 
@@ -396,17 +396,17 @@ case 0x19:
 		ENDDEBUG
 
 		if (doack) {
-			(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL ); 
+			(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL );
 			tp_ctimeout(p, TM_sendack, (int)p->tp_keepalive_ticks);
 		} else
 			tp_ctimeout( p, TM_sendack, (int)p->tp_sendack_ticks);
-		
+
 		IFDEBUG(D_DATA)
 			printf("after stash calling sbwakeup\n");
 		ENDDEBUG
 	}
 		 break;
-case 0x1a: 
+case 0x1a:
 		{
 		tp0_stash(p, e);
 		sbwakeup( &p->tp_sock->so_rcv );
@@ -416,7 +416,7 @@ case 0x1a:
 		ENDDEBUG
 	}
 		 break;
-case 0x1b: 
+case 0x1b:
 		{
 		int doack; /* tells if we must ack immediately */
 
@@ -429,17 +429,17 @@ case 0x1b:
 		ENDDEBUG
 
 		if(doack)
-			(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL ); 
+			(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL );
 		else
 			tp_ctimeout_MIN( p, TM_sendack, (int)p->tp_sendack_ticks);
-		
+
 		IFDEBUG(D_DATA)
 			printf("after stash calling sbwakeup\n");
 		ENDDEBUG
 	}
 		 break;
-case 0x1c: 
-		{ 	
+case 0x1c:
+		{
 		IFTRACE(D_DATA)
 			tptrace(TPPTmisc, "NIW seq rcvnxt lcredit ",
 				e->ev_union.EV_DT_TPDU.e_seq, p->tp_rcvnxt, p->tp_lcredit, 0);
@@ -447,10 +447,10 @@ case 0x1c:
 		IncStat(ts_dt_niw);
 		m_freem(e->ev_union.EV_DT_TPDU.e_data);
 		tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
-		(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL ); 
+		(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL );
 	}
 		 break;
-case 0x1d: 
+case 0x1d:
 		{
 		if (p->tp_ucddata) {
 			m_freem(p->tp_ucddata);
@@ -462,10 +462,10 @@ case 0x1d:
 		soisconnected(p->tp_sock);
 		IFTRACE(D_CONN)
 			struct socket *so = p->tp_sock;
-			tptrace(TPPTmisc, 
+			tptrace(TPPTmisc,
 			"called sosiconn: so so_state rcv.sb_sel rcv.sb_flags",
 				so, so->so_state, so->so_rcv.sb_sel, so->so_rcv.sb_flags);
-			tptrace(TPPTmisc, 
+			tptrace(TPPTmisc,
 			"called sosiconn 2: so_qlen so_error so_rcv.sb_cc so_head",
 				so->so_qlen, so->so_error, so->so_rcv.sb_cc, so->so_head);
 		ENDTRACE
@@ -474,7 +474,7 @@ case 0x1d:
 		tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
 	}
 		 break;
-case 0x1e: 
+case 0x1e:
 		{
 		if( p->tp_state == TP_AKWAIT ) {
 			if (p->tp_ucddata) {
@@ -485,7 +485,7 @@ case 0x1e:
 			soisconnected(p->tp_sock);
 			tp_ctimeout(p, TM_sendack, (int)p->tp_keepalive_ticks);
 			tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
-		} 
+		}
 		IFTRACE(D_XPD)
 		tptrace(TPPTmisc, "XPD tpdu accepted Xrcvnxt, e_seq datalen m_len\n",
 				p->tp_Xrcvnxt,e->ev_union.EV_XPD_TPDU.e_seq,  e->ev_union.EV_XPD_TPDU.e_datalen, e->ev_union.EV_XPD_TPDU.e_data->m_len);
@@ -504,15 +504,15 @@ case 0x1e:
 		SEQ_INC(p, p->tp_Xrcvnxt);
 	}
 		 break;
-case 0x1f: 
+case 0x1f:
 		{
 		if( p->tp_Xrcv.sb_cc == 0 ) {
-			/* kludge for select(): */ 
+			/* kludge for select(): */
 			/* p->tp_sock->so_state &= ~SS_OOBAVAIL; */
 		}
 	}
 		 break;
-case 0x20: 
+case 0x20:
 		{
 		IFTRACE(D_XPD)
 			tptrace(TPPTmisc, "XPD tpdu niw (Xrcvnxt, e_seq) or not cdt (cc)\n",
@@ -532,7 +532,7 @@ case 0x20:
 		 */
 	}
 		 break;
-case 0x21: 
+case 0x21:
 		{
 		struct socket *so = p->tp_sock;
 
@@ -547,7 +547,7 @@ case 0x21:
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0x22: 
+case 0x22:
 		{
 		struct socket *so = p->tp_sock;
 		struct mbuf *data = MNULL;
@@ -567,14 +567,14 @@ case 0x22:
 		}
 	}
 		 break;
-case 0x23: 
+case 0x23:
 		{
 		tp_soisdisconnecting(p->tp_sock);
 		tp_netcmd( p, CONN_CLOSE);
 		tp_soisdisconnected(p);
 	}
 		 break;
-case 0x24: 
+case 0x24:
 		{
 		struct mbuf *data = MCPY(p->tp_ucddata, M_WAIT);
 
@@ -586,7 +586,7 @@ case 0x24:
 		}
 		if (data) {
 			IFDEBUG(D_CONN)
-				printf("T_DISC_req.trans tp_ucddata 0x%x\n", 
+				printf("T_DISC_req.trans tp_ucddata 0x%x\n",
 					p->tp_ucddata);
 				dump_mbuf(data, "ucddata @ T_DISC_req");
 			ENDDEBUG
@@ -599,7 +599,7 @@ case 0x24:
 			return tp_emit(DR_TPDU_type, p, 0, e->ev_union.EV_T_DISC_req.e_reason, data);
 	}
 		 break;
-case 0x25: 
+case 0x25:
 		{
 		int error;
 		struct mbuf *data = MCPY(p->tp_ucddata, M_WAIT);
@@ -608,12 +608,12 @@ case 0x25:
 		p->tp_retrans --;
 		p->tp_cong_win = 1 * p->tp_l_tpdusize;
 
-		if( error = tp_emit(CC_TPDU_type, p, 0, 0, data) ) 
+		if( error = tp_emit(CC_TPDU_type, p, 0, 0, data) )
 			p->tp_sock->so_error = error;
 		tp_ctimeout(p, TM_retrans, (int)p->tp_cc_ticks);
 	}
 		 break;
-case 0x26: 
+case 0x26:
 		{
 		IncStat(ts_conn_gaveup);
 		tp_soisdisconnecting(p->tp_sock);
@@ -624,10 +624,10 @@ case 0x26:
 		tp_ctimeout(p, TM_retrans, (int)p->tp_dr_ticks);
 	}
 		 break;
-case 0x27: 
+case 0x27:
 		{
 		tp_euntimeout(p, TM_data_retrans); /* all */
-		tp_cuntimeout(p, TM_inact); 
+		tp_cuntimeout(p, TM_inact);
 		tp_cuntimeout(p, TM_sendack);
 
 		IncStat(ts_conn_gaveup);
@@ -639,7 +639,7 @@ case 0x27:
 		tp_ctimeout(p, TM_retrans, (int)p->tp_dr_ticks);
 	}
 		 break;
-case 0x28: 
+case 0x28:
 		{
 		p->tp_cong_win = 1 * p->tp_l_tpdusize;
 		/* resume XPD */
@@ -649,8 +649,8 @@ case 0x28:
 
 			IFTRACE(D_XPD)
 				tptrace(TPPTmisc, "XPD retrans: Xuna Xsndnxt sndnxt snduna",
-					p->tp_Xuna, p->tp_Xsndnxt, p->tp_sndnxt, 
-					p->tp_snduna); 
+					p->tp_Xuna, p->tp_Xsndnxt, p->tp_sndnxt,
+					p->tp_snduna);
 			ENDTRACE
 			IFDEBUG(D_XPD)
 				dump_mbuf(m, "XPD retrans emitting M");
@@ -663,45 +663,45 @@ case 0x28:
 		}
 	}
 		 break;
-case 0x29: 
-		{	
+case 0x29:
+		{
 		p->tp_rxtshift++;
 		(void) tp_data_retrans(p);
 	}
 		 break;
-case 0x2a: 
-		{	
+case 0x2a:
+		{
 		p->tp_retrans --;
 		(void) tp_emit(DR_TPDU_type, p, 0, E_TP_DR_NO_REAS, MNULL);
 		IncStat(ts_retrans_dr);
 		tp_ctimeout(p, TM_retrans, (int)p->tp_dr_ticks);
 	}
 		 break;
-case 0x2b: 
-		{	
+case 0x2b:
+		{
 		p->tp_sock->so_error = ETIMEDOUT;
 		p->tp_refstate = REF_FROZEN;
 		tp_recycle_tsuffix( p );
 		tp_etimeout(p, TM_reference, (int)p->tp_refer_ticks);
 	}
 		 break;
-case 0x2c: 
+case 0x2c:
 		{
 		tp_freeref(p->tp_lref);
 		tp_detach(p);
 	}
 		 break;
-case 0x2d: 
-		{	
+case 0x2d:
+		{
 		if( p->tp_class != TP_CLASS_0) {
 			tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
 			if ( e->ev_number == CC_TPDU )
-				(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL); 
+				(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 0, MNULL);
 		}
 		/* ignore it if class 0 - state tables are blank for this */
 	}
 		 break;
-case 0x2e: 
+case 0x2e:
 		{
 		IFTRACE(D_DATA)
 			tptrace(TPPTmisc, "T_DATA_req sndnxt snduna fcredit, tpcb",
@@ -711,7 +711,7 @@ case 0x2e:
 		tp_send(p);
 	}
 		 break;
-case 0x2f: 
+case 0x2f:
 		{
 		int error = 0;
 
@@ -724,25 +724,25 @@ case 0x2f:
 
 			IFTRACE(D_XPD)
 				tptrace(TPPTmisc, "XPD req: Xuna Xsndnxt sndnxt snduna",
-					p->tp_Xuna, p->tp_Xsndnxt, p->tp_sndnxt, 
-					p->tp_snduna); 
+					p->tp_Xuna, p->tp_Xsndnxt, p->tp_sndnxt,
+					p->tp_snduna);
 			ENDTRACE
 			IFDEBUG(D_XPD)
 				printf("T_XPD_req: sb_cc 0x%x\n", p->tp_Xsnd.sb_cc);
 				dump_mbuf(m, "XPD req emitting M");
 			ENDDEBUG
-			error = 
+			error =
 				tp_emit(XPD_TPDU_type, p, p->tp_Xuna, 1, m);
 			p->tp_retrans = p->tp_Nretrans;
 
 			tp_ctimeout(p, TM_retrans, (int)p->tp_rxtcur);
 			SEQ_INC(p, p->tp_Xsndnxt);
-		} 
+		}
 		if(trick_hc)
 			return error;
 	}
 		 break;
-case 0x30: 
+case 0x30:
 		{
 		struct sockbuf *sb = &p->tp_sock->so_snd;
 
@@ -758,10 +758,10 @@ case 0x30:
 		ENDDEBUG
 	}
 		 break;
-case 0x31: 
+case 0x31:
 		{
 		IFTRACE(D_ACKRECV)
-			tptrace(TPPTmisc, "BOGUS ACK fcc_present, tp_r_subseq e_subseq", 
+			tptrace(TPPTmisc, "BOGUS ACK fcc_present, tp_r_subseq e_subseq",
 				e->ev_union.EV_AK_TPDU.e_fcc_present, p->tp_r_subseq, e->ev_union.EV_AK_TPDU.e_subseq, 0);
 		ENDTRACE
 		if( p->tp_class != TP_CLASS_0 ) {
@@ -772,11 +772,11 @@ case 0x31:
 				(void) tp_emit(AK_TPDU_type, p, p->tp_rcvnxt, 1, MNULL);
 			}
 			tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
-		} 
+		}
 	}
 		 break;
-case 0x32: 
-		{	
+case 0x32:
+		{
 		tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
 		tp_cuntimeout(p, TM_retrans);
 
@@ -786,21 +786,21 @@ case 0x32:
 		tp_send(p);
 	}
 		 break;
-case 0x33: 
+case 0x33:
 		{
 		IFTRACE(D_ACKRECV)
 			tptrace(TPPTmisc, "BOGUS XACK eventtype ", e->ev_number, 0, 0,0);
 		ENDTRACE
 		if( p->tp_class != TP_CLASS_0 ) {
 			tp_ctimeout(p, TM_inact, (int)p->tp_inact_ticks);
-		} 
+		}
 	}
 		 break;
-case 0x34: 
-		{	
+case 0x34:
+		{
 		int timo;
 		IFTRACE(D_TIMER)
-			tptrace(TPPTsendack, -1, p->tp_lcredit, p->tp_sent_uwe, 
+			tptrace(TPPTsendack, -1, p->tp_lcredit, p->tp_sent_uwe,
 			p->tp_sent_lcdt, 0);
 		ENDTRACE
 		IncPStat(p, tps_n_TMsendack);
@@ -814,14 +814,14 @@ case 0x34:
 		tp_ctimeout(p, TM_sendack, timo);
 	}
 		 break;
-case 0x35: 
+case 0x35:
 		{
 		if (sbspace(&p->tp_sock->so_rcv) > 0)
 			tp0_openflow(p);
 	}
 		 break;
-case 0x36: 
-		{	
+case 0x36:
+		{
 		if( trick_hc ) {
 			SeqNum ack_thresh;
 			/*
@@ -842,13 +842,13 @@ case 0x36:
 		}
 	}
 		 break;
-case 0x37: 
+case 0x37:
 		{
 		if(trick_hc)
 		return ECONNABORTED;
 	}
 		 break;
-case 0x38: 
+case 0x38:
 		{
 		ASSERT( p->tp_state != TP_LISTENING );
 		tp_indicate(T_DISCONNECT, p, ECONNRESET);
diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c
index 0c9a831..d26cea0 100644
--- a/sys/netiso/tp_emit.c
+++ b/sys/netiso/tp_emit.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_emit.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_emit.c,v 1.1.1.1 1994/05/24 10:06:56 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_emit.c,v 1.2 1994/08/02 07:51:02 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_emit.c,v $
  *
  * This file contains tp_emit() and tp_error_emit(), which
@@ -133,19 +133,19 @@ char tp_delay = 0x00; /* delay to keep token ring from blowing it */
  * 	For DR and ER tpdus, the argument (eot) is
  * 	the reason for issuing the tpdu rather than an end-of-tsdu indicator.
  *
- * RETURNS:			
+ * RETURNS:
  * 	0  OK
- * 	ENOBUFS 
- * 	E* returned from net layer output rtn 
+ * 	ENOBUFS
+ * 	E* returned from net layer output rtn
+ *
+ * SIDE EFFECTS:
  *
- * SIDE EFFECTS:	
+ * NOTES:
  *
- * NOTES:			
- *  
- * 	WE ASSUME that the tp header + all options will fit in ONE mbuf.  
+ * 	WE ASSUME that the tp header + all options will fit in ONE mbuf.
  *	If mbufs are 256 this will most likely be true, but if they are 128 it's
- *	possible that they won't. 
- *	If you used every option on the CR + max. user data you'd overrun 
+ *	possible that they won't.
+ *	If you used every option on the CR + max. user data you'd overrun
  *	112 but unless you used > 115 bytes for the security
  *	parameter, it would fit in a 256-byte mbuf (240 bytes for the header)
  *	We don't support the security parameter, so this isn't a problem.
@@ -171,7 +171,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 	u_int 	eot;
 	struct mbuf *data;
 {
-	register struct tpdu *hdr; 
+	register struct tpdu *hdr;
 	register struct mbuf *m;
 	int csum_offset=0;
 	int datalen = 0;
@@ -202,7 +202,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 			m->m_flags = M_PKTHDR;
 		}
 	} else {
-		MGETHDR(m, M_DONTWAIT, TPMT_TPHDR); 
+		MGETHDR(m, M_DONTWAIT, TPMT_TPHDR);
 	}
 	m->m_data += max_hdr;
 	if (m == NULL) {
@@ -221,13 +221,13 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 		int 	tp_headersize();
 
 		hdr->tpdu_type = dutype;
-		hdr->tpdu_li = tp_headersize(dutype, tpcb);  
+		hdr->tpdu_li = tp_headersize(dutype, tpcb);
 		/*
 		 * class 0 doesn't use this for DT
-		 * it'll just get overwritten below 
+		 * it'll just get overwritten below
 		 */
-		hdr->tpdu_dref = htons(tpcb->tp_fref); 
-		if( tpcb->tp_use_checksum || 
+		hdr->tpdu_dref = htons(tpcb->tp_fref);
+		if( tpcb->tp_use_checksum ||
 			(dutype == CR_TPDU_type && (tpcb->tp_class & TP_CLASS_4) )) {
 			csum_offset =  hdr->tpdu_li + 2; /* DOESN'T include csum */
 			ADDOPTION(TPP_checksum, hdr, 2, eot /* dummy arg */);
@@ -236,7 +236,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					"tp_emit: csum_offset 0x%x, hdr->tpdu_li 0x%x\n",
 						csum_offset, hdr->tpdu_li);
 			ENDDEBUG
-		} 
+		}
 		/*
 		 * VARIABLE PARTS...
 		 */
@@ -244,7 +244,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 
 		case CR_TPDU_type:
 			hdr->tpdu_CRdref_0 = 0;	/* must be zero */
-		case CC_TPDU_type: 
+		case CC_TPDU_type:
 			if (!tpcb->tp_cebit_off) {
 				tpcb->tp_win_recv = tp_start_win << 8;
 				LOCAL_CREDIT(tpcb);
@@ -274,7 +274,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					hdr->tpdu_cdt = 0;
 				}
 				hdr->tpdu_CCclass = tp_mask_to_num(tpcb->tp_class);
-				hdr->tpdu_CCoptions = 
+				hdr->tpdu_CCoptions =
 					(tpcb->tp_xtd_format? TPO_XTD_FMT:0) |
 					(tpcb->tp_use_efc? TPO_USE_EFC:0);
 
@@ -297,7 +297,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					IncStat(ts_CC_sent);
 				}
 
-				ADDOPTION(TPP_tpdu_size, hdr, 
+				ADDOPTION(TPP_tpdu_size, hdr,
 					sizeof(tpcb->tp_tpdusize), tpcb->tp_tpdusize);
 
 				if (tpcb->tp_class != TP_CLASS_0) {
@@ -307,7 +307,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					ADDOPTION(TPP_acktime, hdr, sizeof(short), millisec);
 
 					x = (tpcb->tp_use_nxpd? TPAO_USE_NXPD: 0)
-					 |	(tpcb->tp_use_rcc?  TPAO_USE_RCC : 0) 
+					 |	(tpcb->tp_use_rcc?  TPAO_USE_RCC : 0)
 					 |  (tpcb->tp_use_checksum?0: TPAO_NO_CSUM)
 					 |	(tpcb->tp_xpd_service? TPAO_USE_TXPD: 0);
 					ADDOPTION(TPP_addl_opt, hdr, 1, x);
@@ -326,7 +326,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 						}
 					}
 				}
-					
+
 				if( (dutype == CR_TPDU_type) && (tpcb->tp_class != TP_CLASS_0)){
 
 					ASSERT( 1 == sizeof(tpcb->tp_vers) );
@@ -346,7 +346,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					ADDOPTION(TPP_alt_class, hdr, 1, x);
 				}
 
-				if( hdr->tpdu_li > MLEN) 
+				if( hdr->tpdu_li > MLEN)
 					panic("tp_emit CR/CC");
 			}
 			break;
@@ -430,7 +430,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 		case DT_TPDU_type:
 			hdr->tpdu_cdt = 0;
 			IFTRACE(D_DATA)
-				tptraceTPCB(TPPTmisc, "emit DT: eot seq tpdu_li", eot, seq, 
+				tptraceTPCB(TPPTmisc, "emit DT: eot seq tpdu_li", eot, seq,
 					hdr->tpdu_li, 0);
 			ENDTRACE
 			if (tpcb->tp_xtd_format) {
@@ -467,13 +467,13 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 			break;
 
 		case AK_TPDU_type:/* ak not used in class 0 */
-			ASSERT( tpcb->tp_class != TP_CLASS_0); 
+			ASSERT( tpcb->tp_class != TP_CLASS_0);
 			data = (struct mbuf *)0;
 			olduwe = tpcb->tp_sent_uwe;
 
 			if (seq != tpcb->tp_sent_rcvnxt || tpcb->tp_rsycnt == 0) {
-				LOCAL_CREDIT( tpcb ); 
-				tpcb->tp_sent_uwe = 
+				LOCAL_CREDIT( tpcb );
+				tpcb->tp_sent_uwe =
 					SEQ(tpcb,tpcb->tp_rcvnxt + tpcb->tp_lcredit -1);
 				tpcb->tp_sent_lcdt = tpcb->tp_lcredit;
 				acking_ooo = 0;
@@ -481,14 +481,14 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				acking_ooo = 1;
 
 			IFDEBUG(D_RENEG)
-				/* occasionally fake a reneging so 
+				/* occasionally fake a reneging so
 					you can test subsequencing */
 				if( olduwe & 0x1 ) {
 					tpcb->tp_reneged = 1;
 					IncStat(ts_ldebug);
 				}
 			ENDDEBUG
-			/* Are we about to reneg on credit? 
+			/* Are we about to reneg on credit?
 			 * When might we do so?
 			 *	a) when using optimistic credit (which we no longer do).
 			 *  b) when drain() gets implemented (not in the plans).
@@ -501,7 +501,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				tpcb->tp_reneged = 1;
 				IncStat(ts_lcdt_reduced);
 				IFTRACE(D_CREDIT)
-					tptraceTPCB(TPPTmisc, 
+					tptraceTPCB(TPPTmisc,
 						"RENEG: olduwe newuwe lcredit rcvnxt",
 						olduwe,
 						tpcb->tp_sent_uwe, tpcb->tp_lcredit,
@@ -514,7 +514,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				 */
 				if( SEQ_LT( tpcb, tpcb->tp_rcvnxt, olduwe) ) {
 					/* tmp1 = number of pkts fewer than the full window */
-					register int tmp1 = 
+					register int tmp1 =
 						(int) SEQ_SUB( tpcb, olduwe, tpcb->tp_rcvnxt);
 
 					if(tmp1 > TP_PM_MAX)
@@ -526,7 +526,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					if(tmp1 > TP_PM_MAX )
 						tmp1 = TP_PM_MAX;
 
-					IncPStat( tpcb, 
+					IncPStat( tpcb,
 							tps_cdt_acked [ tmp1 ]
 							[ ((tpcb->tp_lcredit > TP_PM_MAX)?
 								TP_PM_MAX:tpcb->tp_lcredit) ] );
@@ -535,7 +535,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 			ENDPERF
 
 			IFTRACE(D_ACKSEND)
-				tptraceTPCB(TPPTack, seq, tpcb->tp_lcredit, tpcb->tp_sent_uwe, 
+				tptraceTPCB(TPPTack, seq, tpcb->tp_lcredit, tpcb->tp_sent_uwe,
 					tpcb->tp_r_subseq, 0);
 			ENDTRACE
 			if (tpcb->tp_xtd_format) {
@@ -547,7 +547,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				hdr->tpdu_seqeotX = htonl(seqeotX.s_seqeot);
 				hdr->tpdu_AKcdtX = htons(tpcb->tp_lcredit);
 #else
-				hdr->tpdu_cdt = 0; 
+				hdr->tpdu_cdt = 0;
 				hdr->tpdu_AKseqX = seq;
 				hdr->tpdu_AKcdtX = tpcb->tp_lcredit;
 #endif /* BYTE_ORDER */
@@ -557,8 +557,8 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 			}
 			if ((tpcb->tp_class == TP_CLASS_4) &&
 				(tpcb->tp_reneged || acking_ooo)) {
-				/* 
-				 * Ack subsequence parameter req'd if WE reneged on 
+				/*
+				 * Ack subsequence parameter req'd if WE reneged on
 				 * credit offered.  (ISO 8073, 12.2.3.8.2, p. 74)
 				 */
 				IFDEBUG(D_RENEG)
@@ -568,13 +568,13 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				/*
 				 * add tmp subseq and do a htons on it.
 				 */
-				ADDOPTION(TPP_subseq, hdr, 
+				ADDOPTION(TPP_subseq, hdr,
 					sizeof(tpcb->tp_s_subseq), tpcb->tp_s_subseq);
 			} else
 				tpcb->tp_s_subseq = 0;
 
 			if ( tpcb->tp_sendfcc || eot ) /* overloaded to mean SEND FCC */ {
-				/* 
+				/*
 				 * Rules for sending FCC ("should" send when) :
 				 * %a) received an ack from peer with NO NEWS whatsoever,
 				 *  	and it did not contain an FCC
@@ -584,19 +584,19 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				 *		and below UWE at time of reneging (reduction)
 				 * Now, ISO 8073 12.2.3.8.3 says
 				 * that a retransmitted AK shall not contain the FCC
-				 * parameter.  Now, how the hell you tell the difference 
-				 * between a retransmitted ack and an ack that's sent in 
+				 * parameter.  Now, how the hell you tell the difference
+				 * between a retransmitted ack and an ack that's sent in
 				 * response to a received ack, I don't know, because without
 				 * any local activity, and w/o any received DTs, they
 				 * will contain exactly the same credit/seq# information.
 				 * Anyway, given that the "retransmission of acks"
 				 * procedure (ISO 8073 12.2.3.8.3) is optional, and we
-				 * don't do it (although the peer can't tell that), we 
+				 * don't do it (although the peer can't tell that), we
 				 * ignore this last rule.
 				 *
-				 * We send FCC for reasons a) and b) only. 
+				 * We send FCC for reasons a) and b) only.
 				 * To add reason c) would require a ridiculous amount of state.
-				 * 
+				 *
 				 */
 				u_short 	bogus[4]; /* lwe(32), subseq(16), cdt(16) */
 				SeqNum		lwe;
@@ -613,15 +613,15 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 				bcopy((caddr_t) &fcredit, (caddr_t)&bogus[3], sizeof(u_short));
 
 				IFTRACE(D_ACKSEND)
-					tptraceTPCB(TPPTmisc, 
-						"emit w/FCC: snduna r_subseq fcredit", 
+					tptraceTPCB(TPPTmisc,
+						"emit w/FCC: snduna r_subseq fcredit",
 						tpcb->tp_snduna, tpcb->tp_r_subseq,
 						tpcb->tp_fcredit, 0);
 				ENDTRACE
 
 				IFDEBUG(D_ACKSEND)
 					printf("Calling ADDOPTION 0x%x, 0x%x, 0x%x,0x%x\n",
-						TPP_flow_cntl_conf, 
+						TPP_flow_cntl_conf,
 						hdr, sizeof(bogus), bogus[0]);
 				ENDDEBUG
 				ADDOPTION(TPP_flow_cntl_conf, hdr, sizeof(bogus), bogus[0]);
@@ -632,7 +632,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					"after ADDOPTION csum_offset 0x%x, hdr->tpdu_li 0x%x\n",
 							csum_offset, hdr->tpdu_li);
 				ENDDEBUG
-					
+
 			}
 			tpcb->tp_reneged = 0;
 			tpcb->tp_sent_rcvnxt = seq;
@@ -654,7 +654,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 			break;
 
 		case ER_TPDU_type:
-			hdr->tpdu_ERreason = eot; 
+			hdr->tpdu_ERreason = eot;
 			hdr->tpdu_cdt = 0;
 			/* no user data */
 			data = (struct mbuf *)0;
@@ -670,7 +670,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 	ASSERT( hdr->tpdu_li < MLEN ); /* leave this in */
 	ASSERT( hdr->tpdu_li != 0 ); /* leave this in */
 
-	m->m_len = hdr->tpdu_li ; 
+	m->m_len = hdr->tpdu_li ;
 	hdr->tpdu_li --; /* doesn't include the li field */
 
 	datalen = m_datalen( m ); /* total len */
@@ -683,7 +683,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 					csum_offset, hdr->tpdu_li);
 		ENDDEBUG
 	if( datalen > tpcb->tp_l_tpdusize ) {
-		printf("data len 0x%x tpcb->tp_l_tpdusize 0x%x\n", 
+		printf("data len 0x%x tpcb->tp_l_tpdusize 0x%x\n",
 			datalen, tpcb->tp_l_tpdusize);
 	}
 	IFDEBUG(D_EMIT)
@@ -691,7 +691,7 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 		"tp_emit before gen_csum m_len 0x%x, csum_offset 0x%x, datalen 0x%x\n",
 		m->m_len, csum_offset, datalen);
 	ENDDEBUG
-	if( tpcb->tp_use_checksum || 
+	if( tpcb->tp_use_checksum ||
 		(dutype == CR_TPDU_type && (tpcb->tp_class & TP_CLASS_4)) ) {
 		iso_gen_csum(m, csum_offset, datalen);
 	}
@@ -734,9 +734,9 @@ tp_emit(dutype,	tpcb, seq, eot, data)
 		printf("OUTPUT: returned 0x%x\n", error);
 	ENDDEBUG
 	IFTRACE(D_EMIT)
-		tptraceTPCB(TPPTmisc, 
-			"tp_emit nlproto->output netservice returns datalen", 
-			tpcb->tp_nlproto->nlp_output, tpcb->tp_netservice, error, datalen); 
+		tptraceTPCB(TPPTmisc,
+			"tp_emit nlproto->output netservice returns datalen",
+			tpcb->tp_nlproto->nlp_output, tpcb->tp_netservice, error, datalen);
 	ENDTRACE
 done:
 	if (error) {
@@ -757,7 +757,7 @@ done:
  * 		The error type is the first argument.
  * 		The argument (sref) is the source reference on the bad incoming tpdu,
  * 		and is used for a destination reference on the outgoing packet.
- * 		(faddr) and (laddr) are the foreign and local addresses for this 
+ * 		(faddr) and (laddr) are the foreign and local addresses for this
  *		connection.
  * 		(erdata) is a ptr to the errant incoming tpdu, and is copied into the
  * 		outgoing ER, if an ER is to be issued.
@@ -769,9 +769,9 @@ done:
  * 		0 OK
  *  	ENOBUFS
  *  	E* from net layer datagram output routine
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 
 int
@@ -788,21 +788,21 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 {
 	int						dutype;
 	int 					datalen = 0;
-	register struct tpdu	*hdr; 
+	register struct tpdu	*hdr;
 	register struct mbuf	*m;
 	int						csum_offset;
 
 	IFTRACE(D_ERROR_EMIT)
-		tptrace(TPPTmisc, "tp_error_emit error sref tpcb erlen", 
+		tptrace(TPPTmisc, "tp_error_emit error sref tpcb erlen",
 			error, sref, tpcb, erlen);
 	ENDTRACE
 	IFDEBUG(D_ERROR_EMIT)
 		printf(
-		"tp_error_emit error 0x%x sref 0x%x tpcb 0x%x erlen 0x%x chan 0x%x\n", 
+		"tp_error_emit error 0x%x sref 0x%x tpcb 0x%x erlen 0x%x chan 0x%x\n",
 			error, sref, tpcb, erlen, cons_channel);
 	ENDDEBUG
 
-	MGET(m, M_DONTWAIT, TPMT_TPHDR); 
+	MGET(m, M_DONTWAIT, TPMT_TPHDR);
 	if (m == NULL) {
 		return ENOBUFS;
 	}
@@ -858,7 +858,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 
 	case ER_TPDU_type:
 		IncStat(ts_ER_sent);
-		hdr->tpdu_li = 5; 
+		hdr->tpdu_li = 5;
 		hdr->tpdu_ERreason = (char)error;
 		hdr->tpdu_ERdref = htons(sref);
 		break;
@@ -870,11 +870,11 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 
 	if(tpcb)
 		if( tpcb->tp_use_checksum ) {
-			ADDOPTION(TPP_checksum, hdr, 2, csum_offset /* dummy argument */); 
+			ADDOPTION(TPP_checksum, hdr, 2, csum_offset /* dummy argument */);
 			csum_offset =  hdr->tpdu_li - 2;
 		}
 
-	ASSERT( hdr->tpdu_li < MLEN ); 
+	ASSERT( hdr->tpdu_li < MLEN );
 
 	if (dutype == ER_TPDU_type) {
 		/* copy the errant tpdu into another 'variable part' */
@@ -891,7 +891,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 		/* copy at most as many octets for which you have room */
 		if (erlen + hdr->tpdu_li + 2 > TP_MAX_HEADER_LEN)
 			erlen = TP_MAX_HEADER_LEN - hdr->tpdu_li - 2;
-			
+
 		/* add the "invalid tpdu" parameter : required in class 0 */
 		P = (caddr_t)hdr + (int)(hdr->tpdu_li);
 		vbptr(P)->tpv_code =  TPP_invalid_tpdu; /* parameter code */
@@ -909,7 +909,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 		 * (or max that will fit in a header
 		 */
 		m->m_next = m_copy(erdata, 0, erlen);
-		hdr->tpdu_li += erlen + 2; 
+		hdr->tpdu_li += erlen + 2;
 		m_freem(erdata);
 	} else {
 		IFDEBUG(D_ERROR_EMIT)
@@ -932,7 +932,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 				tptrace(TPPTmisc, "before gen csum datalen", datalen,0,0,0);
 			ENDTRACE
 			IFDEBUG(D_ERROR_EMIT)
-				printf("before gen csum datalen 0x%x, csum_offset 0x%x\n", 
+				printf("before gen csum datalen 0x%x, csum_offset 0x%x\n",
 					datalen, csum_offset);
 			ENDDEBUG
 
@@ -972,10 +972,10 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 			dump_addr((struct sockaddr *)faddr);
 		ENDDEBUG
 		return (tpcb->tp_nlproto->nlp_dgoutput)(
-			&laddr->siso_addr, 
-			&faddr->siso_addr, 
-			m, datalen, 
-					/* no route */	(caddr_t)0, !tpcb->tp_use_checksum); 
+			&laddr->siso_addr,
+			&faddr->siso_addr,
+			m, datalen,
+					/* no route */	(caddr_t)0, !tpcb->tp_use_checksum);
 	} else if (dgout_routine) {
 			IFDEBUG(D_ERROR_EMIT)
 				printf("tp_error_emit sending DG: Laddr\n");
@@ -983,8 +983,8 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
 				printf("Faddr\n");
 				dump_addr((struct sockaddr *)faddr);
 			ENDDEBUG
-				return (*dgout_routine)( &laddr->siso_addr, &faddr->siso_addr, 
-					m, datalen, /* no route */ 
+				return (*dgout_routine)( &laddr->siso_addr, &faddr->siso_addr,
+					m, datalen, /* no route */
 					(caddr_t)0, /* nochecksum==false */0);
 	} else {
 			IFDEBUG(D_ERROR_EMIT)
diff --git a/sys/netiso/tp_events.h b/sys/netiso/tp_events.h
index 16d622b..c425cee 100644
--- a/sys/netiso/tp_events.h
+++ b/sys/netiso/tp_events.h
@@ -1,5 +1,5 @@
 /*
- * $Id: tp_events.h,v 1.2 1994/08/02 07:51:05 davidg Exp $
+ * $Id: tp_events.h,v 1.3 1994/08/21 06:14:24 paul Exp $
  */
 
 #ifndef _NETISO_TP_EVENTS_H_
@@ -7,7 +7,7 @@
 
 struct tp_event {
 	int ev_number;
-	 struct timeval e_time; 
+	 struct timeval e_time;
 #define TM_inact 0x0
 #define TM_retrans 0x1
 #define TM_sendack 0x2
@@ -46,23 +46,23 @@ struct { struct mbuf 	*e_data;	/* first field */
 				} EV_CC_TPDU;
 
 #define CC_TPDU 0xa
-struct { u_int			e_cdt;	
-				  SeqNum 	 	e_seq;		
-				  SeqNum 	 	e_subseq;		
-				  u_char 	 	e_fcc_present;		
+struct { u_int			e_cdt;
+				  SeqNum 	 	e_seq;
+				  SeqNum 	 	e_subseq;
+				  u_char 	 	e_fcc_present;
 				} EV_AK_TPDU;
 
 #define AK_TPDU 0xb
 struct { struct mbuf	*e_data; 	/* first field */
 				  int 			e_datalen; /* 2nd field */
 				  u_int 		e_eot;
-				  SeqNum		e_seq; 
+				  SeqNum		e_seq;
 				} EV_DT_TPDU;
 
 #define DT_TPDU 0xc
 struct { struct mbuf 	*e_data;	/* first field */
 				  int 			e_datalen; 	/* 2nd field */
-				  SeqNum 		e_seq;	
+				  SeqNum 		e_seq;
 				} EV_XPD_TPDU;
 
 #define XPD_TPDU 0xd
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index 63ef233..d8a9a42 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_inet.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_inet.c,v 1.3 1994/11/15 14:26:16 bde Exp $
+ * $Id: tp_inet.c,v 1.4 1995/04/26 21:32:36 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,16 +60,16 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_inet.c,v 1.3 1994/11/15 14:26:16 bde Exp $ 
+ * $Header: /home/ncvs/src/sys/netiso/tp_inet.c,v 1.4 1995/04/26 21:32:36 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_inet.c,v $
  *
  * Here is where you find the inet-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
  * out of the tp source, and everthing here is reached indirectly
- * through a switch table (struct nl_protosw *) tpcb->tp_nlproto 
- * (see tp_pcb.c). 
+ * through a switch table (struct nl_protosw *) tpcb->tp_nlproto
+ * (see tp_pcb.c).
  * The routines here are:
  * 	in_getsufx: gets transport suffix out of an inpcb structure.
  * 	in_putsufx: put transport suffix into an inpcb structure.
@@ -113,7 +113,7 @@ SOFTWARE.
 /*
  * NAME:			in_getsufx()
 
- * CALLED FROM: 	pr_usrreq() on PRU_BIND, 
+ * CALLED FROM: 	pr_usrreq() on PRU_BIND,
  *					PRU_CONNECT, PRU_ACCEPT, and PRU_PEERADDR
  *
  * FUNCTION, ARGUMENTS, and RETURN VALUE:
@@ -123,9 +123,9 @@ SOFTWARE.
  * RETURNS:		internet port / transport suffix
  *  			(CAST TO AN INT)
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 in_getsufx(inp, lenp, data_out, which)
 	struct inpcb *inp;
@@ -148,7 +148,7 @@ in_getsufx(inp, lenp, data_out, which)
 /*
  * NAME:		in_putsufx()
  *
- * CALLED FROM: tp_newsocket(); i.e., when a connection 
+ * CALLED FROM: tp_newsocket(); i.e., when a connection
  *		is being established by an incoming CR_TPDU.
  *
  * FUNCTION, ARGUMENTS:
@@ -157,9 +157,9 @@ in_getsufx(inp, lenp, data_out, which)
  *
  * RETURNS:		Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 /*ARGSUSED*/
 void
@@ -174,19 +174,19 @@ in_putsufx(inp, sufxloc, sufxlen, which)
 }
 
 /*
- * NAME:	in_recycle_tsuffix()	
+ * NAME:	in_recycle_tsuffix()
  *
  * CALLED FROM:	tp.trans whenever we go into REFWAIT state.
  *
  * FUNCTION and ARGUMENT:
- *	 Called when a ref is frozen, to allow the suffix to be reused. 
- * 	(inp) is the net level pcb.  
+ *	 Called when a ref is frozen, to allow the suffix to be reused.
+ * 	(inp) is the net level pcb.
  *
  * RETURNS:			Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:	This really shouldn't have to be done in a NET level pcb 
+ * NOTES:	This really shouldn't have to be done in a NET level pcb
  *	but... for the internet world that just the way it is done in BSD...
  * 	The alternative is to have the port unusable until the reference
  * 	timer goes off.
@@ -212,10 +212,10 @@ in_recycle_tsuffix(inp)
  *
  * RETURNS:		Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
- */ 
+ * NOTES:
+ */
 void
 in_putnetaddr(inp, name, which)
 	register struct inpcb	*inp;
@@ -224,14 +224,14 @@ in_putnetaddr(inp, name, which)
 {
 	switch (which) {
 	case TP_LOCAL:
-		bcopy((caddr_t)&name->sin_addr, 
+		bcopy((caddr_t)&name->sin_addr,
 			(caddr_t)&inp->inp_laddr, sizeof(struct in_addr));
 			/* won't work if the dst address (name) is INADDR_ANY */
 
 		break;
 	case TP_FOREIGN:
 		if( name != (struct sockaddr_in *)0 ) {
-			bcopy((caddr_t)&name->sin_addr, 
+			bcopy((caddr_t)&name->sin_addr,
 				(caddr_t)&inp->inp_faddr, sizeof(struct in_addr));
 		}
 	}
@@ -251,10 +251,10 @@ in_putnetaddr(inp, name, which)
  *
  * RETURNS:		Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
- */ 
+ * NOTES:
+ */
 in_cmpnetaddr(inp, name, which)
 	register struct inpcb	*inp;
 	register struct sockaddr_in	*name;
@@ -282,10 +282,10 @@ in_cmpnetaddr(inp, name, which)
  *
  * RETURNS:		Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
- */ 
+ * NOTES:
+ */
 
 void
 in_getnetaddr( inp, name, which)
@@ -323,7 +323,7 @@ in_getnetaddr( inp, name, which)
  * It appears that setting a double pointer to the rtentry associated with
  * the destination, and returning the header size for the network protocol
  * suffices.
- * 
+ *
  * SIDE EFFECTS:
  * Sets tp_routep pointer in pcb.
  *
@@ -355,12 +355,12 @@ register struct tp_pcb *tpcb;
  *  of the fields.
  *  inp is the inpcb structure; datalen is the length of the data in the
  *  mbuf string m0.
- * RETURNS:			
+ * RETURNS:
  *  whatever (E*) is returned form the net layer output routine.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 
 int
@@ -384,12 +384,12 @@ tpip_output(inp, m0, datalen, nochksum)
  *  instead of a pcb.  It's used by the tp_error_emit, when we
  *  don't have an in_pcb with which to call the normal output rtn.
  *
- * RETURNS:	 ENOBUFS or  whatever (E*) is 
+ * RETURNS:	 ENOBUFS or  whatever (E*) is
  *	returned form the net layer output routine.
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 
 /*ARGSUSED*/
@@ -424,7 +424,7 @@ tpip_output_dg(laddr, faddr, m0, datalen, ro, nochksum)
 
 	ip->ip_p = IPPROTO_TP;
 	m->m_pkthdr.len = ip->ip_len = sizeof(struct ip) + datalen;
-	ip->ip_ttl = MAXTTL;	
+	ip->ip_ttl = MAXTTL;
 		/* don't know why you need to set ttl;
 		 * overlay doesn't even make this available
 		 */
@@ -460,8 +460,8 @@ bad:
  * FUNCTION and ARGUMENTS:
  * Take a packet (m) from ip, strip off the ip header and give it to tp
  *
- * RETURNS:  No return value.  
- * 
+ * RETURNS:  No return value.
+ *
  * SIDE EFFECTS:
  *
  * NOTES:
@@ -490,7 +490,7 @@ tpip_input(m, iplen)
 	if((m = m_pullup(m, iplen + 1)) == MNULL)
 		goto discard;
 	CHANGE_MTYPE(m, TPMT_DATA);
-	
+
 	/*
 	 * Now pull up the whole tp header:
 	 * Unfortunately, there may be IP options to skip past so we
@@ -506,15 +506,15 @@ tpip_input(m, iplen)
 			goto discard;
 		}
 	}
-	/* 
-	 * cannot use tp_inputprep() here 'cause you don't 
+	/*
+	 * cannot use tp_inputprep() here 'cause you don't
 	 * have quite the same situation
 	 */
 
 	IFDEBUG(D_TPINPUT)
 		dump_mbuf(m, "after tpip_input both pullups");
 	ENDDEBUG
-	/* 
+	/*
 	 * m_pullup may have returned a different mbuf
 	 */
 	ip = mtod(m, struct ip *);
@@ -530,7 +530,7 @@ tpip_input(m, iplen)
 	src.sin_family  = AF_INET;
 	src.sin_len  = sizeof(src);
 	dst.sin_addr = *(struct in_addr *)&(ip->ip_dst);
-	dst.sin_family  = AF_INET; 
+	dst.sin_family  = AF_INET;
 	dst.sin_len  = sizeof(dst);
 
 	(void) tp_input(m, (struct sockaddr *)&src, (struct sockaddr *)&dst,
@@ -564,9 +564,9 @@ extern void tp_quench();
  *
  * RETURNS:	Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 
 void
@@ -587,14 +587,14 @@ tpin_quench(inp)
  *	It either returns an error status to the user or
  *	causes all connections on this address to be aborted
  *	by calling the appropriate xx_notify() routine.
- *	(cmd) is the type of ICMP error.   
+ *	(cmd) is the type of ICMP error.
  * 	(sa) the address of the sender
  *
  * RETURNS:	 Nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 ProtoHook
 tpip_ctlinput(cmd, sin)
@@ -664,9 +664,9 @@ tpip_ctlinput(cmd, sin)
  *
  * RETURNS:	 Nothing
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 
 ProtoHook
diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c
index 1eac406..2caa2bf 100644
--- a/sys/netiso/tp_input.c
+++ b/sys/netiso/tp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_input.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_input.c,v 1.1.1.1 1994/05/24 10:06:54 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_input.c,v 1.2 1994/08/02 07:51:11 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_input.c,v $
  *
  * tp_input() gets an mbuf chain from ip.  Actually, not directly
@@ -81,7 +81,7 @@ SOFTWARE.
  * socket.  tp_input calls sonewconn() and tp_newsocket() to set up the
  * "child" socket.  Most tpcb values are copied from the parent tpcb into
  * the child.
- * 
+ *
  * Also in here is tp_headersize() (grot) which tells the expected size
  * of a tp header, to be used by other layers.  It's in here because it
  * uses the static structure tpdu_info.
@@ -128,7 +128,7 @@ int 	iso_check_csum(), tp_driver(), tp_headersize(), tp_error_emit();
 */
 
 struct mbuf *
-tp_inputprep(m) 
+tp_inputprep(m)
 	register struct mbuf *m;
 {
 	int hdrlen;
@@ -157,7 +157,7 @@ tp_inputprep(m)
 	if(((int)m->m_data) & 0x3) {
 		/* If we are not 4-byte aligned, we have to be
 		 * above the beginning of the mbuf, and it is ok just
-		 * to slide it back. 
+		 * to slide it back.
 		 */
 		caddr_t ocp = m->m_data;
 
@@ -172,7 +172,7 @@ tp_inputprep(m)
 	hdrlen = 1 + *mtod( m, u_char *);
 
 	/*
-	 * now pull up the whole tp header 
+	 * now pull up the whole tp header
 	 */
 	if ( m->m_len < hdrlen) {
 		if ((m = m_pullup(m, hdrlen)) == MNULL ) {
@@ -224,9 +224,9 @@ static u_char tpdu_info[][4] =
 	if (Phrase) {error = (Erval); errlen = (int)(Loc); IncStat(Stat);\
 	goto Whattodo; }
 
-/* 
+/*
  * WHENEVER YOU USE THE FOLLOWING MACRO,
- * BE SURE THE TPDUTYPE IS A LEGIT VALUE FIRST! 
+ * BE SURE THE TPDUTYPE IS A LEGIT VALUE FIRST!
  */
 
 #define WHILE_OPTIONS(P, hdr, format)\
@@ -273,7 +273,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
 	register struct tp_pcb	*tpcb = sototpcb(so); /* old tpcb, needed below */
 	register struct tp_pcb	*newtpcb;
 
-	/* 
+	/*
 	 * sonewconn() gets a new socket structure,
 	 * a new lower layer pcb and a new tpcb,
 	 * but the pcbs are unnamed (not bound)
@@ -281,20 +281,20 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
 	IFTRACE(D_NEWSOCK)
 		tptraceTPCB(TPPTmisc, "newsock: listg_so, _tpcb, so_head",
 			so, tpcb, so->so_head, 0);
-	ENDTRACE	
+	ENDTRACE
 
 	if ((so = sonewconn(so, SS_ISCONFIRMING)) == (struct socket *)0)
 		return so;
 	IFTRACE(D_NEWSOCK)
 		tptraceTPCB(TPPTmisc, "newsock: after newconn so, so_head",
 			so, so->so_head, 0, 0);
-	ENDTRACE	
+	ENDTRACE
 
 	IFDEBUG(D_NEWSOCK)
 		printf("tp_newsocket(channel 0x%x)  after sonewconn so 0x%x \n",
 				cons_channel, so);
 		dump_addr(fname);
-		{ 
+		{
 			struct socket *t, *head ;
 
 			head = so->so_head;
@@ -307,8 +307,8 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
 		}
 	ENDDEBUG
 
-	/* 
-	 * before we clobber the old tpcb ptr, get these items from the parent pcb 
+	/*
+	 * before we clobber the old tpcb ptr, get these items from the parent pcb
 	 */
 	newtpcb = sototpcb(so);
 	newtpcb->_tp_param = tpcb->_tp_param;
@@ -319,7 +319,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
 	bcopy( tpcb->tp_lsuffix, newtpcb->tp_lsuffix, newtpcb->tp_lsuffixlen);
 
 	if( /* old */ tpcb->tp_ucddata) {
-		/* 
+		/*
 		 * These data are the connect- , confirm- or disconnect- data.
 		 */
 		struct mbuf *conndata;
@@ -370,7 +370,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
 			printf("tp_route_to FAILED! detaching tpcb 0x%x, so 0x%x\n",
 				tpcb, so);
 		ENDDEBUG
-		(void) tp_detach(tpcb); 
+		(void) tp_detach(tpcb);
 		return 0;
 	}
 ok:
@@ -388,7 +388,7 @@ tpcons_output()
 }
 #endif /* !CONS */
 
-/* 
+/*
  * NAME: 	tp_input()
  *
  * CALLED FROM:
@@ -398,12 +398,12 @@ tpcons_output()
  *  Process an incoming TPDU (m), finding the associated tpcb if there
  *  is one. Create the appropriate type of event and call the driver.
  *  (faddr) and (laddr) are the foreign and local addresses.
- * 
+ *
  * 	When tp_input() is called we KNOW that the ENTIRE TP HEADER
  * 	has been m_pullup-ed.
  *
  * RETURN VALUE: Nada
- *  
+ *
  * SIDE EFFECTS:
  *	When using COSNS it may affect the state of the net-level pcb
  *
@@ -439,7 +439,7 @@ tp_input(m, faddr, laddr, cons_channel, dgout_routine, ce_bit)
 	caddr_t					fsufxloc, lsufxloc;
 	int						tpdu_len;
 	u_int 					takes_data;
-	u_int					fcc_present; 
+	u_int					fcc_present;
 	int						errlen;
 	struct tp_conn_param 	tpp;
 	int						tpcons_output();
@@ -457,16 +457,16 @@ again:
 #ifdef TP_PERF_MEAS
 	GET_CUR_TIME( &e.e_time ); perf_meas = 0;
 #endif /* TP_PERF_MEAS */
-	
+
 	IFDEBUG(D_TPINPUT)
 		printf("tp_input(0x%x, ... 0x%x)\n", m, cons_channel);
 	ENDDEBUG
 
 
-	/* 
+	/*
 	 * get the actual tpdu length - necessary for monitoring
 	 * and for checksumming
-	 * 
+	 *
 	 * Also, maybe measure the mbuf chain lengths and sizes.
 	 */
 
@@ -497,7 +497,7 @@ again:
 		ENDDEBUG
 	}
 	IFTRACE(D_TPINPUT)
-		tptraceTPCB(TPPTtpduin, hdr->tpdu_type, hdr, hdr->tpdu_li+1, tpdu_len, 
+		tptraceTPCB(TPPTtpduin, hdr->tpdu_type, hdr, hdr->tpdu_li+1, tpdu_len,
 			0);
 	ENDTRACE
 
@@ -511,7 +511,7 @@ again:
 		printf("input: dref 0x%x sref 0x%x\n", dref, sref);
 	ENDDEBUG
 	IFTRACE(D_TPINPUT)
-		tptrace(TPPTmisc, "channel dutype dref ", 
+		tptrace(TPPTmisc, "channel dutype dref ",
 			cons_channel, dutype, dref, 0);
 	ENDTRACE
 
@@ -528,7 +528,7 @@ again:
 #endif /* ARGO_DEBUG */
 
 	CHECK( (dutype < TP_MIN_TPDUTYPE || dutype > TP_MAX_TPDUTYPE),
-		E_TP_INV_TPDU, ts_inv_dutype, respond, 
+		E_TP_INV_TPDU, ts_inv_dutype, respond,
 		2 );
 		/* unfortunately we can't take the address of the tpdu_type field,
 		 * since it's a bit field - so we just use the constant offset 2
@@ -548,7 +548,7 @@ again:
 
 			switch( vbptr(P)->tpv_code ) {
 
-			case	TPP_tpdu_size: 		
+			case	TPP_tpdu_size:
 				vb_getval(P, u_char, dusize);
 				IFDEBUG(D_TPINPUT)
 					printf("CR dusize 0x%x\n", dusize);
@@ -612,7 +612,7 @@ again:
 			case	TPP_vers:
 				/* not in class 0; 1 octet; in CR_TPDU only */
 				/* COS tests says if version wrong, use default version!?XXX */
-				CHECK( (vbval(P, u_char) != TP_VERSION ), 
+				CHECK( (vbval(P, u_char) != TP_VERSION ),
 					E_TP_INV_PVAL, ts_inv_pval, setversion,
 					(1 + (caddr_t)&vbptr(P)->tpv_val - (caddr_t)hdr) );
 			setversion:
@@ -636,7 +636,7 @@ again:
 					static u_char bad_alt_classes[5] =
 						{ ~0, ~3, ~5, ~0xf, ~0x1f};
 
-					aclass = 
+					aclass =
 						(u_char *) &(((struct tp_vbp *)P)->tpv_val);
 					for (i = ((struct tp_vbp *)P)->tpv_len; i>0; i--) {
 						alt_classes |= (1<<((*aclass++)>>4));
@@ -654,8 +654,8 @@ again:
 			case	TPP_residER:
 			case	TPP_priority:
 			case	TPP_transdelay:
-			case	TPP_throughput: 
-			case	TPP_addl_info: 
+			case	TPP_throughput:
+			case	TPP_addl_info:
 			case	TPP_subseq:
 			default:
 				IFDEBUG(D_TPINPUT)
@@ -665,12 +665,12 @@ again:
 				IncStat(ts_param_ignored);
 				break;
 
-			case	TPP_checksum:		
+			case	TPP_checksum:
 				IFDEBUG(D_TPINPUT)
 					printf("CR before cksum\n");
 				ENDDEBUG
 
-				CHECK( iso_check_csum(m, tpdu_len), 
+				CHECK( iso_check_csum(m, tpdu_len),
 					E_TP_INV_PVAL, ts_bad_csum, discard, 0)
 
 				IFDEBUG(D_TPINPUT)
@@ -711,8 +711,8 @@ again:
 
 			CHECK(t == 0, E_TP_NO_SESSION, ts_inv_sufx, respond,
 				(1 + 2 + (caddr_t)&hdr->_tpduf - (caddr_t)hdr))
-				/* _tpduf is the fixed part; add 2 to get the dref bits of 
-				 * the fixed part (can't take the address of a bit field) 
+				/* _tpduf is the fixed part; add 2 to get the dref bits of
+				 * the fixed part (can't take the address of a bit field)
 				 */
 			IFDEBUG(D_TPINPUT)
 				printf("checking if dup CR\n");
@@ -730,13 +730,13 @@ again:
 				}
 			}
 			IFTRACE(D_TPINPUT)
-				tptrace(TPPTmisc, "tp_input: tpcb *lsufxloc tpstate", 
+				tptrace(TPPTmisc, "tp_input: tpcb *lsufxloc tpstate",
 					tpcb, *lsufxloc, tpcb->tp_state, 0);
 			ENDTRACE
 		}
 
-		/* 
-		 * WE HAVE A TPCB 
+		/*
+		 * WE HAVE A TPCB
 		 * already know that the classes in the CR match at least
 		 * one class implemented, but we don't know yet if they
 		 * include any classes permitted by this server.
@@ -747,7 +747,7 @@ again:
 		ENDDEBUG
 		IFDEBUG(D_CONN)
 			printf(
-"CR: bef CHKS: flags 0x%x class_to_use 0x%x alt 0x%x opt 0x%x tp_class 0x%x\n", 
+"CR: bef CHKS: flags 0x%x class_to_use 0x%x alt 0x%x opt 0x%x tp_class 0x%x\n",
 				tpcb->tp_flags, class_to_use, alt_classes, opt, tpcb->tp_class);
 		ENDDEBUG
 		/* tpcb->tp_class doesn't include any classes not implemented  */
@@ -774,27 +774,27 @@ again:
 #endif /* notdef */
 
 		CHECK(
-			tp_consistency(tpcb, 0 /* not force or strict */, &tpp) != 0, 
+			tp_consistency(tpcb, 0 /* not force or strict */, &tpp) != 0,
 			E_TP_NEGOT_FAILED, ts_negotfailed, clear_parent_tcb,
-			(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr) 
+			(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr)
 				/* ^ more or less the location of class */
 			)
 		}
 		IFTRACE(D_CONN)
-			tptrace(TPPTmisc, 
+			tptrace(TPPTmisc,
 				"after 1 consist class_to_use class, out, tpconsout",
-				class_to_use, 
+				class_to_use,
 				tpcb->tp_class, dgout_routine, tpcons_output
 				);
 		ENDTRACE
 		CHECK(
 			((class_to_use == TP_CLASS_0)&&(dgout_routine != tpcons_output)),
 			E_TP_NEGOT_FAILED, ts_negotfailed, clear_parent_tcb,
-			(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr) 
+			(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr)
 				/* ^ more or less the location of class */
 			)
 		IFDEBUG(D_CONN)
-			printf("CR: after CRCCCHECKS: tpcb 0x%x, flags 0x%x\n", 
+			printf("CR: after CRCCCHECKS: tpcb 0x%x, flags 0x%x\n",
 				tpcb, tpcb->tp_flags);
 		ENDDEBUG
 		takes_data = TRUE;
@@ -804,17 +804,17 @@ again:
 		so = tpcb->tp_sock;
 		if (so->so_options & SO_ACCEPTCONN) {
 			struct tp_pcb *parent_tpcb = tpcb;
-			/* 
-			 * Create a socket, tpcb, ll pcb, etc. 
-			 * for this newborn connection, and fill in all the values. 
+			/*
+			 * Create a socket, tpcb, ll pcb, etc.
+			 * for this newborn connection, and fill in all the values.
 			 */
 			IFDEBUG(D_CONN)
 				printf("abt to call tp_newsocket(0x%x, 0x%x, 0x%x, 0x%x)\n",
 					so, laddr, faddr, cons_channel);
 			ENDDEBUG
-			if( (so = 
-				tp_newsocket(so, faddr, cons_channel, 
-					class_to_use, 
+			if( (so =
+				tp_newsocket(so, faddr, cons_channel,
+					class_to_use,
 					((tpcb->tp_netservice == IN_CLNS) ? IN_CLNS :
 					(dgout_routine == tpcons_output)?ISO_CONS:ISO_CLNS))
 					) == (struct socket *)0 ) {
@@ -834,7 +834,7 @@ again:
 			insque(tpcb, parent_tpcb);
 
 			/*
-			 * Stash the addresses in the net level pcb 
+			 * Stash the addresses in the net level pcb
 			 * kind of like a pcbconnect() but don't need
 			 * or want all those checks.
 			 */
@@ -855,15 +855,15 @@ again:
 #ifdef TP_PERF_MEAS
 			if( tpcb->tp_perf_on = perf_meas ) { /* assignment */
 				/* ok, let's create an mbuf for stashing the
-				 * statistics if one doesn't already exist 
+				 * statistics if one doesn't already exist
 				 */
 				(void) tp_setup_perf(tpcb);
 			}
 #endif /* TP_PERF_MEAS */
 			tpcb->tp_fref = sref;
 
-			/* We've already checked for consistency with the options 
-			 * set in tpp,  but we couldn't set them earlier because 
+			/* We've already checked for consistency with the options
+			 * set in tpp,  but we couldn't set them earlier because
 			 * we didn't want to change options in the LISTENING tpcb.
 			 * Now we set the options in the new socket's tpcb.
 			 */
@@ -878,8 +878,8 @@ again:
 
 			tpcb->tp_peer_acktime = acktime;
 
-			/* 
-			 * The following kludge is used to test retransmissions and 
+			/*
+			 * The following kludge is used to test retransmissions and
 			 * timeout during connection establishment.
 			 */
 			IFDEBUG(D_ZDREF)
@@ -896,12 +896,12 @@ again:
 			CONG_UPDATE_SAMPLE(tpcb, ce_bit);
 		}
 	} else if ( dutype == ER_TPDU_type ) {
-		/* 
+		/*
 		 * ER TPDUs have to be recognized separately
 		 * because they don't necessarily have a tpcb
 		 * with them and we don't want err out looking for such
 		 * a beast.
-		 * We could put a bunch of little kludges in the 
+		 * We could put a bunch of little kludges in the
 		 * next section of code so it would avoid references to tpcb
 		 * if dutype == ER_TPDU_type but we don't want code for ERs to
 		 * mess up code for data transfer.
@@ -909,7 +909,7 @@ again:
 		IncStat(ts_ER_rcvd);
 		e.ev_number = ER_TPDU;
 		e.ATTR(ER_TPDU).e_reason =  (u_char)hdr->tpdu_ERreason;
-		CHECK (((int)dref <= 0 || dref >= tp_refinfo.tpr_size || 
+		CHECK (((int)dref <= 0 || dref >= tp_refinfo.tpr_size ||
 			(tpcb = tp_ref[dref].tpr_pcb ) == (struct tp_pcb *) 0 ||
 			tpcb->tp_refstate == REF_FREE ||
 			tpcb->tp_refstate == REF_FROZEN),
@@ -919,8 +919,8 @@ again:
 		/* tpdu type is CC, XPD, XAK, GR, AK, DR, DC, or DT */
 
 		/* In the next 4 checks,
-		 * _tpduf is the fixed part; add 2 to get the dref bits of 
-		 * the fixed part (can't take the address of a bit field) 
+		 * _tpduf is the fixed part; add 2 to get the dref bits of
+		 * the fixed part (can't take the address of a bit field)
 		 */
 #ifdef TPCONS
 		if (cons_channel && dutype == DT_TPDU_type) {
@@ -934,7 +934,7 @@ again:
 				ENDDEBUG
 				dref = tpcb->tp_lref;
 				sref = tpcb->tp_fref;
-				CHECK( (tpcb->tp_refstate == REF_FREE), 
+				CHECK( (tpcb->tp_refstate == REF_FREE),
 					E_TP_MISM_REFS,ts_inv_dref, nonx_dref,
 					(1 + 2 + (caddr_t)&hdr->_tpduf - (caddr_t)hdr))
 				goto tp0_data;
@@ -947,10 +947,10 @@ again:
 			CHECK( ((int)dref <= 0 || dref >= tp_refinfo.tpr_size) ,
 				E_TP_MISM_REFS,ts_inv_dref, nonx_dref,
 				(1 + 2 + (caddr_t)&hdr->_tpduf - (caddr_t)hdr))
-			CHECK( ((tpcb = tp_ref[dref].tpr_pcb ) == (struct tp_pcb *) 0 ), 
+			CHECK( ((tpcb = tp_ref[dref].tpr_pcb ) == (struct tp_pcb *) 0 ),
 				E_TP_MISM_REFS,ts_inv_dref, nonx_dref,
 				(1 + 2 + (caddr_t)&hdr->_tpduf - (caddr_t)hdr))
-			CHECK( (tpcb->tp_refstate == REF_FREE), 
+			CHECK( (tpcb->tp_refstate == REF_FREE),
 				E_TP_MISM_REFS,ts_inv_dref, nonx_dref,
 				(1 + 2 + (caddr_t)&hdr->_tpduf - (caddr_t)hdr))
 		}
@@ -968,7 +968,7 @@ again:
 		IFDEBUG(D_TPINPUT)
 			printf("state of dref %d ok, tpcb 0x%x\n", dref,tpcb);
 		ENDDEBUG
-		/* 
+		/*
 		 * At this point the state of the dref could be
 		 * FROZEN: tpr_pcb == NULL,  has ( reference only) timers
 		 *		   for example, DC may arrive after the close() has detached
@@ -983,18 +983,18 @@ again:
 		dusize = tpcb->tp_tpdusize;
 		pdusize = tpcb->tp_ptpdusize;
 
-		dutype = hdr->tpdu_type << 8; /* for the switch below */ 
+		dutype = hdr->tpdu_type << 8; /* for the switch below */
 
 		WHILE_OPTIONS(P, hdr, tpcb->tp_xtd_format) /* { */
 
 #define caseof(x,y) case (((x)<<8)+(y))
 		switch( dutype | vbptr(P)->tpv_code ) {
 
-			caseof( CC_TPDU_type, TPP_addl_opt ): 
+			caseof( CC_TPDU_type, TPP_addl_opt ):
 					/* not in class 0; 1 octet */
 					vb_getval(P, u_char, addlopt);
 					break;
-			caseof( CC_TPDU_type, TPP_tpdu_size ): 
+			caseof( CC_TPDU_type, TPP_tpdu_size ):
 				{
 					u_char odusize = dusize;
 					vb_getval(P, u_char, dusize);
@@ -1007,7 +1007,7 @@ again:
 					ENDDEBUG
 				}
 					break;
-			caseof( CC_TPDU_type, TPP_ptpdu_size ): 
+			caseof( CC_TPDU_type, TPP_ptpdu_size ):
 				{
 					u_short opdusize = pdusize;
 					switch (vbptr(P)->tpv_len) {
@@ -1047,24 +1047,24 @@ again:
 					ENDDEBUG
 					break;
 
-			caseof( CC_TPDU_type,	TPP_checksum):		
-			caseof( DR_TPDU_type,	TPP_checksum):		
-			caseof( DT_TPDU_type,	TPP_checksum):		
-			caseof( XPD_TPDU_type,	TPP_checksum):		
+			caseof( CC_TPDU_type,	TPP_checksum):
+			caseof( DR_TPDU_type,	TPP_checksum):
+			caseof( DT_TPDU_type,	TPP_checksum):
+			caseof( XPD_TPDU_type,	TPP_checksum):
 					if( tpcb->tp_use_checksum )  {
-						CHECK( iso_check_csum(m, tpdu_len), 
+						CHECK( iso_check_csum(m, tpdu_len),
 							E_TP_INV_PVAL, ts_bad_csum, discard, 0)
 					}
 					break;
 
 			/*  this is different from the above because in the context
-			 *  of concat/ sep tpdu_len might not be the same as hdr len 
+			 *  of concat/ sep tpdu_len might not be the same as hdr len
 			 */
-			caseof( AK_TPDU_type,	TPP_checksum):		
-			caseof( XAK_TPDU_type,	TPP_checksum):		
-			caseof( DC_TPDU_type,	TPP_checksum):		
+			caseof( AK_TPDU_type,	TPP_checksum):
+			caseof( XAK_TPDU_type,	TPP_checksum):
+			caseof( DC_TPDU_type,	TPP_checksum):
 					if( tpcb->tp_use_checksum )  {
-						CHECK( iso_check_csum(m, (int)hdr->tpdu_li + 1), 
+						CHECK( iso_check_csum(m, (int)hdr->tpdu_li + 1),
 							E_TP_INV_PVAL, ts_bad_csum, discard, 0)
 					}
 					break;
@@ -1099,13 +1099,13 @@ again:
 					ysubseq = ntohs(ysubseq);
 					ycredit = ntohs(ycredit);
 					IFDEBUG(D_ACKRECV)
-						printf("%s%x, subseq 0x%x, cdt 0x%x dref 0x%x\n", 
+						printf("%s%x, subseq 0x%x, cdt 0x%x dref 0x%x\n",
 							"AK FCC lwe 0x", ylwe, ysubseq, ycredit, dref);
 					ENDDEBUG
 				}
 				break;
 
-			default: 
+			default:
 				IFDEBUG(D_TPINPUT)
 					printf("param ignored dutype 0x%x, code  0x%x\n",
 						dutype, vbptr(P)->tpv_code);
@@ -1123,7 +1123,7 @@ again:
 		/* NOTE: the variable dutype has been shifted left! */
 
 		switch( hdr->tpdu_type ) {
-		case CC_TPDU_type: 
+		case CC_TPDU_type:
 			/* If CC comes back with an unacceptable class
 			 * respond with a DR or ER
 			 */
@@ -1146,13 +1146,13 @@ again:
 #endif /* notdef */
 
 			CHECK(
-				tp_consistency(tpcb, TP_FORCE, &tpp) != 0, 
+				tp_consistency(tpcb, TP_FORCE, &tpp) != 0,
 				E_TP_NEGOT_FAILED, ts_negotfailed, respond,
-				(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr) 
+				(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr)
 					/* ^ more or less the location of class */
 				)
 			IFTRACE(D_CONN)
-				tptrace(TPPTmisc, 
+				tptrace(TPPTmisc,
 					"after 1 consist class, out, tpconsout",
 					tpcb->tp_class, dgout_routine, tpcons_output, 0
 					);
@@ -1161,7 +1161,7 @@ again:
 				((class_to_use == TP_CLASS_0)&&
 					(dgout_routine != tpcons_output)),
 				E_TP_NEGOT_FAILED, ts_negotfailed, respond,
-				(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr) 
+				(1 + 2 + (caddr_t)&hdr->_tpdufr.CRCC - (caddr_t)hdr)
 					/* ^ more or less the location of class */
 				)
 #ifdef TPCONS
@@ -1182,23 +1182,23 @@ again:
 
 			IFTRACE(D_CONN)
 				tptrace(TPPTmisc, "after CC class flags dusize CCclass",
-					tpcb->tp_class, tpcb->tp_flags, tpcb->tp_tpdusize, 
+					tpcb->tp_class, tpcb->tp_flags, tpcb->tp_tpdusize,
 					hdr->tpdu_CCclass);
 			ENDTRACE
 
-			/* if called or calling suffices appeared on the CC, 
+			/* if called or calling suffices appeared on the CC,
 			 * they'd better jive with what's in the pcb
 			 */
 			if( fsufxlen ) {
 				CHECK( ((tpcb->tp_fsuffixlen != fsufxlen) ||
 					bcmp(fsufxloc, tpcb->tp_fsuffix, fsufxlen)),
-					E_TP_INV_PVAL,ts_inv_sufx, respond, 
+					E_TP_INV_PVAL,ts_inv_sufx, respond,
 					(1+fsufxloc - (caddr_t)hdr))
 			}
 			if( lsufxlen ) {
 				CHECK( ((tpcb->tp_lsuffixlen != lsufxlen) ||
 					bcmp(lsufxloc, tpcb->tp_lsuffix, lsufxlen)),
-					E_TP_INV_PVAL,ts_inv_sufx, respond, 
+					E_TP_INV_PVAL,ts_inv_sufx, respond,
 					(1+lsufxloc - (caddr_t)hdr))
 			}
 
@@ -1213,16 +1213,16 @@ again:
 			if (sref != tpcb->tp_fref)
 				printf("INPUT: inv sufx DCsref 0x%x, tp_fref 0x%x\n",
 					sref, tpcb->tp_fref);
-					
-			CHECK( (sref != tpcb->tp_fref), 
+
+			CHECK( (sref != tpcb->tp_fref),
 				E_TP_MISM_REFS, ts_inv_sufx, discard,
 				(1 + (caddr_t)&hdr->tpdu_DCsref - (caddr_t)hdr))
-		
+
 			e.ev_number = DC_TPDU;
 			IncStat(ts_DC_rcvd);
 			break;
 
-		case DR_TPDU_type: 
+		case DR_TPDU_type:
 			IFTRACE(D_TPINPUT)
 				tptrace(TPPTmisc, "DR recvd", hdr->tpdu_DRreason, 0, 0, 0);
 			ENDTRACE
@@ -1230,9 +1230,9 @@ again:
 				printf("INPUT: inv sufx DRsref 0x%x tp_fref 0x%x\n",
 					sref, tpcb->tp_fref);
 			}
-					
+
 			CHECK( (sref != 0 && sref != tpcb->tp_fref &&
-					tpcb->tp_state != TP_CRSENT), 
+					tpcb->tp_state != TP_CRSENT),
 				(TP_ERROR_SNDC | E_TP_MISM_REFS),ts_inv_sufx, respond,
 				(1 + (caddr_t)&hdr->tpdu_DRsref - (caddr_t)hdr))
 
@@ -1252,7 +1252,7 @@ again:
 			IncStat(ts_ER_rcvd);
 			break;
 
-		case AK_TPDU_type: 
+		case AK_TPDU_type:
 
 			e.ATTR(AK_TPDU).e_subseq = subseq;
 			e.ATTR(AK_TPDU).e_fcc_present = fcc_present;
@@ -1273,7 +1273,7 @@ again:
 				e.ATTR(AK_TPDU).e_seq = hdr->tpdu_AKseq;
 			}
 			IFTRACE(D_TPINPUT)
-				tptrace(TPPTmisc, "AK recvd seq cdt subseq fcc_pres", 
+				tptrace(TPPTmisc, "AK recvd seq cdt subseq fcc_pres",
 					e.ATTR(AK_TPDU).e_seq, e.ATTR(AK_TPDU).e_cdt,
 					subseq, fcc_present);
 			ENDTRACE
@@ -1283,7 +1283,7 @@ again:
 			IncPStat(tpcb, tps_AK_rcvd);
 			break;
 
-		case XAK_TPDU_type: 
+		case XAK_TPDU_type:
 			if (tpcb->tp_xtd_format) {
 #ifdef BYTE_ORDER
 				union seq_type seqeotX;
@@ -1301,7 +1301,7 @@ again:
 			IncPStat(tpcb, tps_XAK_rcvd);
 			break;
 
-		case XPD_TPDU_type: 
+		case XPD_TPDU_type:
 			if (tpcb->tp_xtd_format) {
 #ifdef BYTE_ORDER
 				union seq_type seqeotX;
@@ -1359,7 +1359,7 @@ again:
 			IncPStat(tpcb, tps_DT_rcvd);
 			break;
 
-		case GR_TPDU_type: 
+		case GR_TPDU_type:
 			tp_indicate(T_DISCONNECT, tpcb, ECONNABORTED);
 			/* drop through */
 		default:
@@ -1374,7 +1374,7 @@ again:
 			goto respond;
 		}
 	}
-	/* peel off the tp header; 
+	/* peel off the tp header;
 	 * remember that the du_li doesn't count itself.
 	 * This may leave us w/ an empty mbuf at the front of a chain.
 	 * We can't just throw away the empty mbuf because hdr still points
@@ -1436,7 +1436,7 @@ again:
 			/* FALLTHROUGH */
 
 		case DT_TPDU_type:
-			for (n = m; n; n = n->m_next) { 
+			for (n = m; n; n = n->m_next) {
 				MCHTYPE(n, mbtype);
 			}
 		invoke:
@@ -1481,14 +1481,14 @@ again:
 		case CR_TPDU:
 			m = e.ATTR(CC_TPDU).e_data; /* same field for all three dutypes */
 			IFDEBUG(D_TPINPUT)
-				printf("after driver, restoring m to 0x%x, takes_data 0x%x\n", 
+				printf("after driver, restoring m to 0x%x, takes_data 0x%x\n",
 				m, takes_data);
 			ENDDEBUG
 			break;
 		default:
 			break;
 	}
-	/* Concatenated sequences are terminated by any tpdu that 
+	/* Concatenated sequences are terminated by any tpdu that
 	 * carries data: CR, CC, DT, XPD, DR.
 	 * All other tpdu types may be concatenated: AK, XAK, DC, ER.
 	 */
@@ -1496,15 +1496,15 @@ again:
 separate:
 	if ( takes_data == 0 )  {
 		ASSERT( m != MNULL );
-		/* 
-		 * we already peeled off the prev. tp header so 
+		/*
+		 * we already peeled off the prev. tp header so
 		 * we can just pull up some more and repeat
 		 */
 
 		if( m = tp_inputprep(m) ) {
 		IFDEBUG(D_TPINPUT)
 			hdr = mtod(m, struct tpdu *);
-			printf("tp_input @ separate: hdr 0x%x size %d m 0x%x\n", 
+			printf("tp_input @ separate: hdr 0x%x size %d m 0x%x\n",
 			hdr, (int) hdr->tpdu_li + 1, m);
 			dump_mbuf(m, "tp_input after driver, at separate");
 		ENDDEBUG
@@ -1582,17 +1582,17 @@ respond:
  *  much data to put in each tpdu.
  *
  * FUNCTION, ARGUMENTS, and RETURN VALUE:
- *  For a given connection, represented by (tpcb), and 
+ *  For a given connection, represented by (tpcb), and
  *  tpdu type (dutype), return the size of a tp header.
  *
  * RETURNS:	  the expected size of the heade in bytesr
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
  * NOTES:	 It would be nice if it got the network header size as well.
  */
 int
-tp_headersize(dutype, tpcb) 
+tp_headersize(dutype, tpcb)
 	int 			dutype;
 	struct tp_pcb 	*tpcb;
 {
@@ -1602,24 +1602,24 @@ tp_headersize(dutype, tpcb)
 		tptrace(TPPTmisc, "tp_headersize dutype class xtd_format",
 			dutype, tpcb->tp_class, tpcb->tp_xtd_format, 0);
 	ENDTRACE
-	if( !( (tpcb->tp_class == TP_CLASS_0) || 
-			(tpcb->tp_class == TP_CLASS_4) || 
-			(dutype == DR_TPDU_type) || 
+	if( !( (tpcb->tp_class == TP_CLASS_0) ||
+			(tpcb->tp_class == TP_CLASS_4) ||
+			(dutype == DR_TPDU_type) ||
 			(dutype == CR_TPDU_type) )) {
-				printf("tp_headersize:dutype 0x%x, class 0x%x", 
+				printf("tp_headersize:dutype 0x%x, class 0x%x",
 			dutype, tpcb->tp_class);
 	/* TODO: identify this and GET RID OF IT */
 	}
-	ASSERT( (tpcb->tp_class == TP_CLASS_0) || 
-			(tpcb->tp_class == TP_CLASS_4) || 
-			(dutype == DR_TPDU_type) || 
+	ASSERT( (tpcb->tp_class == TP_CLASS_0) ||
+			(tpcb->tp_class == TP_CLASS_4) ||
+			(dutype == DR_TPDU_type) ||
 			(dutype == CR_TPDU_type) );
 
 	if( tpcb->tp_class == TP_CLASS_0 ) {
 		size =  tpdu_info[ dutype ] [TP_LEN_CLASS_0_INDEX];
 	} else  {
 		size = tpdu_info[ dutype ] [tpcb->tp_xtd_format];
-	} 
+	}
 	return size;
 	/* caller must get network level header size separately */
 }
diff --git a/sys/netiso/tp_ip.h b/sys/netiso/tp_ip.h
index 0849813..865e2fd 100644
--- a/sys/netiso/tp_ip.h
+++ b/sys/netiso/tp_ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_ip.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_ip.h,v 1.2 1994/08/02 07:51:13 davidg Exp $
+ * $Id: tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp $
  */
 
 #ifndef _NETISO_TP_IP_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_ip.h,v 1.2 1994/08/02 07:51:13 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_ip.h,v 1.3 1994/08/21 06:14:24 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_ip.h,v $
  *
  * internet IP-dependent structures and include files
@@ -85,7 +85,7 @@ SOFTWARE.
 #include <netinet/ip_var.h>
 
 
-struct inpcb tp_inpcb;	
+struct inpcb tp_inpcb;
 	/* queue of active inpcbs for tp ; for tp with dod ip */
 
 #endif
diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c
index 21f3f7d..b62debe 100644
--- a/sys/netiso/tp_iso.c
+++ b/sys/netiso/tp_iso.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_iso.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,16 +60,16 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
- * $Header: /home/ncvs/src/sys/netiso/tp_iso.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_iso.c,v 1.2 1994/08/02 07:51:14 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_iso.c,v $
  *
  * Here is where you find the iso-dependent code.  We've tried
  * keep all net-level and (primarily) address-family-dependent stuff
  * out of the tp source, and everthing here is reached indirectly
- * through a switch table (struct nl_protosw *) tpcb->tp_nlproto 
- * (see tp_pcb.c). 
+ * through a switch table (struct nl_protosw *) tpcb->tp_nlproto
+ * (see tp_pcb.c).
  * The routines here are:
  * 		iso_getsufx: gets transport suffix out of an isopcb structure.
  * 		iso_putsufx: put transport suffix into an isopcb structure.
@@ -79,7 +79,7 @@ SOFTWARE.
  *		iso_recycle_suffix: clear suffix for reuse in isopcb
  * 		tpclnp_ctlinput: handle ER CNLPdu : icmp-like stuff
  * 		tpclnp_mtu: figure out what size tpdu to use
- *		tpclnp_input: take a pkt from clnp, strip off its clnp header, 
+ *		tpclnp_input: take a pkt from clnp, strip off its clnp header,
  *				give to tp
  *		tpclnp_output_dg: package a pkt for clnp given 2 addresses & some data
  *		tpclnp_output: package a pkt for clnp given an isopcb & some data
@@ -197,7 +197,7 @@ iso_putsufx(isop, sufxloc, sufxlen, which)
  * CALLED FROM:
  * 	tp.trans whenever we go into REFWAIT state.
  * FUNCTION and ARGUMENT:
- *	 Called when a ref is frozen, to allow the suffix to be reused. 
+ *	 Called when a ref is frozen, to allow the suffix to be reused.
  * 	(isop) is the net level pcb.  This really shouldn't have to be
  * 	done in a NET level pcb but... for the internet world that just
  * 	the way it is done in BSD...
@@ -220,7 +220,7 @@ iso_recycle_tsuffix(isop)
  * 	Copy a whole net addr from a struct sockaddr (name).
  * 	into an isopcb (isop).
  * 	The argument (which) takes values TP_LOCAL or TP_FOREIGN
- */ 
+ */
 void
 iso_putnetaddr(isop, name, which)
 	register struct isopcb	*isop;
@@ -259,7 +259,7 @@ iso_putnetaddr(isop, name, which)
  * 	compare a whole net addr from a struct sockaddr (name),
  * 	with that implicitly stored in an isopcb (isop).
  * 	The argument (which) takes values TP_LOCAL or TP_FOREIGN.
- */ 
+ */
 iso_cmpnetaddr(isop, name, which)
 	register struct isopcb	*isop;
 	register struct sockaddr_iso	*name;
@@ -298,7 +298,7 @@ iso_cmpnetaddr(isop, name, which)
  * 	Copy a whole net addr from an isopcb (isop) into
  * 	a struct sockaddr (name).
  * 	The argument (which) takes values TP_LOCAL or TP_FOREIGN.
- */ 
+ */
 
 void
 iso_getnetaddr( isop, name, which)
@@ -326,7 +326,7 @@ iso_getnetaddr( isop, name, which)
  * It appears that setting a double pointer to the rtentry associated with
  * the destination, and returning the header size for the network protocol
  * suffices.
- * 
+ *
  * SIDE EFFECTS:
  * Sets tp_routep pointer in pcb.
  *
@@ -385,7 +385,7 @@ tpclnp_output(isop, m0, datalen, nochksum)
 		dump_mbuf(m0, "at tpclnp_output");
 	ENDDEBUG
 
-	return 
+	return
 		clnp_output(m0, isop, datalen,  /* flags */nochksum ? CLNP_NO_CKSUM : 0);
 }
 
@@ -444,13 +444,13 @@ tpclnp_output_dg(laddr, faddr, m0, datalen, ro, nochksum)
 	IncStat(ts_tpdu_sent);
 
 	err = clnp_output(m0, &tmppcb, datalen,  flags);
-	
+
 	/*
 	 *	Free route allocated by clnp (if the route was indeed allocated)
 	 */
 	if (tmppcb.isop_route.ro_rt)
 		RTFREE(tmppcb.isop_route.ro_rt);
-	
+
 	return(err);
 }
 /*
@@ -458,7 +458,7 @@ tpclnp_output_dg(laddr, faddr, m0, datalen, ro, nochksum)
  * 	clnp's input routine, indirectly through the protosw.
  * FUNCTION and ARGUMENTS:
  * Take a packet (m) from clnp, strip off the clnp header and give it to tp
- * No return value.  
+ * No return value.
  */
 ProtoHook
 tpclnp_input(m, src, dst, clnp_len, ce_bit)
@@ -507,7 +507,7 @@ tpclnp_input(m, src, dst, clnp_len, ce_bit)
 	ENDDEBUG
 
 	IFDEBUG(D_TPISO)
-		printf("calling %sinput : src 0x%x, dst 0x%x, src addr:\n", 
+		printf("calling %sinput : src 0x%x, dst 0x%x, src addr:\n",
 			(input == tp_input ? "tp_" : "clts_"), src, dst);
 		dump_isoaddr(src);
 		printf(" dst addr:\n");
@@ -518,9 +518,9 @@ tpclnp_input(m, src, dst, clnp_len, ce_bit)
 				0, tpclnp_output_dg, ce_bit);
 
 	IFDEBUG(D_QUENCH)
-		{ 
+		{
 			if(time.tv_usec & 0x4 && time.tv_usec & 0x40) {
-				printf("tpclnp_input: FAKING %s\n", 
+				printf("tpclnp_input: FAKING %s\n",
 					tp_stat.ts_pkt_rcvd & 0x1?"QUENCH":"QUENCH2");
 				if(tp_stat.ts_pkt_rcvd & 0x1) {
 					tpclnp_ctlinput(PRC_QUENCH, &src);
@@ -573,7 +573,7 @@ tpiso_quench(isop)
  *	It either returns an error status to the user or
  *	it causes all connections on this address to be aborted
  *	by calling the appropriate xx_notify() routine.
- *	(cmd) is the type of ICMP error.   
+ *	(cmd) is the type of ICMP error.
  * 	(siso) is the address of the guy who sent the ER CLNPDU
  */
 ProtoHook
diff --git a/sys/netiso/tp_meas.c b/sys/netiso/tp_meas.c
index 460403e..f7bbecb 100644
--- a/sys/netiso/tp_meas.c
+++ b/sys/netiso/tp_meas.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -61,9 +61,9 @@ SOFTWARE.
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
- * $Header: /home/ncvs/src/sys/netiso/tp_meas.c,v 1.1.1.1 1994/05/24 10:06:52 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_meas.c,v 1.2 1994/08/02 07:51:15 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_meas.c,v $
- * 
+ *
  * tp_meas.c : create a performance measurement event
  * in the circular buffer tp_Meas[]
  */
@@ -90,14 +90,14 @@ struct tp_Meas tp_Meas[TPMEASN];
  *  stashes a performance-measurement event for the given reference (ref)
  *  (kind) tells which kind of event, timev is the time to be stored
  *  with this event, (seq), (win), and (size) are integers that usually
- *  refer to the sequence number, window number (on send) and 
+ *  refer to the sequence number, window number (on send) and
  *  size of tpdu or window.
  *
  * RETURNS:		Nada
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 void
 Tpmeas(ref, kind, timev, seq, win, size)
@@ -118,7 +118,7 @@ Tpmeas(ref, kind, timev, seq, win, size)
 	if(kind == TPtime_from_ll)
 		bcopy((caddr_t)timev, (caddr_t)&tpm->tpm_time, sizeof(struct timeval));
 	else
-		bcopy( (caddr_t)&time, 
+		bcopy( (caddr_t)&time,
 			(caddr_t)&tpm->tpm_time, sizeof(struct timeval) );
 	tpm->tpm_seq = seq;
 	tpm->tpm_window = win;
diff --git a/sys/netiso/tp_meas.h b/sys/netiso/tp_meas.h
index 5613db5..ec38744 100644
--- a/sys/netiso/tp_meas.h
+++ b/sys/netiso/tp_meas.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_meas.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_meas.h,v 1.2 1994/08/02 07:51:16 davidg Exp $
+ * $Id: tp_meas.h,v 1.3 1994/08/21 06:14:25 paul Exp $
  */
 
 #ifndef _NETISO_TP_MEAS_H_
@@ -42,13 +42,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
@@ -86,11 +86,11 @@ extern struct tp_Meas tp_Meas[];
  */
 #define TPtime_from_session	0x01
 #define TPtime_to_session	0x02
-#define TPtime_ack_rcvd		0x03 
+#define TPtime_ack_rcvd		0x03
 #define TPtime_ack_sent		0x04
 #define TPtime_from_ll		0x05
 #define TPtime_to_ll		0x06
-#define TPsbsend			0x07 
+#define TPsbsend			0x07
 #define TPtime_open			0x08
 #define TPtime_open_X		0x28 /* xtd format */
 #define TPtime_close		0x09
diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c
index 0ae2683..bfa938b 100644
--- a/sys/netiso/tp_output.c
+++ b/sys/netiso/tp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_output.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_output.c,v 1.2 1994/08/02 07:51:17 davidg Exp $
+ * $Id: tp_output.c,v 1.3 1995/04/26 21:32:37 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_output.c,v 1.2 1994/08/02 07:51:17 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_output.c,v 1.3 1995/04/26 21:32:37 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_output.c,v $
  *
  * In here is tp_ctloutput(), the guy called by [sg]etsockopt(),
@@ -107,8 +107,8 @@ SOFTWARE.
  *  the input arguements iff no errors were encountered.
  *  Strict means that no inconsistency will be tolerated.  If it's
  *  not used, checksum and tpdusize inconsistencies will be tolerated.
- *  The reason for this is that in some cases, when we're negotiating down 
- *	from class  4, these options should be changed but should not 
+ *  The reason for this is that in some cases, when we're negotiating down
+ *	from class  4, these options should be changed but should not
  *  cause negotiation to fail.
  *
  * RETURNS
@@ -127,12 +127,12 @@ tp_consistency( tpcb, cmd, param )
 	int 			class_to_use  = tp_mask_to_num(param->p_class);
 
 	IFTRACE(D_SETPARAMS)
-		tptrace(TPPTmisc, 
-		"tp_consist enter class_to_use dontchange param.class cmd", 
+		tptrace(TPPTmisc,
+		"tp_consist enter class_to_use dontchange param.class cmd",
 		class_to_use, param->p_dont_change_params, param->p_class, cmd);
 	ENDTRACE
 	IFDEBUG(D_SETPARAMS)
-		printf("tp_consistency %s %s\n", 
+		printf("tp_consistency %s %s\n",
 			cmd& TP_FORCE?	"TP_FORCE":	"",
 			cmd& TP_STRICT?	"TP_STRICT":"");
 	ENDDEBUG
@@ -140,7 +140,7 @@ tp_consistency( tpcb, cmd, param )
 		cmd &= ~TP_FORCE;
 	}
 	/* can switch net services within a domain, but
-	 * cannot switch domains 
+	 * cannot switch domains
 	 */
 	switch( param->p_netservice) {
 	case ISO_CONS:
@@ -169,7 +169,7 @@ tp_consistency( tpcb, cmd, param )
 	}
 	if( (param->p_class & TP_CLASSES_IMPLEMENTED) == 0 ) {
 		error = EINVAL; goto done;
-	} 
+	}
 	IFDEBUG(D_SETPARAMS)
 		printf("Nretrans 0x%x\n",  param->p_Nretrans );
 	ENDDEBUG
@@ -211,12 +211,12 @@ tp_consistency( tpcb, cmd, param )
 		}
 		if (param->p_tpdusize > TP0_TPDUSIZE)  {
 			if (cmd & TP_STRICT) {
-				error = EINVAL; 
+				error = EINVAL;
 			} else {
 				param->p_tpdusize = TP0_TPDUSIZE;
 			}
 			break;
-		} 
+		}
 
 		/* connect/disc data not allowed for class 0 */
 		if (tpcb->tp_ucddata) {
@@ -228,7 +228,7 @@ tp_consistency( tpcb, cmd, param )
 			}
 		}
 		break;
-		
+
 	case 4:
 		IFDEBUG(D_SETPARAMS)
 			printf("dt_ticks 0x%x\n",  param->p_dt_ticks );
@@ -240,7 +240,7 @@ tp_consistency( tpcb, cmd, param )
 			printf("ref 0x%x\n",  param->p_ref_ticks );
 		ENDDEBUG
 		if( (param->p_class & TP_CLASS_4 ) && (
-			  (param->p_dt_ticks < 1) || (param->p_dr_ticks < 1) || 
+			  (param->p_dt_ticks < 1) || (param->p_dr_ticks < 1) ||
 			  (param->p_x_ticks < 1)	|| (param->p_keepalive_ticks < 1) ||
 			  (param->p_sendack_ticks < 1) || (param->p_ref_ticks < 1) ||
 			  (param->p_inact_ticks < 1) ) ) {
@@ -250,7 +250,7 @@ tp_consistency( tpcb, cmd, param )
 		IFDEBUG(D_SETPARAMS)
 			printf("rx_strat 0x%x\n",  param->p_rx_strat );
 		ENDDEBUG
-		if(param->p_rx_strat > 
+		if(param->p_rx_strat >
 			( TPRX_USE_CW | TPRX_EACH | TPRX_FASTSTART) ) {
 				if(cmd & TP_STRICT) {
 					error = EINVAL;
@@ -280,12 +280,12 @@ tp_consistency( tpcb, cmd, param )
 		}
 		if (param->p_tpdusize > TP_TPDUSIZE)  {
 			if(cmd & TP_STRICT) {
-				error = EINVAL; 
+				error = EINVAL;
 			} else {
 				param->p_tpdusize = TP_TPDUSIZE;
 			}
 			break;
-		} 
+		}
 		break;
 	}
 
@@ -315,7 +315,7 @@ tp_consistency( tpcb, cmd, param )
 done:
 
 	IFTRACE(D_CONN)
-		tptrace(TPPTmisc, "tp_consist returns class xtdfmt cmd", 
+		tptrace(TPPTmisc, "tp_consist returns class xtdfmt cmd",
 			error, tpcb->tp_class, tpcb->tp_xtd_format, cmd);
 	ENDTRACE
 	IFDEBUG(D_CONN)
@@ -330,7 +330,7 @@ done:
  * NAME: 	tp_ctloutput()
  *
  * CALLED FROM:
- * 	[sg]etsockopt(), via so[sg]etopt(). 
+ * 	[sg]etsockopt(), via so[sg]etopt().
  *
  * FUNCTION and ARGUMENTS:
  * 	Implements the socket options at transport level.
@@ -338,18 +338,18 @@ done:
  * 	(so) is the socket.
  * 	(level) is SOL_TRANSPORT (see ../sys/socket.h)
  * 	(optname) is the particular command or option to be set.
- * 	(**mp) is an mbuf structure.  
+ * 	(**mp) is an mbuf structure.
  *
  * RETURN VALUE:
  * 	ENOTSOCK if the socket hasn't got an associated tpcb
- *  EINVAL if 
+ *  EINVAL if
  * 		trying to set window too big
- * 		trying to set illegal max tpdu size 
+ * 		trying to set illegal max tpdu size
  * 		trying to set illegal credit fraction
  * 		trying to use unknown or unimplemented class of TP
  *		structure passed to set timer values is wrong size
- *  	illegal combination of command/GET-SET option, 
- *			e.g., GET w/ TPOPT_CDDATA_CLEAR: 
+ *  	illegal combination of command/GET-SET option,
+ *			e.g., GET w/ TPOPT_CDDATA_CLEAR:
  *  EOPNOTSUPP if the level isn't transport, or command is neither GET nor SET
  *   or if the transport-specific command is not implemented
  *  EISCONN if trying a command that isn't allowed after a connection
@@ -362,7 +362,7 @@ done:
  *
  * NOTES:
  */
-ProtoHook 
+ProtoHook
 tp_ctloutput(cmd, so, level, optname, mp)
 	int 			cmd, level, optname;
 	struct socket	*so;
@@ -375,12 +375,12 @@ tp_ctloutput(cmd, so, level, optname, mp)
 	int			error = 0;
 
 	IFTRACE(D_REQUEST)
-		tptrace(TPPTmisc, "tp_ctloutput cmd so optname mp", 
+		tptrace(TPPTmisc, "tp_ctloutput cmd so optname mp",
 			cmd, so, optname, mp);
 	ENDTRACE
 	IFDEBUG(D_REQUEST)
 		printf(
-	"tp_ctloutput so 0x%x cmd 0x%x optname 0x%x, mp 0x%x *mp 0x%x tpcb 0x%x\n", 
+	"tp_ctloutput so 0x%x cmd 0x%x optname 0x%x, mp 0x%x *mp 0x%x tpcb 0x%x\n",
 			so, cmd, optname, mp, mp?*mp:0, tpcb);
 	ENDDEBUG
 	if( tpcb == (struct tp_pcb *)0 ) {
@@ -408,7 +408,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		else if (tpcb->tp_nlproto->nlp_ctloutput == NULL)
 			error = EOPNOTSUPP;
 		else
-			return ((tpcb->tp_nlproto->nlp_ctloutput)(cmd, optname, 
+			return ((tpcb->tp_nlproto->nlp_ctloutput)(cmd, optname,
 				tpcb->tp_npcb, *mp));
 		goto done;
 	} else if ( level == SOL_SOCKET) {
@@ -425,10 +425,10 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		goto done;
 	} else if ( level !=  SOL_TRANSPORT ) {
 		error = EOPNOTSUPP; goto done;
-	} 
+	}
 	if (cmd != PRCO_GETOPT && cmd != PRCO_SETOPT) {
 		error = EOPNOTSUPP; goto done;
-	} 
+	}
 	if ( so->so_error ) {
 		error = so->so_error; goto done;
 	}
@@ -438,17 +438,17 @@ tp_ctloutput(cmd, so, level, optname, mp)
 	 */
 	if ( ((so->so_state & SS_ISCONNECTING)||(so->so_state & SS_ISCONNECTED))
 		&&
-		(cmd == PRCO_SETOPT  && 
-			optname != TPOPT_DISC_DATA && 
-			optname != TPOPT_CFRM_DATA && 
+		(cmd == PRCO_SETOPT  &&
+			optname != TPOPT_DISC_DATA &&
+			optname != TPOPT_CFRM_DATA &&
 			optname != TPOPT_PERF_MEAS &&
 			optname != TPOPT_CDDATA_CLEAR ) ) {
 		error = EISCONN; goto done;
-	} 
+	}
 	/* The only options allowed after disconnection are GET DISC DATA,
 	 * and TPOPT_PSTATISTICS
 	 * and they're not allowed if the ref timer has gone off, because
-	 * the tpcb is gone 
+	 * the tpcb is gone
 	 */
 	if ((so->so_state & (SS_ISCONNECTED | SS_ISCONFIRMING)) ==  0) {
 		if ( so->so_pcb == (caddr_t)0 ) {
@@ -461,7 +461,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 	}
 
 	value = mtod(*mp, caddr_t);  /* it's aligned, don't worry,
-								  * but lint complains about it 
+								  * but lint complains about it
 								  */
 	val_len = (*mp)->m_len;
 
@@ -534,7 +534,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		} else /* cmd == PRCO_SETOPT  */ {
 			if( (val_len > MAX_TSAP_SEL_LEN) || (val_len <= 0 )) {
 				printf("val_len 0x%x (*mp)->m_len 0x%x\n", val_len, (*mp));
-				error = EINVAL; 
+				error = EINVAL;
 			} else {
 				bcopy(value, (caddr_t)tpcb->tp_fsuffix, val_len);
 				tpcb->tp_fsuffixlen = val_len;
@@ -544,10 +544,10 @@ tp_ctloutput(cmd, so, level, optname, mp)
 
 	case TPOPT_FLAGS:
 		IFDEBUG(D_REQUEST)
-			printf("%s TPOPT_FLAGS value 0x%x *value 0x%x, flags 0x%x \n", 
-				cmd==PRCO_GETOPT?"GET":"SET", 
+			printf("%s TPOPT_FLAGS value 0x%x *value 0x%x, flags 0x%x \n",
+				cmd==PRCO_GETOPT?"GET":"SET",
 				value,
-				*value, 
+				*value,
 				tpcb->tp_flags);
 		ENDDEBUG
 
@@ -579,11 +579,11 @@ tp_ctloutput(cmd, so, level, optname, mp)
 			*(struct tp_conn_param *)value = tpcb->_tp_param;
 			(*mp)->m_len = sizeof(tpcb->_tp_param);
 		} else /* cmd == PRCO_SETOPT  */ {
-			if( (error = 
-				tp_consistency(tpcb, TP_STRICT | TP_FORCE, 
+			if( (error =
+				tp_consistency(tpcb, TP_STRICT | TP_FORCE,
 								(struct tp_conn_param *)value))==0) {
-				/* 
-				 * tp_consistency doesn't copy the whole set of params 
+				/*
+				 * tp_consistency doesn't copy the whole set of params
 				 */
 				tpcb->_tp_param = *(struct tp_conn_param *)value;
 				(*mp)->m_len = sizeof(tpcb->_tp_param);
@@ -591,11 +591,11 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		}
 		break;
 
-	case TPOPT_PSTATISTICS: 
+	case TPOPT_PSTATISTICS:
 #ifdef TP_PERF_MEAS
 		if (cmd == PRCO_SETOPT) {
 			error = EINVAL; goto done;
-		} 
+		}
 		IFPERF(tpcb)
 			if (*mp) {
 				struct mbuf * n;
@@ -605,17 +605,17 @@ tp_ctloutput(cmd, so, level, optname, mp)
 				} while (n);
 			}
 			*mp = m_copym(tpcb->tp_p_mbuf, (int)M_COPYALL, M_WAITOK);
-		ENDPERF 
+		ENDPERF
 		else {
 			error = EINVAL; goto done;
-		} 
+		}
 		break;
 #else
 		error = EOPNOTSUPP;
 		goto done;
 #endif /* TP_PERF_MEAS */
-		
-	case TPOPT_CDDATA_CLEAR: 
+
+	case TPOPT_CDDATA_CLEAR:
 		if (cmd == PRCO_GETOPT) {
 			error = EINVAL;
 		} else {
@@ -627,25 +627,25 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		break;
 
 	case TPOPT_CFRM_DATA:
-	case TPOPT_DISC_DATA: 
-	case TPOPT_CONN_DATA: 
+	case TPOPT_DISC_DATA:
+	case TPOPT_CONN_DATA:
 		if( tpcb->tp_class == TP_CLASS_0 ) {
 			error = EOPNOTSUPP;
 			break;
 		}
 		IFDEBUG(D_REQUEST)
 			printf("%s\n", optname==TPOPT_DISC_DATA?"DISC data":"CONN data");
-			printf("m_len 0x%x, vallen 0x%x so_snd.cc 0x%x\n", 
+			printf("m_len 0x%x, vallen 0x%x so_snd.cc 0x%x\n",
 				(*mp)->m_len, val_len, so->so_snd.sb_cc);
 			dump_mbuf(so->so_snd.sb_mb, "tp_ctloutput: sosnd ");
 		ENDDEBUG
 		if (cmd == PRCO_SETOPT) {
 			int len = tpcb->tp_ucddata ?  tpcb->tp_ucddata->m_len : 0;
 			/* can append connect data in several calls */
-			if (len + val_len > 
+			if (len + val_len >
 				(optname==TPOPT_CONN_DATA?TP_MAX_CR_DATA:TP_MAX_DR_DATA) ) {
 				error = EMSGSIZE; goto done;
-			} 
+			}
 			(*mp)->m_next = MNULL;
 			(*mp)->m_act = 0;
 			if (tpcb->tp_ucddata)
@@ -665,7 +665,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 		}
 		break;
 
-	case TPOPT_PERF_MEAS: 
+	case TPOPT_PERF_MEAS:
 #ifdef TP_PERF_MEAS
 		if (cmd == PRCO_GETOPT) {
 			*value = (u_int)tpcb->tp_perf_on;
@@ -676,7 +676,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
 				error = EINVAL;
 			else  tpcb->tp_perf_on = (*value);
 		}
-		if( tpcb->tp_perf_on ) 
+		if( tpcb->tp_perf_on )
 			error = tp_setup_perf(tpcb);
 #else  /* TP_PERF_MEAS */
 		error = EOPNOTSUPP;
@@ -686,15 +686,15 @@ tp_ctloutput(cmd, so, level, optname, mp)
 	default:
 		error = EOPNOTSUPP;
 	}
-	
+
 done:
 	IFDEBUG(D_REQUEST)
 		dump_mbuf(so->so_snd.sb_mb, "tp_ctloutput sosnd at end");
 		dump_mbuf(*mp, "tp_ctloutput *mp");
 	ENDDEBUG
-	/* 
-	 * sigh: getsockopt looks only at m_len : all output data must 
-	 * reside in the first mbuf 
+	/*
+	 * sigh: getsockopt looks only at m_len : all output data must
+	 * reside in the first mbuf
 	 */
 	if (*mp) {
 		if (cmd == PRCO_SETOPT) {
diff --git a/sys/netiso/tp_param.h b/sys/netiso/tp_param.h
index a9c0ff2..6b01953 100644
--- a/sys/netiso/tp_param.h
+++ b/sys/netiso/tp_param.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_param.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_param.h,v 1.2 1994/08/02 07:51:19 davidg Exp $
+ * $Id: tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp $
  */
 
 #ifndef _NETISO_TP_PARAM_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_param.h,v 1.2 1994/08/02 07:51:19 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_param.h,v 1.3 1994/08/21 06:14:26 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_param.h,v $
  *
  */
@@ -92,7 +92,7 @@ extern int N_TPREF;
 #define 	TP_TPDUSIZE			0xc		/* 4096 octets for classes 1-4*/
 #define 	TP0_TPDUSIZE		0xb		/* 2048 octets for class 0 */
 #define 	TP_DFL_TPDUSIZE		0x7		/* 128 octets default */
-	/* NOTE: don't ever negotiate 8192 because could get 
+	/* NOTE: don't ever negotiate 8192 because could get
 	 * wraparound in checksumming
 	 * (No mtu is likely to be larger than 4K anyway...)
 	 */
@@ -100,10 +100,10 @@ extern int N_TPREF;
 #define		TP_MAXRXTSHIFT		6		/* factor of 64 */
 #define		TP_MAXPORT			0xefff
 
-/* ALPHA: to be used in the context: gain= 1/(2**alpha), or 
- * put another way, gaintimes(x) (x)>>alpha (forgetting the case alpha==0) 
+/* ALPHA: to be used in the context: gain= 1/(2**alpha), or
+ * put another way, gaintimes(x) (x)>>alpha (forgetting the case alpha==0)
  */
-#define 	TP_RTT_ALPHA		3 
+#define 	TP_RTT_ALPHA		3
 #define 	TP_RTV_ALPHA		2
 #define		TP_REXMTVAL(tpcb)\
 	((tp_rttadd + (tpcb)->tp_rtt + ((tpcb)->tp_rtv) << 2) / tp_rttdiv)
@@ -111,7 +111,7 @@ extern int N_TPREF;
 	((tv = value) > (max) ? (tv = max) : (tv < min ? tv = min : tv))
 
 /*
- * not sure how to treat data on disconnect 
+ * not sure how to treat data on disconnect
  */
 #define 	T_CONN_DATA			0x1
 #define 	T_DISCONNECT		0x2
@@ -144,7 +144,7 @@ extern int N_TPREF;
 #define ACK_REORDER			(1<< _ACK_REORDER_)
 
 /******************************************************
- * constants used in the protocol 
+ * constants used in the protocol
  *****************************************************/
 
 #define		TP_VERSION 			0x1
@@ -164,15 +164,15 @@ extern int N_TPREF;
 #define		TP_NML_FMT_BIT 	0x80
 #define		TP_NML_FMT_MASK	0x7f
 
-/*  
- * values for the tpdu_type field, 2nd byte in a tpdu 
+/*
+ * values for the tpdu_type field, 2nd byte in a tpdu
  */
 
 #define TP_MIN_TPDUTYPE 0x1
 
 #define XPD_TPDU_type	0x1
 #define XAK_TPDU_type	0x2
-#define GR_TPDU_type	0x3	
+#define GR_TPDU_type	0x3
 #define AK_TPDU_type	0x6
 #define ER_TPDU_type	0x7
 #define DR_TPDU_type	0x8
@@ -184,7 +184,7 @@ extern int N_TPREF;
 #define TP_MAX_TPDUTYPE 0xf
 
 /*
- * identifiers for the variable-length options in tpdus 
+ * identifiers for the variable-length options in tpdus
  */
 
 #define		TPP_acktime			0x85
@@ -239,10 +239,10 @@ extern int N_TPREF;
 #ifndef 	MNULL
 #define 	MNULL				(struct mbuf *)0
 #endif 	/* MNULL */
-	/* if ../sys/mbuf.h gets MT_types up to 0x40, these will 
+	/* if ../sys/mbuf.h gets MT_types up to 0x40, these will
 	 * have to be changed:
 	 */
-#define 	MT_XPD 				0x44	
+#define 	MT_XPD 				0x44
 #define 	MT_EOT 				0x40
 
 #define		TP_ENOREF			0x80000000
@@ -272,7 +272,7 @@ typedef		int				ProtoHook;
 		(diffp)->tv_usec = 1000000 - (diffp)->tv_usec;\
 	}\
 }
-			
+
 /******************************************************
  * Some macros used for address families
  *****************************************************/
@@ -326,7 +326,7 @@ bcopy((caddr_t)&(((struct tp_vbp *)(src))->tpv_val),(caddr_t)&(dst),sizeof(type)
 /******************************************************
  * Macro for the local credit:
  * uses max transmission unit for the ll
- * (as modified by the max TPDU size negotiated) 
+ * (as modified by the max TPDU size negotiated)
  *****************************************************/
 
 #if defined(ARGO_DEBUG)&&!defined(LOCAL_CREDIT_EXPAND)
@@ -352,7 +352,7 @@ extern int tp_rttadd, tp_rttdiv;
 #include <sys/syslog.h>
 #define printf logpri(LOG_DEBUG),addlog
 
-#ifndef  tp_NSTATES 
+#ifndef  tp_NSTATES
 
 #include <netiso/tp_states.h>
 #include <netiso/tp_events.h>
@@ -364,4 +364,4 @@ extern int tp_rttadd, tp_rttdiv;
 #endif  /* tp_NSTATES  */
 #endif /* KERNEL */
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c
index 2fe3812..da34f3f 100644
--- a/sys/netiso/tp_pcb.c
+++ b/sys/netiso/tp_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_pcb.c,v 1.3 1994/11/15 14:23:06 bde Exp $
+ * $Id: tp_pcb.c,v 1.4 1995/04/26 21:32:38 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,20 +60,20 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.3 1994/11/15 14:23:06 bde Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_pcb.c,v 1.4 1995/04/26 21:32:38 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_pcb.c,v $
  *
  *
- * This is the initialization and cleanup stuff - 
+ * This is the initialization and cleanup stuff -
  * for the tp machine in general as well as  for the individual pcbs.
  * tp_init() is called at system startup.  tp_attach() and tp_getref() are
  * called when a socket is created.  tp_detach() and tp_freeref()
- * are called during the closing stage and/or when the reference timer 
- * goes off. 
- * tp_soisdisconnecting() and tp_soisdisconnected() are tp-specific 
+ * are called during the closing stage and/or when the reference timer
+ * goes off.
+ * tp_soisdisconnecting() and tp_soisdisconnected() are tp-specific
  * versions of soisconnect*
  * and are called (obviously) during the closing phase.
  *
@@ -102,10 +102,10 @@ SOFTWARE.
 #include <netiso/tp_seq.h>
 #include <netiso/tp_clnp.h>
 
-/* ticks are in units of: 
+/* ticks are in units of:
  * 500 nano-fortnights ;-) or
- * 500 ms or 
- * 1/2 second 
+ * 500 ms or
+ * 1/2 second
  */
 
 struct tp_conn_param tp_conn_param[] = {
@@ -131,7 +131,7 @@ struct tp_conn_param tp_conn_param[] = {
 		TP_TPDUSIZE, 			/* u_char p_tpdusize */
 
 		TPACK_WINDOW, 			/* 4 bits p_ack_strat */
-		TPRX_USE_CW | TPRX_FASTSTART, 
+		TPRX_USE_CW | TPRX_FASTSTART,
 								/* 4 bits p_rx_strat*/
 		TP_CLASS_4 | TP_CLASS_0,/* 5 bits p_class */
 		1,						/* 1 bit xtd format */
@@ -166,7 +166,7 @@ struct tp_conn_param tp_conn_param[] = {
 		TP_TPDUSIZE, 			/* u_char p_tpdusize */
 
 		TPACK_WINDOW, 			/* 4 bits p_ack_strat */
-		TPRX_USE_CW | TPRX_FASTSTART, 
+		TPRX_USE_CW | TPRX_FASTSTART,
 								/* 4 bits p_rx_strat*/
 		TP_CLASS_4,				/* 5 bits p_class */
 		1,						/* 1 bit xtd format */
@@ -197,7 +197,7 @@ struct tp_conn_param tp_conn_param[] = {
 		0,		/* n/a */		/* short p_inact_ticks;	*/
 
 		/* Use tp4 defaults just in case the user changes ONLY
-		 * the class 
+		 * the class
 		 */
 		(short) 100, 			/* short p_lcdtfract */
 		(short) TP0_SOCKBUFSIZE,	/* short p_winsize */
@@ -238,7 +238,7 @@ struct tp_conn_param tp_conn_param[] = {
 		TP0_TPDUSIZE, 			/* u_char p_tpdusize */
 
 		TPACK_WINDOW, 			/* 4 bits p_ack_strat */
-		TPRX_USE_CW ,			/* No fast start */ 
+		TPRX_USE_CW ,			/* No fast start */
 								/* 4 bits p_rx_strat*/
 		TP_CLASS_4 | TP_CLASS_0,/* 5 bits p_class */
 		0,						/* 1 bit xtd format */
@@ -257,37 +257,37 @@ struct tp_conn_param tp_conn_param[] = {
 int		in_putnetaddr();
 int		in_getnetaddr();
 int		in_cmpnetaddr();
-int 	in_putsufx(); 
-int 	in_getsufx(); 
-int 	in_recycle_tsuffix(); 
-int 	tpip_mtu(); 
-int 	in_pcbbind(); 
-int 	in_pcbconnect(); 
+int 	in_putsufx();
+int 	in_getsufx();
+int 	in_recycle_tsuffix();
+int 	tpip_mtu();
+int 	in_pcbbind();
+int 	in_pcbconnect();
 #if 0
 /* XXX these are now declared as returning void in <netinet/in_pcb.h>. */
-int 	in_pcbdisconnect(); 
-int 	in_pcbdetach(); 
+int 	in_pcbdisconnect();
+int 	in_pcbdetach();
 #endif
-int 	in_pcballoc(); 
-int 	tpip_output(); 
-int 	tpip_output_dg(); 
+int 	in_pcballoc();
+int 	tpip_output();
+int 	tpip_output_dg();
 struct inpcb	tp_inpcb;
 #endif /* INET */
 #ifdef ISO
 int		iso_putnetaddr();
 int		iso_getnetaddr();
 int		iso_cmpnetaddr();
-int 	iso_putsufx(); 
-int 	iso_getsufx(); 
-int 	iso_recycle_tsuffix(); 
-int		tpclnp_mtu(); 
-int		iso_pcbbind(); 
-int		iso_pcbconnect(); 
-int		iso_pcbdisconnect(); 
-int 	iso_pcbdetach(); 
-int 	iso_pcballoc(); 
-int 	tpclnp_output(); 
-int 	tpclnp_output_dg(); 
+int 	iso_putsufx();
+int 	iso_getsufx();
+int 	iso_recycle_tsuffix();
+int		tpclnp_mtu();
+int		iso_pcbbind();
+int		iso_pcbconnect();
+int		iso_pcbdisconnect();
+int 	iso_pcbdetach();
+int 	iso_pcballoc();
+int 	tpclnp_output();
+int 	tpclnp_output_dg();
 int		iso_nlctloutput();
 struct isopcb	tp_isopcb;
 #endif /* ISO */
@@ -295,16 +295,16 @@ struct isopcb	tp_isopcb;
 int		iso_putnetaddr();
 int		iso_getnetaddr();
 int		iso_cmpnetaddr();
-int 	iso_putsufx(); 
-int 	iso_getsufx(); 
-int 	iso_recycle_tsuffix(); 
-int		iso_pcbbind(); 
-int		tpcons_pcbconnect(); 
+int 	iso_putsufx();
+int 	iso_getsufx();
+int 	iso_recycle_tsuffix();
+int		iso_pcbbind();
+int		tpcons_pcbconnect();
 int		tpclnp_mtu();
-int		iso_pcbdisconnect(); 
-int 	iso_pcbdetach(); 
-int 	iso_pcballoc(); 
-int 	tpcons_output(); 
+int		iso_pcbdisconnect();
+int 	iso_pcbdetach();
+int 	iso_pcballoc();
+int 	tpcons_output();
 struct isopcb	tp_isopcb;
 #endif /* TPCONS */
 
@@ -371,7 +371,7 @@ u_long tp_recvspace = 1024 * 4;
  * RETURNS:  Nada
  *
  * SIDE EFFECTS:
- * 
+ *
  * NOTES:
  */
 int
@@ -439,7 +439,7 @@ tp_soisdisconnecting(so)
  * NAME: tp_soisdisconnected()
  *
  * CALLED FROM:
- *	tp.trans	
+ *	tp.trans
  *
  * FUNCTION and ARGUMENTS:
  *  Set state of the socket (so) to reflect that fact that we're disconnectED
@@ -474,7 +474,7 @@ tp_soisdisconnected(tpcb)
 		bcopy ((caddr_t)ttpcb->tp_fsuffix, (caddr_t)&fsufx, sizeof(u_int) );
 		bcopy ((caddr_t)ttpcb->tp_lsuffix, (caddr_t)&lsufx, sizeof(u_int) );
 
-		tpmeas(ttpcb->tp_lref, TPtime_close, 
+		tpmeas(ttpcb->tp_lref, TPtime_close,
 		   &time, &lsufx, &fsufx, ttpcb->tp_fref);
 		tpcb->tp_perf_on = 0; /* turn perf off */
 	ENDPERF
@@ -497,7 +497,7 @@ tp_soisdisconnected(tpcb)
  *  Frees the reference represented by (r) for re-use.
  *
  * RETURNS: Nothing
- * 
+ *
  * SIDE EFFECTS:
  *
  * NOTES:	better be called at clock priority !!!!!
@@ -511,7 +511,7 @@ RefNum n;
 
 	tpcb = r->tpr_pcb;
 	IFDEBUG(D_TIMER)
-		printf("tp_freeref called for ref %d pcb %x maxrefopen %d\n", 
+		printf("tp_freeref called for ref %d pcb %x maxrefopen %d\n",
 		n, tpcb, tp_refinfo.tpr_maxopen);
 	ENDDEBUG
 	IFTRACE(D_TIMER)
@@ -545,7 +545,7 @@ RefNum n;
  *
  * FUNCTION and ARGUMENTS:
  *  obtains the next free reference and allocates the appropriate
- *  ref structure, links that structure to (tpcb) 
+ *  ref structure, links that structure to (tpcb)
  *
  * RETURN VALUE:
  *	a reference number
@@ -556,7 +556,7 @@ RefNum n;
  * NOTES:
  */
 u_long
-tp_getref(tpcb) 
+tp_getref(tpcb)
 	register struct tp_pcb *tpcb;
 {
 	register struct tp_ref	*r, *rlim;
@@ -587,7 +587,7 @@ got_one:
 	r->tpr_pcb = tpcb;
 	tpcb->tp_refstate = REF_OPENING;
 	i = r - tp_refinfo.tpr_base;
-	if (tp_refinfo.tpr_maxopen < i) 
+	if (tp_refinfo.tpr_maxopen < i)
 		tp_refinfo.tpr_maxopen = i;
 	return (u_long)i;
 }
@@ -663,7 +663,7 @@ tp_attach(so, protocol)
 		tptrace(TPPTmisc, "tp_attach:dom so", dom, so, 0, 0);
 	ENDTRACE
 
-	if (so->so_pcb != NULL) { 
+	if (so->so_pcb != NULL) {
 		return EISCONN;	/* socket already part of a connection*/
 	}
 
@@ -681,8 +681,8 @@ tp_attach(so, protocol)
 	}
 	bzero( (caddr_t)tpcb, sizeof (struct tp_pcb) );
 
-	if ( ((lref = tp_getref(tpcb)) &  TP_ENOREF) != 0 ) { 
-		error = ETOOMANYREFS; 
+	if ( ((lref = tp_getref(tpcb)) &  TP_ENOREF) != 0 ) {
+		error = ETOOMANYREFS;
 		goto bad3;
 	}
 	tpcb->tp_lref = lref;
@@ -708,13 +708,13 @@ tp_attach(so, protocol)
 		   /* Spec says default is 128 octets,
 			* that is, if the tpdusize argument never appears, use 128.
 			* As the initiator, we will always "propose" the 2048
-			* size, that is, we will put this argument in the CR 
+			* size, that is, we will put this argument in the CR
 			* always, but accept what the other side sends on the CC.
 			* If the initiator sends us something larger on a CR,
 			* we'll respond w/ this.
 			* Our maximum is 4096.  See tp_chksum.c comments.
 			*/
-	tpcb->tp_cong_win = 
+	tpcb->tp_cong_win =
 		tpcb->tp_l_tpdusize = 1 << tpcb->tp_tpdusize;
 
 	tpcb->tp_seqmask  = TP_NML_FMT_MASK;
@@ -764,7 +764,7 @@ bad2:
  * CALLED FROM:
  *	tp.trans, on behalf of a user close request
  *  and when the reference timer goes off
- * (if the disconnect  was initiated by the protocol entity 
+ * (if the disconnect  was initiated by the protocol entity
  * rather than by the user)
  *
  * FUNCTION and ARGUMENTS:
@@ -793,7 +793,7 @@ tp_detach(tpcb)
 			tpcb,so);
 	ENDDEBUG
 	IFTRACE(D_CONN)
-		tptraceTPCB(TPPTmisc, "tp_detach tpcb so lsufx", 
+		tptraceTPCB(TPPTmisc, "tp_detach tpcb so lsufx",
 			tpcb, so, *(u_short *)(tpcb->tp_lsuffix), 0);
 	ENDTRACE
 
@@ -825,9 +825,9 @@ tp_detach(tpcb)
 	tpcb->tp_notdetached = 0;
 
 	IFDEBUG(D_CONN)
-		printf("calling (...nlproto->...)(0x%x, so 0x%x)\n", 
+		printf("calling (...nlproto->...)(0x%x, so 0x%x)\n",
 			tpcb->tp_npcb, so);
-		printf("so 0x%x so_head 0x%x,  qlen %d q0len %d qlimit %d\n", 
+		printf("so 0x%x so_head 0x%x,  qlen %d q0len %d qlimit %d\n",
 		so,  so->so_head,
 		so->so_q0len, so->so_qlen, so->so_qlimit);
 	ENDDEBUG
@@ -858,11 +858,11 @@ tp_detach(tpcb)
 		tp_freeref(tpcb->tp_lref);
 	}
 #ifdef TP_PERF_MEAS
-	/* 
+	/*
 	 * Get rid of the cluster mbuf allocated for performance measurements, if
-	 * there is one.  Note that tpcb->tp_perf_on says nothing about whether or 
-	 * not a cluster mbuf was allocated, so you have to check for a pointer 
-	 * to one (that is, we need the TP_PERF_MEASs around the following section 
+	 * there is one.  Note that tpcb->tp_perf_on says nothing about whether or
+	 * not a cluster mbuf was allocated, so you have to check for a pointer
+	 * to one (that is, we need the TP_PERF_MEASs around the following section
 	 * of code, not the IFPERFs)
 	 */
 	if (tpcb->tp_p_mbuf) {
diff --git a/sys/netiso/tp_pcb.h b/sys/netiso/tp_pcb.h
index 9d32431..6322835 100644
--- a/sys/netiso/tp_pcb.h
+++ b/sys/netiso/tp_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_pcb.h,v 1.3 1994/08/21 06:14:27 paul Exp $
+ * $Id: tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
  */
 
 #ifndef _NETISO_TP_PCB_H_
@@ -42,13 +42,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
@@ -63,13 +63,13 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.3 1994/08/21 06:14:27 paul Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_pcb.h,v 1.4 1995/04/26 21:32:39 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_pcb.h,v $
  *
- * 
+ *
  * This file defines the transport protocol control block (tpcb).
  * and a bunch of #define values that are used in the tpcb.
  */
@@ -187,7 +187,7 @@ struct tp_pcb {
 	SeqNum				tp_rcvnxt;		/* next DT seq # expect to recv */
 	SeqNum	 			tp_sent_lcdt;	/* cdt according to last ack sent */
 	SeqNum	 			tp_sent_uwe;	/* uwe according to last ack sent */
-	SeqNum	 			tp_sent_rcvnxt;	/* rcvnxt according to last ack sent 
+	SeqNum	 			tp_sent_rcvnxt;	/* rcvnxt according to last ack sent
 										 * needed for perf measurements only
 										 */
 	u_short				tp_lcredit;		/* current local credit in # packets */
@@ -209,7 +209,7 @@ struct tp_pcb {
 
 
 	/* parameters per-connection controllable by user */
-	struct tp_conn_param _tp_param; 
+	struct tp_conn_param _tp_param;
 
 #define	tp_Nretrans _tp_param.p_Nretrans
 #define	tp_dr_ticks _tp_param.p_dr_ticks
@@ -263,7 +263,7 @@ struct tp_pcb {
 #define USES_PDN(t)			(((t)->tp_flags & TPF_NLQOS_PDN) != 0)
 
 
-	unsigned 
+	unsigned
 		tp_sendfcc:1,			/* shall next ack include FCC parameter? */
 		tp_trace:1,				/* is this pcb being traced? (not used yet) */
 		tp_perf_on:1,			/* 0/1 -> performance measuring on  */
@@ -356,4 +356,4 @@ extern struct tp_pcb	*tp_ftimeolist;
 #define	tpcbtoso(tp)	((struct socket *)((tp)->tp_sock))
 #define	tpcbtoref(tp)	((struct tp_ref *)((tp)->tp_ref))
 
-#endif  
+#endif
diff --git a/sys/netiso/tp_seq.h b/sys/netiso/tp_seq.h
index 2441e6a..7b8fcd3 100644
--- a/sys/netiso/tp_seq.h
+++ b/sys/netiso/tp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_seq.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_seq.h,v 1.2 1994/08/02 07:51:22 davidg Exp $
+ * $Id: tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp $
  */
 
 #ifndef _NETISO_TP_SEQ_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_seq.h,v 1.2 1994/08/02 07:51:22 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_seq.h,v 1.3 1994/08/21 06:14:28 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_seq.h,v $
  *
  * These macros perform sequence number arithmetic modulo (2**7 or 2**31).
@@ -99,7 +99,7 @@ SOFTWARE.
 ( ((int)((seq)-(operand)) < 0)\
 ? ((-(int)((seq)-(operand))) < (int)(tpcb)->tp_seqhalf)\
 : !(((int)(seq)-(operand)) < (int)(tpcb)->tp_seqhalf))
-	
+
 #define SEQ_MIN(tpcb, a, b) ( SEQ_GT(tpcb, a, b) ? b : a)
 
 #define SEQ_MAX(tpcb, a, b) ( SEQ_GT(tpcb, a, b) ? a : b)
@@ -122,4 +122,4 @@ SOFTWARE.
 #define IN_SWINDOW(tpcb, seq, lwe, uwe)\
 	( SEQ_GT(tpcb, seq, lwe) && SEQ_LEQ(tpcb, seq, uwe) )
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_stat.h b/sys/netiso/tp_stat.h
index c5a3f3f..e7c80fd 100644
--- a/sys/netiso/tp_stat.h
+++ b/sys/netiso/tp_stat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_stat.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_stat.h,v 1.2 1994/08/02 07:51:23 davidg Exp $
+ * $Id: tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp $
  */
 
 #ifndef _NETISO_TP_STAT_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_stat.h,v 1.2 1994/08/02 07:51:23 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_stat.h,v 1.3 1994/08/21 06:14:28 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_stat.h,v $
  *
  * Here are the data structures in which the global
@@ -98,11 +98,11 @@ struct tp_stat {
 	u_long ts_dt_ooo;		/* dt tpdus received out of order */
 	u_long ts_dt_niw;		/* dt tpdus received & not in window */
 	u_long ts_xpd_niw;		/* xpd tpdus received & not in window */
-	u_long ts_xpd_dup;		
+	u_long ts_xpd_dup;
 	u_long ts_dt_dup;		/* dt tpdus received & are duplicates */
 
 	u_long ts_zfcdt;		/* # times f credit went down to 0 */
-	u_long ts_lcdt_reduced; /* 
+	u_long ts_lcdt_reduced; /*
 		# times local cdt reduced on an acknowledgement.
 		*/
 
@@ -199,30 +199,30 @@ struct tp_stat {
 #define IncPStat(Tpcb, X) if((Tpcb)->tp_perf_on) (Tpcb)->tp_p_meas->/**/X/**/++
 
 /* BEWARE OF MACROS like this ^^^ must be sure it's surrounded by {} if
- * it's used in an if-else statement. 
+ * it's used in an if-else statement.
  */
 
 
 /* for perf measurement stuff: maximum window size it can handle */
 
 struct tp_pmeas {
-		/* the first few are distributions as a fn of window size 
+		/* the first few are distributions as a fn of window size
 		 * only keep enough space for normal format plus 1 slot for
 		 * extended format, in case any windows larger than 15 are used
 		 */
 
-		/* 
-		 * tps_npdusent: for each call to tp_sbsend, we inc the 
+		/*
+		 * tps_npdusent: for each call to tp_sbsend, we inc the
 		 * element representing the number of pdus sent in this call
 		 */
-		int		tps_win_lim_by_cdt[TP_PM_MAX+1]; 
-		int		tps_win_lim_by_data[TP_PM_MAX+1]; 
-		/* 
+		int		tps_win_lim_by_cdt[TP_PM_MAX+1];
+		int		tps_win_lim_by_data[TP_PM_MAX+1];
+		/*
 		 * tps_sendtime: Each call to tp_sbsend() is timed.  For
 		 * Each window size, we keep the running average of the time
 		 * taken by tp_sbsend() for each window size.
 		 */
-		int	tps_sendtime[TP_PM_MAX+1]; 
+		int	tps_sendtime[TP_PM_MAX+1];
 		/*
 		 * n_TMsendack: # times ack sent because timer went off
 		 * n_ack_cuz_eot: # times ack sent due to EOTSDU on incoming packet
@@ -243,13 +243,13 @@ struct tp_pmeas {
 		 * only received 6 since our last credit advertisement, we'll
 		 * keep the difference, 4, in this variable.
 		 */
-		int		tps_ack_early[TP_PM_MAX+1]; 
+		int		tps_ack_early[TP_PM_MAX+1];
 		/*
 		 * when we ack, for the # pkts we actually acked w/ this ack,
 		 * how much cdt are we advertising?
 		 * [ size of window acknowledged ] [ cdt we're giving ]
 		 */
-		int		tps_cdt_acked[TP_PM_MAX+1][TP_PM_MAX+1]; 
+		int		tps_cdt_acked[TP_PM_MAX+1][TP_PM_MAX+1];
 
 		int 	tps_AK_sent;
 		int 	tps_XAK_sent;
@@ -281,4 +281,4 @@ int PStat_Junk;
 
 #endif /* TP_PERF_MEAS */
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c
index 12193a9..6125a0a 100644
--- a/sys/netiso/tp_subr.c
+++ b/sys/netiso/tp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_subr.c,v 1.2 1994/08/02 07:51:25 davidg Exp $
+ * $Id: tp_subr.c,v 1.3 1995/04/26 21:32:40 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_subr.c,v 1.2 1994/08/02 07:51:25 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_subr.c,v 1.3 1995/04/26 21:32:40 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_subr.c,v $
  *
  * The main work of data transfer is done here.
@@ -71,7 +71,7 @@ SOFTWARE.
  * They include the routines that check the validity of acks and Xacks,
  * (tp_goodack() and tp_goodXack() )
  * take packets from socket buffers and send them (tp_send()),
- * drop the data from the socket buffers (tp_sbdrop()),  
+ * drop the data from the socket buffers (tp_sbdrop()),
  * and put incoming packet data into socket buffers (tp_stash()).
  */
 
@@ -107,7 +107,7 @@ void	tp_send();
  * CALLED FROM:
  *	tp.trans, when an XAK arrives
  * FUNCTION and ARGUMENTS:
- * 	Determines if the sequence number (seq) from the XAK 
+ * 	Determines if the sequence number (seq) from the XAK
  * 	acks anything new.  If so, drop the appropriate tpdu
  * 	from the XPD send queue.
  * RETURN VALUE:
@@ -116,13 +116,13 @@ void	tp_send();
 int
 tp_goodXack(tpcb, seq)
 	struct tp_pcb	*tpcb;
-	SeqNum 			seq; 
+	SeqNum 			seq;
 {
 
 	IFTRACE(D_XPD)
-		tptraceTPCB(TPPTgotXack, 
-			seq, tpcb->tp_Xuna, tpcb->tp_Xsndnxt, tpcb->tp_sndnew, 
-			tpcb->tp_snduna); 
+		tptraceTPCB(TPPTgotXack,
+			seq, tpcb->tp_Xuna, tpcb->tp_Xsndnxt, tpcb->tp_sndnew,
+			tpcb->tp_snduna);
 	ENDTRACE
 
 	if ( seq == tpcb->tp_Xuna ) {
@@ -141,14 +141,14 @@ tp_goodXack(tpcb, seq)
 			ENDDEBUG
 
 			IFTRACE(D_XPD)
-				tptraceTPCB(TPPTmisc, 
+				tptraceTPCB(TPPTmisc,
 					"goodXack: dropping cc ",
 					(int)(tpcb->tp_Xsnd.sb_cc),
 					0,0,0);
 			ENDTRACE
 			sbdroprecord(&tpcb->tp_Xsnd);
 			return 1;
-	} 
+	}
 	return 0;
 }
 
@@ -194,7 +194,7 @@ register struct tp_pcb *tpcb;
 		if ((tpcb->tp_rtv += ((delta - tpcb->tp_rtv) >> TP_RTV_ALPHA)) <= 0)
 			tpcb->tp_rtv = 1;
 	} else {
-		/* 
+		/*
 		 * No rtt measurement yet - use the unsmoothed rtt.
 		 * Set the variance to half the rtt (so our first
 		 * retransmit happens at 3*rtt)
@@ -228,7 +228,7 @@ register struct tp_pcb *tpcb;
  * CALLED FROM:
  *  tp.trans when an AK arrives
  * FUNCTION and ARGUMENTS:
- * 	Given (cdt), the credit from the AK tpdu, and 
+ * 	Given (cdt), the credit from the AK tpdu, and
  *	(seq), the sequence number from the AK tpdu,
  *  tp_goodack() determines if the AK acknowledges something in the send
  * 	window, and if so, drops the appropriate packets from the retransmission
@@ -250,7 +250,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
 	register SeqNum			seq;
 	u_int					subseq;
 {
-	int 	old_fcredit; 
+	int 	old_fcredit;
 	int 	bang = 0; 	/* bang --> ack for something heretofore unacked */
 	u_int	bytes_acked;
 
@@ -259,8 +259,8 @@ tp_goodack(tpcb, cdt, seq, subseq)
 			tpcb, seq, cdt, tpcb->tp_snduna, tpcb->tp_sndnew, tpcb->tp_sndnxt);
 	ENDDEBUG
 	IFTRACE(D_ACKRECV)
-		tptraceTPCB(TPPTgotack, 
-			seq,cdt, tpcb->tp_snduna,tpcb->tp_sndnew,subseq); 
+		tptraceTPCB(TPPTgotack,
+			seq,cdt, tpcb->tp_snduna,tpcb->tp_sndnew,subseq);
 	ENDTRACE
 
 	IFPERF(tpcb)
@@ -379,7 +379,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
 				tpcb->tp_sndnxt_m = 0;
 		}
 		bang++;
-	} 
+	}
 
 	if( cdt != 0 && old_fcredit == 0 ) {
 		tpcb->tp_sendfcc = 1;
@@ -417,7 +417,7 @@ done:
  *  drops everything up TO but not INCLUDING seq # (seq)
  *  from the retransmission queue.
  */
-tp_sbdrop(tpcb, seq) 
+tp_sbdrop(tpcb, seq)
 	register struct 	tp_pcb 			*tpcb;
 	SeqNum					seq;
 {
@@ -469,7 +469,7 @@ tp_send(tpcb)
 	int						idle, idleticks, off, cong_win;
 #ifdef TP_PERF_MEAS
 	int			 			send_start_time = ticks;
-	SeqNum					oldnxt = tpcb->tp_sndnxt; 
+	SeqNum					oldnxt = tpcb->tp_sndnxt;
 #endif /* TP_PERF_MEAS */
 
 	idle = (tpcb->tp_snduna == tpcb->tp_sndnew);
@@ -488,19 +488,19 @@ tp_send(tpcb)
 	highseq = SEQ(tpcb, tpcb->tp_fcredit + tpcb->tp_snduna);
 	if (tpcb->tp_Xsnd.sb_mb)
 		highseq = SEQ_MIN(tpcb, highseq, tpcb->tp_sndnew);
-		
+
 	IFDEBUG(D_DATA)
 		printf("tp_send enter tpcb 0x%x nxt 0x%x win %d high 0x%x\n",
 				tpcb, tpcb->tp_sndnxt, cong_win, highseq);
 	ENDDEBUG
 	IFTRACE(D_DATA)
-		tptraceTPCB( TPPTmisc, "tp_send sndnew snduna", 
+		tptraceTPCB( TPPTmisc, "tp_send sndnew snduna",
 			tpcb->tp_sndnew,  tpcb->tp_snduna, 0, 0);
-		tptraceTPCB( TPPTmisc, "tp_send tpcb->tp_sndnxt win fcredit congwin", 
+		tptraceTPCB( TPPTmisc, "tp_send tpcb->tp_sndnxt win fcredit congwin",
 			tpcb->tp_sndnxt, cong_win, tpcb->tp_fcredit, tpcb->tp_cong_win);
 	ENDTRACE
 	IFTRACE(D_DATA)
-		tptraceTPCB( TPPTmisc, "tp_send 2 nxt high fcredit congwin", 
+		tptraceTPCB( TPPTmisc, "tp_send 2 nxt high fcredit congwin",
 			tpcb->tp_sndnxt, highseq, tpcb->tp_fcredit, cong_win);
 	ENDTRACE
 
@@ -527,7 +527,7 @@ send:
 			len < (tpcb->tp_l_tpdusize / 2))
 				break;  /* Nagle . . . . . */
 		cong_win -= len;
-		/* make a copy - mb goes into the retransmission list 
+		/* make a copy - mb goes into the retransmission list
 		 * while m gets emitted.  m_copy won't copy a zero-length mbuf.
 		 */
 		mb = m;
@@ -535,8 +535,8 @@ send:
 		if (m == MNULL)
 				break;
 		IFTRACE(D_STASH)
-			tptraceTPCB( TPPTmisc, 
-				"tp_send mcopy nxt high eotsdu len", 
+			tptraceTPCB( TPPTmisc,
+				"tp_send mcopy nxt high eotsdu len",
 				tpcb->tp_sndnxt, highseq, eotsdu, len);
 		ENDTRACE
 
@@ -591,11 +591,11 @@ send:
 
 			npkts = SEQ_SUB(tpcb, tpcb->tp_sndnxt, oldnxt);
 
-			if (npkts > 0) 
+			if (npkts > 0)
 				tpcb->tp_Nwindow++;
 
-			if (npkts > TP_PM_MAX) 
-				npkts = TP_PM_MAX; 
+			if (npkts > TP_PM_MAX)
+				npkts = TP_PM_MAX;
 
 			t = &(tpcb->tp_p_meas->tps_sendtime[npkts]);
 			*t += (t - elapsed) >> TP_RTT_ALPHA;
@@ -608,7 +608,7 @@ send:
 			}
 			now.tv_sec = elapsed / hz;
 			now.tv_usec = (elapsed - (hz * now.tv_sec)) * 1000000 / hz;
-			tpmeas( tpcb->tp_lref, 
+			tpmeas( tpcb->tp_lref,
 					TPsbsend, &elapsed, newseq, tpcb->tp_Nwindow, npkts);
 		}
 	ENDPERF
@@ -616,10 +616,10 @@ send:
 
 
 	IFTRACE(D_DATA)
-		tptraceTPCB( TPPTmisc, 
+		tptraceTPCB( TPPTmisc,
 			"tp_send at end: new nxt eotsdu error",
 			tpcb->tp_sndnew, tpcb->tp_sndnxt, eotsdu, tpcb->tp_sock->so_error);
-		
+
 	ENDTRACE
 }
 
@@ -633,7 +633,7 @@ int eotsdu;
 {
 	register struct mbuf *n;
 	register struct sockbuf *sb = &tpcb->tp_sock->so_snd;
-	int	maxsize = tpcb->tp_l_tpdusize 
+	int	maxsize = tpcb->tp_l_tpdusize
 			- tp_headersize(DT_TPDU_type, tpcb)
 			- (tpcb->tp_use_checksum?4:0) ;
 	int totlen = m->m_pkthdr.len;
@@ -707,18 +707,18 @@ out:
  * CALLED FROM:
  *	tp.trans on arrival of a DT tpdu
  * FUNCTION, ARGUMENTS, and RETURN VALUE:
- * 	Returns 1 if 
+ * 	Returns 1 if
  *		a) something new arrived and it's got eotsdu_reached bit on,
  * 		b) this arrival was caused other out-of-sequence things to be
  *    	accepted, or
  * 		c) this arrival is the highest seq # for which we last gave credit
  *   	(sender just sent a whole window)
- *  In other words, returns 1 if tp should send an ack immediately, 0 if 
+ *  In other words, returns 1 if tp should send an ack immediately, 0 if
  *  the ack can wait a while.
  *
  * Note: this implementation no longer renegs on credit, (except
  * when debugging option D_RENEG is on, for the purpose of testing
- * ack subsequencing), so we don't  need to check for incoming tpdus 
+ * ack subsequencing), so we don't  need to check for incoming tpdus
  * being in a reneged portion of the window.
  */
 
@@ -741,7 +741,7 @@ tp_stash(tpcb, e)
 		n->m_act = 0;
 	}
 		IFDEBUG(D_STASH)
-			dump_mbuf(tpcb->tp_sock->so_rcv.sb_mb, 
+			dump_mbuf(tpcb->tp_sock->so_rcv.sb_mb,
 				"stash: so_rcv before appending");
 			dump_mbuf(E.e_data,
 				"stash: e_data before appending");
@@ -756,12 +756,12 @@ tp_stash(tpcb, e)
 	if (E.e_seq == tpcb->tp_rcvnxt) {
 
 		IFDEBUG(D_STASH)
-			printf("stash EQ: seq 0x%x datalen 0x%x eot 0x%x\n", 
+			printf("stash EQ: seq 0x%x datalen 0x%x eot 0x%x\n",
 			E.e_seq, E.e_datalen, E.e_eot);
 		ENDDEBUG
 
 		IFTRACE(D_STASH)
-			tptraceTPCB(TPPTmisc, "stash EQ: seq len eot", 
+			tptraceTPCB(TPPTmisc, "stash EQ: seq len eot",
 			E.e_seq, E.e_datalen, E.e_eot, 0);
 		ENDTRACE
 
@@ -770,7 +770,7 @@ tp_stash(tpcb, e)
 		sbappend(&tpcb->tp_sock->so_rcv, E.e_data);
 
 		SEQ_INC( tpcb, tpcb->tp_rcvnxt );
-		/* 
+		/*
 		 * move chains from the reassembly queue to the socket buffer
 		 */
 		if (tpcb->tp_rsycnt) {
@@ -791,7 +791,7 @@ tp_stash(tpcb, e)
 			}
 		}
 		IFDEBUG(D_STASH)
-			dump_mbuf(tpcb->tp_sock->so_rcv.sb_mb, 
+			dump_mbuf(tpcb->tp_sock->so_rcv.sb_mb,
 				"stash: so_rcv after appending");
 		ENDDEBUG
 
@@ -800,7 +800,7 @@ tp_stash(tpcb, e)
 		SeqNum uwe;
 
 		IFTRACE(D_STASH)
-			tptraceTPCB(TPPTmisc, "stash Reseq: seq rcvnxt lcdt", 
+			tptraceTPCB(TPPTmisc, "stash Reseq: seq rcvnxt lcdt",
 			E.e_seq, tpcb->tp_rcvnxt, tpcb->tp_lcredit, 0);
 		ENDTRACE
 
@@ -838,9 +838,9 @@ tp_stash(tpcb, e)
 			ack_reason |= ACK_STRAT_FULLWIN;
 
 		IFTRACE(D_STASH)
-			tptraceTPCB(TPPTmisc, 
+			tptraceTPCB(TPPTmisc,
 				"end of stash, eot, ack_reason, sent_uwe ",
-				E.e_eot, ack_reason, tpcb->tp_sent_uwe, 0); 
+				E.e_eot, ack_reason, tpcb->tp_sent_uwe, 0);
 		ENDTRACE
 
 		if ( ack_reason == ACK_DONT ) {
@@ -855,7 +855,7 @@ tp_stash(tpcb, e)
 				} else if(ack_reason & ACK_REORDER) {
 					IncPStat(tpcb, tps_n_ack_cuz_reorder);
 				}
-				tpmeas(tpcb->tp_lref, TPtime_ack_sent, 0, 
+				tpmeas(tpcb->tp_lref, TPtime_ack_sent, 0,
 							SEQ_ADD(tpcb, E.e_seq, 1), 0, 0);
 			ENDPERF
 			{
@@ -863,7 +863,7 @@ tp_stash(tpcb, e)
 
 				/* keep track of all reasons that apply */
 				for( i=1; i<_ACK_NUM_REASONS_ ;i++) {
-					if( ack_reason & (1<<i) ) 
+					if( ack_reason & (1<<i) )
 						IncStat( ts_ackreason[i] );
 				}
 			}
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 6928049..943d11b 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_subr2.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_subr2.c,v 1.2 1994/08/02 07:51:26 davidg Exp $
+ * $Id: tp_subr2.c,v 1.3 1995/04/26 21:32:41 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.2 1994/08/02 07:51:26 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_subr2.c,v 1.3 1995/04/26 21:32:41 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_subr2.c,v $
  *
  * Some auxiliary routines:
@@ -134,7 +134,7 @@ void tp_rsyset();
  * SIDE EFFECTS:
  *
  * NOTES:
- *  This doesn't actually get called in a production system - 
+ *  This doesn't actually get called in a production system -
  *  the macro gets expanded instead in place of calls to this proc.
  *  But for debugging, we call this and that allows us to add
  *  debugging messages easily here.
@@ -146,10 +146,10 @@ tp_local_credit(tpcb)
 	LOCAL_CREDIT(tpcb);
 	IFDEBUG(D_CREDIT)
 		printf("ref 0x%x lcdt 0x%x l_tpdusize 0x%x decbit 0x%x\n",
-			tpcb->tp_lref, 
-			tpcb->tp_lcredit, 
-			tpcb->tp_l_tpdusize, 
-			tpcb->tp_decbit, 
+			tpcb->tp_lref,
+			tpcb->tp_lcredit,
+			tpcb->tp_l_tpdusize,
+			tpcb->tp_decbit,
 			tpcb->tp_cong_win
 			);
 	ENDDEBUG
@@ -168,7 +168,7 @@ tp_local_credit(tpcb)
  * 	a combo of event, state, predicate
  *
  * FUNCTION and ARGUMENTS:
- *  print error mesg 
+ *  print error mesg
  *
  * RETURN VALUE:
  *  EIO - always
@@ -215,30 +215,30 @@ tp_drain()
  * 	attached to the tpcb.
  *
  * RETURNS:  Rien
- * 
+ *
  * SIDE EFFECTS:
  *
  * NOTES:
  */
 void
 tp_indicate(ind, tpcb, error)
-	int				ind; 
+	int				ind;
 	u_short			error;
 	register struct tp_pcb	*tpcb;
 {
 	register struct socket *so = tpcb->tp_sock;
 	IFTRACE(D_INDICATION)
-		tptraceTPCB(TPPTindicate, ind, *(u_short *)(tpcb->tp_lsuffix), 
+		tptraceTPCB(TPPTindicate, ind, *(u_short *)(tpcb->tp_lsuffix),
 			*(u_short *)(tpcb->tp_fsuffix), error,so->so_pgid);
 	ENDTRACE
 	IFDEBUG(D_INDICATION)
 		char *ls, *fs;
-		ls = tpcb->tp_lsuffix, 
-		fs = tpcb->tp_fsuffix, 
+		ls = tpcb->tp_lsuffix,
+		fs = tpcb->tp_fsuffix,
 
 		printf(
 "indicate 0x%x lsuf 0x%02x%02x fsuf 0x%02x%02x err 0x%x  noind 0x%x ref 0x%x\n",
-		ind, 
+		ind,
 		*ls, *(ls+1), *fs, *(fs+1),
 		error, /*so->so_pgrp,*/
 		tpcb->tp_no_disc_indications,
@@ -280,15 +280,15 @@ tp_indicate(ind, tpcb, error)
  * NAME : tp_getoptions()
  *
  * CALLED FROM:
- * 	tp.trans whenever we go into OPEN state 
+ * 	tp.trans whenever we go into OPEN state
  *
  * FUNCTION and ARGUMENTS:
  *  sets the proper flags and values in the tpcb, to control
  *  the appropriate actions for the given class, options,
  *  sequence space, etc, etc.
- * 
+ *
  * RETURNS: Nada
- * 
+ *
  * SIDE EFFECTS:
  *
  * NOTES:
@@ -297,7 +297,7 @@ void
 tp_getoptions(tpcb)
 struct tp_pcb *tpcb;
 {
-	tpcb->tp_seqmask = 
+	tpcb->tp_seqmask =
 		tpcb->tp_xtd_format ?	TP_XTD_FMT_MASK :	TP_NML_FMT_MASK ;
 	tpcb->tp_seqbit =
 		tpcb->tp_xtd_format ?	TP_XTD_FMT_BIT :	TP_NML_FMT_BIT ;
@@ -305,7 +305,7 @@ struct tp_pcb *tpcb;
 	tpcb->tp_dt_ticks =
 		max(tpcb->tp_dt_ticks, (tpcb->tp_peer_acktime + 2));
 	tp_rsyset(tpcb);
-	
+
 }
 
 /*
@@ -315,7 +315,7 @@ struct tp_pcb *tpcb;
  *  Called when a ref is frozen.
  *
  * FUNCTION and ARGUMENTS:
- *  allows the suffix to be reused. 
+ *  allows the suffix to be reused.
  *
  * RETURNS: zilch
  *
@@ -345,20 +345,20 @@ tp_recycle_tsuffix(tpcb)
  *  Congestion window scheme:
  *  Initial value is 1.  ("slow start" as Nagle, et. al. call it)
  *  For each good ack that arrives, the congestion window is increased
- *  by 1 (up to max size of logical infinity, which is to say, 
+ *  by 1 (up to max size of logical infinity, which is to say,
  *	it doesn't wrap around).
  *  Source quench causes it to drop back to 1.
- *  tp_send() uses the smaller of (regular window, congestion window). 
- *  One retransmission strategy option is to have any retransmission 
+ *  tp_send() uses the smaller of (regular window, congestion window).
+ *  One retransmission strategy option is to have any retransmission
  *	cause reset the congestion window back  to 1.
  *
  *	(cmd) is either PRC_QUENCH: source quench, or
  *		PRC_QUENCH2: dest. quench (dec bit)
  *
  * RETURNS:
- * 
+ *
  * SIDE EFFECTS:
- * 
+ *
  * NOTES:
  */
 void
@@ -389,15 +389,15 @@ tp_quench( tpcb, cmd )
 /*
  * NAME:	tp_netcmd()
  *
- * CALLED FROM:			
+ * CALLED FROM:
  *
- * FUNCTION and ARGUMENTS:			
+ * FUNCTION and ARGUMENTS:
  *
- * RETURNS:			
+ * RETURNS:
  *
- * SIDE EFFECTS:	
+ * SIDE EFFECTS:
  *
- * NOTES:			
+ * NOTES:
  */
 tp_netcmd( tpcb, cmd )
 	struct tp_pcb *tpcb;
@@ -467,7 +467,7 @@ tp_mask_to_num(x)
 	return j;
 }
 
-static 
+static
 copyQOSparms(src, dst)
 	struct tp_conn_param *src, *dst;
 {
@@ -598,15 +598,15 @@ punt_route:
 /*
  * CALLED FROM:
  *  tp_usrreq on PRU_CONNECT and tp_input on receipt of CR
- *	
+ *
  * FUNCTION and ARGUMENTS:
  * 	-- An mbuf containing the peer's network address.
  *  -- Our control block, which will be modified
  *  -- In the case of cons, a control block for that layer.
  *
- *	
+ *
  * RETURNS:
- *	errno value	 : 
+ *	errno value	 :
  *	EAFNOSUPPORT if can't find an nl_protosw for x.25 (really could panic)
  *	ECONNREFUSED if trying to run TP0 with non-type 37 address
  *  possibly other E* returned from cons_netcmd()
@@ -629,13 +629,13 @@ tp_route_to( m, tpcb, channel)
 
 	siso = mtod(m, struct sockaddr_iso *);
 	IFTRACE(D_CONN)
-		tptraceTPCB(TPPTmisc, 
+		tptraceTPCB(TPPTmisc,
 		"route_to: so  afi netservice class",
 		tpcb->tp_sock, siso->siso_addr.isoa_genaddr[0], tpcb->tp_netservice,
 			tpcb->tp_class);
 	ENDTRACE
 	IFDEBUG(D_CONN)
-		printf("tp_route_to( m x%x, channel 0x%x, tpcb 0x%x netserv 0x%x)\n", 
+		printf("tp_route_to( m x%x, channel 0x%x, tpcb 0x%x netserv 0x%x)\n",
 			m, channel, tpcb, tpcb->tp_netservice);
 		printf("m->mlen x%x, m->m_data:\n", m->m_len);
 		dump_buf(mtod(m, caddr_t), m->m_len);
@@ -685,7 +685,7 @@ tp_route_to( m, tpcb, channel)
 		}
 		if (tpcb->tp_nlproto->nlp_afamily != siso->siso_family) {
 			IFDEBUG(D_CONN)
-				printf("tp_route_to( CHANGING nlproto old 0x%x new 0x%x)\n", 
+				printf("tp_route_to( CHANGING nlproto old 0x%x new 0x%x)\n",
 						save_netservice, tpcb->tp_netservice);
 			ENDDEBUG
 			if (error = tp_set_npcb(tpcb))
@@ -707,7 +707,7 @@ done:
 		printf("tp_route_to  returns 0x%x\n", error);
 	ENDDEBUG
 	IFTRACE(D_CONN)
-		tptraceTPCB(TPPTmisc, "route_to: returns: error netserv class", error, 
+		tptraceTPCB(TPPTmisc, "route_to: returns: error netserv class", error,
 			tpcb->tp_netservice, tpcb->tp_class, 0);
 	ENDTRACE
 	return error;
@@ -736,12 +736,12 @@ tp0_stash( tpcb, e )
 	ENDPERF
 
 	IFDEBUG(D_STASH)
-		printf("stash EQ: seq 0x%x datalen 0x%x eot 0x%x", 
+		printf("stash EQ: seq 0x%x datalen 0x%x eot 0x%x",
 		E.e_seq, E.e_datalen, E.e_eot);
 	ENDDEBUG
 
 	IFTRACE(D_STASH)
-		tptraceTPCB(TPPTmisc, "stash EQ: seq len eot", 
+		tptraceTPCB(TPPTmisc, "stash EQ: seq len eot",
 		E.e_seq, E.e_datalen, E.e_eot, 0);
 	ENDTRACE
 
@@ -760,7 +760,7 @@ tp0_stash( tpcb, e )
 		register struct pklcd *lcp = (struct pklcd *)isop->isop_chan;
 		pk_flowcontrol(lcp, sbspace(sb) <= 0, 1);
 	}
-} 
+}
 
 void
 tp0_openflow(tpcb)
@@ -784,7 +784,7 @@ pk_flowcontrol() {}
 /*
  * CALLED FROM:
  *  tp_ctloutput() when the user sets TPOPT_PERF_MEAS on
- *  and tp_newsocket() when a new connection is made from 
+ *  and tp_newsocket() when a new connection is made from
  *  a listening socket with tp_perf_on == true.
  * FUNCTION and ARGUMENTS:
  *  (tpcb) is the usual; this procedure gets a clear cluster mbuf for
@@ -793,7 +793,7 @@ pk_flowcontrol() {}
  *  ENOBUFS if it cannot get a cluster mbuf.
  */
 
-int 
+int
 tp_setup_perf(tpcb)
 	register struct tp_pcb *tpcb;
 {
@@ -814,8 +814,8 @@ tp_setup_perf(tpcb)
 		bzero( (caddr_t)tpcb->tp_p_meas, sizeof (struct tp_pmeas) );
 		IFDEBUG(D_PERF_MEAS)
 			printf(
-			"tpcb 0x%x so 0x%x ref 0x%x tp_p_meas 0x%x tp_perf_on 0x%x\n", 
-				tpcb, tpcb->tp_sock, tpcb->tp_lref, 
+			"tpcb 0x%x so 0x%x ref 0x%x tp_p_meas 0x%x tp_perf_on 0x%x\n",
+				tpcb, tpcb->tp_sock, tpcb->tp_lref,
 				tpcb->tp_p_meas, tpcb->tp_perf_on);
 		ENDDEBUG
 		tpcb->tp_perf_on = 1;
diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c
index 34fa0cc..6ccc615 100644
--- a/sys/netiso/tp_timer.c
+++ b/sys/netiso/tp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_timer.c,v 1.1.1.1 1994/05/24 10:06:44 rgrimes Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_timer.c,v 1.2 1994/08/02 07:51:27 davidg Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_timer.c,v $
  *
  */
@@ -92,7 +92,7 @@ struct	tp_pcb *tp_ftimeolist = (struct tp_pcb *)&tp_ftimeolist;
 
 /*
  * CALLED FROM:
- *  at autoconfig time from tp_init() 
+ *  at autoconfig time from tp_init()
  * 	a combo of event, state, predicate
  * FUNCTION and ARGUMENTS:
  *  initialize data structures for the timers
@@ -197,7 +197,7 @@ tp_slowtimo()
 	IncStat(ts_Cticks);
 	/* tp_ref[0] is never used */
 	for (rp = tp_ref + tp_refinfo.tpr_maxopen; rp > tp_ref; rp--) {
-		if ((tpcb = rp->tpr_pcb) == 0 || tpcb->tp_refstate < REF_OPEN) 
+		if ((tpcb = rp->tpr_pcb) == 0 || tpcb->tp_refstate < REF_OPEN)
 			continue;
 		/* check the timers */
 		for (t = 0; t < TM_NTIMERS; t++) {
@@ -309,11 +309,11 @@ tp_fasttimo()
 void
 tp_ctimeout(tpcb, which, ticks)
 	register struct tp_pcb	*tpcb;
-	int 					which, ticks; 
+	int 					which, ticks;
 {
 
 	IFTRACE(D_TIMER)
-		tptrace(TPPTmisc, "tp_ctimeout ref which tpcb active", 
+		tptrace(TPPTmisc, "tp_ctimeout ref which tpcb active",
 			tpcb->tp_lref, which, tpcb, tpcb->tp_timer[which]);
 	ENDTRACE
 	if(tpcb->tp_timer[which])
@@ -326,18 +326,18 @@ tp_ctimeout(tpcb, which, ticks)
 
 /*
  * CALLED FROM:
- *  tp.trans 
+ *  tp.trans
  * FUNCTION and ARGUMENTS:
- * 	Version of tp_ctimeout that resets the C-type time if the 
+ * 	Version of tp_ctimeout that resets the C-type time if the
  * 	parameter (ticks) is > the current value of the timer.
  */
 void
 tp_ctimeout_MIN(tpcb, which, ticks)
 	register struct tp_pcb	*tpcb;
-	int						which, ticks; 
+	int						which, ticks;
 {
 	IFTRACE(D_TIMER)
-		tptrace(TPPTmisc, "tp_ctimeout_MIN ref which tpcb active", 
+		tptrace(TPPTmisc, "tp_ctimeout_MIN ref which tpcb active",
 			tpcb->tp_lref, which, tpcb, tpcb->tp_timer[which]);
 	ENDTRACE
 	IncStat(ts_Cset);
@@ -365,7 +365,7 @@ tp_cuntimeout(tpcb, which)
 	ENDDEBUG
 
 	IFTRACE(D_TIMER)
-		tptrace(TPPTmisc, "tp_cuntimeout ref which, active", refp-tp_ref, 
+		tptrace(TPPTmisc, "tp_cuntimeout ref which, active", refp-tp_ref,
 			which, tpcb->tp_timer[which], 0);
 	ENDTRACE
 
diff --git a/sys/netiso/tp_timer.h b/sys/netiso/tp_timer.h
index 0ee6182..0894480 100644
--- a/sys/netiso/tp_timer.h
+++ b/sys/netiso/tp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_timer.h,v 1.2 1994/08/02 07:51:28 davidg Exp $
+ * $Id: tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp $
  */
 
 #ifndef _NETISO_TP_TIMER_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_timer.h,v 1.2 1994/08/02 07:51:28 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_timer.h,v 1.3 1994/08/21 06:14:30 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_timer.h,v $
  *
  * ARGO TP
@@ -91,4 +91,4 @@ SOFTWARE.
     { if((p)->tp_timer[w] > (t)) (p)->tp_timer[w] = (t);}
 #endif /* TP_DEBUG_TIMERS */
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_tpdu.h b/sys/netiso/tp_tpdu.h
index c281ecf..c9a3679 100644
--- a/sys/netiso/tp_tpdu.h
+++ b/sys/netiso/tp_tpdu.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_tpdu.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_tpdu.h,v 1.2 1994/08/02 07:51:29 davidg Exp $
+ * $Id: tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
  */
 
 #ifndef _NETISO_TP_TPDU_H_
@@ -42,13 +42,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
@@ -63,10 +63,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.2 1994/08/02 07:51:29 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_tpdu.h,v 1.3 1994/08/21 06:14:31 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_tpdu.h,v $
  *
  * This ghastly set of macros makes it possible to
@@ -110,7 +110,7 @@ struct tpdu_fixed {
 #define tpdu_type _tpduf._tpduf_type
 #define tpdu_cdt _tpduf._tpduf_cdt
 #define tpdu_dref _tpduf._tpduf_dref
-			
+
 struct tp0du {
 	u_char		_tp0_li,
 				_tp0_cdt_type,		/* same as in tpdu_fixed */
@@ -127,10 +127,10 @@ struct tp0du {
 
 #define tp0du_eot _tp0_eot
 #define tp0du_mbz _tp0_mbz
-			
+
 /*
  * This is used when the extended format seqence numbers are
- * being sent and received. 
+ * being sent and received.
  */
 				/*
 				 * the seqeot field is an int that overlays the seq
@@ -294,4 +294,4 @@ struct tpdu {
 	union 	tpdu_fixed_rest _tpdufr;
 };
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_trace.c b/sys/netiso/tp_trace.c
index 20a40ea..a6f64ef 100644
--- a/sys/netiso/tp_trace.c
+++ b/sys/netiso/tp_trace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_trace.c,v 1.2 1994/08/02 07:51:30 davidg Exp $
+ * $Id: tp_trace.c,v 1.3 1995/04/26 21:32:41 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_trace.c,v 1.2 1994/08/02 07:51:30 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_trace.c,v 1.3 1995/04/26 21:32:41 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_trace.c,v $
  *
  * The whole protocol trace module.
@@ -110,7 +110,7 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
 	struct tp_pcb	*tpcb;
 	u_int 			event, arg;
 	u_int	 		src;
-	u_int	 		len; 
+	u_int	 		len;
 	u_int	 		arg4;
 	u_int	 		arg5;
 {
@@ -137,27 +137,27 @@ tpTrace(tpcb, event, arg, src, len, arg4, arg5)
 	case TPPTmisc:
 
 		/* arg is a string */
-		bcopy((caddr_t)arg, (caddr_t)tp->tpt_str, 
+		bcopy((caddr_t)arg, (caddr_t)tp->tpt_str,
 			(unsigned)MIN(1+strlen((caddr_t) arg), TPTRACE_STRLEN));
-		tp->tpt_m2 = src; 
+		tp->tpt_m2 = src;
 		tp->tpt_m3 = len;
 		tp->tpt_m4 = arg4;
 		tp->tpt_m1 = arg5;
 		break;
 
-	case TPPTgotXack: 
-	case TPPTXack: 
-	case TPPTsendack: 
-	case TPPTgotack: 
-	case TPPTack: 
-	case TPPTindicate: 
+	case TPPTgotXack:
+	case TPPTXack:
+	case TPPTsendack:
+	case TPPTgotack:
+	case TPPTack:
+	case TPPTindicate:
 	default:
-	case TPPTdriver: 
-		tp->tpt_m2 = arg; 
+	case TPPTdriver:
+		tp->tpt_m2 = arg;
 		tp->tpt_m3 = src;
 		tp->tpt_m4 = len;
 		tp->tpt_m5 = arg4;
-		tp->tpt_m1 = arg5; 
+		tp->tpt_m1 = arg5;
 		break;
 	case TPPTparam:
 		bcopy((caddr_t)src, (caddr_t)&tp->tpt_param, sizeof(struct tp_param));
diff --git a/sys/netiso/tp_trace.h b/sys/netiso/tp_trace.h
index fb5365f..b2dd01c 100644
--- a/sys/netiso/tp_trace.h
+++ b/sys/netiso/tp_trace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_trace.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_trace.h,v 1.2 1994/08/02 07:51:31 davidg Exp $
+ * $Id: tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp $
  */
 
 #ifndef _NETISO_TP_TRACE_H_
@@ -42,13 +42,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
@@ -63,13 +63,13 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_trace.h,v 1.2 1994/08/02 07:51:31 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_trace.h,v 1.3 1994/08/21 06:14:32 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_trace.h,v $
  *
- * 
+ *
  * Definitions needed for the protocol trace mechanism.
  */
 
@@ -171,7 +171,7 @@ int tp_Tracen = 0;
 
 #define IFTRACE(ascii)\
 	if(tp_traceflags[ascii]) {
-/* 
+/*
  * for some reason lint complains about tp_param being undefined no
  * matter where or how many times I define it.
  */
@@ -193,4 +193,4 @@ int tp_Tracen = 0;
 
 #endif /* TPPT */
 
-#endif 
+#endif
diff --git a/sys/netiso/tp_user.h b/sys/netiso/tp_user.h
index 3916865..bc86c2e 100644
--- a/sys/netiso/tp_user.h
+++ b/sys/netiso/tp_user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_user.h	8.1 (Berkeley) 6/10/93
- * $Id: tp_user.h,v 1.2 1994/08/02 07:51:32 davidg Exp $
+ * $Id: tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp $
  */
 
 #ifndef _NETISO_TP_USER_H_
@@ -42,13 +42,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
@@ -63,13 +63,13 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_user.h,v 1.2 1994/08/02 07:51:32 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_user.h,v 1.3 1994/08/21 06:14:32 paul Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_user.h,v $
  *
- * These are the values a real-live user ;-) needs. 
+ * These are the values a real-live user ;-) needs.
  */
 
 #ifndef _TYPES_
@@ -78,7 +78,7 @@ SOFTWARE.
 
 struct tp_conn_param {
 	/* PER CONNECTION parameters */
-	short	p_Nretrans; 
+	short	p_Nretrans;
 	short	p_dr_ticks;
 
 	short	p_cc_ticks;
@@ -129,12 +129,12 @@ struct tp_conn_param {
 
 #define TPOPT_INTERCEPT		0x200
 #define TPOPT_FLAGS			0x300
-#define TPOPT_CONN_DATA		0x400 
-#define TPOPT_DISC_DATA		0x500 
-#define TPOPT_CFRM_DATA		0x600 
-#define TPOPT_CDDATA_CLEAR	0x700 
-#define TPOPT_MY_TSEL		0x800 
-#define TPOPT_PEER_TSEL		0x900 
+#define TPOPT_CONN_DATA		0x400
+#define TPOPT_DISC_DATA		0x500
+#define TPOPT_CFRM_DATA		0x600
+#define TPOPT_CDDATA_CLEAR	0x700
+#define TPOPT_MY_TSEL		0x800
+#define TPOPT_PEER_TSEL		0x900
 #define TPOPT_PERF_MEAS		0xa00
 #define TPOPT_PSTATISTICS	0xb00
 #define TPOPT_PARAMS		0xc00 /* to replace a bunch of the others */
@@ -145,7 +145,7 @@ struct tp_disc_reason {
 	u_int	dr_reason;
 };
 
-/* 
+/*
  ***********************flags**********************************
  */
 
@@ -155,7 +155,7 @@ struct tp_disc_reason {
 #define TPFLAG_GENERAL_ADDR		(u_char)0x04 /* bound to wildcard addr */
 
 
-/* 
+/*
  ***********************end flags******************************
  */
 
diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c
index 4532770..13948e8 100644
--- a/sys/netiso/tp_usrreq.c
+++ b/sys/netiso/tp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id: tp_usrreq.c,v 1.2 1994/08/02 07:51:33 davidg Exp $
+ * $Id: tp_usrreq.c,v 1.3 1995/04/26 21:32:42 pst Exp $
  */
 
 /***********************************************************
@@ -39,13 +39,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
@@ -60,10 +60,10 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
-/* 
+/*
  * ARGO TP
  *
- * $Header: /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.2 1994/08/02 07:51:33 davidg Exp $
+ * $Header: /home/ncvs/src/sys/netiso/tp_usrreq.c,v 1.3 1995/04/26 21:32:42 pst Exp $
  * $Source: /home/ncvs/src/sys/netiso/tp_usrreq.c,v $
  *
  * tp_usrreq(), the fellow that gets called from most of the socket code.
@@ -121,7 +121,7 @@ dump_mbuf(n, str)
 		printf("EMPTY:\n");
 		return;
 	}
-		
+
 	while (n) {
 		nextrecord = n->m_act;
 		printf("RECORD:\n");
@@ -199,7 +199,7 @@ restart:
 	}
 
 	/* Take the first mbuf off the chain.
-	 * Each XPD TPDU gives you a complete TSDU so the chains don't get 
+	 * Each XPD TPDU gives you a complete TSDU so the chains don't get
 	 * coalesced, but one TSDU may span several mbufs.
 	 * Nevertheless, since n should have a most 16 bytes, it
 	 * will fit into m.  (size was checked in tp_input() )
@@ -209,7 +209,7 @@ restart:
 	 * Code for excision of OOB data should be added to
 	 * uipc_socket2.c (like sbappend).
 	 */
-	
+
 	sblock(sb, M_WAITOK);
 	for (nn = &sb->sb_mb; n = *nn; nn = &n->m_act)
 		if (n->m_type == MT_OOBDATA)
@@ -247,7 +247,7 @@ restart:
 	if ((inflags & MSG_PEEK) == 0) {
 		n = *nn;
 		*nn = n->m_act;
-		for (; n; n = m_free(n)) 
+		for (; n; n = m_free(n))
 			sbfree(sb, n);
 	}
 
@@ -259,7 +259,7 @@ release:
 			tpcb->tp_Xrcv.sb_cc, m->m_len, 0, 0);
 	ENDTRACE
 	if (error == 0)
-		error = DoEvent(T_USR_Xrcvd); 
+		error = DoEvent(T_USR_Xrcvd);
 	return error;
 }
 
@@ -290,7 +290,7 @@ tp_sendoob(tpcb, so, xdata, outflags)
 	 * mbuf (mark) into the DATA queue, with its sequence number in m_next
 	 * to be assigned to this XPD tpdu, so data xfer can stop
 	 * when it reaches the zero-length mbuf if this XPD TPDU hasn't
-	 * yet been acknowledged.  
+	 * yet been acknowledged.
 	 */
 	register struct sockbuf *sb = &(tpcb->tp_Xsnd);
 	register struct mbuf 	*xmark;
@@ -302,7 +302,7 @@ tp_sendoob(tpcb, so, xdata, outflags)
 		if (xdata)
 			printf("xdata len 0x%x\n", xdata->m_len);
 	ENDDEBUG
-	/* DO NOT LOCK the Xsnd buffer!!!! You can have at MOST one 
+	/* DO NOT LOCK the Xsnd buffer!!!! You can have at MOST one
 	 * socket buf locked at any time!!! (otherwise you might
 	 * sleep() in sblock() w/ a signal pending and cause the
 	 * system call to be aborted w/ a locked socketbuf, which
@@ -353,14 +353,14 @@ tp_sendoob(tpcb, so, xdata, outflags)
 		tptraceTPCB(TPPTmisc, "XPD mark m_next ", xdata->m_next, 0, 0, 0);
 	ENDTRACE
 
-	sbappendrecord(sb, xdata);	
+	sbappendrecord(sb, xdata);
 
 	IFDEBUG(D_XPD)
 		printf("tp_sendoob len 0x%x\n", len);
 		dump_mbuf(so->so_snd.sb_mb, "XPD request Regular sndbuf:");
 		dump_mbuf(tpcb->tp_Xsnd.sb_mb, "XPD request Xsndbuf:");
 	ENDDEBUG
-	return DoEvent(T_XPD_req); 
+	return DoEvent(T_XPD_req);
 }
 
 /*
@@ -368,11 +368,11 @@ tp_sendoob(tpcb, so, xdata, outflags)
  *  the socket routines
  * FUNCTION and ARGUMENTS:
  * 	Handles all "user requests" except the [gs]ockopts() requests.
- * 	The argument (req) is the request type (PRU*), 
+ * 	The argument (req) is the request type (PRU*),
  * 	(m) is an mbuf chain, generally used for send and
  * 	receive type requests only.
  * 	(nam) is used for addresses usually, in particular for the bind request.
- * 
+ *
  */
 /*ARGSUSED*/
 ProtoHook
@@ -380,11 +380,11 @@ tp_usrreq(so, req, m, nam, controlp)
 	struct socket *so;
 	u_int req;
 	struct mbuf *m, *nam, *controlp;
-{	
+{
 	register struct tp_pcb *tpcb =  sototpcb(so);
 	int s = splnet();
 	int error = 0;
-	int flags, *outflags = &flags; 
+	int flags, *outflags = &flags;
 	u_long eotsdu = 0;
 	struct tp_event E;
 
@@ -394,7 +394,7 @@ tp_usrreq(so, req, m, nam, controlp)
 			printf("WARNING!!! so->so_error is 0x%x\n", so->so_error);
 	ENDDEBUG
 	IFTRACE(D_REQUEST)
-		tptraceTPCB(TPPTusrreq, "req so m state [", req, so, m, 
+		tptraceTPCB(TPPTusrreq, "req so m state [", req, so, m,
 			tpcb?tpcb->tp_state:0);
 	ENDTRACE
 
@@ -416,8 +416,8 @@ tp_usrreq(so, req, m, nam, controlp)
 		break;
 
 	case PRU_ABORT: 	/* called from close() */
-		/* called for each incoming connect queued on the 
-		 *	parent (accepting) socket 
+		/* called for each incoming connect queued on the
+		 *	parent (accepting) socket
 		 */
 		if (tpcb->tp_state == TP_OPEN || tpcb->tp_state == TP_CONFIRMING) {
 			E.ATTR(T_DISC_req).e_reason = E_TP_NO_SESSION;
@@ -474,7 +474,7 @@ tp_usrreq(so, req, m, nam, controlp)
 
 	case PRU_CONNECT:
 		IFTRACE(D_CONN)
-			tptraceTPCB(TPPTmisc, 
+			tptraceTPCB(TPPTmisc,
 			"PRU_CONNECT: so 0x%x *SHORT_LSUFXP(tpcb) 0x%x lsuflen 0x%x, class 0x%x",
 			tpcb->tp_sock, *SHORT_LSUFXP(tpcb), tpcb->tp_lsuffixlen,
 				tpcb->tp_class);
@@ -500,7 +500,7 @@ tp_usrreq(so, req, m, nam, controlp)
 			break;
 		IFDEBUG(D_CONN)
 			printf(
-				"PRU_CONNECT after tpcb 0x%x so 0x%x npcb 0x%x flags 0x%x\n", 
+				"PRU_CONNECT after tpcb 0x%x so 0x%x npcb 0x%x flags 0x%x\n",
 				tpcb, so, tpcb->tp_npcb, tpcb->tp_flags);
 			printf("isop 0x%x isop->isop_socket offset 12 :\n", tpcb->tp_npcb);
 			dump_buf(tpcb->tp_npcb, 16);
@@ -511,7 +511,7 @@ tp_usrreq(so, req, m, nam, controlp)
 				tpcb->tp_fsuffix, TP_FOREIGN);
 		}
 		if (tpcb->tp_state == TP_CLOSED) {
-			soisconnecting(so);  
+			soisconnecting(so);
 			error = DoEvent(T_CONN_req);
 		} else {
 			(tpcb->tp_nlproto->nlp_pcbdisc)(tpcb->tp_npcb);
@@ -522,13 +522,13 @@ tp_usrreq(so, req, m, nam, controlp)
 			lsufx = *(u_short *)(tpcb->tp_lsuffix);
 			fsufx = *(u_short *)(tpcb->tp_fsuffix);
 
-			tpmeas(tpcb->tp_lref, 
-				TPtime_open | (tpcb->tp_xtd_format << 4), 
+			tpmeas(tpcb->tp_lref,
+				TPtime_open | (tpcb->tp_xtd_format << 4),
 				&time, lsufx, fsufx, tpcb->tp_fref);
 		ENDPERF
 		break;
 
-	case PRU_ACCEPT: 
+	case PRU_ACCEPT:
 		(tpcb->tp_nlproto->nlp_getnetaddr)(tpcb->tp_npcb, nam, TP_FOREIGN);
 		IFDEBUG(D_REQUEST)
 			printf("ACCEPT PEERADDDR:");
@@ -539,7 +539,7 @@ tp_usrreq(so, req, m, nam, controlp)
 			lsufx = *(u_short *)(tpcb->tp_lsuffix);
 			fsufx = *(u_short *)(tpcb->tp_fsuffix);
 
-			tpmeas(tpcb->tp_lref, TPtime_open, 
+			tpmeas(tpcb->tp_lref, TPtime_open,
 				&time, lsufx, fsufx, tpcb->tp_fref);
 		ENDPERF
 		break;
@@ -556,7 +556,7 @@ tp_usrreq(so, req, m, nam, controlp)
 				tpcb->tp_lcredit, tpcb->tp_sent_lcdt,
 				so->so_rcv.sb_cc, so->so_rcv.sb_hiwat);
 			LOCAL_CREDIT(tpcb);
-			tptraceTPCB(TPPTmisc, 
+			tptraceTPCB(TPPTmisc,
 				"PRU_RCVD AF sbspace lcredit hiwat cc",
 				sbspace(&so->so_rcv), tpcb->tp_lcredit,
 				so->so_rcv.sb_cc, so->so_rcv.sb_hiwat);
@@ -567,9 +567,9 @@ tp_usrreq(so, req, m, nam, controlp)
 				so->so_rcv.sb_hiwat);
 		ENDDEBUG
 		if (((int)nam) & MSG_OOB)
-			error = DoEvent(T_USR_Xrcvd); 
-		else 
-			error = DoEvent(T_USR_rcvd); 
+			error = DoEvent(T_USR_Xrcvd);
+		else
+			error = DoEvent(T_USR_rcvd);
 		break;
 
 	case PRU_RCVOOB:
@@ -627,13 +627,13 @@ tp_usrreq(so, req, m, nam, controlp)
 		{
 			/*
 			 * Could have eotsdu and no data.(presently MUST have
-			 * an mbuf though, even if its length == 0) 
+			 * an mbuf though, even if its length == 0)
 			 */
 			int totlen = m->m_pkthdr.len;
 			struct sockbuf *sb = &so->so_snd;
 			IFPERF(tpcb)
 			   PStat(tpcb, Nb_from_sess) += totlen;
-			   tpmeas(tpcb->tp_lref, TPtime_from_session, 0, 0, 
+			   tpmeas(tpcb->tp_lref, TPtime_from_session, 0, 0,
 					PStat(tpcb, Nb_from_sess), totlen);
 			ENDPERF
 			IFDEBUG(D_SYSCALL)
@@ -649,7 +649,7 @@ tp_usrreq(so, req, m, nam, controlp)
 				dump_mbuf(sb->sb_mb, "so_snd.sb_mb");
 			ENDDEBUG
 			if (tpcb->tp_state == TP_OPEN)
-				error = DoEvent(T_DATA_req); 
+				error = DoEvent(T_DATA_req);
 			IFDEBUG(D_SYSCALL)
 				printf("PRU_SEND: after driver error 0x%x \n",error);
 				printf("so_snd 0x%x cc 0t%d mbcnt 0t%d\n",
@@ -692,7 +692,7 @@ tp_usrreq(so, req, m, nam, controlp)
 			tpcb ? tpcb->tp_state : 0);
 	ENDDEBUG
 	IFTRACE(D_REQUEST)
-		tptraceTPCB(TPPTusrreq, "END req so m state [", req, so, m, 
+		tptraceTPCB(TPPTusrreq, "END req so m state [", req, so, m,
 			tpcb ? tpcb->tp_state : 0);
 	ENDTRACE
 	if (controlp) {
diff --git a/sys/netiso/tuba_subr.c b/sys/netiso/tuba_subr.c
index b7131ad..80a1e67 100644
--- a/sys/netiso/tuba_subr.c
+++ b/sys/netiso/tuba_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_subr.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tuba_subr.c,v 1.2 1994/08/02 07:51:34 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -129,7 +129,7 @@ tuba_output(m, tp)
 	struct	isopcb *isop;
 	struct	addr_arg arg;
 
-	if (tp == 0 || (n = tp->t_template) == 0 || 
+	if (tp == 0 || (n = tp->t_template) == 0 ||
 	    (isop = (struct isopcb *)tp->t_tuba_pcb) == 0) {
 		isop = &tuba_isopcb;
 		n = mtod(m, struct tcpiphdr *);
@@ -231,7 +231,7 @@ tuba_pcbconnect(inp, nam)
  * FUNCTION and ARGUMENTS:
  * Take a packet (m) from clnp, strip off the clnp header
  * and do tcp input processing.
- * No return value.  
+ * No return value.
  */
 tuba_tcpinput(m, src, dst)
 	register struct mbuf *m;
@@ -289,7 +289,7 @@ tuba_tcpinput(m, src, dst)
 		struct mbuf *m0 = m;
 
 		MGETHDR(m, M_DONTWAIT, MT_DATA);
-		if (m == 0) { 
+		if (m == 0) {
 			m = m0;
 			goto drop;
 		}
diff --git a/sys/netiso/tuba_usrreq.c b/sys/netiso/tuba_usrreq.c
index e1e922a..2b4f716 100644
--- a/sys/netiso/tuba_usrreq.c
+++ b/sys/netiso/tuba_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tuba_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tuba_usrreq.c,v 1.2 1994/08/02 07:51:38 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -170,7 +170,7 @@ tuba_usrreq(so, req, m, nam, control)
 			error = EINVAL;
 			break;
 		}
-		if ((error = iso_pcbbind(isop, nam)) || 
+		if ((error = iso_pcbbind(isop, nam)) ||
 		    (siso = isop->isop_laddr) == 0)
 			break;
 		bcopy(TSEL(siso), &inp->inp_lport, 2);
@@ -216,7 +216,7 @@ tuba_usrreq(so, req, m, nam, control)
 		}
 		bcopy(TSEL(isop->isop_faddr), &inp->inp_fport, 2);
 		if (inp->inp_laddr.s_addr == 0 &&
-		     (inp->inp_laddr.s_addr = 
+		     (inp->inp_laddr.s_addr =
 			    tuba_lookup(isop->isop_laddr, M_WAITOK)) == 0)
 			goto unconnect;
 		if ((tp->t_template = tcp_template(tp)) == 0)
diff --git a/sys/netiso/xebec/debug.h b/sys/netiso/xebec/debug.h
index 2e3f167..c5b3622 100644
--- a/sys/netiso/xebec/debug.h
+++ b/sys/netiso/xebec/debug.h
@@ -1,5 +1,5 @@
-/* $Header: debug.h,v 2.1 88/09/19 12:56:16 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/debug.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/debug.h,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/debug.h,v $ */
 
 #define OUT stdout
 
@@ -9,10 +9,10 @@ extern int	debug[128];
 extern int column;
 
 #define IFDEBUG(letter) \
-	if(debug['letter']) { 
+	if(debug['letter']) {
 #define ENDDEBUG  ; (void) fflush(stdout);}
 
-#else 
+#else
 
 #define STAR *
 #define IFDEBUG(letter)	 //*beginning of comment*/STAR
diff --git a/sys/netiso/xebec/llparse.c b/sys/netiso/xebec/llparse.c
index fee7a9f..68b511e 100644
--- a/sys/netiso/xebec/llparse.c
+++ b/sys/netiso/xebec/llparse.c
@@ -1,13 +1,13 @@
-/* $Header: llparse.c,v 2.2 88/09/19 12:54:59 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/llparse.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/llparse.c,v 1.1.1.1 1994/05/24 10:07:51 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/llparse.c,v $ */
 /*
  * ************************* NOTICE *******************************
  * This code is in the public domain.  It cannot be copyrighted.
- * This ll parser was originally written by Keith Thompson for the 
+ * This ll parser was originally written by Keith Thompson for the
  * University of Wisconsin Crystal project.
  * It was based on an FMQ lr parser written by Jon Mauney at the
  * University of Wisconsin.
- * It was subsequently modified very slightly by Nancy Hall at the 
+ * It was subsequently modified very slightly by Nancy Hall at the
  * University of Wisconsin for the Crystal project.
  * ****************************************************************
  */
@@ -293,13 +293,13 @@ llsetattr(n)
 	ENDDEBUG
 	if(lldescindex >= LLMAXDESC) {
 		fprintf(stdout, "llattribute stack overflow: desc\n");
-		fprintf(stdout, 
+		fprintf(stdout,
 			"lldescindex=0x%x, llattrtop=0x%x\n",lldescindex, llattrtop);
 		Exit(-1);
 	}
 	ptr = &llattrdesc[lldescindex];
 	ptr->llabase = &llattributes[llattrtop];
-	ptr->lloldtop = ++llattrtop; 
+	ptr->lloldtop = ++llattrtop;
 	ptr->llaindex = 1;
 	ptr->llacnt = n+1; /* the lhs ALWAYS uses an attr; it remains on the
 						stack when the production is recognized */
diff --git a/sys/netiso/xebec/llparse.h b/sys/netiso/xebec/llparse.h
index 1b6133b..718c360 100644
--- a/sys/netiso/xebec/llparse.h
+++ b/sys/netiso/xebec/llparse.h
@@ -1,5 +1,5 @@
-/* $Header: llparse.h,v 2.1 88/09/19 12:56:20 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/llparse.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/llparse.h,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/llparse.h,v $ */
 
 	/************************************************************
 		attributes stack garbage
@@ -42,7 +42,7 @@
 	extern	struct	lltoken {
 		short		llterm;		/* token number */
 		short		llstate;	/* inserted deleted normal */
-		LLattrib	llattrib; 
+		LLattrib	llattrib;
 	} 	lltoken;
 	typedef	struct lltoken	LLtoken;
 
diff --git a/sys/netiso/xebec/llscan.c b/sys/netiso/xebec/llscan.c
index ffdb9a9..8f1f1a0 100644
--- a/sys/netiso/xebec/llscan.c
+++ b/sys/netiso/xebec/llscan.c
@@ -1,11 +1,11 @@
-/* $Header: llscan.c,v 2.2 88/09/19 12:55:06 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/llscan.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/llscan.c,v 1.1.1.1 1994/05/24 10:07:50 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/llscan.c,v $ */
 /*
  * ************************* NOTICE *******************************
  * This code is in the public domain.  It cannot be copyrighted.
- * This scanner was originally written by Keith Thompson for the 
+ * This scanner was originally written by Keith Thompson for the
  * University of Wisconsin Crystal project.
- * It was subsequently modified significantly by Nancy Hall at the 
+ * It was subsequently modified significantly by Nancy Hall at the
  * University of Wisconsin for the ARGO project.
  * ****************************************************************
  */
@@ -63,7 +63,7 @@ int chtype[128] = {
 };
 
 
-extern FILE *astringfile; 
+extern FILE *astringfile;
 static char *buffptr;
 static char buffer[2][LINELEN];
 static int currentbuf = 1;
@@ -135,9 +135,9 @@ char **buf;
 	return(0);
 }
 
-getstr(o,c) 
-	/* c is the string delimiter 
-	 * allow the delimiter to be escaped 
+getstr(o,c)
+	/* c is the string delimiter
+	 * allow the delimiter to be escaped
 	 * the messy part: translate $ID to
 	 *   e->ev_union.ID
 	 * where ID is an event with a non-zero obj_struc
@@ -146,7 +146,7 @@ getstr(o,c)
 char o,c;
 {
 	register int nested = 1;
-	register int allow_nesting = (o==c)?-1:1; 
+	register int allow_nesting = (o==c)?-1:1;
 
 	IFDEBUG(S)
 		fprintf(stdout,"getstr: ch=%c, delimiters %c %c\n",
@@ -170,14 +170,14 @@ char o,c;
 
 			/* assume it's an event */
 			/* addbuf is a macro so this isn't as bad as
-			 * it looks 
+			 * it looks
 			 * add "e->ev_union."
 			 */
 			if( (ch = getch()) == '$' ) {
 				addbuf('e'); addbuf('-'); addbuf('>');
 				addbuf('e'); addbuf('v'); addbuf('_');
 				addbuf('u'); addbuf('n'); addbuf('i');
-				addbuf('o'); addbuf('n'); 
+				addbuf('o'); addbuf('n');
 				addbuf('.');
 				AddCurrentEventName(& buffptr);
 			} else {
@@ -195,7 +195,7 @@ char o,c;
 				} else if( !strncmp(obufp, synonyms[EVENT_SYN],
 										strlen(synonyms[EVENT_SYN]))) {
 					buffptr = obufp;
-					addbuf('e'); 
+					addbuf('e');
 				} else {
 					fprintf(stderr, "Unknown synonym %s\n", obufp);
 					Exit(-1);
@@ -219,7 +219,7 @@ char o,c;
 			if( (ch != o ) && (ch != c) && (ch != '$') ) {
 			/* may need to handle case where \ is last char in file... */
 				/* don't treat is as escape; not open or close so
-				 * don't have to worry about nesting either 
+				 * don't have to worry about nesting either
 				 */
 				addbuf('\\');
 			}
@@ -231,14 +231,14 @@ char o,c;
 		if( ch == o ) nested += allow_nesting;
 		else if( ch == c ) nested--;
 		if ( (buffptr - buffer[currentbuf]) > LINELEN) {
-			fprintf(stderr, 
+			fprintf(stderr,
 			"%s too long.\n", (o=='{')?"Action":"Predicate"); /*}*/
-			fprintf(stderr, 
+			fprintf(stderr,
 			"buffptr, currentbuf 0x%x, 0x%x\n",buffptr,currentbuf );
 			Exit(-1);
 		}
 		IFDEBUG(S)
-			fprintf(stdout,"loop in getstr: ch 0x%x,%c o=%c,c=%c nested=%d\n", 
+			fprintf(stdout,"loop in getstr: ch 0x%x,%c o=%c,c=%c nested=%d\n",
 				ch,ch,o,c,nested);
 		ENDDEBUG
 	}
@@ -324,7 +324,7 @@ again:
 						break;
 					whatchar = (c=='*')?0:(c=='/'?1:2);
 					IFDEBUG(S)
-						fprintf(stdout, 
+						fprintf(stdout,
 							"comment: whatchar = %d, c = 0x%x,%c, oldstate=%d",
 							whatchar, c,c, state);
 					ENDDEBUG
diff --git a/sys/netiso/xebec/main.c b/sys/netiso/xebec/main.c
index a0b4842..b46a930 100644
--- a/sys/netiso/xebec/main.c
+++ b/sys/netiso/xebec/main.c
@@ -1,5 +1,5 @@
-/* $Header: main.c,v 2.4 88/09/19 12:55:13 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/main.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/main.c,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/main.c,v $ */
 /*
  * TODO:
  * rewrite the command line stuff altogether - it's kludged beyond
@@ -45,7 +45,7 @@ char *synonyms[] = {
 usage(a)
 char *a;
 {
-	fprintf(stderr, 
+	fprintf(stderr,
 	"usage: %s <transition file> {-D<debug options>} <other options>\n",
 		a);
 	fprintf(stderr, "\t<other options> is any combination of:\n");
@@ -55,9 +55,9 @@ char *a;
 	fprintf(stderr, "\t\t-I<initial values file name>\n");
 	fprintf(stderr, "\t\t-X<debugging file name>\n");
 	fprintf(stderr, "\t\t-K<directory name>\n");
-	fprintf(stderr, 
+	fprintf(stderr,
 	"\tThese names do NOT include the suffices (.c, .h)\n");
-	fprintf(stderr, 
+	fprintf(stderr,
 	"\t\t-D<options> to turn on debug options for xebec itself\n");
 	fprintf(stderr, "\t-<nn> for levels of debugging output\n");
 	fprintf(stderr, "\t\t<nn> ranges from 1 to 3, 1 is default(everything)\n");
@@ -97,7 +97,7 @@ register char *proto;
 #ifdef DEBUG
 		DOIT(astringfile);
 #endif DEBUG
-		fprintf(astringfile, 
+		fprintf(astringfile,
 				"#ifndef _NFILE\n#include <stdio.h>\n#endif _NFILE\n" );
 	ENDDEBUG
 
@@ -109,7 +109,7 @@ register char *proto;
 
 	if(pgoption)
 		putdriver(actfile, 15);
-	else 
+	else
 		putdriver(actfile, 14);
 
 	FakeFilename(actfile, Transfilename, lineno);
@@ -338,7 +338,7 @@ char *argv[];
 		/*
 		putdriver(actfile, 10);
 		*/
-		if(debug['K']) { 
+		if(debug['K']) {
 			putdriver(actfile, 11);
 		} else {
 			switch(debug['X']) {
@@ -356,8 +356,8 @@ char *argv[];
 	ENDDEBUG
 	putdriver(actfile, 8);
 	(void) fclose(actfile);
-	IFDEBUG(X) 
-		/* { */ 
+	IFDEBUG(X)
+		/* { */
 		fprintf(astringfile, "};\n");
 		(void) fclose(astringfile);
 	ENDDEBUG
@@ -369,7 +369,7 @@ char *argv[];
 
 	finish = time(0);
 	fprintf(stdout, "%d seconds\n", finish - start);
-	if( print_protoerrs ) 
+	if( print_protoerrs )
 		printprotoerrs();
 }
 
@@ -386,7 +386,7 @@ Exit(n)
 	exit(n);
 }
 
-syntax() 
+syntax()
 {
 	static char *synt[] = {
 		"*PROTOCOL <string>\n",
@@ -397,7 +397,7 @@ syntax()
 		"*TRANSITIONS <string>\n",
 	};
 }
-	
+
 FakeFilename(outfile, name, l)
 FILE *outfile;
 char *name;
diff --git a/sys/netiso/xebec/main.h b/sys/netiso/xebec/main.h
index cb5bd74..236058d 100644
--- a/sys/netiso/xebec/main.h
+++ b/sys/netiso/xebec/main.h
@@ -1,10 +1,10 @@
-/* $Header: main.h,v 2.1 88/09/19 12:56:24 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/main.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/main.h,v 1.1.1.1 1994/05/24 10:07:49 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/main.h,v $ */
 
 #define TRUE 1
 #define FALSE 0
 #define LINELEN 2350
-	/* approx limit on token size for C compiler 
+	/* approx limit on token size for C compiler
 	 * which matters for the purpose of debugging (astring.c...)
 	 */
 
diff --git a/sys/netiso/xebec/malloc.c b/sys/netiso/xebec/malloc.c
index 5cdfc14..d09af29 100644
--- a/sys/netiso/xebec/malloc.c
+++ b/sys/netiso/xebec/malloc.c
@@ -1,15 +1,15 @@
-/* $Header: malloc.c,v 2.2 88/09/19 12:55:18 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/malloc.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/malloc.c,v 1.1.1.1 1994/05/24 10:07:48 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/malloc.c,v $ */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
  * However it does work...
  */
 
-/* 
+/*
  * a simple malloc
  * it might be brain-damaged but for the purposes of xebec
- * it's a whole lot faster than the c library malloc 
+ * it's a whole lot faster than the c library malloc
  */
 
 #include <stdio.h>
@@ -72,7 +72,7 @@ int x;
 		if(((unsigned)(hiwat) & 0x3)) {
 			bytesmalloced = 4 - (int) ((unsigned)(hiwat) & 0x3);
 			hiwat = sbrk( bytesmalloced );
-		} else 
+		} else
 			bytesmalloced = 0;
 		firsttime = 0;
 		highend = hiwat;
diff --git a/sys/netiso/xebec/procs.c b/sys/netiso/xebec/procs.c
index 49d862a..8134a82 100644
--- a/sys/netiso/xebec/procs.c
+++ b/sys/netiso/xebec/procs.c
@@ -1,5 +1,5 @@
-/* $Header: procs.c,v 2.3 88/09/19 12:55:22 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/procs.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/procs.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/procs.c,v $ */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
@@ -47,11 +47,11 @@ end_events() {
 			protocol);
 	ENDDEBUG
 	/* NOSTRICT */
-	Statelist = 
+	Statelist =
 	  (struct Stateent **) Malloc((Nstates+1) * sizeof(struct Statent *));
 	/* NOSTRICT */
-	Predlist =  
-	  (struct Predicate **) 
+	Predlist =
+	  (struct Predicate **)
 	  Malloc ( (((Nevents)<<Eventshift)+Nstates)*sizeof(struct Predicate *) );
 
 	size = (((Nevents)<<Eventshift)+Nstates)*sizeof(struct Predicate *) ;
@@ -141,7 +141,7 @@ static int Npred=0, Ndefpred=0, Ntrans=0, Ndefevent=0, Nnulla=0;
 statetable(string, oldstate, newstate, action, event)
 char *string;
 int action;
-struct Object *oldstate, *newstate, *event; 
+struct Object *oldstate, *newstate, *event;
 {
 	register int different;
 
@@ -168,7 +168,7 @@ struct Object *oldstate, *newstate, *event;
 
 stateentry(index, oldstate, newstate, action)
 int index, action;
-int oldstate, newstate; 
+int oldstate, newstate;
 {
 	extern FILE *statevalfile;
 
@@ -232,18 +232,18 @@ int action, newstate;
 					state, event, Index);
 					fflush(stdout);
 				ENDDEBUG
-			} else 
+			} else
 				Npred++;
 			/* put at END of list */
 #ifndef LINT
 			IFDEBUG(g)
-				fprintf(stdout, 
-				"predicate for event 0x%x, state 0x%x is 0x%x, %s\n", 
+				fprintf(stdout,
+				"predicate for event 0x%x, state 0x%x is 0x%x, %s\n",
 				event, state, Index, str);
 				fflush(stdout);
 			ENDDEBUG
 #endif LINT
-			for( ((q = &Predlist[(event<<Eventshift)+state]), 
+			for( ((q = &Predlist[(event<<Eventshift)+state]),
 					 (p = Predlist[(event<<Eventshift)+state]));
 							p ; p = p->p_next ) {
 				q = &p->p_next;
@@ -257,7 +257,7 @@ int action, newstate;
 			*q = p;
 
 			IFDEBUG(g)
-				fprintf(stdout, 
+				fprintf(stdout,
 			  	  "predtable index 0x%x, transno %d, E 0x%x, S 0x%x\n",
 					 Index, transno, e, s);
 			ENDDEBUG
@@ -274,7 +274,7 @@ printprotoerrs()
 	register int e,s;
 
 	fprintf(stderr, "[ Event, State ] without any transitions :\n");
-	for(e = 0; e < Nevents; e++) { 
+	for(e = 0; e < Nevents; e++) {
 		fprintf(stderr, "Event 0x%x: states ", e);
 		for(s = 0; s < Nstates; s++) {
 			if( Predlist[(e<<Eventshift)+s] == 0 )
@@ -297,10 +297,10 @@ FILE *f;
 
 #ifdef notdef
 	fprintf(stdout,
-		" Xebec used %8d bytes of storage, wasted %8d bytes\n", 
+		" Xebec used %8d bytes of storage, wasted %8d bytes\n",
 		bytesmalloced, byteswasted);
 #endif notdef
-	fprintf(stdout, 
+	fprintf(stdout,
 		" %8d states\n %8d events\n %8d transitions\n",
 		Nstates, Nevents, Ntrans);
 	fprintf(stdout,
@@ -325,11 +325,11 @@ FILE *f;
 					if(!hadapred)
 						fprintf(f, "case 0x%x:\n\t", (e<<Eventshift) + s);
 					hadapred = 1;
-					fprintf(f, "if %s return 0x%x;\n\t else ", 
+					fprintf(f, "if %s return 0x%x;\n\t else ",
 					p->p_str, p->p_index);
 				} else {
 					if(defaultindex) {
-						fprintf(stderr, 
+						fprintf(stderr,
 "\nConflict between transitions %d and %d: duplicate default \n",
 						p->p_transno, defaultItrans);
 						Exit(-1);
@@ -345,9 +345,9 @@ FILE *f;
 			IFDEBUG(d)
 				fflush(f);
 			ENDDEBUG
-		} 
+		}
 		IFDEBUG(g)
-		fprintf(stdout, 
+		fprintf(stdout,
 		"loop: e 0x%x s 0x%x hadapred 0x%x dindex 0x%x for trans 0x%x\n",
 			e, s, hadapred, defaultindex, defaultItrans);
 		ENDDEBUG
@@ -375,19 +375,19 @@ FILE *f;
 	for(s = 0; s< Nstates; s++) fprintf(f, "0,"); /* event 0 */
 	fprintf(f, "},\n");
 
-	for(e = 0; e < Nevents; e++) { 
-		fprintf(f, " {"); 
+	for(e = 0; e < Nevents; e++) {
+		fprintf(f, " {");
 		for(s = 0; s < Nstates; s++) {
 			register struct Predicate *xyz = Predlist[(e<<Eventshift)+s];
 			/* this kludge is to avoid a lint msg. concerning
-			 * loss of bits 
+			 * loss of bits
 			 */
 			if (xyz == (struct Predicate *)(-1))
 				fprintf(f, "-1,");
 			else
 				fprintf(f, "0x%x,", Predlist[(e<<Eventshift)+s]);
 		}
-		fprintf(f, " },\n"); 
+		fprintf(f, " },\n");
 	}
 	fprintf(f, "};");
 }
@@ -420,14 +420,14 @@ int event,state;
 {
 	register struct Predicate *p, **q;
 
-	for( 
-	((q = &Predlist[(event<<Eventshift) +state]), 
+	for(
+	((q = &Predlist[(event<<Eventshift) +state]),
 	 (p = Predlist[(event<<Eventshift) + state]));
 		p!= (struct Predicate *)0 ; p = p->p_next ) {
 #ifndef LINT
 		IFDEBUG(a)
-			fprintf(OUT, 
-			"dump_pentry for event 0x%x, state 0x%x is 0x%x\n", 
+			fprintf(OUT,
+			"dump_pentry for event 0x%x, state 0x%x is 0x%x\n",
 			 event, state, p);
 		ENDDEBUG
 #endif LINT
diff --git a/sys/netiso/xebec/putdriver.c b/sys/netiso/xebec/putdriver.c
index 996ac64..85fcd50 100644
--- a/sys/netiso/xebec/putdriver.c
+++ b/sys/netiso/xebec/putdriver.c
@@ -1,5 +1,5 @@
-/* $Header: putdriver.c,v 2.2 88/09/19 12:55:27 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/putdriver.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/putdriver.c,v 1.1.1.1 1994/05/24 10:07:46 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/putdriver.c,v $ */
 
 /*
  * This code is such a kludge that I don't want to put my name on it.
@@ -90,7 +90,7 @@ static char *strings[] = {
 	protocol,
 	"_debug;\n\textern FILE *",
 	protocol,
-	"_astringfile;\n", 
+	"_astringfile;\n",
 	(char *)0,
 	(char *)0,
 	(char *)0,
@@ -137,7 +137,7 @@ static char *strings[] = {
 	"\n_XEBEC_PG int _Xebec_action(a,e,p)\nint a;\nstruct ",
 	protocol,
 	"_event *e;\n",
-	protocol, 
+	protocol,
 	PCBNAME,
 	" *p;\n{\n",
 	"switch(a) {\n",
@@ -161,15 +161,15 @@ static char *strings[] = {
 	"\n_XEBEC_PG int\n_Xebec_index( e,p )\n",
 	"\tstruct ",
 	protocol,
-	"_event *e;\n\t", 
-	protocol, 
+	"_event *e;\n\t",
+	protocol,
 	PCBNAME,
 	" *p;\n{\nswitch( (e->ev_number<<",
 	Eventshiftstring,
 	")+(p->",
-	protocol, 
+	protocol,
 	statename,
-	") ) {\n", 
+	") ) {\n",
 	(char *)0,
 	(char *)0,
 	(char *)0,
@@ -230,11 +230,11 @@ static struct { int start; int finish; } parts[] = {
 	PART15,
 };
 
-putdriver(f, x) 
+putdriver(f, x)
 FILE *f;
 int x;
 {
-	register int i; 
+	register int i;
 
 	for( i = parts[x].start; i<= parts[x].finish; i++)
 		fprintf(f, "%s", strings[i]);
diff --git a/sys/netiso/xebec/sets.c b/sys/netiso/xebec/sets.c
index 3bb74ed..6022a89 100644
--- a/sys/netiso/xebec/sets.c
+++ b/sys/netiso/xebec/sets.c
@@ -1,5 +1,5 @@
-/* $Header: sets.c,v 2.3 88/09/19 12:55:30 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/sets.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/sets.c,v 1.1.1.1 1994/05/24 10:07:45 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/sets.c,v $ */
 /*
  * This code is such a kludge that I don't want to put my name on it.
  * It was a ridiculously fast hack and needs rewriting.
@@ -14,9 +14,9 @@
 struct Object *CurrentEvent = (struct Object *)0;
 struct Object *Objtree;
 struct Object dummy;
-/* 
+/*
  * define a set w/ type and name
- * return a set number 
+ * return a set number
  */
 #undef NULL
 #define NULL (struct Object *)0
@@ -118,19 +118,19 @@ FILE *f;
 	fprintf(f, "struct %s_event {\n\tint ev_number;\n", &protocol[0]);
 	IFDEBUG(X)
 		/* finish sstring[] & start estring[] */
-		fprintf(astringfile, 
+		fprintf(astringfile,
 		"};\n\nchar *%s_estring[] = {\n", protocol);
 	ENDDEBUG
 }
 
 int FirstEventAttribute = 1;
 
-static 
-insert(o) 
+static
+insert(o)
 struct Object *o;
 {
 	struct Object *p = Objtree;
-	struct Object **q = &Objtree; 
+	struct Object **q = &Objtree;
 	int val=1;
 
 
@@ -143,7 +143,7 @@ struct Object *o;
 			fprintf(stderr, "No states may be defined after *TRANSITIONS\n");
 			Exit(-1);
 		}
-		o->obj_number =  Nstates++ ; 
+		o->obj_number =  Nstates++ ;
 		if(Nstates > MAXSTATES) {
 			fprintf(stderr, "Too many states\n");
 			Exit(-1);
@@ -153,7 +153,7 @@ struct Object *o;
 			fprintf(astringfile, "\"%s(0x%x)\",\n", o->obj_name, o->obj_number);
 		ENDDEBUG
 	} else {
-		/* EVENTSET */ 
+		/* EVENTSET */
 		if( ! states_done )  {
 			fprintf(stderr, "states must precede events\n");
 			Exit(-1);
@@ -168,7 +168,7 @@ struct Object *o;
 				fprintf(Efile,  "\n\tunion{\n"); /*} */
 				FirstEventAttribute = 0;
 			}
-			fprintf(Efile, 
+			fprintf(Efile,
 			"struct %s %s%s;\n\n", o->obj_struc, EV_PREFIX,  o->obj_name);
 		}
 		fprintf(Efile, "#define %s 0x%x\n", o->obj_name, o->obj_number);
@@ -215,10 +215,10 @@ struct Object *o;
 	ENDDEBUG
 }
 
-delete(o) 
+delete(o)
 struct Object *o;
 {
-	register struct Object *p = o->obj_right; 
+	register struct Object *p = o->obj_right;
 	register struct Object *q;
 	register struct Object *newparent;
 	register struct Object **np_childlink;
@@ -262,7 +262,7 @@ struct Object *o;
 		p = o->obj_left;
 	}
 	*np_childlink = p;
-	if(p) 
+	if(p)
 		p->obj_parent = newparent;
 
 	IFDEBUG(T)
@@ -281,13 +281,13 @@ int keep;
 	IFDEBUG(o)
 		printf("defineset(0x%x,%s, %s)\n", type , adr, keep?"KEEP":"NO_KEEP");
 	ENDDEBUG
-	
+
 	onew = (struct Object *)Malloc(sizeof (struct Object));
 	bzero(onew, sizeof(struct Object));
 	onew->obj_name = adr;
 	onew->obj_kind = OBJ_SET;
 	onew->obj_type = type;
-	if(keep) 
+	if(keep)
 		insert( onew );
 		/* address already stashed before calling defineset */
 	IFDEBUG(o)
@@ -321,9 +321,9 @@ char *struc;
 	IFDEBUG(o)
 		printf("defineitem(0x%x, %s at 0x%x, %s)\n", type, adr, adr, struc);
 	ENDDEBUG
-	
+
 	if( onew = lookup( type, adr ) ) {
-		fprintf(stderr, 
+		fprintf(stderr,
 	"Internal error at defineitem: trying to redefine obj type 0x%x, adr %s\n",
 			type, adr);
 		exit(-1);
@@ -349,7 +349,7 @@ char *adr;
 	IFDEBUG(o)
 		printf("member(0x%x, %s)\n", o, adr);
 	ENDDEBUG
-	
+
 	oold = lookup(  o->obj_type, adr );
 
 	onew = (struct Object *)Malloc(sizeof (struct Object));
@@ -396,7 +396,7 @@ AddCurrentEventName(x)
 register char **x;
 {
 	register char *n = EV_PREFIX; ;
-	
+
 	if( CurrentEvent == (struct Object *)0 ) {
 		fprintf(stderr, "No event named!  BARF!\n"); Exit(-1);
 	}
@@ -429,7 +429,7 @@ dumptree(o,i)
 		fprintf(stdout, "%3d NULL\n", i);
 	} else {
 		dumptree(o->obj_left, i+1);
-		for(j=0; j<i; j++) 
+		for(j=0; j<i; j++)
 			fputc(' ', stdout);
 		fprintf(stdout, "%3d 0x%x: %s\n", i,o, OBJ_NAME(o));
 		dumptree(o->obj_right, i+1);
@@ -467,6 +467,6 @@ char *pred, *action;
 	fprintf(stdout, " <== ");
 	dumpit(oldstate);
 	dumpit(event);
-	fprintf(stdout, "\n\t\t%s\n\t\t%s\n", pred?pred:"DEFAULT", 
+	fprintf(stdout, "\n\t\t%s\n\t\t%s\n", pred?pred:"DEFAULT",
 		action);
 }
diff --git a/sys/netiso/xebec/sets.h b/sys/netiso/xebec/sets.h
index 96eb791..15168ef 100644
--- a/sys/netiso/xebec/sets.h
+++ b/sys/netiso/xebec/sets.h
@@ -1,5 +1,5 @@
-/* $Header: sets.h,v 2.1 88/09/19 12:56:33 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/sets.h,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/sets.h,v 1.1.1.1 1994/05/24 10:07:44 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/sets.h,v $ */
 
 #define MAXEVENTS 200
 #define MAXSTATES 200
@@ -15,7 +15,7 @@ struct Object {
 	unsigned char obj_type; /* state or event */
 	char *obj_name;
 	char *obj_struc;
-	int obj_number; 
+	int obj_number;
 	struct Object *obj_members; /* must be null for kind==item */
 	/* for the tree */
 	struct Object *obj_left;
diff --git a/sys/netiso/xebec/xebec.c b/sys/netiso/xebec/xebec.c
index 132bcb8..40f862f 100644
--- a/sys/netiso/xebec/xebec.c
+++ b/sys/netiso/xebec/xebec.c
@@ -1,5 +1,5 @@
-/* $Header: xebec.c,v 2.2 88/09/19 12:55:37 nhall Exp $ */
-/* $Source: /var/home/tadl/src/argo/xebec/RCS/xebec.c,v $ */
+/* $Header: /home/ncvs/src/sys/netiso/xebec/xebec.c,v 1.1.1.1 1994/05/24 10:07:43 rgrimes Exp $ */
+/* $Source: /home/ncvs/src/sys/netiso/xebec/xebec.c,v $ */
 
 #include "xebec.h"
 #include "llparse.h"
@@ -9,9 +9,9 @@
 
 #include "main.h"
 #include "sets.h"
-#include <stdio.h> 
+#include <stdio.h>
 
-extern FILE *eventfile_h, *actfile; 
+extern FILE *eventfile_h, *actfile;
 
 llaction(lln,token)
 LLtoken *token;
@@ -24,41 +24,41 @@ case 1:
 	break;
 
 case 10: {
-	
+
 					if(strlen(llattr->llabase[3].ID.address) > 50 ) {
-						fprintf(stderr, 
-						"Protocol name may not exceed 50 chars in length.\n"); 
+						fprintf(stderr,
+						"Protocol name may not exceed 50 chars in length.\n");
 						Exit(-1);
 					}
-					strcpy(protocol, llattr->llabase[3].ID.address); 
-					openfiles(protocol); 
-				
+					strcpy(protocol, llattr->llabase[3].ID.address);
+					openfiles(protocol);
+
 } break;
 
 case 11: {
- 
-					llattr->llabase[7].pcb.isevent = 0; 
-				
+
+					llattr->llabase[7].pcb.isevent = 0;
+
 } break;
 
 case 12: {
 
 				  fprintf(actfile, "\ntypedef %s %s%s;\n",
-							  llattr->llabase[7].pcb.address,protocol, PCBNAME); 
+							  llattr->llabase[7].pcb.address,protocol, PCBNAME);
 				  llattr->llabase[8].syn.type = PCB_SYN;
-				
+
 } break;
 
 case 13: {
- llattr->llabase[11].part.type = (unsigned char) STATESET; 
+ llattr->llabase[11].part.type = (unsigned char) STATESET;
 } break;
 
 case 14: {
- end_states(eventfile_h); 
+ end_states(eventfile_h);
 } break;
 
 case 15: {
- llattr->llabase[14].pcb.isevent = 1; 
+ llattr->llabase[14].pcb.isevent = 1;
 } break;
 
 case 16: {
@@ -67,56 +67,56 @@ case 16: {
 					includecode(eventfile_h, llattr->llabase[14].pcb.address);
 					fprintf(eventfile_h, "\n"); /* fmq gags on single chars */
 					llattr->llabase[15].syn.type = EVENT_SYN;
-				
+
 } break;
 
 case 17: {
- 
-				  	llattr->llabase[16].part.type = (unsigned char)EVENTSET; 
-				
+
+				  	llattr->llabase[16].part.type = (unsigned char)EVENTSET;
+
 } break;
 
 case 18: {
- end_events(); 
+ end_events();
 } break;
 
 case 19: {
- 
+
 					putincludes();
 					putdriver(actfile, 9);
-				
+
 } break;
 
 case 20: {
 	if(llattr->llabase[0].pcb.isevent)  {
-					fprintf(stderr, 
+					fprintf(stderr,
 					"Event is a list of objects enclosed by \"{}\"\n");
 					Exit(-1);
 				}
-			  fprintf(eventfile_h, "struct "); 
-			
+			  fprintf(eventfile_h, "struct ");
+
 } break;
 
 case 21: {
- llattr->llabase[0].pcb.address = llattr->llabase[2].ACTION.address; 
+ llattr->llabase[0].pcb.address = llattr->llabase[2].ACTION.address;
 } break;
 
 case 22: {
 	if( ! llattr->llabase[0].pcb.isevent)  {
-					fprintf(stderr, 
+					fprintf(stderr,
 					"Pcb requires a type or structure definition.\"{}\"\n");
 					Exit(-1);
 				}
-			   llattr->llabase[0].pcb.address = llattr->llabase[1].ACTION.address; 
-			
+			   llattr->llabase[0].pcb.address = llattr->llabase[1].ACTION.address;
+
 } break;
 
 case 23: {
-  llattr->llabase[0].pcb.address = llattr->llabase[1].ID.address; 
+  llattr->llabase[0].pcb.address = llattr->llabase[1].ID.address;
 } break;
 
 case 24: {
- synonyms[llattr->llabase[0].syn.type] = stash( llattr->llabase[2].ID.address ); 
+ synonyms[llattr->llabase[0].syn.type] = stash( llattr->llabase[2].ID.address );
 } break;
 
 case 25: {
@@ -124,130 +124,130 @@ case 25: {
 } break;
 
 case 26: {
- 
+
 			llattr->llabase[2].partrest.address = llattr->llabase[1].ID.address;
-			llattr->llabase[2].partrest.type = llattr->llabase[0].part.type; 
-		
+			llattr->llabase[2].partrest.type = llattr->llabase[0].part.type;
+
 } break;
 
 case 27: {
- llattr->llabase[3].parttail.type = llattr->llabase[0].part.type; 
+ llattr->llabase[3].parttail.type = llattr->llabase[0].part.type;
 } break;
 
 case 28: {
- llattr->llabase[1].part.type = llattr->llabase[0].parttail.type; 
+ llattr->llabase[1].part.type = llattr->llabase[0].parttail.type;
 } break;
 
 case 29: {
- 
+
 			  if(  lookup( llattr->llabase[0].partrest.type, llattr->llabase[0].partrest.address ) ) {
 				fprintf(stderr, "bnf:trying to redefine obj type 0x%x, adr %s\n",
 					llattr->llabase[0].partrest.type, llattr->llabase[0].partrest.address);
 				Exit(-1);
-			  } 
+			  }
 			  llattr->llabase[2].setdef.type = llattr->llabase[0].partrest.type;
 			  llattr->llabase[2].setdef.address = stash( llattr->llabase[0].partrest.address );
 			  llattr->llabase[2].setdef.keep = 1;
-			
+
 } break;
 
 case 30: {
- llattr->llabase[3].setstruct.object = llattr->llabase[2].setdef.object; 
+ llattr->llabase[3].setstruct.object = llattr->llabase[2].setdef.object;
 } break;
 
 case 31: {
- 
-		 defineitem(llattr->llabase[0].partrest.type, 
-					llattr->llabase[0].partrest.address, llattr->llabase[1].ACTION.address); 
-		
+
+		 defineitem(llattr->llabase[0].partrest.type,
+					llattr->llabase[0].partrest.address, llattr->llabase[1].ACTION.address);
+
 } break;
 
 case 32: {
- 
+
 			defineitem(llattr->llabase[0].partrest.type, llattr->llabase[0].partrest.address, (char *)0);
-		
+
 } break;
 
 case 33: {
 
 				if(llattr->llabase[0].setstruct.object)  {
-					/* WHEN COULD THIS BE FALSE?? 
+					/* WHEN COULD THIS BE FALSE??
 					 * isn't it supposed to be setstruct.object???
 					 * (it used to be $ACTION.address)
 					 */
 
 					llattr->llabase[0].setstruct.object->obj_struc = llattr->llabase[1].ACTION.address;
-					fprintf(eventfile_h, 
-						"struct %s %s%s;\n\n", llattr->llabase[1].ACTION.address, 
+					fprintf(eventfile_h,
+						"struct %s %s%s;\n\n", llattr->llabase[1].ACTION.address,
 						EV_PREFIX,  llattr->llabase[0].setstruct.object->obj_name);
 				}
-			
+
 } break;
 
 case 34: {
- 
-			llattr->llabase[2].setlist.setnum = 
-			defineset(llattr->llabase[0].setdef.type, llattr->llabase[0].setdef.address, llattr->llabase[0].setdef.keep); 
-		
+
+			llattr->llabase[2].setlist.setnum =
+			defineset(llattr->llabase[0].setdef.type, llattr->llabase[0].setdef.address, llattr->llabase[0].setdef.keep);
+
 } break;
 
 case 35: {
- llattr->llabase[0].setdef.object = llattr->llabase[2].setlist.setnum; 
+ llattr->llabase[0].setdef.object = llattr->llabase[2].setlist.setnum;
 } break;
 
 case 36: {
- 
-		member(llattr->llabase[0].setlist.setnum, llattr->llabase[1].ID.address); 
-				llattr->llabase[2].setlisttail.setnum = llattr->llabase[0].setlist.setnum; 
-	
+
+		member(llattr->llabase[0].setlist.setnum, llattr->llabase[1].ID.address);
+				llattr->llabase[2].setlisttail.setnum = llattr->llabase[0].setlist.setnum;
+
 } break;
 
 case 37: {
- llattr->llabase[2].setlist.setnum = llattr->llabase[0].setlisttail.setnum; 
+ llattr->llabase[2].setlist.setnum = llattr->llabase[0].setlisttail.setnum;
 } break;
 
 case 38: {
- transno ++; 
+ transno ++;
 } break;
 
 case 39: {
- 
-	 	CurrentEvent /* GAG! */ = llattr->llabase[6].event.object; 
-	 
+
+	 	CurrentEvent /* GAG! */ = llattr->llabase[6].event.object;
+
 } break;
 
 case 40: {
- 
-		llattr->llabase[8].actionpart.string = llattr->llabase[7].predicatepart.string; 
-		llattr->llabase[8].actionpart.newstate = llattr->llabase[1].newstate.object; 
+
+		llattr->llabase[8].actionpart.string = llattr->llabase[7].predicatepart.string;
+		llattr->llabase[8].actionpart.newstate = llattr->llabase[1].newstate.object;
 		llattr->llabase[8].actionpart.oldstate = llattr->llabase[5].oldstate.object;
-	
+
 } break;
 
 case 41: {
- 
+
 		 llattr->llabase[0].predicatepart.string = stash ( llattr->llabase[1].PREDICATE.address );
-	
+
 } break;
 
 case 42: {
- 
+
 		llattr->llabase[0].predicatepart.string = (char *)0;
-	
+
 } break;
 
 case 43: {
 
-	  statetable( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate, 
+	  statetable( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate,
 					llattr->llabase[0].actionpart.newstate,
-					acttable(actfile, llattr->llabase[1].ACTION.address ), 
-					CurrentEvent ); 
+					acttable(actfile, llattr->llabase[1].ACTION.address ),
+					CurrentEvent );
 	  if( print_trans ) {
-	  	dump_trans( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate, 
+	  	dump_trans( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate,
 					llattr->llabase[0].actionpart.newstate,
-					llattr->llabase[1].ACTION.address, CurrentEvent ); 
+					llattr->llabase[1].ACTION.address, CurrentEvent );
 	  }
-	
+
 } break;
 
 case 44: {
@@ -255,65 +255,65 @@ case 44: {
 	  statetable(llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate, llattr->llabase[0].actionpart.newstate,
 				  0, CurrentEvent ); /* KLUDGE - remove this */
 	  if( print_trans ) {
-	  	dump_trans( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate, 
+	  	dump_trans( llattr->llabase[0].actionpart.string, llattr->llabase[0].actionpart.oldstate,
 					llattr->llabase[0].actionpart.newstate,
-					"NULLACTION", CurrentEvent ); 
+					"NULLACTION", CurrentEvent );
 	  }
-	
+
 } break;
 
 case 45: {
-	
+
 		llattr->llabase[0].oldstate.object = Lookup(STATESET, llattr->llabase[1].ID.address);
-	
+
 } break;
 
 case 46: {
 
 			llattr->llabase[1].setdef.address = (char *)0;
-			llattr->llabase[1].setdef.type = (unsigned char)STATESET; 
+			llattr->llabase[1].setdef.type = (unsigned char)STATESET;
 			llattr->llabase[1].setdef.keep = 0;
-		
+
 } break;
 
 case 47: {
- 
-			llattr->llabase[0].oldstate.object = llattr->llabase[1].setdef.object; 
-		
+
+			llattr->llabase[0].oldstate.object = llattr->llabase[1].setdef.object;
+
 } break;
 
 case 48: {
- 
-		llattr->llabase[0].newstate.object = Lookup(STATESET, llattr->llabase[1].ID.address); 
-	
+
+		llattr->llabase[0].newstate.object = Lookup(STATESET, llattr->llabase[1].ID.address);
+
 } break;
 
 case 49: {
- 
+
 		extern struct Object *SameState;
 
 		llattr->llabase[0].newstate.object = SameState;
-	
+
 } break;
 
 case 50: {
 
-			llattr->llabase[0].event.object = Lookup(EVENTSET, llattr->llabase[1].ID.address); 
-		
+			llattr->llabase[0].event.object = Lookup(EVENTSET, llattr->llabase[1].ID.address);
+
 } break;
 
 case 51: {
 
 			llattr->llabase[1].setdef.address = (char *)0;
-			llattr->llabase[1].setdef.type = (unsigned char)EVENTSET; 
+			llattr->llabase[1].setdef.type = (unsigned char)EVENTSET;
 			llattr->llabase[1].setdef.keep = 0;
-		
+
 } break;
 
 case 52: {
- 
-			llattr->llabase[0].event.object = llattr->llabase[1].setdef.object; 
-		
+
+			llattr->llabase[0].event.object = llattr->llabase[1].setdef.object;
+
 } break;
 }
 }
@@ -369,55 +369,55 @@ short llnsyms = 44;
 short llnprods = 38;
 short llinfinite = 10000;
 short llproductions[] = {
-41, -21, 5, -20, 2, 
-41, -22, 5, 
-41, -23, 1, 
--24, 1, 3, 
-
-26, -36, 1, 
-25, -37, 11, 
-
-28, -27, 29, -26, 1, 
-27, -28, 
-
-30, -30, 31, -29, 10, 
--31, 5, 
--32, 
--33, 5, 
-
--35, 8, 25, -34, 7, 
-42, 33, 
-17, 38, -40, 37, -39, 34, 35, 10, 10, 9, -38, 36, 
--50, 1, 
--52, 31, -51, 
--45, 1, 
--47, 31, -46, 
--48, 1, 
--49, 21, 
--41, 4, 
--42, 19, 
--43, 5, 
--44, 20, 
-32, -19, 14, -18, 12, 27, -17, 24, -16, 23, -15, 13, -14, 12, 27, -13, 16, 12, 24, -12, 23, -11, 18, 40, 12, -10, 1, 6, 12, 
-12, -25, 5, 15, 
-
-17, 
-
-32, 
-
-22, 39, 
+41, -21, 5, -20, 2,
+41, -22, 5,
+41, -23, 1,
+-24, 1, 3,
+
+26, -36, 1,
+25, -37, 11,
+
+28, -27, 29, -26, 1,
+27, -28,
+
+30, -30, 31, -29, 10,
+-31, 5,
+-32,
+-33, 5,
+
+-35, 8, 25, -34, 7,
+42, 33,
+17, 38, -40, 37, -39, 34, 35, 10, 10, 9, -38, 36,
+-50, 1,
+-52, 31, -51,
+-45, 1,
+-47, 31, -46,
+-48, 1,
+-49, 21,
+-41, 4,
+-42, 19,
+-43, 5,
+-44, 20,
+32, -19, 14, -18, 12, 27, -17, 24, -16, 23, -15, 13, -14, 12, 27, -13, 16, 12, 24, -12, 23, -11, 18, 40, 12, -10, 1, 6, 12,
+12, -25, 5, 15,
+
+17,
+
+32,
+
+22, 39,
 0
 };
 struct llprodindex llprodindex[] = {
-{   0,   0,   0 }, {   0,   5,  19 }, {   5,   3,   3 }, {   8,   3,   2 }, 
-{  11,   3,   2 }, {  14,   0,   2 }, {  14,   3,   0 }, {  17,   3,   1 }, 
-{  20,   0,   0 }, {  20,   5,   3 }, {  25,   2,   0 }, {  27,   0,   3 }, 
-{  27,   5,   1 }, {  32,   2,   0 }, {  34,   1,   3 }, {  35,   2,   1 }, 
-{  37,   0,   0 }, {  37,   5,   1 }, {  42,   2,   0 }, {  44,  12,   3 }, 
-{  56,   2,   2 }, {  58,   3,   2 }, {  61,   2,   0 }, {  63,   3,   2 }, 
-{  66,   2,   1 }, {  68,   2,   0 }, {  70,   2,   9 }, {  72,   2,   1 }, 
-{  74,   2,   1 }, {  76,   2,   1 }, {  78,  29,   1 }, { 107,   4,   1 }, 
-{ 111,   0,   1 }, { 111,   1,   1 }, { 112,   0,   1 }, { 112,   1,   1 }, 
+{   0,   0,   0 }, {   0,   5,  19 }, {   5,   3,   3 }, {   8,   3,   2 },
+{  11,   3,   2 }, {  14,   0,   2 }, {  14,   3,   0 }, {  17,   3,   1 },
+{  20,   0,   0 }, {  20,   5,   3 }, {  25,   2,   0 }, {  27,   0,   3 },
+{  27,   5,   1 }, {  32,   2,   0 }, {  34,   1,   3 }, {  35,   2,   1 },
+{  37,   0,   0 }, {  37,   5,   1 }, {  42,   2,   0 }, {  44,  12,   3 },
+{  56,   2,   2 }, {  58,   3,   2 }, {  61,   2,   0 }, {  63,   3,   2 },
+{  66,   2,   1 }, {  68,   2,   0 }, {  70,   2,   9 }, {  72,   2,   1 },
+{  74,   2,   1 }, {  76,   2,   1 }, {  78,  29,   1 }, { 107,   4,   1 },
+{ 111,   0,   1 }, { 111,   1,   1 }, { 112,   0,   1 }, { 112,   1,   1 },
 { 113,   0,   1 }, { 113,   2,   2 }, {   0,   0,   0 }
 };
 short llepsilon[] = {
@@ -427,19 +427,19 @@ short llepsilon[] = {
  0, 0, 1, 0, 1, 0, 1, 0, 0
 };
 struct llparsetable llparsetable[] = {
-{   1,   3 }, {   2,   1 }, {   5,   2 }, {   0,  23 }, {   1,   5 }, 
-{   3,   4 }, {  12,   5 }, {   0,  24 }, {   1,   6 }, {   0,  25 }, 
-{   8,   8 }, {  11,   7 }, {   0,  26 }, {   1,   9 }, {   0,  27 }, 
-{   1,  10 }, {  12,  11 }, {   0,  28 }, {   1,  14 }, {   5,  13 }, 
-{  10,  12 }, {  12,  14 }, {   0,  29 }, {   1,  16 }, {   5,  15 }, 
-{  12,  16 }, {   0,  30 }, {   7,  17 }, {   0,  31 }, {   1,  18 }, 
-{  21,  18 }, {   0,  32 }, {   1,  19 }, {  21,  19 }, {   0,  33 }, 
-{   1,  20 }, {   7,  21 }, {   0,  34 }, {   1,  22 }, {   7,  23 }, 
-{   0,  35 }, {   1,  24 }, {  21,  25 }, {   0,  36 }, {   4,  26 }, 
-{  19,  27 }, {   0,  37 }, {   5,  28 }, {  20,  29 }, {   0,  38 }, 
-{  12,  30 }, {   0,  39 }, {  15,  31 }, {  18,  32 }, {   0,  40 }, 
-{   1,  34 }, {   3,  34 }, {  12,  34 }, {  17,  33 }, {   0,  41 }, 
-{   1,  35 }, {  21,  35 }, {  22,  36 }, {   0,  42 }, {  12,  37 }, 
+{   1,   3 }, {   2,   1 }, {   5,   2 }, {   0,  23 }, {   1,   5 },
+{   3,   4 }, {  12,   5 }, {   0,  24 }, {   1,   6 }, {   0,  25 },
+{   8,   8 }, {  11,   7 }, {   0,  26 }, {   1,   9 }, {   0,  27 },
+{   1,  10 }, {  12,  11 }, {   0,  28 }, {   1,  14 }, {   5,  13 },
+{  10,  12 }, {  12,  14 }, {   0,  29 }, {   1,  16 }, {   5,  15 },
+{  12,  16 }, {   0,  30 }, {   7,  17 }, {   0,  31 }, {   1,  18 },
+{  21,  18 }, {   0,  32 }, {   1,  19 }, {  21,  19 }, {   0,  33 },
+{   1,  20 }, {   7,  21 }, {   0,  34 }, {   1,  22 }, {   7,  23 },
+{   0,  35 }, {   1,  24 }, {  21,  25 }, {   0,  36 }, {   4,  26 },
+{  19,  27 }, {   0,  37 }, {   5,  28 }, {  20,  29 }, {   0,  38 },
+{  12,  30 }, {   0,  39 }, {  15,  31 }, {  18,  32 }, {   0,  40 },
+{   1,  34 }, {   3,  34 }, {  12,  34 }, {  17,  33 }, {   0,  41 },
+{   1,  35 }, {  21,  35 }, {  22,  36 }, {   0,  42 }, {  12,  37 },
 {   0,  43 }, {   0,   0 }
 };
 short llparseindex[] = {