Date: Thu, 13 Jan 2000 10:36:21 -0800 (PST) From: Guido van Rooij <guido@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/ipfilter HISTORY fil.c fils.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_ftp_pxy.c ip_nat.c ip_nat.h ip_sfil.c ip_state.c ipl.h ipmon.c ipnat.c parse.c solaris.c todo src/contrib/ipfilter/iplang iplang_y.y src/contrib/ipfilter/ipsend ... Message-ID: <200001131836.KAA34085@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
guido 2000/01/13 10:36:21 PST
Modified files:
contrib/ipfilter HISTORY fil.c fils.c ip_compat.h ip_fil.c
ip_fil.h ip_frag.c ip_ftp_pxy.c ip_nat.c
ip_nat.h ip_sfil.c ip_state.c ipl.h
ipmon.c ipnat.c parse.c solaris.c todo
Log:
Merge `conflicts' (I'd rather have the head restored to the vendor branch)
Revision Changes Path
1.4 +68 -0 src/contrib/ipfilter/HISTORY
1.4 +65 -7 src/contrib/ipfilter/fil.c
1.4 +3 -2 src/contrib/ipfilter/fils.c
1.4 +7 -2 src/contrib/ipfilter/ip_compat.h
1.4 +33 -49 src/contrib/ipfilter/ip_fil.c
1.4 +9 -4 src/contrib/ipfilter/ip_fil.h
1.4 +4 -4 src/contrib/ipfilter/ip_frag.c
1.4 +2 -2 src/contrib/ipfilter/ip_ftp_pxy.c
1.4 +75 -25 src/contrib/ipfilter/ip_nat.c
1.4 +5 -4 src/contrib/ipfilter/ip_nat.h
1.4 +9 -8 src/contrib/ipfilter/ip_sfil.c
1.4 +95 -17 src/contrib/ipfilter/ip_state.c
1.4 +1 -1 src/contrib/ipfilter/ipl.h
1.7 +3 -3 src/contrib/ipfilter/ipmon.c
1.4 +21 -5 src/contrib/ipfilter/ipnat.c
1.4 +53 -12 src/contrib/ipfilter/parse.c
1.4 +160 -40 src/contrib/ipfilter/solaris.c
1.4 +1 -0 src/contrib/ipfilter/todo
Modified files:
contrib/ipfilter/iplang iplang_y.y
contrib/ipfilter/ipsend ipsend.c iptest.1 iptest.c
contrib/ipfilter/man ipf.4 ipf.5 ipf.8 ipfstat.8 ipmon.8
ipnat.4
contrib/ipfilter/rules ftp-proxy
Log:
merge `conflicts' (I'd rather have the head restored to the vendor branch)
Revision Changes Path
1.4 +2 -1 src/contrib/ipfilter/iplang/iplang_y.y
1.6 +4 -2 src/contrib/ipfilter/ipsend/ipsend.c
1.6 +1 -1 src/contrib/ipfilter/ipsend/iptest.1
1.4 +5 -2 src/contrib/ipfilter/ipsend/iptest.c
1.6 +2 -2 src/contrib/ipfilter/man/ipf.4
1.6 +1 -1 src/contrib/ipfilter/man/ipf.5
1.5 +0 -1 src/contrib/ipfilter/man/ipf.8
1.5 +4 -1 src/contrib/ipfilter/man/ipfstat.8
1.8 +41 -1 src/contrib/ipfilter/man/ipmon.8
1.6 +1 -1 src/contrib/ipfilter/man/ipnat.4
1.4 +6 -1 src/contrib/ipfilter/rules/ftp-proxy
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?200001131836.KAA34085>