Remove trailing whitespace.

32 files changed, 321 insertions, 321 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index cc1611f..0beb578 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.15 1995/05/09 13:35:44 davidg Exp $
+ * $Id: if_ether.c,v 1.16 1995/05/11 00:13:16 wollman Exp $
  */
 
 /*
@@ -516,7 +516,7 @@ reply:
 			(void)memcpy(ea->arp_sha, ac->ac_enaddr, sizeof(ea->arp_sha));
 			rtfree(rt);
 #ifdef DEBUG_PROXY
-			printf("arp: proxying for %s\n", 
+			printf("arp: proxying for %s\n",
 			       inet_ntoa(itaddr));
 #endif
 #else
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 935788c..2551fe3 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.h,v 1.7 1994/12/22 22:00:30 wollman Exp $
+ * $Id: if_ether.h,v 1.8 1995/04/02 01:26:26 wpaul Exp $
  */
 
 #ifndef _NETINET_IF_ETHER_H_
@@ -92,7 +92,7 @@ struct	ether_addr {
  * Ethernet Address Resolution Protocol.
  *
  * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to 
+ * to resolving internet addresses.  Field names used correspond to
  * RFC 826.
  */
 struct	ether_arp {
@@ -119,10 +119,10 @@ struct	arpcom {
 	u_char	ac_enaddr[6];		/* ethernet hardware address */
 	struct	in_addr ac_ipaddr;	/* copy of ip address- XXX */
 	struct	ether_multi *ac_multiaddrs; /* list of ether multicast addrs */
-	int	ac_multicnt;		/* length of ac_multiaddrs list */	
+	int	ac_multicnt;		/* length of ac_multiaddrs list */
 };
 
-struct llinfo_arp {				
+struct llinfo_arp {
 	struct	llinfo_arp *la_next;
 	struct	llinfo_arp *la_prev;
 	struct	rtentry *la_rt;
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index a8efc5a..14ec343 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id: if_fddi.h,v 1.1 1995/03/10 17:43:45 thomas Exp $
+ * $Id: if_fddi.h,v 1.1 1995/03/14 09:14:14 davidg Exp $
  */
 
 #ifndef _NETINET_IF_FDDI_H_
@@ -77,7 +77,7 @@ struct	fddi_header {
 void    fddi_ifattach __P((struct ifnet *));
 void    fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *));
 int     fddi_output __P((struct ifnet *,
-           struct mbuf *, struct sockaddr *, struct rtentry *)); 
+           struct mbuf *, struct sockaddr *, struct rtentry *));
 
 #endif
 
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index c864e14..dac0add 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.9 1995/04/26 18:10:53 pst Exp $
+ * $Id: igmp.c,v 1.10 1995/05/16 01:28:29 davidg Exp $
  */
 
 /*
@@ -97,12 +97,12 @@ fill_rti(inm)
 #endif
 	while (rti) {
 		if (rti->ifp == inm->inm_ifp){ /* ? is it ok to compare */
-					       /* pointers */	
+					       /* pointers */
 			inm->inm_rti  = rti;
 #ifdef IGMP_DEBUG
 			printf("[igmp.c, _fill_rti] --> found old entry \n");
 #endif
-			if (rti->type == IGMP_OLD_ROUTER) 
+			if (rti->type == IGMP_OLD_ROUTER)
 				return IGMP_HOST_MEMBERSHIP_REPORT;
 			else
 				return IGMP_HOST_NEW_MEMBERSHIP_REPORT;
@@ -114,7 +114,7 @@ fill_rti(inm)
 	rti->type = IGMP_NEW_ROUTER;
 	rti->time = IGMP_AGE_THRESHOLD;
 	rti->next = Head;
-	Head = rti;	
+	Head = rti;
 	inm->inm_rti = rti;
 #ifdef IGMP_DEBUG
 	printf("[igmp.c, _fill_rti] --> created new entry \n");
@@ -166,7 +166,7 @@ igmp_input(m, iphlen)
 	register struct in_ifaddr *ia;
 	struct in_multistep step;
 	struct router_info *rti;
-	
+
 	int timer; /** timer value in the igmp query header **/
 
 	++igmpstat.igps_rcv_total;
@@ -237,9 +237,9 @@ igmp_input(m, iphlen)
 			 */
 			IN_FIRST_MULTI(step, inm);
 			while (inm != NULL) {
-				if (inm->inm_ifp == ifp 
+				if (inm->inm_ifp == ifp
 				    && inm->inm_timer == 0
-				    && inm->inm_addr.s_addr 
+				    && inm->inm_addr.s_addr
 				    != igmp_all_hosts_group) {
 
 					inm->inm_state = IGMP_DELAYING_MEMBER;
@@ -254,7 +254,7 @@ igmp_input(m, iphlen)
 		    /*
 		    ** New Router
 		    */
-		    
+
 		    if (ip->ip_dst.s_addr != igmp_all_hosts_group) {
 			if (!(m->m_flags & M_MCAST)) {
 			    ++igmpstat.igps_rcv_badqueries;
@@ -263,14 +263,14 @@ igmp_input(m, iphlen)
 			}
 		    }
 		    if (ip->ip_dst.s_addr == igmp_all_hosts_group) {
-			
+
 			/*
 			 * - Start the timers in all of our membership records
 			 *   for the interface on which the query arrived
 			 *   excl. those that belong to the "all-hosts" group.
 			 * - For timers already running check if they need to
 			 *   be reset.
-			 * - Use the igmp->igmp_code filed as the maximum 
+			 * - Use the igmp->igmp_code filed as the maximum
 			 *   delay possible
 			 */
 			IN_FIRST_MULTI(step, inm);
@@ -307,7 +307,7 @@ igmp_input(m, iphlen)
 		      /*
 		      ** group specific query
 		      */
-		      	
+
 		      IN_FIRST_MULTI(step, inm);
 		      while (inm != NULL) {
 			if (inm->inm_addr.s_addr == ip->ip_dst.s_addr) {
@@ -382,7 +382,7 @@ igmp_input(m, iphlen)
 		if (inm != NULL) {
 		  inm->inm_timer = 0;
 		  ++igmpstat.igps_rcv_ourreports;
-		  
+
 		  switch(inm->inm_state){
 		  case IGMP_IDLE_MEMBER:
 		  case IGMP_LAZY_MEMBER:
@@ -398,7 +398,7 @@ igmp_input(m, iphlen)
 		    break;
 		  }
 		}
-	      
+
 		break;
 
 	      case IGMP_HOST_NEW_MEMBERSHIP_REPORT:
@@ -406,17 +406,17 @@ igmp_input(m, iphlen)
 		 * an new report
 		 */
 		++igmpstat.igps_rcv_reports;
-    
+
 		if (ifp->if_flags & IFF_LOOPBACK)
 		  break;
-		
+
 		if (!IN_MULTICAST(ntohl(igmp->igmp_group.s_addr)) ||
 		    igmp->igmp_group.s_addr != ip->ip_dst.s_addr) {
 		  ++igmpstat.igps_rcv_badreports;
 		  m_freem(m);
 		  return;
 		}
-		
+
 		/*
 		 * KLUDGE: if the IP source address of the report has an
 		 * unspecified (i.e., zero) subnet number, as is allowed for
@@ -430,7 +430,7 @@ igmp_input(m, iphlen)
 		  IFP_TO_IA(ifp, ia);
 		  if (ia) ip->ip_src.s_addr = htonl(ia->ia_subnet);
 		}
-		
+
 		/*
 		 * If we belong to the group being reported, stop
 		 * our timer for that group.
@@ -439,7 +439,7 @@ igmp_input(m, iphlen)
 		if (inm != NULL) {
 		  inm->inm_timer = 0;
 		  ++igmpstat.igps_rcv_ourreports;
-		  
+
 		  switch(inm->inm_state){
 		  case IGMP_DELAYING_MEMBER:
 		  case IGMP_IDLE_MEMBER:
@@ -558,7 +558,7 @@ igmp_slowtimo()
 		}
 		rti = rti->next;
 	}
-#ifdef IGMP_DEBUG	
+#ifdef IGMP_DEBUG
 	printf("[igmp.c,_slowtimo] -- > exiting \n");
 #endif
 	splx(s);
@@ -638,7 +638,7 @@ igmp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
 
 	switch(name[0]) {
 	case IGMPCTL_STATS:
-		return sysctl_rdstruct(oldp, oldlenp, newp, &igmpstat, 
+		return sysctl_rdstruct(oldp, oldlenp, newp, &igmpstat,
 				       sizeof igmpstat);
 	default:
 		return ENOPROTOOPT;
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 1e082c4..4011b4c 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $Id: igmp.h,v 1.3 1994/08/21 05:27:25 paul Exp $
+ * $Id: igmp.h,v 1.4 1994/09/06 22:42:17 wollman Exp $
  */
 
 #ifndef _NETINET_IGMP_H_
@@ -76,15 +76,15 @@ struct igmp {
 
 #define IGMP_DELAYING_MEMBER                     1
 #define IGMP_IDLE_MEMBER                         2
-#define IGMP_LAZY_MEMBER                         3 
-#define IGMP_SLEEPING_MEMBER                     4 
-#define IGMP_AWAKENING_MEMBER                    5 
+#define IGMP_LAZY_MEMBER                         3
+#define IGMP_SLEEPING_MEMBER                     4
+#define IGMP_AWAKENING_MEMBER                    5
 
 
 #define IGMP_OLD_ROUTER                          0
 #define IGMP_NEW_ROUTER                          1
 
-#define IGMP_AGE_THRESHOLD		         540 
+#define IGMP_AGE_THRESHOLD		         540
 
 #ifdef IGMP_STATES
 static char *tostate[]={"","DELAYING_MEMBER","IDLE","LAZY","SLEEPING",
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 230ff10..1ebbab3 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.2 (Berkeley) 11/15/93
- * $Id: in.c,v 1.12 1995/04/25 19:50:20 wollman Exp $
+ * $Id: in.c,v 1.13 1995/04/26 18:10:54 pst Exp $
  */
 
 #include <sys/param.h>
@@ -209,7 +209,7 @@ in_control(so, cmd, data, ifp)
 				    ifra->ifra_addr.sin_addr.s_addr)
 					break;
 			}
-			if ((ifp->if_flags & IFF_POINTOPOINT) 
+			if ((ifp->if_flags & IFF_POINTOPOINT)
 			    && (cmd == SIOCAIFADDR)
 			    && (ifra->ifra_dstaddr.sin_addr.s_addr
 				== INADDR_ANY)) {
@@ -411,7 +411,7 @@ in_control(so, cmd, data, ifp)
 		IFP_TO_IA(oia->ia_ifp, ia);
 		if (ia) {	/* there is another address */
 			struct in_multi *inm;
-			for(inm = oia->ia_multiaddrs.lh_first; inm; 
+			for(inm = oia->ia_multiaddrs.lh_first; inm;
 			    inm = inm->inm_entry.le_next) {
 				IFAFREE(&inm->inm_ia->ia_ifa);
 				ia->ia_ifa.ifa_refcnt++;
@@ -426,7 +426,7 @@ in_control(so, cmd, data, ifp)
 			LIST_INIT(&mk->mk_head);
 			mk->mk_ifp = ifp;
 
-			for(inm = oia->ia_multiaddrs.lh_first; inm; 
+			for(inm = oia->ia_multiaddrs.lh_first; inm;
 			    inm = inm->inm_entry.le_next) {
 				LIST_INSERT_HEAD(&mk->mk_head, inm, inm_entry);
 			}
@@ -437,7 +437,7 @@ in_control(so, cmd, data, ifp)
 				FREE(mk, M_IPMADDR);
 			}
 		}
-		
+
 		IFAFREE((&oia->ia_ifa));
 		break;
 
@@ -551,20 +551,20 @@ in_ifinit(ifp, ia, sin, scrub)
 
 		/*
 		 * Continuation of multicast address hack:
-		 * If there was a multicast group list previously saved 
+		 * If there was a multicast group list previously saved
 		 * for this interface, then we re-attach it to the first
 		 * address configured on the i/f.
 		 */
 		for(mk = in_mk.lh_first; mk; mk = mk->mk_entry.le_next) {
 			if(mk->mk_ifp == ifp) {
 				struct in_multi *inm;
-				
-				for(inm = mk->mk_head.lh_first; inm; 
+
+				for(inm = mk->mk_head.lh_first; inm;
 				    inm = inm->inm_entry.le_next) {
 					IFAFREE(&inm->inm_ia->ia_ifa);
 					ia->ia_ifa.ifa_refcnt++;
 					inm->inm_ia = ia;
-					LIST_INSERT_HEAD(&ia->ia_multiaddrs, 
+					LIST_INSERT_HEAD(&ia->ia_multiaddrs,
 							 inm, inm_entry);
 				}
 				LIST_REMOVE(mk, mk_entry);
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index daac129..9f12495 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -76,7 +76,7 @@ in_cksum(m, len)
 			 * of a word spanning between this mbuf and the
 			 * last mbuf.
 			 *
-			 * s_util.c[0] is already saved when scanning previous 
+			 * s_util.c[0] is already saved when scanning previous
 			 * mbuf.
 			 */
 			s_util.c[1] = *(char *)w;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 16dabf7..6f8fe0e 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.2 (Berkeley) 1/4/94
- * $Id: in_pcb.c,v 1.10 1995/04/10 08:52:45 davidg Exp $
+ * $Id: in_pcb.c,v 1.11 1995/05/03 07:16:51 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -208,14 +208,14 @@ in_pcbladdr(inp, nam, plocal_sin)
 		register struct route *ro;
 
 		ia = (struct in_ifaddr *)0;
-		/* 
+		/*
 		 * If route is known or can be allocated now,
 		 * our src addr is taken from the i/f, else punt.
 		 */
 		ro = &inp->inp_route;
 		if (ro->ro_rt &&
 		    (satosin(&ro->ro_dst)->sin_addr.s_addr !=
-			sin->sin_addr.s_addr || 
+			sin->sin_addr.s_addr ||
 		    inp->inp_socket->so_options & SO_DONTROUTE)) {
 			RTFREE(ro->ro_rt);
 			ro->ro_rt = (struct rtentry *)0;
@@ -276,7 +276,7 @@ in_pcbladdr(inp, nam, plocal_sin)
 	 * and exit to caller, that will do the lookup.
 	 */
 		*plocal_sin = &ia->ia_addr;
-                
+
 	}
 	return(0);
 }
@@ -357,7 +357,7 @@ in_setsockaddr(inp, nam)
 	struct mbuf *nam;
 {
 	register struct sockaddr_in *sin;
-	
+
 	nam->m_len = sizeof (*sin);
 	sin = mtod(nam, struct sockaddr_in *);
 	bzero((caddr_t)sin, sizeof (*sin));
@@ -373,7 +373,7 @@ in_setpeeraddr(inp, nam)
 	struct mbuf *nam;
 {
 	register struct sockaddr_in *sin;
-	
+
 	nam->m_len = sizeof (*sin);
 	sin = mtod(nam, struct sockaddr_in *);
 	bzero((caddr_t)sin, sizeof (*sin));
@@ -470,9 +470,9 @@ in_losing(inp)
 		rt_missmsg(RTM_LOSING, &info, rt->rt_flags, 0);
 		if (rt->rt_flags & RTF_DYNAMIC)
 			(void) rtrequest(RTM_DELETE, rt_key(rt),
-				rt->rt_gateway, rt_mask(rt), rt->rt_flags, 
+				rt->rt_gateway, rt_mask(rt), rt->rt_flags,
 				(struct rtentry **)0);
-		else 
+		else
 		/*
 		 * A new route can be allocated
 		 * the next time output is attempted.
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 82fcde2..1a5f6d9 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)in_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id: in_proto.c,v 1.13 1995/04/09 01:29:20 davidg Exp $
+ *	$Id: in_proto.c,v 1.14 1995/05/11 00:13:17 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -160,7 +160,7 @@ struct protosw inetsw[] = {
 extern int in_inithead(void **, int);
 
 struct domain inetdomain =
-    { AF_INET, "internet", 0, 0, 0, 
+    { AF_INET, "internet", 0, 0, 0,
       inetsw, &inetsw[sizeof(inetsw)/sizeof(inetsw[0])], 0,
       in_inithead, 32, sizeof(struct sockaddr_in)
     };
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 73b91b5..150d989 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -12,7 +12,7 @@
  * no representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied
  * warranty.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
  * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: in_rmx.c,v 1.11 1995/02/20 15:48:44 davidg Exp $
+ * $Id: in_rmx.c,v 1.12 1995/03/19 14:29:01 davidg Exp $
  */
 
 /*
@@ -114,14 +114,14 @@ static void
 in_clsroute(struct radix_node *rn, struct radix_node_head *head)
 {
 	struct rtentry *rt = (struct rtentry *)rn;
-	
+
 	if(!(rt->rt_flags & RTF_UP))
 		return;		/* prophylactic measures */
 
 	if((rt->rt_flags & (RTF_LLINFO | RTF_HOST)) != RTF_HOST)
 		return;
 
-	if((rt->rt_flags & (RTF_WASCLONED | RTPRF_OURS)) 
+	if((rt->rt_flags & (RTF_WASCLONED | RTPRF_OURS))
 	   != RTF_WASCLONED)
 		return;
 
@@ -180,10 +180,10 @@ in_rtqkill(struct radix_node *rn, void *rock)
 				ap->killed++;
 			}
 		} else {
-			if(ap->updating 
-			   && (time.tv_sec - rt->rt_rmx.rmx_expire 
+			if(ap->updating
+			   && (time.tv_sec - rt->rt_rmx.rmx_expire
 			       > rtq_reallyold)) {
-				rt->rt_rmx.rmx_expire = time.tv_sec 
+				rt->rt_rmx.rmx_expire = time.tv_sec
 					+ rtq_reallyold;
 			}
 			ap->nextstop = lmin(ap->nextstop,
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index f4548c6..a21ec47 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $Id: in_var.h,v 1.8 1995/03/16 18:14:53 bde Exp $
+ * $Id: in_var.h,v 1.9 1995/03/23 18:14:41 wollman Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
@@ -60,7 +60,7 @@ struct in_ifaddr {
 	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
 #define	ia_broadaddr	ia_dstaddr
 	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-	LIST_HEAD(in_multihead, in_multi) ia_multiaddrs; 
+	LIST_HEAD(in_multihead, in_multi) ia_multiaddrs;
 					/* list of multicast addresses */
 };
 
@@ -80,7 +80,7 @@ struct	in_aliasreq {
 
 #define IN_LNAOF(in, ifa) \
 	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-			
+
 
 #ifdef	KERNEL
 extern	struct	in_ifaddr *in_ifaddr;
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index d3e3517..864474a 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- * $Id: ip.h,v 1.3 1994/08/21 05:27:30 paul Exp $
+ * $Id: ip.h,v 1.4 1995/05/05 14:36:38 ache Exp $
  */
 
 #ifndef _NETINET_IP_H_
@@ -51,11 +51,11 @@
  * against negative integers quite easily, and fail in subtle ways.
  */
 struct ip {
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if BYTE_ORDER == LITTLE_ENDIAN
 	u_char	ip_hl:4,		/* header length */
 		ip_v:4;			/* version */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if BYTE_ORDER == BIG_ENDIAN
 	u_char	ip_v:4,			/* version */
 		ip_hl:4;		/* header length */
 #endif
@@ -131,11 +131,11 @@ struct	ip_timestamp {
 	u_char	ipt_code;		/* IPOPT_TS */
 	u_char	ipt_len;		/* size of structure (variable) */
 	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if BYTE_ORDER == LITTLE_ENDIAN
 	u_char	ipt_flg:4,		/* flags, see below */
 		ipt_oflw:4;		/* overflow counter */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if BYTE_ORDER == BIG_ENDIAN
 	u_char	ipt_oflw:4,		/* overflow counter */
 		ipt_flg:4;		/* flags, see below */
 #endif
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index a4bf19f..8e0bc5b 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -24,7 +24,7 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
-#include <sys/time.h> 
+#include <sys/time.h>
 #include <sys/kernel.h>
 
 #include <net/if.h>
@@ -42,13 +42,13 @@
 
 #include <netinet/ip_fw.h>
 
-#ifdef IPFIREWALL_DEBUG 
+#ifdef IPFIREWALL_DEBUG
 #define dprintf1(a)		printf(a)
 #define dprintf2(a1,a2)		printf(a1,a2)
 #define dprintf3(a1,a2,a3)	printf(a1,a2,a3)
 #define dprintf4(a1,a2,a3,a4)	printf(a1,a2,a3,a4)
 #else
-#define dprintf1(a)	
+#define dprintf1(a)
 #define dprintf2(a1,a2)
 #define dprintf3(a1,a2,a3)
 #define dprintf4(a1,a2,a3,a4)
@@ -63,7 +63,7 @@
 #ifdef IPFIREWALL_DEBUG
 #define dprint_ip(a)	print_ip(a)
 #else
-#define dprint_ip(a)	
+#define dprint_ip(a)
 #endif
 
 
@@ -118,13 +118,13 @@ struct ip_fw 	*chain;
 
 		/*
 		 * If the chain is empty
-		 * allow any packet-this is equal 
+		 * allow any packet-this is equal
 		 * to disabling firewall.
 		 */
-    if (!chain) 
-	return(1);    
+    if (!chain)
+	return(1);
 
-		/* 
+		/*
 		 * This way we handle fragmented packets.
 		 * we ignore all fragments but the first one
 		 * so the whole packet can't be reassembled.
@@ -181,7 +181,7 @@ struct ip_fw 	*chain;
 	dprintf1("\n");
 
 
-    for (f=chain;f;f=f->fw_next) 
+    for (f=chain;f;f=f->fw_next)
 	if ((src.s_addr&f->fw_smsk.s_addr)==f->fw_src.s_addr
 	&&  (dst.s_addr&f->fw_dmsk.s_addr)==f->fw_dst.s_addr) {
 
@@ -190,7 +190,7 @@ struct ip_fw 	*chain;
 
 	   if (f->fw_flg&IP_FW_F_IFNAME) {
 
-		if (!f->fw_via_name[0]) 
+		if (!f->fw_via_name[0])
 			goto via_match; /* No name/unit set,match any */
 
 		if (rif->if_unit==f->fw_via_unit &&
@@ -198,9 +198,9 @@ struct ip_fw 	*chain;
 			goto via_match;
 	   } else {
 
-		if (!f->fw_via_ip.s_addr) 
+		if (!f->fw_via_ip.s_addr)
                         goto via_match; /* No via ip set,match any */
-			
+
                 for (ia_p=ia;ia_p;ia_p=ia_p->ifa_next) {
 	                if (!ia_p->ifa_addr||ia_p->ifa_addr->sa_family!=AF_INET)
        	                	continue;
@@ -212,11 +212,11 @@ struct ip_fw 	*chain;
                 }
 
 	   }
-	   /* 
+	   /*
 	    * If we got here,no "via"'s matched,so
 	    * we should continue to the next firewall entry.
 	    */
-           continue; 
+           continue;
 via_match:
 			f_prt=f->fw_flg&IP_FW_F_KIND;
 			if (f_prt==IP_FW_F_ALL) {
@@ -224,8 +224,8 @@ via_match:
 			goto got_match;
 	    } else {
 	/*
-	 * This is actually buggy as if you set SYN flag 
-	 * on UDp or ICMP firewall it will never work,but 
+	 * This is actually buggy as if you set SYN flag
+	 * on UDp or ICMP firewall it will never work,but
 	 * actually it is a concern of software which sets
 	 * firewall entries.
 	 */
@@ -286,7 +286,7 @@ got_match:
 			break;
 	}
 	print_ip(ip->ip_src);
-	if (ip->ip_p==IPPROTO_TCP || ip->ip_p==IPPROTO_UDP) 
+	if (ip->ip_p==IPPROTO_TCP || ip->ip_p==IPPROTO_UDP)
 	    printf(":%d",src_port);
 	printf(" ");
 	print_ip(ip->ip_dst);
@@ -317,10 +317,10 @@ bad_packet:
 			 */
 		if (!(f->fw_flg&IP_FW_F_ICMPRPL))
 			return 0;
-   		m = m_get(M_DONTWAIT, MT_SOOPTS); 
+   		m = m_get(M_DONTWAIT, MT_SOOPTS);
 			/*
-			 * We never retry,we don't want to 
-			 * waste time-it is not so critical 
+			 * We never retry,we don't want to
+			 * waste time-it is not so critical
 			 * if ICMP unsent.
 			 */
 		if (!m)
@@ -363,8 +363,8 @@ int nh_conv;
     u_short 			f_prt, prt=0;
     char 			rev=0;
 
-    if (!chain) 
-		return;     
+    if (!chain)
+		return;
 
     if (ip->ip_off&IP_OFFMASK)
 		return;
@@ -402,7 +402,7 @@ int nh_conv;
 	}
  	if  ((f->fw_flg&IP_FW_F_BIDIR) &&
 	    ((src.s_addr&f->fw_smsk.s_addr)==f->fw_dst.s_addr
-	&&  (dst.s_addr&f->fw_dmsk.s_addr)==f->fw_src.s_addr)) { 
+	&&  (dst.s_addr&f->fw_dmsk.s_addr)==f->fw_src.s_addr)) {
 			rev=1;
 			goto addr_match;
 	}
@@ -410,7 +410,7 @@ int nh_conv;
 addr_match:
 		/*
 		 * We use here same code for "via" matching
-		 * as in firewall.This is wrong and does not do 
+		 * as in firewall.This is wrong and does not do
 		 * much use,because in most cases instead of interface
 		 * passed NULL pointer.Need to be completely
 		 * rewritten.
@@ -420,7 +420,7 @@ addr_match:
 
 	   if (f->fw_flg&IP_FW_F_IFNAME) {
 
-		if (!f->fw_via_name[0]) 
+		if (!f->fw_via_name[0])
 			goto via_match; /* No name/unit set,match any */
 
 		if (rif->if_unit==f->fw_via_unit &&
@@ -428,9 +428,9 @@ addr_match:
 			goto via_match;
 	   } else {
 
-		if (!f->fw_via_ip.s_addr) 
+		if (!f->fw_via_ip.s_addr)
                         goto via_match; /* No via ip set,match any */
-			
+
                 for (ia_p=ia;ia_p;ia_p=ia_p->ifa_next) {
 	                if (!ia_p->ifa_addr||ia_p->ifa_addr->sa_family!=AF_INET)
        	                	continue;
@@ -442,11 +442,11 @@ addr_match:
                 }
 
 	   }
-	   /* 
+	   /*
 	    * If we got here,no "via"'s matched,so
 	    * we should continue to the next firewall entry.
 	    */
-           continue; 
+           continue;
 via_match:
 			f_prt=f->fw_flg&IP_FW_F_KIND;
 			if (f_prt==IP_FW_F_ALL) {
@@ -457,10 +457,10 @@ via_match:
 						    /*
 						     * Rise byte count,
 						     * if need to convert from
-						     * host to network byte 
+						     * host to network byte
 						     * order,do it.
 						     */
-			if (nh_conv)		    
+			if (nh_conv)
 				f->fw_bcnt+=ntohs(ip->ip_len);
 			else
 				f->fw_bcnt+=ip->ip_len;
@@ -476,7 +476,7 @@ via_match:
 					f->fw_flg&IP_FW_F_SRNG) &&
         port_match(&f->fw_pts[f->fw_nsp],f->fw_ndp,dst_port,
 					f->fw_flg&IP_FW_F_DRNG)))
-	|| ((rev)   
+	|| ((rev)
 	&& (port_match(&f->fw_pts[0],f->fw_nsp,dst_port,
                                         f->fw_flg&IP_FW_F_SRNG)
 	&& port_match(&f->fw_pts[f->fw_nsp],f->fw_ndp,src_port,
@@ -486,10 +486,10 @@ via_match:
 					      /*
 					       * Rise byte count,
 					       * if need to convert from
-					       * host to network byte 
+					       * host to network byte
 					       * order,do it.
 					       */
-		if (nh_conv)		    
+		if (nh_conv)
 			f->fw_bcnt+=ntohs(ip->ip_len);
 		else
 			f->fw_bcnt+=ip->ip_len;
@@ -540,7 +540,7 @@ struct ip_fw *frwl;
     int s=splnet();
     u_long m_src_mask,m_dst_mask;
     u_long n_sa,n_da,o_sa,o_da,o_sm,o_dm,n_sm,n_dm;
-    u_short n_sr,n_dr,o_sr,o_dr; 
+    u_short n_sr,n_dr,o_sr,o_dr;
     u_short oldkind,newkind;
     int addb4=0;
     int n_o,n_n;
@@ -572,7 +572,7 @@ struct ip_fw *frwl;
 		newkind=ftmp->fw_flg & IP_FW_F_KIND;
 		oldkind=chtmp->fw_flg & IP_FW_F_KIND;
 
-		if (newkind!=IP_FW_F_ALL 
+		if (newkind!=IP_FW_F_ALL
 		&&  oldkind!=IP_FW_F_ALL
 		&&  oldkind!=newkind) {
 				chtmp_prev=chtmp;
@@ -596,9 +596,9 @@ struct ip_fw *frwl;
 		m_dst_mask = o_dm & n_dm;
 
 		if ((o_sa & m_src_mask) == (n_sa & m_src_mask)) {
-			if (n_sm > o_sm) 
+			if (n_sm > o_sm)
 				addb4++;
-			if (n_sm < o_sm) 
+			if (n_sm < o_sm)
 				addb4--;
 		}
 
@@ -629,15 +629,15 @@ struct ip_fw *frwl;
 				 * of ports.
 				 */
 
-				if (ftmp->fw_flg & IP_FW_F_SRNG) 
+				if (ftmp->fw_flg & IP_FW_F_SRNG)
 					n_sr=ftmp->fw_pts[1]-ftmp->fw_pts[0];
-				else 
+				else
 					n_sr=(ftmp->fw_nsp)?
 						ftmp->fw_nsp : USHRT_MAX;
-					
-				if (chtmp->fw_flg & IP_FW_F_SRNG) 
+
+				if (chtmp->fw_flg & IP_FW_F_SRNG)
 				     o_sr=chtmp->fw_pts[1]-chtmp->fw_pts[0];
-				else 
+				else
 				     o_sr=(chtmp->fw_nsp)?
 				 	    chtmp->fw_nsp : USHRT_MAX;
 
@@ -645,7 +645,7 @@ struct ip_fw *frwl;
 					addb4++;
 				if (n_sr>o_sr)
 					addb4--;
-					
+
 				n_n=ftmp->fw_nsp;
 				n_o=chtmp->fw_nsp;
 		/*
@@ -657,15 +657,15 @@ struct ip_fw *frwl;
 				    (n_o>(IP_FW_MAX_PORTS-2)))
 					goto skip_check;
 
-				if (ftmp->fw_flg & IP_FW_F_DRNG) 
+				if (ftmp->fw_flg & IP_FW_F_DRNG)
 				       n_dr=ftmp->fw_pts[n_n+1]-ftmp->fw_pts[n_n];
-				else 
+				else
 				       n_dr=(ftmp->fw_ndp)?
 						ftmp->fw_ndp : USHRT_MAX;
 
-				if (chtmp->fw_flg & IP_FW_F_DRNG) 
+				if (chtmp->fw_flg & IP_FW_F_DRNG)
 				     o_dr=chtmp->fw_pts[n_o+1]-chtmp->fw_pts[n_o];
-				else 
+				else
 				       o_dr=(chtmp->fw_ndp)?
 						chtmp->fw_ndp : USHRT_MAX;
 				if (n_dr<o_dr)
@@ -678,7 +678,7 @@ skip_check:
 		}
 		if (addb4>0) {
 			if (chtmp_prev) {
-				chtmp_prev->fw_next=ftmp; 
+				chtmp_prev->fw_next=ftmp;
 				ftmp->fw_next=chtmp;
 			} else {
 				*chainptr=ftmp;
@@ -727,7 +727,7 @@ struct ip_fw *frwl;
     while(ftmp)
     {
      matches=1;
-     if (ftmp->fw_src.s_addr!=frwl->fw_src.s_addr 
+     if (ftmp->fw_src.s_addr!=frwl->fw_src.s_addr
      ||  ftmp->fw_dst.s_addr!=frwl->fw_dst.s_addr
      ||  ftmp->fw_smsk.s_addr!=frwl->fw_smsk.s_addr
      ||  ftmp->fw_dmsk.s_addr!=frwl->fw_dmsk.s_addr
@@ -756,12 +756,12 @@ struct ip_fw *frwl;
             }
         else
             {
-             *chainptr=ftmp->fw_next; 
+             *chainptr=ftmp->fw_next;
              free(ftmp,M_IPFW);
              ftmp=*chainptr;
             }
-       
-      }      
+
+      }
     else
       {
        ltmp = ftmp;
@@ -795,7 +795,7 @@ struct ip_fw *frwl;
     while(ftmp)
     {
      matches=1;
-     if (ftmp->fw_src.s_addr!=frwl->fw_src.s_addr 
+     if (ftmp->fw_src.s_addr!=frwl->fw_src.s_addr
      ||  ftmp->fw_dst.s_addr!=frwl->fw_dst.s_addr
      ||  ftmp->fw_smsk.s_addr!=frwl->fw_smsk.s_addr
      ||  ftmp->fw_dmsk.s_addr!=frwl->fw_dmsk.s_addr
@@ -885,7 +885,7 @@ if ( stage == IP_ACCT_FLUSH )
        {
 	free_fw_chain(&ip_acct_chain);
 	return(0);
-       }  
+       }
 if ( stage == IP_ACCT_ZERO )
        {
 	zero_fw_chain(ip_acct_chain);
@@ -925,16 +925,16 @@ if ( stage == IP_ACCT_ADD
 #ifdef IPFIREWALL
 int
 ip_fw_ctl(stage,m)
-int stage;	
+int stage;
 struct mbuf *m;
 {
 if ( stage == IP_FW_FLUSH )
        {
 	free_fw_chain(&ip_fw_chain);
 	return(0);
-       }  
+       }
 
-if ( m == 0 )	
+if ( m == 0 )
        {
          printf("ip_fw_ctl:  NULL mbuf ptr\n");
 	 return(EINVAL);
@@ -955,11 +955,11 @@ if ( stage == IP_FW_POLICY )
  * to firewall chain or deleting'em
  */
 
-if ( stage == IP_FW_ADD || 
+if ( stage == IP_FW_ADD ||
      stage == IP_FW_DEL ) {
 
 	    struct ip_fw *frwl;
- 
+
 	    if (!(frwl=check_ipfw_struct(m)))
 			return (EINVAL);
 
@@ -976,7 +976,7 @@ if ( stage == IP_FW_ADD ||
 		return(EINVAL);
 #endif
 	    }
-} 
+}
 
 dprintf2("ip_fw_ctl:  unknown request %d\n",stage);
 return(EINVAL);
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index 87ba0fb..47e5131 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -86,15 +86,15 @@ struct ip_fw {
 #define IP_FW_F_IFNAME	0x200	/* Use interface name/unit (not IP)   */
 #define IP_FW_F_MASK	0x3FF	/* All possible flag bits mask        */
 
-/*    
+/*
  * New IP firewall options for [gs]etsockopt at the RAW IP level.
- */     
+ */
 #define IP_FW_BASE_CTL	53
 
 #define IP_FW_ADD     (IP_FW_BASE_CTL)
 #define IP_FW_DEL     (IP_FW_BASE_CTL+4)
 #define IP_FW_FLUSH   (IP_FW_BASE_CTL+6)
-#define IP_FW_POLICY  (IP_FW_BASE_CTL+7) 
+#define IP_FW_POLICY  (IP_FW_BASE_CTL+7)
 
 #define IP_ACCT_ADD   (IP_FW_BASE_CTL+10)
 #define IP_ACCT_DEL   (IP_FW_BASE_CTL+11)
diff --git a/sys/netinet/ip_fwdef.c b/sys/netinet/ip_fwdef.c
index c1050e5..2f2a966 100644
--- a/sys/netinet/ip_fwdef.c
+++ b/sys/netinet/ip_fwdef.c
@@ -13,7 +13,7 @@
  */
 
 /*
- * Dumb definitions which needed when 
+ * Dumb definitions which needed when
  * firewall/accounting module is not loaded.
  */
 
@@ -22,7 +22,7 @@
 #include <sys/domain.h>
 #include <sys/socket.h>
 #include <sys/errno.h>
-#include <sys/time.h> 
+#include <sys/time.h>
 #include <sys/kernel.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 031de2e..d7b4a11 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.5 1995/02/16 00:27:43 wollman Exp $
+ * $Id: ip_icmp.c,v 1.6 1995/03/16 18:14:54 bde Exp $
  */
 
 #include <sys/param.h>
@@ -128,7 +128,7 @@ icmp_error(n, type, code, dest, destifp)
 		icp->icmp_gwaddr.s_addr = dest;
 	else {
 		icp->icmp_void = 0;
-		/* 
+		/*
 		 * The following assignments assume an overlay with the
 		 * zeroed icmp_void field.
 		 */
@@ -246,7 +246,7 @@ icmp_input(m, hlen)
 			case ICMP_UNREACH_NEEDFRAG:
 				code = PRC_MSGSIZE;
 				break;
-				
+
 			case ICMP_UNREACH_NET_UNKNOWN:
 			case ICMP_UNREACH_NET_PROHIB:
 			case ICMP_UNREACH_TOSNET:
@@ -319,7 +319,7 @@ icmp_input(m, hlen)
 		icp->icmp_rtime = iptime();
 		icp->icmp_ttime = icp->icmp_rtime;	/* bogus, do later! */
 		goto reflect;
-		
+
 	case ICMP_MASKREQ:
 #define	satosin(sa)	((struct sockaddr_in *)(sa))
 		if (icmpmaskrepl == 0)
@@ -378,7 +378,7 @@ reflect:
 		icmpdst.sin_addr = icp->icmp_gwaddr;
 #ifdef	ICMPPRINTFS
 		if (icmpprintfs)
-			printf("redirect dst %lx to %lx\n", 
+			printf("redirect dst %lx to %lx\n",
 				NTOHL(icp->icmp_ip.ip_dst.s_addr),
 				NTOHL(icp->icmp_gwaddr.s_addr));
 #endif
@@ -495,7 +495,7 @@ icmp_reflect(m)
 			    /*
 			     * Should check for overflow, but it "can't happen"
 			     */
-			    if (opt == IPOPT_RR || opt == IPOPT_TS || 
+			    if (opt == IPOPT_RR || opt == IPOPT_TS ||
 				opt == IPOPT_SECURITY) {
 				    bcopy((caddr_t)cp,
 					mtod(opts, caddr_t) + opts->m_len, len);
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 1a73e0d..aa0e3e1 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_icmp.h,v 1.2 1994/08/02 07:48:35 davidg Exp $
+ * $Id: ip_icmp.h,v 1.3 1994/08/21 05:27:31 paul Exp $
  */
 
 #ifndef _NETINET_IP_ICMP_H_
@@ -60,7 +60,7 @@ struct icmp {
 
 		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
 		struct ih_pmtu {
-			n_short ipm_void;    
+			n_short ipm_void;
 			n_short ipm_nextmtu;
 		} ih_pmtu;
 	} icmp_hun;
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 89498b9..22a4f45 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.20 1995/05/09 13:35:45 davidg Exp $
+ * $Id: ip_input.c,v 1.21 1995/05/11 00:13:18 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -255,12 +255,12 @@ next:
 		goto next;
 
         /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is 
+         * matter if it is destined to another node, or whether it is
          * a multicast one, RSVP wants it! and prevents it from being forwarded
          * anywhere else. Also checks if the rsvp daemon is running before
 	 * grabbing the packet.
          */
-	if (ip_rsvpd != NULL && ip->ip_p==IPPROTO_RSVP) 
+	if (ip_rsvpd != NULL && ip->ip_p==IPPROTO_RSVP)
 		goto ours;
 
 	/*
@@ -357,9 +357,9 @@ ours:
 
 		/*
 		 * If packet came to us we count it...
-		 * This way we count all incoming packets which has 
+		 * This way we count all incoming packets which has
 		 * not been forwarded...
-		 * Do not convert ip_len to host byte order when 
+		 * Do not convert ip_len to host byte order when
 		 * counting,ppl already made it for us before..
 		 */
 	if (ip_acct_cnt_ptr!=NULL)
@@ -747,7 +747,7 @@ ip_dooptions(m)
 				char buf[4*sizeof "123"];
 				strcpy(buf, inet_ntoa(ip->ip_dst));
 
-				log(LOG_WARNING, 
+				log(LOG_WARNING,
 				    "attempted source route from %s to %s\n",
 				    inet_ntoa(ip->ip_src), buf);
 				type = ICMP_UNREACH;
@@ -1207,17 +1207,17 @@ ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 	case IPCTL_DEFTTL:
 		return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_defttl));
 	case IPCTL_SOURCEROUTE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen, 
+		return (sysctl_int(oldp, oldlenp, newp, newlen,
 				   &ip_dosourceroute));
 #ifdef notyet
 	case IPCTL_DEFMTU:
 		return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtu));
 #endif
 	case IPCTL_RTEXPIRE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen, 
+		return (sysctl_int(oldp, oldlenp, newp, newlen,
 				   &rtq_reallyold));
 	case IPCTL_RTMINEXPIRE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen, 
+		return (sysctl_int(oldp, oldlenp, newp, newlen,
 				   &rtq_minreallyold));
 	case IPCTL_RTMAXCACHE:
 		return (sysctl_int(oldp, oldlenp, newp, newlen,
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index fc5b618..7226fd4 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -138,8 +138,8 @@ u_long timeout_val = 0;			/* count of outstanding upcalls */
 
 /*
  * Define the token bucket filter structures
- * tbftable -> each vif has one of these for storing info 
- * qtable   -> each interface has an associated queue of pkts 
+ * tbftable -> each vif has one of these for storing info
+ * qtable   -> each interface has an associated queue of pkts
  */
 
 struct tbf tbftable[MAXVIFS];
@@ -169,7 +169,7 @@ struct ip multicast_encap_iphdr = {
 	sizeof(struct ip),		/* total length */
 	0,				/* id */
 	0,				/* frag offset */
-	ENCAP_TTL, ENCAP_PROTO,	
+	ENCAP_TTL, ENCAP_PROTO,
 	0,				/* checksum */
 };
 
@@ -217,7 +217,7 @@ void multiencap_decap(struct mbuf *m);
 /*
  * A simple hash function: returns MFCHASHMOD of the low-order octet of
  * the argument's network or subnet number and the multicast group assoc.
- */ 
+ */
 static u_long
 nethash_fc(m,n)
     register u_long m;
@@ -269,7 +269,7 @@ struct mfc *mfchash[MFCHASHSIZ];
  */
 static struct mfc *
 mfcfind(origin, mcastgrp)
-    u_long origin; 
+    u_long origin;
     u_long mcastgrp;
 {
     register struct mbuf *mb_rt;
@@ -538,7 +538,7 @@ X_ip_mrouter_done()
      */
     last_encap_src = NULL;
     last_encap_vif = NULL;
- 
+
     ip_mrouter = NULL;
 
     splx(s);
@@ -632,12 +632,12 @@ add_vif(vifcp)
 
     if (mrtdebug)
 	log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d\n",
-	    vifcp->vifc_vifi, 
+	    vifcp->vifc_vifi,
 	    ntohl(vifcp->vifc_lcl_addr.s_addr),
 	    (vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
 	    ntohl(vifcp->vifc_rmt_addr.s_addr),
 	    vifcp->vifc_threshold,
-	    vifcp->vifc_rate_limit);    
+	    vifcp->vifc_rate_limit);
 
     return 0;
 }
@@ -727,16 +727,16 @@ add_mfc(mfccp)
 	return 0;
     }
 
-    /* 
+    /*
      * Find the entry for which the upcall was made and update
      */
     s = splnet();
     hash = nethash_fc(mfccp->mfcc_origin.s_addr, mfccp->mfcc_mcastgrp.s_addr);
-    for (prev_mb_rt = mb_rt = mfctable[hash], nstl = 0; 
+    for (prev_mb_rt = mb_rt = mfctable[hash], nstl = 0;
 	 mb_rt; prev_mb_rt = mb_rt, mb_rt = mb_rt->m_next) {
 
 	rt = mtod(mb_rt, struct mfc *);
-	if (((rt->mfc_origin.s_addr & mfccp->mfcc_originmask.s_addr) 
+	if (((rt->mfc_origin.s_addr & mfccp->mfcc_originmask.s_addr)
 	     == mfccp->mfcc_origin.s_addr) &&
 	    (rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr) &&
 	    (mb_rt->m_act != NULL)) {
@@ -768,14 +768,14 @@ add_mfc(mfccp)
 	    while (mb_rt->m_act) {
 		mb_ntry = mb_rt->m_act;
 		rte = mtod(mb_ntry, struct rtdetq *);
-		ip_mdq(rte->m, rte->ifp, rte->tunnel_src, 
+		ip_mdq(rte->m, rte->ifp, rte->tunnel_src,
 		       rt1, rte->imo);
 		mb_rt->m_act = mb_ntry->m_act;
 		m_freem(rte->m);
 		m_free(mb_ntry);
 	    }
 
-	    /* 
+	    /*
 	     * If more than one entry was created for a single upcall
 	     * delete that entry
 	     */
@@ -796,12 +796,12 @@ add_mfc(mfccp)
 		ntohl(mfccp->mfcc_mcastgrp.s_addr),
 		ntohl(mfccp->mfcc_originmask.s_addr),
 		mfccp->mfcc_parent);
-	
+
 	for (prev_mb_rt = mb_rt = mfctable[hash];
 	     mb_rt; prev_mb_rt = mb_rt, mb_rt = mb_rt->m_next) {
-	    
+
 	    rt = mtod(mb_rt, struct mfc *);
-	    if (((rt->mfc_origin.s_addr & mfccp->mfcc_originmask.s_addr) 
+	    if (((rt->mfc_origin.s_addr & mfccp->mfcc_originmask.s_addr)
 		 == mfccp->mfcc_origin.s_addr) &&
 		(rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr)) {
 
@@ -822,9 +822,9 @@ add_mfc(mfccp)
 		splx(s);
 		return ENOBUFS;
 	    }
-	    
+
 	    rt = mtod(mb_rt, struct mfc *);
-	    
+
 	    /* insert new entry at head of hash chain */
 	    rt->mfc_origin     = mfccp->mfcc_origin;
 	    rt->mfc_originmask = mfccp->mfcc_originmask;
@@ -834,7 +834,7 @@ add_mfc(mfccp)
 		VIFM_COPY(mfccp->mfcc_ttls[i], rt->mfc_ttls[i]);
 	    /* initialize pkt counters per src-grp */
 	    rt->mfc_pkt_cnt    = 0;
-	    
+
 	    /* link into table */
 	    mb_rt->m_next  = mfctable[hash];
 	    mfctable[hash] = mb_rt;
@@ -964,7 +964,7 @@ X_ip_mforward(ip, ifp, m, imo)
 	 *	 on intermediate routing hosts!  Therefore, we hereby
 	 *	 change the spec.
 	 */
-	
+
 	/*
 	 * Verify that the tunnel options are well-formed.
 	 */
@@ -1038,7 +1038,7 @@ X_ip_mforward(ip, ifp, m, imo)
 	hash = nethash_fc(ip->ip_src.s_addr, ip->ip_dst.s_addr);
 	for (mb_rt = mfctable[hash]; mb_rt; mb_rt = mb_rt->m_next) {
 	    rt = mtod(mb_rt, struct mfc *);
-	    if (((ip->ip_src.s_addr & rt->mfc_originmask.s_addr) == 
+	    if (((ip->ip_src.s_addr & rt->mfc_originmask.s_addr) ==
 		 rt->mfc_origin.s_addr) &&
 		(ip->ip_dst.s_addr == rt->mfc_mcastgrp.s_addr) &&
 		(mb_rt->m_act != NULL))
@@ -1104,33 +1104,33 @@ X_ip_mforward(ip, ifp, m, imo)
 	splx(s);
 
 	if (hash == 0) {
-	    /* 
-	     * Send message to routing daemon to install 
+	    /*
+	     * Send message to routing daemon to install
 	     * a route into the kernel table
 	     */
 	    k_igmpsrc.sin_addr = ip->ip_src;
 	    k_igmpdst.sin_addr = ip->ip_dst;
-	    
+
 	    mm = m_copy(m, 0, M_COPYALL);
 	    if (mm == NULL) {
 		splx(s);
 		return ENOBUFS;
 	    }
-	    
+
 	    k_data = mtod(mm, struct ip *);
 	    k_data->ip_p = 0;
-	    
+
 	    mrtstat.mrts_upcalls++;
 
           rip_ip_input(mm, ip_mrouter, (struct sockaddr *)&k_igmpsrc);
-	    
+
 	    /* set timer to cleanup entry if upcall is lost */
 	    timeout(cleanup_cache, (caddr_t)mb_rt, 100);
 	    timeout_val++;
 	}
-	
+
 	return 0;
-    }		
+    }
 }
 
 #ifndef MROUTE_LKM
@@ -1158,8 +1158,8 @@ cleanup_cache(xmb_rt)
     hash = nethash_fc(rt->mfc_origin.s_addr, rt->mfc_mcastgrp.s_addr);
 
     if (mrtdebug)
-	log(LOG_DEBUG, "ip_mforward: cleanup ipm %d h %d s %x g %x\n", 
-	    ip_mrouter, hash, ntohl(rt->mfc_origin.s_addr), 
+	log(LOG_DEBUG, "ip_mforward: cleanup ipm %d h %d s %x g %x\n",
+	    ip_mrouter, hash, ntohl(rt->mfc_origin.s_addr),
 	    ntohl(rt->mfc_mcastgrp.s_addr));
 
     mrtstat.mrts_cache_cleanups++;
@@ -1172,7 +1172,7 @@ cleanup_cache(xmb_rt)
 	if (m0 == mb_rt)
 	    break;
 
-    /* 
+    /*
      * drop all the packets
      * free the mbuf with the pkt, if, timing info
      */
@@ -1185,14 +1185,14 @@ cleanup_cache(xmb_rt)
 	m_free(m);
     }
 
-    /* 
+    /*
      * Delete the entry from the cache
      */
     if (prev_m0 != m0) {	/* if moved past head of list */
 	MFREE(m0, prev_m0->m_next);
     } else			/* delete head of list, it is in the table */
 	mfctable[hash] = m_free(m0);
-    
+
     timeout_val--;
     splx(s);
 }
@@ -1227,7 +1227,7 @@ ip_mdq(m, ifp, tunnel_src, rt, imo)
 	/* came in the wrong interface */
 	if (mrtdebug)
 	    log(LOG_DEBUG, "wrong if: ifp %x vifi %d\n",
-		ifp, vifi); 
+		ifp, vifi);
 	++mrtstat.mrts_wrong_if;
 	return (int)tunnel_src;
     }
@@ -1250,13 +1250,13 @@ ip_mdq(m, ifp, tunnel_src, rt, imo)
                     encap_send((ip), (vifp), (m));       \
                 else                                     \
                     phyint_send((ip), (vifp), (m));      \
-                }                                  
+                }
 
-/* If no options or the imo_multicast_vif option is 0, don't do this part 
+/* If no options or the imo_multicast_vif option is 0, don't do this part
  */
-    if ((imo != NULL) && 
-       (( vifi = imo->imo_multicast_vif - 1) < numvifs) /*&& (vifi>=0)*/) 
-    {  
+    if ((imo != NULL) &&
+       (( vifi = imo->imo_multicast_vif - 1) < numvifs) /*&& (vifi>=0)*/)
+    {
         MC_SEND(ip,viftable+vifi,m);
         return (1);        /* make sure we are done: No more physical sends */
     }
@@ -1270,7 +1270,7 @@ ip_mdq(m, ifp, tunnel_src, rt, imo)
 }
 
 /* check if a vif number is legal/ok. This is used by ip_output, to export
- * numvifs there, 
+ * numvifs there,
  */
 int
 X_legal_vif_num(vif)
@@ -1394,7 +1394,7 @@ srcrt_send(ip, vifp, m)
     if (vifp->v_rate_limit <= 0)
 	tbf_send_packet(vifp, mb_opts, 0);
     else
-	tbf_control(vifp, mb_opts, 
+	tbf_control(vifp, mb_opts,
 		    mtod(mb_opts, struct ip *), ip_copy->ip_len, 0);
 }
 
@@ -1502,7 +1502,7 @@ multiencap_decap(m)
     }
     if (ip->ip_src.s_addr != last_encap_src) {
 	register struct vif *vife;
-	
+
 	vifp = viftable;
 	vife = vifp + numvifs;
 	last_encap_src = ip->ip_src.s_addr;
@@ -1564,7 +1564,7 @@ tbf_control(vifp, m, ip, p_len, imo)
 {
     tbf_update_tokens(vifp);
 
-    /* if there are enough tokens, 
+    /* if there are enough tokens,
      * and the queue is empty,
      * send this packet out
      */
@@ -1601,11 +1601,11 @@ tbf_control(vifp, m, ip, p_len, imo)
     return;
 }
 
-/* 
+/*
  * adds a packet to the queue at the interface
  */
 void
-tbf_queue(vifp, m, ip, imo) 
+tbf_queue(vifp, m, ip, imo)
 	register struct vif *vifp;
 	register struct mbuf *m;
 	register struct ip *ip;
@@ -1627,7 +1627,7 @@ tbf_queue(vifp, m, ip, imo)
 }
 
 
-/* 
+/*
  * processes the queue at the interface
  */
 void
@@ -1665,11 +1665,11 @@ tbf_process_q(vifp)
     splx(s);
 }
 
-/* 
+/*
  * removes the jth packet from the queue at the interface
  */
 void
-tbf_dequeue(vifp,j) 
+tbf_dequeue(vifp,j)
     register struct vif *vifp;
     register int j;
 {
@@ -1681,7 +1681,7 @@ tbf_dequeue(vifp,j)
 	qtable[index][i-1].pkt_len = qtable[index][i].pkt_len;
 	qtable[index][i-1].pkt_ip = qtable[index][i].pkt_ip;
 	qtable[index][i-1].pkt_imo = qtable[index][i].pkt_imo;
-    }		
+    }
     qtable[index][i-1].pkt_m = NULL;
     qtable[index][i-1].pkt_len = NULL;
     qtable[index][i-1].pkt_ip = NULL;
@@ -1698,7 +1698,7 @@ tbf_reprocess_q(xvifp)
 	void *xvifp;
 {
     register struct vif *vifp = xvifp;
-    if (ip_mrouter == NULL) 
+    if (ip_mrouter == NULL)
 	return;
 
     tbf_update_tokens(vifp);
@@ -1806,7 +1806,7 @@ priority(vifp, ip)
     /* temporary hack; will add general packet classifier some day */
 
     prio = 50;  /* default priority */
-    
+
     /* check for source route options and add option length to get dst */
     if (vifp->v_flags & VIFF_SRCRT)
 	graddr = ntohl((ip+8)->ip_dst.s_addr);
@@ -1845,7 +1845,7 @@ priority(vifp, ip)
 }
 
 /*
- * End of token bucket filter modifications 
+ * End of token bucket filter modifications
  */
 
 #ifdef MROUTE_LKM
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 945c6bd..4c815e8 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_mroute.h,v 1.5 1994/09/14 03:10:12 wollman Exp $
+ * $Id: ip_mroute.h,v 1.6 1995/03/16 18:14:59 bde Exp $
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
@@ -125,7 +125,7 @@ struct vif_req {
     u_char         v_flags;         /* VIFF_ flags defined above           */
     u_char         v_threshold;     /* min ttl required to forward on vif  */
     struct in_addr v_lcl_addr;      /* local interface address             */
-    struct in_addr v_rmt_addr; 
+    struct in_addr v_rmt_addr;
     char           v_if_name[IFNAMSIZ];  /* if name */
 };
 
@@ -170,7 +170,7 @@ struct sioc_vif_req {
     u_long icount;
     u_long ocount;
 };
-    
+
 
 #ifdef KERNEL
 
@@ -187,8 +187,8 @@ struct vif {
 };
 
 /*
- * The kernel's multicast forwarding cache entry structure 
- * (A field for the type of service (mfc_tos) is to be added 
+ * The kernel's multicast forwarding cache entry structure
+ * (A field for the type of service (mfc_tos) is to be added
  * at a future point)
  */
 struct mfc {
@@ -220,7 +220,7 @@ struct rtdetq {
 #define MAX_UPQ	4		/* max. no of pkts in upcall Q */
 
 /*
- * Token Bucket filter code 
+ * Token Bucket filter code
  */
 #define MAX_BKT_SIZE    10000             /* 10K bytes size 		*/
 #define MAXQSIZE        10                /* max # of pkts in queue 	*/
@@ -228,7 +228,7 @@ struct rtdetq {
 /*
  * queue structure at each vif
  */
-struct pkt_queue 
+struct pkt_queue
 {
     u_long pkt_len;               /* length of packet in queue 	*/
     struct mbuf *pkt_m;           /* pointer to packet mbuf	*/
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 8869323..8e6fb56 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.17 1995/04/26 18:10:55 pst Exp $
+ * $Id: ip_output.c,v 1.18 1995/05/09 13:35:46 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -1065,7 +1065,7 @@ ip_getmoptions(optname, imo, mp)
 
 	switch (optname) {
 
-	case IP_MULTICAST_VIF: 
+	case IP_MULTICAST_VIF:
 		if (imo != NULL)
 			*(mtod(*mp, int *)) = imo->imo_multicast_vif;
 		else
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index a1f0c42..73bd43d 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_var.h,v 1.8 1995/03/16 16:25:42 wollman Exp $
+ * $Id: ip_var.h,v 1.9 1995/03/16 18:15:01 bde Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -71,11 +71,11 @@ struct ipq {
  * Note: ipf_next must be at same offset as ipq_next above
  */
 struct	ipasfrag {
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if BYTE_ORDER == LITTLE_ENDIAN
 	u_char	ip_hl:4,
 		ip_v:4;
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if BYTE_ORDER == BIG_ENDIAN
 	u_char	ip_v:4,
 		ip_hl:4;
 #endif
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 441f5f5..89697a0 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.2 (Berkeley) 1/4/94
- * $Id: raw_ip.c,v 1.17 1995/04/09 01:29:23 davidg Exp $
+ * $Id: raw_ip.c,v 1.18 1995/05/12 20:00:21 ache Exp $
  */
 
 #include <sys/param.h>
@@ -249,7 +249,7 @@ rip_ctloutput(op, so, level, optname, m)
 		}
 
 		if (op == PRCO_SETOPT) {
-			error=(*ip_fw_ctl_ptr)(optname, *m); 
+			error=(*ip_fw_ctl_ptr)(optname, *m);
 			if (*m)
 				(void)m_free(*m);
 		}
@@ -261,13 +261,13 @@ rip_ctloutput(op, so, level, optname, m)
 	case IP_ACCT_ADD:
 	case IP_ACCT_CLR:
 	case IP_ACCT_FLUSH:
-	case IP_ACCT_ZERO: 
+	case IP_ACCT_ZERO:
 		if (ip_acct_ctl_ptr==NULL) {
 			if (*m)
 				(void)m_free(*m);
 			return(EINVAL);
 		}
-	
+
 		if (op == PRCO_SETOPT) {
 			error=(*ip_acct_ctl_ptr)(optname, *m);
 			if (*m)
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index cb7d75c..a79acf9 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp.h,v 1.4 1995/02/08 20:18:44 wollman Exp $
+ * $Id: tcp.h,v 1.5 1995/02/14 02:35:14 wollman Exp $
  */
 
 #ifndef _NETINET_TCP_H_
@@ -49,11 +49,11 @@ struct tcphdr {
 	u_short	th_dport;		/* destination port */
 	tcp_seq	th_seq;			/* sequence number */
 	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN 
+#if BYTE_ORDER == LITTLE_ENDIAN
 	u_char	th_x2:4,		/* (unused) */
 		th_off:4;		/* data offset */
 #endif
-#if BYTE_ORDER == BIG_ENDIAN 
+#if BYTE_ORDER == BIG_ENDIAN
 	u_char	th_off:4,		/* data offset */
 		th_x2:4;		/* (unused) */
 #endif
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 47fd018..bf0fd0c 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.23 1995/05/09 12:32:06 olah Exp $
+ *	$Id: tcp_input.c,v 1.24 1995/05/11 01:41:06 davidg Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -318,7 +318,7 @@ tcp_input(m, iphlen)
 		}
 		optlen = off - sizeof (struct tcphdr);
 		optp = mtod(m, caddr_t) + sizeof (struct tcpiphdr);
-		/* 
+		/*
 		 * Do quick retrieval of timestamp options ("options
 		 * prediction?").  If timestamp is the only option and it's
 		 * formatted as recommended in RFC 1323 appendix A, we
@@ -382,7 +382,7 @@ findpcb:
 		goto dropwithreset;
 	if (tp->t_state == TCPS_CLOSED)
 		goto drop;
-	
+
 	/* Unscale the window into a 32-bit value. */
 	if ((tiflags & TH_SYN) == 0)
 		tiwin = ti->ti_win << tp->snd_scale;
@@ -447,7 +447,7 @@ findpcb:
 		tcp_dooptions(tp, optp, optlen, ti,
 			&to);
 
-	/* 
+	/*
 	 * Header prediction: check for the two common cases
 	 * of a uni-directional data xfer.  If the packet has
 	 * no control flags, is in-sequence, the window didn't
@@ -480,7 +480,7 @@ findpcb:
 	    tiwin && tiwin == tp->snd_wnd &&
 	    tp->snd_nxt == tp->snd_max) {
 
-		/* 
+		/*
 		 * If last ACK falls within this segment's sequence numbers,
 		 * record the timestamp.
 		 * NOTE that the test is modified according to the latest
@@ -666,7 +666,7 @@ findpcb:
 		tp->cc_recv = to.to_cc;
 		/*
 		 * Perform TAO test on incoming CC (SEG.CC) option, if any.
-		 * - compare SEG.CC against cached CC from the same host, 
+		 * - compare SEG.CC against cached CC from the same host,
 		 *	if any.
 		 * - if SEG.CC > chached value, SYN must be new and is accepted
 		 *	immediately: save new CC in the cache, mark the socket
@@ -794,7 +794,7 @@ findpcb:
 			/* Segment is acceptable, update cache if undefined. */
 			if (taop->tao_ccsent == 0)
 				taop->tao_ccsent = to.to_ccecho;
-			
+
 			tp->rcv_adv += tp->rcv_wnd;
 			tp->snd_una++;		/* SYN is acked */
 			/*
@@ -822,19 +822,19 @@ findpcb:
 		/*
 		 *  Received initial SYN in SYN-SENT[*] state => simul-
 		 *  taneous open.  If segment contains CC option and there is
-		 *  a cached CC, apply TAO test; if it succeeds, connection is 
+		 *  a cached CC, apply TAO test; if it succeeds, connection is
 		 *  half-synchronized.  Otherwise, do 3-way handshake:
 		 *        SYN-SENT -> SYN-RECEIVED
 		 *        SYN-SENT* -> SYN-RECEIVED*
 		 *  If there was no CC option, clear cached CC value.
 		 */
 			tp->t_flags |= TF_ACKNOW;
-			tp->t_timer[TCPT_REXMT] = 0;		    
+			tp->t_timer[TCPT_REXMT] = 0;
 			if (to.to_flag & TOF_CC) {
 				if (taop->tao_cc != 0 &&
 				    CC_GT(to.to_cc, taop->tao_cc)) {
 					/*
-					 * update cache and make transition: 
+					 * update cache and make transition:
 					 *        SYN-SENT -> ESTABLISHED*
 					 *        SYN-SENT* -> FIN-WAIT-1*
 					 */
@@ -852,7 +852,7 @@ findpcb:
 				taop->tao_cc = 0;
 				tp->t_state = TCPS_SYN_RECEIVED;
 			}
-		}				
+		}
 
 trimthenstep6:
 		/*
@@ -877,7 +877,7 @@ trimthenstep6:
 		 *  our data will be ACK'd; if so, enter normal data segment
 		 *  processing in the middle of step 5, ack processing.
 		 *  Otherwise, goto step 6.
-		 */ 
+		 */
  		if (tiflags & TH_ACK)
 			goto process_ACK;
 		goto step6;
@@ -893,8 +893,8 @@ trimthenstep6:
 	 *                  segment, hoping to find new TCPCB in LISTEN state;
 	 *
 	 *		else must be old SYN; drop it.
-	 *      else do normal processing. 
-	 */      
+	 *      else do normal processing.
+	 */
 	case TCPS_LAST_ACK:
 	case TCPS_CLOSING:
 	case TCPS_TIME_WAIT:
@@ -917,7 +917,7 @@ trimthenstep6:
 	 * States other than LISTEN or SYN_SENT.
 	 * First check timestamp, if present.
 	 * Then check the connection count, if present.
-	 * Then check that at least some bytes of segment are within 
+	 * Then check that at least some bytes of segment are within
 	 * receive window.  If segment begins before rcv_nxt,
 	 * drop leading data (and SYN); if nothing left, just ack.
 	 *
@@ -965,7 +965,7 @@ trimthenstep6:
 		if (tiflags & TH_SYN) {
 			tiflags &= ~TH_SYN;
 			ti->ti_seq++;
-			if (ti->ti_urp > 1) 
+			if (ti->ti_urp > 1)
 				ti->ti_urp--;
 			else
 				tiflags &= ~TH_URG;
@@ -1064,7 +1064,7 @@ trimthenstep6:
 	 * NOTE that the test is modified according to the latest
 	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
 	 */
-	if ((to.to_flag & TOF_TS) != 0 && 
+	if ((to.to_flag & TOF_TS) != 0 &&
 	    SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
 		tp->ts_recent_age = tcp_now;
 		tp->ts_recent = to.to_tsval;
@@ -1125,7 +1125,7 @@ trimthenstep6:
 		else
 			goto drop;
 	}
-	
+
 	/*
 	 * Ack processing.
 	 */
@@ -1159,7 +1159,7 @@ trimthenstep6:
 			taop->tao_cc = tp->cc_recv;
 
 		/*
-		 * Make transitions:  
+		 * Make transitions:
 		 *      SYN-RECEIVED  -> ESTABLISHED
 		 *      SYN-RECEIVED* -> FIN-WAIT-1
 		 */
@@ -1168,7 +1168,7 @@ trimthenstep6:
 			tp->t_flags &= ~TF_NEEDFIN;
 		} else
 			tp->t_state = TCPS_ESTABLISHED;
-		/* 
+		/*
 		 * If segment contains data or ACK, will call tcp_reass()
 		 * later; if not, do so now to pass queued data to user.
 		 */
@@ -1216,7 +1216,7 @@ trimthenstep6:
 				 * the new ssthresh).
 				 *
 				 * Dup acks mean that packets have left the
-				 * network (they're now cached at the receiver) 
+				 * network (they're now cached at the receiver)
 				 * so bump cwnd by the amount in the receiver
 				 * to keep a constant cwnd packets in the
 				 * network.
@@ -1265,11 +1265,11 @@ trimthenstep6:
 			goto dropafterack;
 		}
 		/*
-		 *  If we reach this point, ACK is not a duplicate, 
+		 *  If we reach this point, ACK is not a duplicate,
 		 *     i.e., it ACKs something we sent.
 		 */
 		if (tp->t_flags & TF_NEEDSYN) {
-			/* 
+			/*
 			 *   T/TCP: Connection was half-synchronized, and our
 			 *   SYN has been ACK'd (so connection is now fully
 			 *   synchronized).  Go to non-starred state and
@@ -1422,7 +1422,7 @@ step6:
 	 * Don't look at window if no ACK: TAC's send garbage on first SYN.
 	 */
 	if ((tiflags & TH_ACK) &&
-	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) || 
+	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
 	    (tp->snd_wl1 == ti->ti_seq && (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
 	     (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
 		/* keep track of pure window updates */
@@ -1457,14 +1457,14 @@ step6:
 		 * If this segment advances the known urgent pointer,
 		 * then mark the data stream.  This should not happen
 		 * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
-		 * a FIN has been received from the remote side. 
+		 * a FIN has been received from the remote side.
 		 * In these states we ignore the URG.
 		 *
 		 * According to RFC961 (Assigned Protocols),
 		 * the urgent pointer points to the last octet
 		 * of urgent data.  We continue, however,
 		 * to consider it to indicate the first octet
-		 * of data past the urgent section as the original 
+		 * of data past the urgent section as the original
 		 * spec states (in one of two places).
 		 */
 		if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
@@ -1532,11 +1532,11 @@ dodata:							/* XXX */
 			 *  (ie SEND_SYN flag on) then delay ACK,
 			 *  so it may be piggybacked when SYN is sent.
 			 *  Otherwise, since we received a FIN then no
-			 *  more input can be expected, send ACK now. 
+			 *  more input can be expected, send ACK now.
 			 */
 			if (tp->t_flags & TF_NEEDSYN)
 				tp->t_flags |= TF_DELACK;
-			else 
+			else
 				tp->t_flags |= TF_ACKNOW;
 			tp->rcv_nxt++;
 		}
@@ -1561,7 +1561,7 @@ dodata:							/* XXX */
 
 	 	/*
 		 * In FIN_WAIT_2 state enter the TIME_WAIT state,
-		 * starting the time-wait timer, turning off the other 
+		 * starting the time-wait timer, turning off the other
 		 * standard timers.
 		 */
 		case TCPS_FIN_WAIT_2:
@@ -1714,7 +1714,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
 			NTOHL(to->to_tsecr);
 
-			/* 
+			/*
 			 * A timestamp received in a SYN makes
 			 * it ok to send timestamp requests and replies.
 			 */
@@ -1731,7 +1731,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			bcopy((char *)cp + 2,
 			    (char *)&to->to_cc, sizeof(to->to_cc));
 			NTOHL(to->to_cc);
-			/* 
+			/*
 			 * A CC or CC.new option received in a SYN makes
 			 * it ok to send CC in subsequent segments.
 			 */
@@ -1747,7 +1747,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			bcopy((char *)cp + 2,
 			    (char *)&to->to_cc, sizeof(to->to_cc));
 			NTOHL(to->to_cc);
-			/* 
+			/*
 			 * A CC or CC.new option received in a SYN makes
 			 * it ok to send CC in subsequent segments.
 			 */
@@ -1782,7 +1782,7 @@ tcp_pulloutofband(so, ti, m)
 	register struct mbuf *m;
 {
 	int cnt = ti->ti_urp - 1;
-	
+
 	while (cnt >= 0) {
 		if (m->m_len > cnt) {
 			char *cp = mtod(m, caddr_t) + cnt;
@@ -1841,7 +1841,7 @@ tcp_xmit_timer(tp, rtt)
 		if ((tp->t_rttvar += delta) <= 0)
 			tp->t_rttvar = 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).
@@ -1865,7 +1865,7 @@ tcp_xmit_timer(tp, rtt)
 	 */
 	TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp),
 	    tp->t_rttmin, TCPTV_REXMTMAX);
-	
+
 	/*
 	 * We received an ack for a packet that wasn't retransmitted;
 	 * it is probably safe to discard any error indications we've
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index b3f5365..33a6b83 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.3 (Berkeley) 12/30/93
- * $Id: tcp_output.c,v 1.9 1995/04/09 01:29:25 davidg Exp $
+ * $Id: tcp_output.c,v 1.10 1995/05/09 13:35:47 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -226,7 +226,7 @@ again:
 	 * window, then want to send a window update to peer.
 	 */
 	if (win > 0) {
-		/* 
+		/*
 		 * "adv" is the amount we can increase the window,
 		 * taking into account that we are limited by
 		 * TCP_MAXWIN << tp->rcv_scale.
@@ -313,7 +313,7 @@ send:
 			mss = htons((u_short) tcp_mssopt(tp));
 			(void)memcpy(opt + 2, &mss, sizeof(mss));
 			optlen = TCPOLEN_MAXSEG;
-	 
+
 			if ((tp->t_flags & TF_REQ_SCALE) &&
 			    ((flags & TH_ACK) == 0 ||
 			    (tp->t_flags & TF_RCVD_SCALE))) {
@@ -326,9 +326,9 @@ send:
 			}
 		}
  	}
- 
+
  	/*
-	 * Send a timestamp and echo-reply if this is a SYN and our side 
+	 * Send a timestamp and echo-reply if this is a SYN and our side
 	 * wants to use timestamps (TF_REQ_TSTMP is set) or both our side
 	 * and our peer have sent timestamps in our SYN's.
  	 */
@@ -337,7 +337,7 @@ send:
 	    ((flags & TH_ACK) == 0 ||
 	     (tp->t_flags & TF_RCVD_TSTMP))) {
 		u_long *lp = (u_long *)(opt + optlen);
- 
+
  		/* Form timestamp option as shown in appendix A of RFC 1323. */
  		*lp++ = htonl(TCPOPT_TSTAMP_HDR);
  		*lp++ = htonl(tcp_now);
@@ -373,7 +373,7 @@ send:
 			opt[optlen++] = TCPOPT_CC;
 			opt[optlen++] = TCPOLEN_CC;
 			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
-			
+
 			optlen += 4;
 			break;
 
@@ -408,7 +408,7 @@ send:
 				opt[optlen++] = TCPOPT_NOP;
 				opt[optlen++] = TCPOPT_CC;
 				opt[optlen++] = TCPOLEN_CC;
-				*(u_int32_t *)&opt[optlen] = 
+				*(u_int32_t *)&opt[optlen] =
 					htonl(tp->cc_send);
 				optlen += 4;
 				opt[optlen++] = TCPOPT_NOP;
@@ -424,7 +424,7 @@ send:
  	}
 
  	hdrlen += optlen;
- 
+
 	/*
 	 * Adjust data length if insertion of options will
 	 * bump the packet length beyond the t_maxopd length.
@@ -527,7 +527,7 @@ send:
 	 * window for use in delaying messages about window sizes.
 	 * If resending a FIN, be sure not to use a new sequence number.
 	 */
-	if (flags & TH_FIN && tp->t_flags & TF_SENTFIN && 
+	if (flags & TH_FIN && tp->t_flags & TF_SENTFIN &&
 	    tp->snd_nxt == tp->snd_max)
 		tp->snd_nxt--;
 	/*
@@ -665,7 +665,7 @@ send:
 	error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route,
 	    so->so_options & SO_DONTROUTE, 0);
 #else
-	error = ip_output(m, (struct mbuf *)0, &tp->t_inpcb->inp_route, 
+	error = ip_output(m, (struct mbuf *)0, &tp->t_inpcb->inp_route,
 	    so->so_options & SO_DONTROUTE);
 #endif
     }
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 47fd018..bf0fd0c 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.23 1995/05/09 12:32:06 olah Exp $
+ *	$Id: tcp_input.c,v 1.24 1995/05/11 01:41:06 davidg Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -318,7 +318,7 @@ tcp_input(m, iphlen)
 		}
 		optlen = off - sizeof (struct tcphdr);
 		optp = mtod(m, caddr_t) + sizeof (struct tcpiphdr);
-		/* 
+		/*
 		 * Do quick retrieval of timestamp options ("options
 		 * prediction?").  If timestamp is the only option and it's
 		 * formatted as recommended in RFC 1323 appendix A, we
@@ -382,7 +382,7 @@ findpcb:
 		goto dropwithreset;
 	if (tp->t_state == TCPS_CLOSED)
 		goto drop;
-	
+
 	/* Unscale the window into a 32-bit value. */
 	if ((tiflags & TH_SYN) == 0)
 		tiwin = ti->ti_win << tp->snd_scale;
@@ -447,7 +447,7 @@ findpcb:
 		tcp_dooptions(tp, optp, optlen, ti,
 			&to);
 
-	/* 
+	/*
 	 * Header prediction: check for the two common cases
 	 * of a uni-directional data xfer.  If the packet has
 	 * no control flags, is in-sequence, the window didn't
@@ -480,7 +480,7 @@ findpcb:
 	    tiwin && tiwin == tp->snd_wnd &&
 	    tp->snd_nxt == tp->snd_max) {
 
-		/* 
+		/*
 		 * If last ACK falls within this segment's sequence numbers,
 		 * record the timestamp.
 		 * NOTE that the test is modified according to the latest
@@ -666,7 +666,7 @@ findpcb:
 		tp->cc_recv = to.to_cc;
 		/*
 		 * Perform TAO test on incoming CC (SEG.CC) option, if any.
-		 * - compare SEG.CC against cached CC from the same host, 
+		 * - compare SEG.CC against cached CC from the same host,
 		 *	if any.
 		 * - if SEG.CC > chached value, SYN must be new and is accepted
 		 *	immediately: save new CC in the cache, mark the socket
@@ -794,7 +794,7 @@ findpcb:
 			/* Segment is acceptable, update cache if undefined. */
 			if (taop->tao_ccsent == 0)
 				taop->tao_ccsent = to.to_ccecho;
-			
+
 			tp->rcv_adv += tp->rcv_wnd;
 			tp->snd_una++;		/* SYN is acked */
 			/*
@@ -822,19 +822,19 @@ findpcb:
 		/*
 		 *  Received initial SYN in SYN-SENT[*] state => simul-
 		 *  taneous open.  If segment contains CC option and there is
-		 *  a cached CC, apply TAO test; if it succeeds, connection is 
+		 *  a cached CC, apply TAO test; if it succeeds, connection is
 		 *  half-synchronized.  Otherwise, do 3-way handshake:
 		 *        SYN-SENT -> SYN-RECEIVED
 		 *        SYN-SENT* -> SYN-RECEIVED*
 		 *  If there was no CC option, clear cached CC value.
 		 */
 			tp->t_flags |= TF_ACKNOW;
-			tp->t_timer[TCPT_REXMT] = 0;		    
+			tp->t_timer[TCPT_REXMT] = 0;
 			if (to.to_flag & TOF_CC) {
 				if (taop->tao_cc != 0 &&
 				    CC_GT(to.to_cc, taop->tao_cc)) {
 					/*
-					 * update cache and make transition: 
+					 * update cache and make transition:
 					 *        SYN-SENT -> ESTABLISHED*
 					 *        SYN-SENT* -> FIN-WAIT-1*
 					 */
@@ -852,7 +852,7 @@ findpcb:
 				taop->tao_cc = 0;
 				tp->t_state = TCPS_SYN_RECEIVED;
 			}
-		}				
+		}
 
 trimthenstep6:
 		/*
@@ -877,7 +877,7 @@ trimthenstep6:
 		 *  our data will be ACK'd; if so, enter normal data segment
 		 *  processing in the middle of step 5, ack processing.
 		 *  Otherwise, goto step 6.
-		 */ 
+		 */
  		if (tiflags & TH_ACK)
 			goto process_ACK;
 		goto step6;
@@ -893,8 +893,8 @@ trimthenstep6:
 	 *                  segment, hoping to find new TCPCB in LISTEN state;
 	 *
 	 *		else must be old SYN; drop it.
-	 *      else do normal processing. 
-	 */      
+	 *      else do normal processing.
+	 */
 	case TCPS_LAST_ACK:
 	case TCPS_CLOSING:
 	case TCPS_TIME_WAIT:
@@ -917,7 +917,7 @@ trimthenstep6:
 	 * States other than LISTEN or SYN_SENT.
 	 * First check timestamp, if present.
 	 * Then check the connection count, if present.
-	 * Then check that at least some bytes of segment are within 
+	 * Then check that at least some bytes of segment are within
 	 * receive window.  If segment begins before rcv_nxt,
 	 * drop leading data (and SYN); if nothing left, just ack.
 	 *
@@ -965,7 +965,7 @@ trimthenstep6:
 		if (tiflags & TH_SYN) {
 			tiflags &= ~TH_SYN;
 			ti->ti_seq++;
-			if (ti->ti_urp > 1) 
+			if (ti->ti_urp > 1)
 				ti->ti_urp--;
 			else
 				tiflags &= ~TH_URG;
@@ -1064,7 +1064,7 @@ trimthenstep6:
 	 * NOTE that the test is modified according to the latest
 	 * proposal of the tcplw@cray.com list (Braden 1993/04/26).
 	 */
-	if ((to.to_flag & TOF_TS) != 0 && 
+	if ((to.to_flag & TOF_TS) != 0 &&
 	    SEQ_LEQ(ti->ti_seq, tp->last_ack_sent)) {
 		tp->ts_recent_age = tcp_now;
 		tp->ts_recent = to.to_tsval;
@@ -1125,7 +1125,7 @@ trimthenstep6:
 		else
 			goto drop;
 	}
-	
+
 	/*
 	 * Ack processing.
 	 */
@@ -1159,7 +1159,7 @@ trimthenstep6:
 			taop->tao_cc = tp->cc_recv;
 
 		/*
-		 * Make transitions:  
+		 * Make transitions:
 		 *      SYN-RECEIVED  -> ESTABLISHED
 		 *      SYN-RECEIVED* -> FIN-WAIT-1
 		 */
@@ -1168,7 +1168,7 @@ trimthenstep6:
 			tp->t_flags &= ~TF_NEEDFIN;
 		} else
 			tp->t_state = TCPS_ESTABLISHED;
-		/* 
+		/*
 		 * If segment contains data or ACK, will call tcp_reass()
 		 * later; if not, do so now to pass queued data to user.
 		 */
@@ -1216,7 +1216,7 @@ trimthenstep6:
 				 * the new ssthresh).
 				 *
 				 * Dup acks mean that packets have left the
-				 * network (they're now cached at the receiver) 
+				 * network (they're now cached at the receiver)
 				 * so bump cwnd by the amount in the receiver
 				 * to keep a constant cwnd packets in the
 				 * network.
@@ -1265,11 +1265,11 @@ trimthenstep6:
 			goto dropafterack;
 		}
 		/*
-		 *  If we reach this point, ACK is not a duplicate, 
+		 *  If we reach this point, ACK is not a duplicate,
 		 *     i.e., it ACKs something we sent.
 		 */
 		if (tp->t_flags & TF_NEEDSYN) {
-			/* 
+			/*
 			 *   T/TCP: Connection was half-synchronized, and our
 			 *   SYN has been ACK'd (so connection is now fully
 			 *   synchronized).  Go to non-starred state and
@@ -1422,7 +1422,7 @@ step6:
 	 * Don't look at window if no ACK: TAC's send garbage on first SYN.
 	 */
 	if ((tiflags & TH_ACK) &&
-	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) || 
+	    (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
 	    (tp->snd_wl1 == ti->ti_seq && (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
 	     (tp->snd_wl2 == ti->ti_ack && tiwin > tp->snd_wnd))))) {
 		/* keep track of pure window updates */
@@ -1457,14 +1457,14 @@ step6:
 		 * If this segment advances the known urgent pointer,
 		 * then mark the data stream.  This should not happen
 		 * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
-		 * a FIN has been received from the remote side. 
+		 * a FIN has been received from the remote side.
 		 * In these states we ignore the URG.
 		 *
 		 * According to RFC961 (Assigned Protocols),
 		 * the urgent pointer points to the last octet
 		 * of urgent data.  We continue, however,
 		 * to consider it to indicate the first octet
-		 * of data past the urgent section as the original 
+		 * of data past the urgent section as the original
 		 * spec states (in one of two places).
 		 */
 		if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
@@ -1532,11 +1532,11 @@ dodata:							/* XXX */
 			 *  (ie SEND_SYN flag on) then delay ACK,
 			 *  so it may be piggybacked when SYN is sent.
 			 *  Otherwise, since we received a FIN then no
-			 *  more input can be expected, send ACK now. 
+			 *  more input can be expected, send ACK now.
 			 */
 			if (tp->t_flags & TF_NEEDSYN)
 				tp->t_flags |= TF_DELACK;
-			else 
+			else
 				tp->t_flags |= TF_ACKNOW;
 			tp->rcv_nxt++;
 		}
@@ -1561,7 +1561,7 @@ dodata:							/* XXX */
 
 	 	/*
 		 * In FIN_WAIT_2 state enter the TIME_WAIT state,
-		 * starting the time-wait timer, turning off the other 
+		 * starting the time-wait timer, turning off the other
 		 * standard timers.
 		 */
 		case TCPS_FIN_WAIT_2:
@@ -1714,7 +1714,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			    (char *)&to->to_tsecr, sizeof(to->to_tsecr));
 			NTOHL(to->to_tsecr);
 
-			/* 
+			/*
 			 * A timestamp received in a SYN makes
 			 * it ok to send timestamp requests and replies.
 			 */
@@ -1731,7 +1731,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			bcopy((char *)cp + 2,
 			    (char *)&to->to_cc, sizeof(to->to_cc));
 			NTOHL(to->to_cc);
-			/* 
+			/*
 			 * A CC or CC.new option received in a SYN makes
 			 * it ok to send CC in subsequent segments.
 			 */
@@ -1747,7 +1747,7 @@ tcp_dooptions(tp, cp, cnt, ti, to)
 			bcopy((char *)cp + 2,
 			    (char *)&to->to_cc, sizeof(to->to_cc));
 			NTOHL(to->to_cc);
-			/* 
+			/*
 			 * A CC or CC.new option received in a SYN makes
 			 * it ok to send CC in subsequent segments.
 			 */
@@ -1782,7 +1782,7 @@ tcp_pulloutofband(so, ti, m)
 	register struct mbuf *m;
 {
 	int cnt = ti->ti_urp - 1;
-	
+
 	while (cnt >= 0) {
 		if (m->m_len > cnt) {
 			char *cp = mtod(m, caddr_t) + cnt;
@@ -1841,7 +1841,7 @@ tcp_xmit_timer(tp, rtt)
 		if ((tp->t_rttvar += delta) <= 0)
 			tp->t_rttvar = 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).
@@ -1865,7 +1865,7 @@ tcp_xmit_timer(tp, rtt)
 	 */
 	TCPT_RANGESET(tp->t_rxtcur, TCP_REXMTVAL(tp),
 	    tp->t_rttmin, TCPTV_REXMTMAX);
-	
+
 	/*
 	 * We received an ack for a packet that wasn't retransmitted;
 	 * it is probably safe to discard any error indications we've
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index ea68652..381824d 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_subr.c,v 1.9 1995/03/16 18:15:05 bde Exp $
+ * $Id: tcp_subr.c,v 1.10 1995/04/09 01:29:26 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -251,7 +251,7 @@ tcp_newtcpcb(inp)
 	tp->t_srtt = TCPTV_SRTTBASE;
 	tp->t_rttvar = tcp_rttdflt * PR_SLOWHZ << 2;
 	tp->t_rttmin = TCPTV_MIN;
-	TCPT_RANGESET(tp->t_rxtcur, 
+	TCPT_RANGESET(tp->t_rxtcur,
 	    ((TCPTV_SRTTBASE >> 2) + (TCPTV_SRTTDFLT << 2)) >> 1,
 	    TCPTV_MIN, TCPTV_REXMTMAX);
 	tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
@@ -304,7 +304,7 @@ tcp_close(tp)
 
 	/*
 	 * If we sent enough data to get some meaningful characteristics,
-	 * save them in the routing entry.  'Enough' is arbitrarily 
+	 * save them in the routing entry.  'Enough' is arbitrarily
 	 * defined as the sendpipesize (default 4K) * 16.  This would
 	 * give us 16 rtt samples assuming we only get one sample per
 	 * window (the usual case on a long haul net).  16 samples is
@@ -420,7 +420,7 @@ tcp_notify(inp, error)
 	} else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 &&
 	    tp->t_softerror)
 		so->so_error = error;
-	else 
+	else
 		tp->t_softerror = error;
 	wakeup((caddr_t) &so->so_timeo);
 	sorwakeup(so);
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 4437ce0..ddab8d6 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_timer.c,v 1.5 1995/04/09 01:29:27 davidg Exp $
+ * $Id: tcp_timer.c,v 1.6 1995/04/12 06:49:56 davidg Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -238,7 +238,7 @@ tcp_timers(tp, timer)
 		 * size increase exponentially with time.  If the
 		 * window is larger than the path can handle, this
 		 * exponential growth results in dropped packet(s)
-		 * almost immediately.  To get more time between 
+		 * almost immediately.  To get more time between
 		 * drops but still "push" the network to take advantage
 		 * of improving conditions, we switch from exponential
 		 * to linear window opening at some threshhold size.
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index ea68652..381824d 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_subr.c,v 1.9 1995/03/16 18:15:05 bde Exp $
+ * $Id: tcp_subr.c,v 1.10 1995/04/09 01:29:26 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -251,7 +251,7 @@ tcp_newtcpcb(inp)
 	tp->t_srtt = TCPTV_SRTTBASE;
 	tp->t_rttvar = tcp_rttdflt * PR_SLOWHZ << 2;
 	tp->t_rttmin = TCPTV_MIN;
-	TCPT_RANGESET(tp->t_rxtcur, 
+	TCPT_RANGESET(tp->t_rxtcur,
 	    ((TCPTV_SRTTBASE >> 2) + (TCPTV_SRTTDFLT << 2)) >> 1,
 	    TCPTV_MIN, TCPTV_REXMTMAX);
 	tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT;
@@ -304,7 +304,7 @@ tcp_close(tp)
 
 	/*
 	 * If we sent enough data to get some meaningful characteristics,
-	 * save them in the routing entry.  'Enough' is arbitrarily 
+	 * save them in the routing entry.  'Enough' is arbitrarily
 	 * defined as the sendpipesize (default 4K) * 16.  This would
 	 * give us 16 rtt samples assuming we only get one sample per
 	 * window (the usual case on a long haul net).  16 samples is
@@ -420,7 +420,7 @@ tcp_notify(inp, error)
 	} else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 &&
 	    tp->t_softerror)
 		so->so_error = error;
-	else 
+	else
 		tp->t_softerror = error;
 	wakeup((caddr_t) &so->so_timeo);
 	sorwakeup(so);
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index eb8237c..b2bc22c 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.12 1995/03/16 18:15:06 bde Exp $
+ *	$Id: tcp_usrreq.c,v 1.13 1995/04/09 01:29:28 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -206,7 +206,7 @@ tcp_usrreq(so, req, m, nam, control)
 			error = EAFNOSUPPORT;
 			break;
 		}
-			
+
 		if ((error = tcp_connect(tp, nam)) != 0)
 			break;
 		error = tcp_output(tp);
@@ -402,7 +402,7 @@ tcp_connect(tp, nam)
 			return error;
 	}
 
-	/* 
+	/*
 	 * Cannot simply call in_pcbconnect, because there might be an
 	 * earlier incarnation of this same connection still in
 	 * TIME_WAIT state, creating an ADDRINUSE error.
@@ -697,7 +697,7 @@ tcp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 	case TCPCTL_RTTDFLT:
 		return (sysctl_int(oldp, oldlenp, newp, newlen, &tcp_rttdflt));
 	case TCPCTL_KEEPIDLE:
-		return (sysctl_int(oldp, oldlenp, newp, newlen, 
+		return (sysctl_int(oldp, oldlenp, newp, newlen,
 				   &tcp_keepidle));
 	case TCPCTL_KEEPINTVL:
 		return (sysctl_int(oldp, oldlenp, newp, newlen,
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 055d20b..7e13103 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.4 (Berkeley) 1/21/94
- * $Id: udp_usrreq.c,v 1.10 1995/05/03 07:16:53 davidg Exp $
+ * $Id: udp_usrreq.c,v 1.11 1995/05/09 13:35:48 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -650,7 +650,7 @@ udp_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
 		return (sysctl_rdstruct(oldp, oldlenp, newp, &udpstat,
 					sizeof udpstat));
 	case UDPCTL_MAXDGRAM:
-		return (sysctl_int(oldp, oldlenp, newp, newlen, 
+		return (sysctl_int(oldp, oldlenp, newp, newlen,
 				   (int *)&udp_sendspace)); /* XXX */
 	case UDPCTL_RECVSPACE:
 		return (sysctl_int(oldp, oldlenp, newp, newlen,