From owner-cvs-all Wed Sep 4 7:52: 0 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A384637B400; Wed, 4 Sep 2002 07:51:47 -0700 (PDT) Received: from spqr.osg.gov.bc.ca (spqr.osg.gov.bc.ca [142.32.102.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id E828743E42; Wed, 4 Sep 2002 07:51:46 -0700 (PDT) (envelope-from Cy.Schubert@osg.gov.bc.ca) Received: from passer.osg.gov.bc.ca (passer.osg.gov.bc.ca [142.32.110.29]) by spqr.osg.gov.bc.ca (Postfix) with ESMTP id 83F339F15D; Wed, 4 Sep 2002 07:51:46 -0700 (PDT) Received: from cwsys.cwsent.com (cwsys2 [10.1.2.1]) by passer.osg.gov.bc.ca (8.12.3/8.12.3) with ESMTP id g84EpgAp093850; Wed, 4 Sep 2002 07:51:44 -0700 (PDT) (envelope-from cy@cwsent.com) Received: from cwsys (localhost [127.0.0.1]) by cwsys.cwsent.com (8.12.3/8.12.3) with ESMTP id g84Epcfw093419; Wed, 4 Sep 2002 07:51:41 -0700 (PDT) (envelope-from cy@cwsys.cwsent.com) Message-Id: <200209041451.g84Epcfw093419@cwsys.cwsent.com> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 Reply-To: Cy Schubert - CITS Open Systems Group From: Cy Schubert - CITS Open Systems Group X-os: FreeBSD X-Sender: cy@cwsent.com To: Andre Albsmeier Cc: Darren Reed , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/ipfilter HISTORY fil.c fils.c ip_auth.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_h323_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_sfil.c ip_state.c ip_state.h ipf.c ipfs.c ipft_ef.c ipft_td.c ipft_tx.c ... In-Reply-To: Message from Andre Albsmeier of "Mon, 02 Sep 2002 10:57:06 +0200." <20020902105706.A93973@curry.mchp.siemens.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 04 Sep 2002 07:51:38 -0700 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message <20020902105706.A93973@curry.mchp.siemens.de>, Andre Albsmeier write s: > On Sat, 31-Aug-2002 at 09:26:51 -0700, Darren Reed wrote: > > darrenr 2002/08/31 09:26:51 PDT > > > > Modified files: (Branch: RELENG_4) > > contrib/ipfilter HISTORY fil.c fils.c ip_auth.c > > ip_compat.h ip_fil.c ip_fil.h ip_frag.c > > ip_frag.h ip_ftp_pxy.c ip_h323_pxy.c > > ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h > > ip_sfil.c ip_state.c ip_state.h ipf.c > > ipfs.c ipft_ef.c ipft_td.c ipft_tx.c > > ipl.h ipmon.c ipnat.c ipt.c kmem.c > > mlf_ipl.c parse.c printnat.c > > contrib/ipfilter/BSD Makefile > > contrib/ipfilter/ipsend ip_var.h > > contrib/ipfilter/man ipftest.1 ipmon.8 ipnat.5 > > contrib/ipfilter/rules example.9 > > contrib/ipfilter/test Makefile > > contrib/ipfilter/test/expected f13 in1 > > contrib/ipfilter/test/input f13 > > Added files: (Branch: RELENG_4) > > contrib/ipfilter/test dotest6 > > contrib/ipfilter/test/expected i12 ni3 > > contrib/ipfilter/test/input ipv6.1 ni3 > > contrib/ipfilter/test/regress i12 ipv6.1 ni3.ipf ni3.nat > > Log: > > Merge IPFilter 3.4.29 into RELENG_4 from -current > > Thanks a lot for this one, Darren! > > One thing I noticed: When comparing ip_frag.c from -current > (or ip-fil3.4.29.tar.gz) with the one in -STABLE, I get: > > andre@bali:/src>diff -u src-5/sys/contrib/ipfilter/netinet/ip_frag.c src-4/sy > s/contrib/ipfilter/netinet/ip_frag.c > --- src-5/sys/contrib/ipfilter/netinet/ip_frag.c Mon Sep 2 10:21:19 200 > 2 > +++ src-4/sys/contrib/ipfilter/netinet/ip_frag.c Mon Sep 2 10:15:42 200 > 2 > @@ -90,7 +90,8 @@ > > #if !defined(lint) > static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darr > en Reed"; > -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ > ip_frag.c,v 1.23 2002/08/28 13:41:36 darrenr Exp $"; > +/*static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.10.2.24 2002/08/28 12: > 41:04 darrenr Exp $";*/ > +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ > ip_frag.c,v 1.15.2.5 2002/08/31 16:24:52 darrenr Exp $"; > #endif > > > @@ -149,7 +150,7 @@ > if (ipfr_inuse >= IPFT_SIZE) > return NULL; > > - if (!(fin->fin_fl & FI_FRAG)) > + if (!(fin->fin_fi.fi_fl & FI_FRAG)) > return NULL; > > frag.ipfr_p = ip->ip_p; > > > I am asking myself if the difference is desired... > > Thanks, > > -Andre I noticed that too, except that /usr/src/contrib/ipfilter/ip_frag.c compares to ip_frag.c that comes with IPF 3.4.29 while /usr/src/sys/contrib/ipfilter/netinet/ip_frag.c has the above differences. Other differences include: fil.c ip_fil.c ip_fil.h ip_h323_pxy.c ip_log.c ip_nat.c -- Cheers, Phone: 250-387-8437 Cy Schubert Fax: 250-387-5766 Team Leader, Sun/Alpha Team Email: Cy.Schubert@osg.gov.bc.ca Open Systems Group, CITS Ministry of Management Services Province of BC FreeBSD UNIX: cy@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message