From owner-cvs-all Mon Sep 2 1:57:19 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 F35CF37B400; Mon, 2 Sep 2002 01:57:09 -0700 (PDT) Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43B6E43E42; Mon, 2 Sep 2002 01:57:08 -0700 (PDT) (envelope-from andre.albsmeier@mchp.siemens.de) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.11.6/8.11.6) with ESMTP id g828v6K15908; Mon, 2 Sep 2002 10:57:07 +0200 (MEST) Received: from curry.mchp.siemens.de (curry.mchp.siemens.de [139.25.42.7]) by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id g828v6S15314; Mon, 2 Sep 2002 10:57:06 +0200 (MEST) Received: (from localhost) by curry.mchp.siemens.de (8.12.5/8.12.5) id g828v6t7035041; Date: Mon, 2 Sep 2002 10:57:06 +0200 From: Andre Albsmeier To: Darren Reed Cc: 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: <20020902105706.A93973@curry.mchp.siemens.de> References: <200208311626.g7VGQp4O061963@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200208311626.g7VGQp4O061963@freefall.freebsd.org>; from darrenr@FreeBSD.ORG on Sat, Aug 31, 2002 at 09:26:51AM -0700 X-Echelon: Pretoria, top secret, top secret, 737, detonator 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 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/sys/contrib/ipfilter/netinet/ip_frag.c --- src-5/sys/contrib/ipfilter/netinet/ip_frag.c Mon Sep 2 10:21:19 2002 +++ src-4/sys/contrib/ipfilter/netinet/ip_frag.c Mon Sep 2 10:15:42 2002 @@ -90,7 +90,8 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message