cvs commit: src/sys/netinet tcp_input.c tcp_usrreq.c

[mjacob at freebsd.org]

Here's what probably works. I'll do the test compiles.
-------------- next part --------------
Index: netinet/tcp_input.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
retrieving revision 1.366
diff -u -r1.366 tcp_input.c
--- netinet/tcp_input.c	29 Jul 2007 01:31:33 -0000	1.366
+++ netinet/tcp_input.c	29 Jul 2007 17:18:33 -0000
@@ -1573,15 +1573,9 @@
 		KASSERT(headlocked, ("%s: trimthenstep6: tcp_close.3: head "
 		    "not locked", __func__));
 		if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) {
-#ifdef	TCPDEBUG
 			log(LOG_DEBUG, "%s; %s: %s: Received data after socket "
 			    "was closed, sending RST and removing tcpcb\n",
 			    s, __func__, tcpstates[tp->t_state]);
-#else
-			log(LOG_DEBUG, "%s; %s: Received data after socket "
-			    "was closed, sending RST and removing tcpcb\n",
-			    s, __func__);
-#endif
 			free(s, M_TCPLOG);
 		}
 		tp = tcp_close(tp);
Index: netinet/tcp_usrreq.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.159
diff -u -r1.159 tcp_usrreq.c
--- netinet/tcp_usrreq.c	29 Jul 2007 01:31:33 -0000	1.159
+++ netinet/tcp_usrreq.c	29 Jul 2007 17:18:34 -0000
@@ -87,9 +87,6 @@
 /*
  * TCP protocol interface to socket abstraction.
  */
-#ifdef	TCPDEBUG
-extern	const char *tcpstates[];
-#endif
 
 static int	tcp_attach(struct socket *);
 static int	tcp_connect(struct tcpcb *, struct sockaddr *,
Index: netipx/spx_debug.c
===================================================================
RCS file: /home/ncvs/src/sys/netipx/spx_debug.c,v
retrieving revision 1.18
diff -u -r1.18 spx_debug.c
--- netipx/spx_debug.c	11 May 2007 10:38:34 -0000	1.18
+++ netipx/spx_debug.c	29 Jul 2007 17:18:34 -0000
@@ -69,6 +69,8 @@
 #include <sys/systm.h>
 #include <sys/protosw.h>
 
+#define	TCPSTATES	/* for logging */
+
 #include <netinet/in_systm.h>
 #include <netinet/tcp_fsm.h>
 
Index: netipx/spx_debug.h
===================================================================
RCS file: /home/ncvs/src/sys/netipx/spx_debug.h,v
retrieving revision 1.17
diff -u -r1.17 spx_debug.h
--- netipx/spx_debug.h	11 May 2007 10:38:34 -0000	1.17
+++ netipx/spx_debug.h	29 Jul 2007 17:18:34 -0000
@@ -95,8 +95,6 @@
 #ifdef _KERNEL
 extern char *prurequests[];
 extern char *sanames[];
-extern char *tcpstates[];
-
 void	spx_trace(short act, u_char ostate, struct spxpcb *sp, struct spx *si,
 	    int req);
 #endif