Made TCPDEBUG truely optional. Based on changes I made in FreeBSD 1.1.5.

Fixed somebody's idea of a joke - about the first half of the lines in
in_proto.c were spaced over by one space.

6 files changed, 160 insertions, 130 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 3ba963b..f59d825 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -164,7 +164,7 @@ netinet/ip_input.c	optional inet
 netinet/ip_mroute.c	optional inet
 netinet/ip_output.c	optional inet
 netinet/raw_ip.c	optional inet
-netinet/tcp_debug.c	optional inet
+netinet/tcp_debug.c	optional tcpdebug
 netinet/tcp_input.c	optional inet
 netinet/tcp_output.c	optional inet
 netinet/tcp_subr.c	optional inet
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 2d33383..13bf148 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,127 +1,129 @@
- /*
-  * Copyright (c) 1982, 1986, 1993
-  *	The Regents of the University of California.  All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-  * 1. Redistributions of source code must retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in the
-  *    documentation and/or other materials provided with the distribution.
-  * 3. All advertising materials mentioning features or use of this software
-  *    must display the following acknowledgement:
-  *	This product includes software developed by the University of
-  *	California, Berkeley and its contributors.
-  * 4. Neither the name of the University nor the names of its contributors
-  *    may be used to endorse or promote products derived from this software
-  *    without specific prior written permission.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  * SUCH DAMAGE.
-  *
-  *	@(#)in_proto.c	8.1 (Berkeley) 6/10/93
-  * $Id: in_proto.c,v 1.4 1994/09/06 22:42:19 wollman Exp $
-  */
-
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/protosw.h>
- #include <sys/domain.h>
- #include <sys/mbuf.h>
-
- #include <net/if.h>
- #include <net/radix.h>
- #include <net/route.h>
-
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <netinet/ip_var.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/in_pcb.h>
- #include <netinet/igmp_var.h>
- #include <netinet/tcp.h>
- #include <netinet/tcp_fsm.h>
- #include <netinet/tcp_seq.h>
- #include <netinet/tcp_timer.h>
- #include <netinet/tcp_var.h>
- #include <netinet/tcpip.h>
- #include <netinet/tcp_debug.h>
- #include <netinet/udp.h>
- #include <netinet/udp_var.h>
- /*
-  * TCP/IP protocol family: IP, ICMP, UDP, TCP.
-  */
-
- #ifdef NSIP
- void	idpip_input(), nsip_ctlinput();
- #endif
-
- #ifdef TPIP
- void	tpip_input(), tpip_ctlinput(), tp_ctloutput();
- int	tp_init(), tp_slowtimo(), tp_drain(), tp_usrreq();
- #endif
-
- #ifdef EON
- void	eoninput(), eonctlinput(), eonprotoinit();
- #endif /* EON */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)in_proto.c	8.1 (Berkeley) 6/10/93
+ * $Id: in_proto.c,v 1.5 1994/09/14 03:10:08 wollman Exp $
+ */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/protosw.h>
+#include <sys/domain.h>
+#include <sys/mbuf.h>
+
+#include <net/if.h>
+#include <net/radix.h>
+#include <net/route.h>
+
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/in_pcb.h>
+#include <netinet/igmp_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_fsm.h>
+#include <netinet/tcp_seq.h>
+#include <netinet/tcp_timer.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcpip.h>
+#ifdef TCPDEBUG
+#include <netinet/tcp_debug.h>
+#endif
+#include <netinet/udp.h>
+#include <netinet/udp_var.h>
+/*
+ * TCP/IP protocol family: IP, ICMP, UDP, TCP.
+ */
+
+#ifdef NSIP
+void	idpip_input(), nsip_ctlinput();
+#endif
+
+#ifdef TPIP
+void	tpip_input(), tpip_ctlinput(), tp_ctloutput();
+int	tp_init(), tp_slowtimo(), tp_drain(), tp_usrreq();
+#endif
+
+#ifdef EON
+void	eoninput(), eonctlinput(), eonprotoinit();
+#endif /* EON */
 
 void multiencap_decap(struct mbuf *);
 
- extern	struct domain inetdomain;
-
- struct protosw inetsw[] = {
- { 0,		&inetdomain,	0,		0,
-   0,		ip_output,	0,		0,
-   0,
-   ip_init,	0,		ip_slowtimo,	ip_drain,	ip_sysctl
- },
- { SOCK_DGRAM,	&inetdomain,	IPPROTO_UDP,	PR_ATOMIC|PR_ADDR,
-   udp_input,	0,		udp_ctlinput,	ip_ctloutput,
-   udp_usrreq,
-   udp_init,	0,		0,		0,		udp_sysctl
- },
- { SOCK_STREAM,	&inetdomain,	IPPROTO_TCP,	PR_CONNREQUIRED|PR_WANTRCVD,
-   tcp_input,	0,		tcp_ctlinput,	tcp_ctloutput,
-   tcp_usrreq,
-   tcp_init,	tcp_fasttimo,	tcp_slowtimo,	tcp_drain,
- },
- { SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
-   rip_input,	rip_output,	0,		rip_ctloutput,
-   rip_usrreq,
-   0,		0,		0,		0,
- },
- { SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
-   icmp_input,	rip_output,	0,		rip_ctloutput,
-   rip_usrreq,
-   0,		0,		0,		0,		icmp_sysctl
- },
- { SOCK_RAW,	&inetdomain,	IPPROTO_IGMP,	PR_ATOMIC|PR_ADDR,
-   igmp_input,	rip_output,	0,		rip_ctloutput,
-   rip_usrreq,
-   igmp_init,	igmp_fasttimo,	igmp_slowtimo,		0,
- },
- { SOCK_RAW,	&inetdomain,	IPPROTO_RSVP,	PR_ATOMIC|PR_ADDR,
-   rip_input,	rip_output,	0,		rip_ctloutput,
-   rip_usrreq,
-   0,		0,		0,		0,
- },
- { SOCK_RAW,	&inetdomain,	IPPROTO_ENCAP,	PR_ATOMIC|PR_ADDR,
-   multiencap_decap, rip_output, 0,		rip_ctloutput,
-   rip_usrreq,
-   0,		0,		0,		0,
- },
+extern	struct domain inetdomain;
+
+struct protosw inetsw[] = {
+{ 0,		&inetdomain,	0,		0,
+  0,		ip_output,	0,		0,
+  0,
+  ip_init,	0,		ip_slowtimo,	ip_drain,	ip_sysctl
+},
+{ SOCK_DGRAM,	&inetdomain,	IPPROTO_UDP,	PR_ATOMIC|PR_ADDR,
+  udp_input,	0,		udp_ctlinput,	ip_ctloutput,
+  udp_usrreq,
+  udp_init,	0,		0,		0,		udp_sysctl
+},
+{ SOCK_STREAM,	&inetdomain,	IPPROTO_TCP,	PR_CONNREQUIRED|PR_WANTRCVD,
+  tcp_input,	0,		tcp_ctlinput,	tcp_ctloutput,
+  tcp_usrreq,
+  tcp_init,	tcp_fasttimo,	tcp_slowtimo,	tcp_drain,
+},
+{ SOCK_RAW,	&inetdomain,	IPPROTO_RAW,	PR_ATOMIC|PR_ADDR,
+  rip_input,	rip_output,	0,		rip_ctloutput,
+  rip_usrreq,
+  0,		0,		0,		0,
+},
+{ SOCK_RAW,	&inetdomain,	IPPROTO_ICMP,	PR_ATOMIC|PR_ADDR,
+  icmp_input,	rip_output,	0,		rip_ctloutput,
+  rip_usrreq,
+  0,		0,		0,		0,		icmp_sysctl
+},
+{ SOCK_RAW,	&inetdomain,	IPPROTO_IGMP,	PR_ATOMIC|PR_ADDR,
+  igmp_input,	rip_output,	0,		rip_ctloutput,
+  rip_usrreq,
+  igmp_init,	igmp_fasttimo,	igmp_slowtimo,		0,
+},
+{ SOCK_RAW,	&inetdomain,	IPPROTO_RSVP,	PR_ATOMIC|PR_ADDR,
+  rip_input,	rip_output,	0,		rip_ctloutput,
+  rip_usrreq,
+  0,		0,		0,		0,
+},
+{ SOCK_RAW,	&inetdomain,	IPPROTO_ENCAP,	PR_ATOMIC|PR_ADDR,
+  multiencap_decap, rip_output, 0,		rip_ctloutput,
+  rip_usrreq,
+  0,		0,		0,		0,
+},
 #ifdef TPIP
 { SOCK_SEQPACKET,&inetdomain,	IPPROTO_TP,	PR_CONNREQUIRED|PR_WANTRCVD,
   tpip_input,	0,		tpip_ctlinput,	tp_ctloutput,
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 68fc751..c6f3e20 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- * $Id: tcp_input.c,v 1.6 1994/08/18 22:35:32 wollman Exp $
+ * $Id: tcp_input.c,v 1.7 1994/08/26 22:27:16 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -58,10 +58,12 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
+#ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
+struct	tcpiphdr tcp_saveti;
+#endif
 
 int	tcprexmtthresh = 3;
-struct	tcpiphdr tcp_saveti;
 struct	inpcb *tcp_last_inpcb = &tcb;
 
 #endif /* TUBA_INCLUDE */
@@ -222,12 +224,14 @@ tcp_input(m, iphlen)
 	register int tiflags;
 	struct socket *so = 0;
 	int todrop, acked, ourfinisacked, needoutput = 0;
-	short ostate = 0;
 	struct in_addr laddr;
 	int dropsocket = 0;
 	int iss = 0;
 	u_long tiwin, ts_val, ts_ecr;
 	int ts_present = 0;
+#ifdef TCPDEBUG
+	short ostate = 0;
+#endif
 
 	tcpstat.tcps_rcvtotal++;
 	/*
@@ -347,10 +351,12 @@ findpcb:
 
 	so = inp->inp_socket;
 	if (so->so_options & (SO_DEBUG|SO_ACCEPTCONN)) {
+#ifdef TCPDEBUG
 		if (so->so_options & SO_DEBUG) {
 			ostate = tp->t_state;
 			tcp_saveti = *ti;
 		}
+#endif
 		if (so->so_options & SO_ACCEPTCONN) {
 			so = sonewconn(so, 0);
 			if (so == 0)
@@ -1269,8 +1275,10 @@ dodata:							/* XXX */
 			break;
 		}
 	}
+#ifdef TCPDEBUG
 	if (so->so_options & SO_DEBUG)
 		tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
+#endif
 
 	/*
 	 * If this is a small packet, then ACK now - with Nagel
@@ -1325,8 +1333,10 @@ drop:
 	/*
 	 * Drop space held by incoming segment and return.
 	 */
+#ifdef TCPDEBUG
 	if (tp && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
 		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
+#endif
 	m_freem(m);
 	/* destroy temporarily created socket */
 	if (dropsocket)
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 92ad379..797a496 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$
+ * $Id: tcp_output.c,v 1.2 1994/08/02 07:49:03 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,9 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
+#ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
+#endif
 
 #ifdef notyet
 extern struct mbuf *m_copypack();
@@ -521,11 +523,13 @@ send:
 		if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
 			tp->snd_max = tp->snd_nxt + len;
 
+#ifdef TCPDEBUG
 	/*
 	 * Trace.
 	 */
 	if (so->so_options & SO_DEBUG)
 		tcp_trace(TA_OUTPUT, tp->t_state, tp, ti, 0);
+#endif
 
 	/*
 	 * Fill in IP length and desired time to live and
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 68fc751..c6f3e20 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- * $Id: tcp_input.c,v 1.6 1994/08/18 22:35:32 wollman Exp $
+ * $Id: tcp_input.c,v 1.7 1994/08/26 22:27:16 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -58,10 +58,12 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
+#ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
+struct	tcpiphdr tcp_saveti;
+#endif
 
 int	tcprexmtthresh = 3;
-struct	tcpiphdr tcp_saveti;
 struct	inpcb *tcp_last_inpcb = &tcb;
 
 #endif /* TUBA_INCLUDE */
@@ -222,12 +224,14 @@ tcp_input(m, iphlen)
 	register int tiflags;
 	struct socket *so = 0;
 	int todrop, acked, ourfinisacked, needoutput = 0;
-	short ostate = 0;
 	struct in_addr laddr;
 	int dropsocket = 0;
 	int iss = 0;
 	u_long tiwin, ts_val, ts_ecr;
 	int ts_present = 0;
+#ifdef TCPDEBUG
+	short ostate = 0;
+#endif
 
 	tcpstat.tcps_rcvtotal++;
 	/*
@@ -347,10 +351,12 @@ findpcb:
 
 	so = inp->inp_socket;
 	if (so->so_options & (SO_DEBUG|SO_ACCEPTCONN)) {
+#ifdef TCPDEBUG
 		if (so->so_options & SO_DEBUG) {
 			ostate = tp->t_state;
 			tcp_saveti = *ti;
 		}
+#endif
 		if (so->so_options & SO_ACCEPTCONN) {
 			so = sonewconn(so, 0);
 			if (so == 0)
@@ -1269,8 +1275,10 @@ dodata:							/* XXX */
 			break;
 		}
 	}
+#ifdef TCPDEBUG
 	if (so->so_options & SO_DEBUG)
 		tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
+#endif
 
 	/*
 	 * If this is a small packet, then ACK now - with Nagel
@@ -1325,8 +1333,10 @@ drop:
 	/*
 	 * Drop space held by incoming segment and return.
 	 */
+#ifdef TCPDEBUG
 	if (tp && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
 		tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
+#endif
 	m_freem(m);
 	/* destroy temporarily created socket */
 	if (dropsocket)
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index be544a6..a8a9b6d 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- * $Id$
+ * $Id: tcp_usrreq.c,v 1.4 1994/08/02 07:49:15 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,9 @@
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
+#ifdef TCPDEBUG
 #include <netinet/tcp_debug.h>
+#endif
 
 /*
  * TCP protocol interface to socket abstraction.
@@ -328,8 +330,10 @@ tcp_usrreq(so, req, m, nam, control)
 	default:
 		panic("tcp_usrreq");
 	}
+#ifdef TCPDEBUG
 	if (tp && (so->so_options & SO_DEBUG))
 		tcp_trace(TA_USER, ostate, tp, (struct tcpiphdr *)0, req);
+#endif
 	splx(s);
 	return (error);
 }