From owner-cvs-src@FreeBSD.ORG Sun Jul 29 17:17:47 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 B527016A418; Sun, 29 Jul 2007 17:17:47 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from ns1.feral.com (ns1.feral.com [192.67.166.1]) by mx1.freebsd.org (Postfix) with ESMTP id 88F1B13C46B; Sun, 29 Jul 2007 17:17:47 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from ns1.feral.com (localhost [127.0.0.1]) by ns1.feral.com (8.14.1/8.14.1) with ESMTP id l6THHdjx084990; Sun, 29 Jul 2007 10:17:47 -0700 (PDT) (envelope-from mjacob@freebsd.org) Received: from localhost (mjacob@localhost) by ns1.feral.com (8.14.1/8.14.1/Submit) with ESMTP id l6THHdAs084987; Sun, 29 Jul 2007 10:17:39 -0700 (PDT) (envelope-from mjacob@freebsd.org) X-Authentication-Warning: ns1.feral.com: mjacob owned process doing -bs Date: Sun, 29 Jul 2007 10:17:39 -0700 (PDT) From: mjacob@freebsd.org To: Andre Oppermann In-Reply-To: <20070729095743.N84864@ns1.feral.com> Message-ID: <20070729101357.A84864@ns1.feral.com> References: <200707290131.l6T1VY8g026872@repoman.freebsd.org> <46AC987A.9040501@freebsd.org> <20070729184123.S44136@mp2.macomnet.net> <20070729095743.N84864@ns1.feral.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: cvs-src@freebsd.org, Maxim Konovalov , src-committers@freebsd.org, cvs-all@freebsd.org 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 Reply-To: mjacob@freebsd.org List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2007 17:17:47 -0000 Sorry- I was a tired and cranky idiot. I have this fixed now, and will do a real universe run *and* ask re. The problem here is that the code is definitely ancient wanky- there's a const char *[] array in tcp_fsm.h that's compiled in iff TCPSTATES is defined. Various files include tcp_fsm.h and define TCPSTATES. However, what is getting the linker bugged is the line extern const char *tcpstates[]; that makes for a *different* definition of the object. The fix is to remove the 'extern' refs (tcp_usrreq doesn't need one, and spx_debug.c should do the TCPSTATES define like tcp_input && tcp_debug do). > > I know. I'm going to look at it more today. > > On Sun, 29 Jul 2007, Maxim Konovalov wrote: > >>> Thanks for fixing this. The whole tcpstates stuff is hackish. >>> We need a better fix as the state reporting in the log message >>> should not depend on TCPDEBUG. >>> >> tb still fails at tcpstates. >> >> -- >> Maxim Konovalov >> >