From owner-cvs-src@FreeBSD.ORG Sat Dec 25 00:14:15 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C080B16A4CE; Sat, 25 Dec 2004 00:14:15 +0000 (GMT) Received: from pooker.samsco.org (pooker.samsco.org [168.103.85.57]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C88543D45; Sat, 25 Dec 2004 00:14:15 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from [192.168.254.11] (junior-wifi.samsco.home [192.168.254.11]) (authenticated bits=0) by pooker.samsco.org (8.12.11/8.12.10) with ESMTP id iBP0I0Ol095199; Fri, 24 Dec 2004 17:18:00 -0700 (MST) (envelope-from scottl@freebsd.org) Message-ID: <41CCB08C.80207@freebsd.org> Date: Fri, 24 Dec 2004 17:13:00 -0700 From: Scott Long User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.2) Gecko/20040929 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Giorgos Keramidas References: <200412240914.iBO9EQwi030378@repoman.freebsd.org> <41CC8E1E.3020809@freebsd.org> <20041224231120.GA70659@gothmog.gr> <41CCA2CC.6080408@freebsd.org> <20041225000752.GA84593@gothmog.gr> In-Reply-To: <20041225000752.GA84593@gothmog.gr> X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, hits=0.1 required=3.8 tests=EXCUSE_3 autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on pooker.samsco.org cc: Darren Reed cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/contrib/ipfilter/netinetip_auth.cip_compat.h ip_frag.c ip_log.c ip_nat.h ip_proxy.c ip_state.c ip_state.h mlfk_ipl.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Sat, 25 Dec 2004 00:14:16 -0000 Giorgos Keramidas wrote: > On 2004-12-24 16:14, Scott Long wrote: > >>Giorgos Keramidas wrote: >> >>>On 2004-12-24 14:46, Scott Long wrote: >>> >>>>Darren Reed wrote: >>>> >>>>>darrenr 2004-12-24 09:14:26 UTC >>>>> >>>>>FreeBSD src repository >>>>> >>>>>Modified files: >>>>> sys/contrib/ipfilter/netinet ip_auth.c ip_compat.h ip_frag.c >>>>> ip_log.c ip_nat.h ip_proxy.c >>>>> ip_state.c ip_state.h mlfk_ipl.c >>>>>Log: >>>>>Enable fine grained locking within IPFilter, using mtx(9) and sx(9) >>>>>allowing >>>>>the the "needs giant" flag to be removed from the driver. >>>> >>>>I'm not sure how this could possibly compile on FreeBSD. Did you forget >>>>to check in a file perhaps? Please fix this ASAP, otherwise it's going >>>>to get reverted. >>> >>>Hi Scott, >>> >>>can you test this as a fix for the build problems? It seems to fix the >>>buildkernel issues here. The arbitrary choise of __FreeBSD_version's >>>value was based on this snippet from src/sys/ipfilter/netinet/ip_compat.h: >> >>Thanks, I'll test it in a few minutes. Would you also be willing to fix >>the warning from PFIL_HOOKS being redefined? > > > Sure. The ip_fil.h header defines PFIL_HOOKS unconditionally, possibly > overriding the definition passed on the command line by the Makefile of > src/sys/modules/ipfilter. > > There are two options: > > a) Either we remove the -DPFIL_HOOKS from the Makefile (possibly resulting > in other breakages at places where ip_fil.h is not included, even though > it should be), or > > b) we commit something like this minor diff to ip_fil.h: > > %%% > gothmog:/usr/src# cvs di -u sys/contrib/ipfilter/netinet/ip_fil.h > Index: sys/contrib/ipfilter/netinet/ip_fil.h > =================================================================== > RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_fil.h,v > retrieving revision 1.27 > diff -u -r1.27 ip_fil.h > --- sys/contrib/ipfilter/netinet/ip_fil.h 27 Aug 2004 20:01:08 -0000 1.27 > +++ sys/contrib/ipfilter/netinet/ip_fil.h 25 Dec 2004 00:03:19 -0000 > @@ -498,7 +498,9 @@ > (defined(NetBSD1_2) && NetBSD1_2 > 1) || (defined(__FreeBSD_version) && \ > (__FreeBSD_version >= 500011)) > # if (NetBSD >= 199905) || (__FreeBSD_version >= 600001) > -# define PFIL_HOOKS > +# ifndef PFIL_HOOKS > +# define PFIL_HOOKS > +# endif > # endif > # ifdef PFIL_HOOKS > # define NETBSD_PF > %%% I don't see anywhere in the ipfilter source where PFIL_HOOKS is actually checked. PFIL_HOOKS was removed as an option from FreeBSD a few months ago and is now assumed to always be present. Maybe we should just remove the __FreeBSD_version from the clause. Scott