From owner-cvs-all Wed Jul 19 16: 1: 3 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 79D5D37B52D; Wed, 19 Jul 2000 16:00:53 -0700 (PDT) (envelope-from darrenr@FreeBSD.org) Received: (from darrenr@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id QAA25452; Wed, 19 Jul 2000 16:00:53 -0700 (PDT) (envelope-from darrenr@FreeBSD.org) Message-Id: <200007192300.QAA25452@freefall.freebsd.org> From: Darren Reed Date: Wed, 19 Jul 2000 16:00:53 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/ipfilter INSTALL.xBSD IPF.KANJI common.c ipfs.c mlfk_ipl.c HISTORY LICENCE Makefile facpri.c facpri.h fil.c fils.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_lfil.c ip_log.c ip_nat.c ip_nat.h ... X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG darrenr 2000/07/19 16:00:53 PDT Modified files: (Branch: RELENG_4) contrib/ipfilter HISTORY LICENCE Makefile facpri.c facpri.h fil.c fils.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_lfil.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_sfil.c ip_state.c ip_state.h ipf.c ipf.h ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c ipft_td.c ipft_tx.c ipl.h ipmon.c ipnat.c ipt.c ipt.h kmem.c kmem.h misc.c ml_ipl.c mlf_ipl.c mli_ipl.c mln_ipl.c mls_ipl.c natparse.c opt.c parse.c pcap.h relay.c snoop.h solaris.c todo contrib/ipfilter/BSD Makefile Makefile.ipsend contrib/ipfilter/FreeBSD-3 INST.FreeBSD-3 unkinstall contrib/ipfilter/iplang Makefile iplang_l.l iplang_y.y contrib/ipfilter/ipsend ipsend.c iptest.c contrib/ipfilter/man Makefile ipf.8 ipfstat.8 ipmon.8 ipnat.5 mkfilters.1 contrib/ipfilter/perl plog contrib/ipfilter/samples proxy.c userauth.c contrib/ipfilter/test/expected i3 i7 n1 contrib/ipfilter/test/regress i3 i7 Added files: (Branch: RELENG_4) contrib/ipfilter INSTALL.xBSD IPF.KANJI common.c ipfs.c mlfk_ipl.c contrib/ipfilter/man ipfs.8 contrib/ipfilter/perl ipf-mrtg.pl Removed files: (Branch: RELENG_4) contrib/ipfilter linux.h Log: actually commit merged diffs to the trunk Revision Changes Path 1.1.1.10.2.2 +0 -5 src/contrib/ipfilter/HISTORY 1.1.1.3.2.1 +1 -1 src/contrib/ipfilter/LICENCE 1.1.1.8.2.2 +40 -18 src/contrib/ipfilter/Makefile 1.1.1.1.2.1 +2 -2 src/contrib/ipfilter/facpri.c 1.1.1.1.2.1 +2 -2 src/contrib/ipfilter/facpri.h 1.1.1.10.2.3 +541 -149 src/contrib/ipfilter/fil.c 1.1.1.8.2.1 +736 -138 src/contrib/ipfilter/fils.c 1.1.1.4.2.2 +41 -28 src/contrib/ipfilter/ip_auth.c 1.1.1.2.2.1 +3 -6 src/contrib/ipfilter/ip_auth.h 1.1.1.8.2.1 +187 -37 src/contrib/ipfilter/ip_compat.h 1.1.1.10.2.2 +449 -220 src/contrib/ipfilter/ip_fil.c 1.1.1.9.2.2 +138 -74 src/contrib/ipfilter/ip_fil.h 1.1.1.7.2.2 +75 -47 src/contrib/ipfilter/ip_frag.c 1.1.1.6.2.1 +4 -2 src/contrib/ipfilter/ip_frag.h 1.1.1.5.2.2 +126 -71 src/contrib/ipfilter/ip_ftp_pxy.c 1.1.1.4.2.1 +39 -31 src/contrib/ipfilter/ip_lfil.c 1.1.1.3.2.2 +11 -10 src/contrib/ipfilter/ip_log.c 1.1.1.10.2.2 +688 -201 src/contrib/ipfilter/ip_nat.c 1.1.1.8.2.2 +71 -29 src/contrib/ipfilter/ip_nat.h 1.1.1.5.2.1 +85 -21 src/contrib/ipfilter/ip_proxy.c 1.1.1.4.2.1 +29 -3 src/contrib/ipfilter/ip_proxy.h 1.1.1.2.2.1 +17 -10 src/contrib/ipfilter/ip_raudio_pxy.c 1.1.1.1.2.2 +6 -0 src/contrib/ipfilter/ip_rcmd_pxy.c 1.1.1.8.2.2 +319 -162 src/contrib/ipfilter/ip_sfil.c 1.1.1.10.2.3 +430 -234 src/contrib/ipfilter/ip_state.c 1.1.1.7.2.2 +42 -19 src/contrib/ipfilter/ip_state.h 1.1.1.6.2.2 +31 -15 src/contrib/ipfilter/ipf.c 1.1.1.5.2.1 +29 -3 src/contrib/ipfilter/ipf.h 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipft_ef.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipft_hx.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipft_pc.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipft_sn.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipft_td.c 1.1.1.6.2.1 +8 -8 src/contrib/ipfilter/ipft_tx.c 1.1.1.9.2.2 +1 -1 src/contrib/ipfilter/ipl.h 1.5.2.2 +102 -50 src/contrib/ipfilter/ipmon.c 1.1.1.8.2.1 +61 -110 src/contrib/ipfilter/ipnat.c 1.1.1.6.2.1 +19 -9 src/contrib/ipfilter/ipt.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/ipt.h 1.1.1.4.2.1 +2 -2 src/contrib/ipfilter/kmem.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/kmem.h 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/misc.c 1.1.1.3.2.1 +1 -1 src/contrib/ipfilter/ml_ipl.c 1.1.1.5.2.1 +5 -1 src/contrib/ipfilter/mlf_ipl.c 1.1.1.2.2.1 +8 -6 src/contrib/ipfilter/mli_ipl.c 1.1.1.6.2.1 +1 -1 src/contrib/ipfilter/mln_ipl.c 1.1.1.4.2.1 +3 -3 src/contrib/ipfilter/mls_ipl.c 1.1.1.2.2.2 +240 -318 src/contrib/ipfilter/natparse.c 1.1.1.4.2.1 +3 -3 src/contrib/ipfilter/opt.c 1.1.1.10.2.2 +149 -512 src/contrib/ipfilter/parse.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/pcap.h 1.1.1.2.6.1 +2 -1 src/contrib/ipfilter/relay.c 1.1.1.5.2.1 +2 -2 src/contrib/ipfilter/snoop.h 1.1.1.9.2.2 +260 -64 src/contrib/ipfilter/solaris.c 1.1.1.8.2.1 +59 -4 src/contrib/ipfilter/todo 1.1.1.1.2.1 +44 -20 src/contrib/ipfilter/BSD/Makefile 1.1.1.1.2.1 +8 -0 src/contrib/ipfilter/BSD/Makefile.ipsend 1.1.1.1.2.1 +1 -1 src/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 1.1.1.1.2.1 +1 -0 src/contrib/ipfilter/FreeBSD-3/unkinstall 1.1.1.1.6.1 +10 -7 src/contrib/ipfilter/iplang/Makefile 1.1.1.4.2.1 +18 -18 src/contrib/ipfilter/iplang/iplang_l.l 1.1.1.5.2.2 +1 -1 src/contrib/ipfilter/iplang/iplang_y.y 1.4.2.1 +2 -2 src/contrib/ipfilter/ipsend/ipsend.c 1.1.1.7.2.1 +1 -1 src/contrib/ipfilter/ipsend/iptest.c 1.1.1.3.2.1 +1 -0 src/contrib/ipfilter/man/Makefile 1.3.2.1 +5 -2 src/contrib/ipfilter/man/ipf.8 1.3.2.2 +75 -2 src/contrib/ipfilter/man/ipfstat.8 1.6.2.1 +23 -7 src/contrib/ipfilter/man/ipmon.8 1.1.1.3.2.1 +57 -7 src/contrib/ipfilter/man/ipnat.5 1.1.1.2.6.1 +1 -1 src/contrib/ipfilter/man/mkfilters.1 1.1.1.1.2.1 +651 -387 src/contrib/ipfilter/perl/plog 1.1.1.2.6.1 +2 -1 src/contrib/ipfilter/samples/proxy.c 1.1.1.1.6.1 +3 -2 src/contrib/ipfilter/samples/userauth.c 1.1.1.1.6.1 +2 -0 src/contrib/ipfilter/test/expected/i3 1.1.1.1.6.1 +2 -1 src/contrib/ipfilter/test/expected/i7 1.1.1.1.2.1 +7 -7 src/contrib/ipfilter/test/expected/n1 1.1.1.1.6.1 +2 -0 src/contrib/ipfilter/test/regress/i3 1.1.1.1.6.1 +1 -0 src/contrib/ipfilter/test/regress/i7 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message