Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Sep 2002 09:01:31 +0200
From:      Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
To:        Cy Schubert - CITS Open Systems Group <Cy.Schubert@uumail.gov.bc.ca>
Cc:        Andre Albsmeier <andre.albsmeier@mchp.siemens.de>, Darren Reed <darrenr@FreeBSD.org>, 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 ...
Message-ID:  <20020905090131.A77981@curry.mchp.siemens.de>
In-Reply-To: <200209041451.g84Epcfw093419@cwsys.cwsent.com>; from Cy.Schubert@uumail.gov.bc.ca on Wed, Sep 04, 2002 at 07:51:38AM -0700
References:  <andre.albsmeier@mchp.siemens.de> <200209041451.g84Epcfw093419@cwsys.cwsent.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 04-Sep-2002 at 07:51:38 -0700, Cy Schubert - CITS Open Systems Group wrote:
> 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
> 

I think it is alright. contrib/ipfilter/ip_fil.h has the following defined:

#define fin_v           fin_fi.fi_v
#define fin_p           fin_fi.fi_p
#define fin_saddr       fin_fi.fi_saddr
#define fin_src         fin_fi.fi_src.in4
#define fin_daddr       fin_fi.fi_daddr
#define fin_dst         fin_fi.fi_dst.in4 
#define fin_fl          fin_fi.fi_fl

So the fin_fl gets replaced by fin_fi.fi_fl :-). Anyway, I think that
sys/contrib/ipfilter/netinet/ip_frag.c should be updated to the "official"
version to reduce unnecessary diffs between them...

	-Andre

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020905090131.A77981>