From owner-cvs-all Wed Aug 28 6:41:45 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 9502537B400; Wed, 28 Aug 2002 06:41:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57BA643E65; Wed, 28 Aug 2002 06:41:38 -0700 (PDT) (envelope-from darrenr@FreeBSD.org) Received: from freefall.freebsd.org (darrenr@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7SDfcJU077331; Wed, 28 Aug 2002 06:41:38 -0700 (PDT) (envelope-from darrenr@freefall.freebsd.org) Received: (from darrenr@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7SDfc6o077330; Wed, 28 Aug 2002 06:41:38 -0700 (PDT) Message-Id: <200208281341.g7SDfc6o077330@freefall.freebsd.org> From: Darren Reed Date: Wed, 28 Aug 2002 06:41:37 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_compat.h ip_fil.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_state.c ip_state.h ipl.h X-FreeBSD-CVS-Branch: HEAD 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 darrenr 2002/08/28 06:41:37 PDT Modified files: sys/contrib/ipfilter/netinet fil.c ip_compat.h ip_fil.c ip_frag.c ip_frag.h ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_state.c ip_state.h ipl.h Log: Finally merge in the changes from ipfilter 3.4.29 to freebsd-current. Main changes here are related to the ftp proxy and making that work better. Revision Changes Path 1.32 +12 -3 src/sys/contrib/ipfilter/netinet/fil.c 1.19 +3 -0 src/sys/contrib/ipfilter/netinet/ip_compat.h 1.34 +16 -3 src/sys/contrib/ipfilter/netinet/ip_fil.c 1.23 +7 -10 src/sys/contrib/ipfilter/netinet/ip_frag.c 1.15 +2 -2 src/sys/contrib/ipfilter/netinet/ip_frag.h 1.22 +156 -30 src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c 1.32 +7 -4 src/sys/contrib/ipfilter/netinet/ip_nat.c 1.19 +1 -0 src/sys/contrib/ipfilter/netinet/ip_nat.h 1.20 +79 -13 src/sys/contrib/ipfilter/netinet/ip_proxy.c 1.12 +1 -1 src/sys/contrib/ipfilter/netinet/ip_proxy.h 1.29 +9 -5 src/sys/contrib/ipfilter/netinet/ip_state.c 1.14 +3 -0 src/sys/contrib/ipfilter/netinet/ip_state.h 1.20 +1 -1 src/sys/contrib/ipfilter/netinet/ipl.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message