From owner-cvs-src@FreeBSD.ORG Mon Jul 30 10:16:10 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52C6E16A417 for ; Mon, 30 Jul 2007 10:16:10 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) by mx1.freebsd.org (Postfix) with ESMTP id CA96813C4A5 for ; Mon, 30 Jul 2007 10:16:09 +0000 (UTC) (envelope-from andre@freebsd.org) Received: (qmail 89814 invoked from network); 30 Jul 2007 10:10:37 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 30 Jul 2007 10:10:37 -0000 Message-ID: <46ADBA68.4080403@freebsd.org> Date: Mon, 30 Jul 2007 12:16:08 +0200 From: Andre Oppermann User-Agent: Thunderbird 1.5.0.12 (Windows/20070509) MIME-Version: 1.0 To: =?UTF-8?B?RGFnLUVybGluZyBTbcO4cmdyYXY=?= References: <20070729214715.I31116@maildrop.int.zabbadoz.net> <20070729160246.A86779@ns1.feral.com> <86zm1ejrat.fsf@ds4.des.no> <20070730.025750.41720145.imp@bsdimp.com> <86k5sijlge.fsf@ds4.des.no> <86r6mqi4wp.fsf@ds4.des.no> In-Reply-To: <86r6mqi4wp.fsf@ds4.des.no> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Cc: src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org, bz@freebsd.org, mjacob@freebsd.org, Warner Losh Subject: Re: cvs commit: src/sys/netinet tcp_input.c tcp_usrreq.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2007 10:16:10 -0000 Dag-Erling Smørgrav wrote: > Dag-Erling Smørgrav writes: >> The attached patch unbreaks the build. > > With additional hunk to fix usr.bin/netstat/ipx.c, which relied on the > brokenness of . Please don't forget to undo the #ifdef and change of the log function in tcp_input.c. > DES > > > ------------------------------------------------------------------------ > > Index: sys/netinet/tcp_fsm.h > =================================================================== > RCS file: /home/ncvs/src/sys/netinet/tcp_fsm.h,v > retrieving revision 1.19 > diff -u -r1.19 tcp_fsm.h > --- sys/netinet/tcp_fsm.h 11 May 2007 10:50:31 -0000 1.19 > +++ sys/netinet/tcp_fsm.h 30 Jul 2007 09:08:26 -0000 > @@ -102,7 +102,7 @@ > #endif > > #ifdef TCPSTATES > -const char *tcpstates[] = { > +static const char *tcpstates[] = { > "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD", > "ESTABLISHED", "CLOSE_WAIT", "FIN_WAIT_1", "CLOSING", > "LAST_ACK", "FIN_WAIT_2", "TIME_WAIT", > Index: sys/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 > --- sys/netinet/tcp_usrreq.c 29 Jul 2007 01:31:33 -0000 1.159 > +++ sys/netinet/tcp_usrreq.c 30 Jul 2007 09:08:19 -0000 > @@ -87,10 +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 *, > struct thread *td); > Index: sys/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 > --- sys/netipx/spx_debug.c 11 May 2007 10:38:34 -0000 1.18 > +++ sys/netipx/spx_debug.c 30 Jul 2007 09:19:46 -0000 > @@ -69,6 +69,8 @@ > #include > #include > > +#define TCPSTATES /* for logging */ > + > #include > #include > > Index: sys/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 > --- sys/netipx/spx_debug.h 11 May 2007 10:38:34 -0000 1.17 > +++ sys/netipx/spx_debug.h 30 Jul 2007 09:12:44 -0000 > @@ -95,7 +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); > Index: usr.bin/netstat/ipx.c > =================================================================== > RCS file: /home/ncvs/src/usr.bin/netstat/ipx.c,v > retrieving revision 1.26 > diff -u -r1.26 ipx.c > --- usr.bin/netstat/ipx.c 16 Jul 2007 17:15:54 -0000 1.26 > +++ usr.bin/netstat/ipx.c 30 Jul 2007 10:01:24 -0000 > @@ -49,6 +49,7 @@ > > #include > > +#define TCPSTATES > #include > > #include > @@ -72,8 +73,6 @@ > > static char *ipx_prpr (struct ipx_addr *); > > -extern char *tcpstates[]; > - > /* > * Print a summary of connections related to a Network Systems > * protocol. For SPX, also give state of connection.