veego
Sun Sep 21 09:49:54 PDT 1997
Update of /cvsroot/src
In directory netbsd1:/home/veego/ipf/new/ipfilter/src

Log Message:
Import ip-filter 3.2beta5

Status:

Vendor Tag:	DARRENR
Release Tags:	v3-2beta5
		
C src/usr.sbin/ipf/Makefile
C src/usr.sbin/ipf/Makefile.inc
C src/usr.sbin/ipf/ipf/ipf.c
C src/usr.sbin/ipf/ipf/parse.c
U src/usr.sbin/ipf/ipf/opt.c
U src/usr.sbin/ipf/ipf/ipf.h
U src/usr.sbin/ipf/ipf/ipf.4
U src/usr.sbin/ipf/ipf/ipf.5
C src/usr.sbin/ipf/ipf/ipl.4
U src/usr.sbin/ipf/ipf/ipf.8
C src/usr.sbin/ipf/ipf/Makefile
U src/usr.sbin/ipf/ipfstat/kmem.c
U src/usr.sbin/ipf/ipfstat/kmem.h
C src/usr.sbin/ipf/ipfstat/fils.c
U src/usr.sbin/ipf/ipfstat/ipfstat.8
C src/usr.sbin/ipf/ipfstat/Makefile
C src/usr.sbin/ipf/ipftest/ipt.c
U src/usr.sbin/ipf/ipftest/ipft_sn.c
U src/usr.sbin/ipf/ipftest/ipft_ef.c
U src/usr.sbin/ipf/ipftest/ipft_td.c
U src/usr.sbin/ipf/ipftest/ipft_pc.c
U src/usr.sbin/ipf/ipftest/ipft_tx.c
U src/usr.sbin/ipf/ipftest/misc.c
U src/usr.sbin/ipf/ipftest/ipft_hx.c
U src/usr.sbin/ipf/ipftest/ipt.h
U src/usr.sbin/ipf/ipftest/snoop.h
U src/usr.sbin/ipf/ipftest/pcap.h
C src/usr.sbin/ipf/ipftest/Makefile
U src/usr.sbin/ipf/ipftest/test/Makefile
U src/usr.sbin/ipf/ipftest/test/dotest
U src/usr.sbin/ipf/ipftest/test/hextest
U src/usr.sbin/ipf/ipftest/test/itest
U src/usr.sbin/ipf/ipftest/test/expected/1
U src/usr.sbin/ipf/ipftest/test/expected/10
U src/usr.sbin/ipf/ipftest/test/expected/11
U src/usr.sbin/ipf/ipftest/test/expected/12
U src/usr.sbin/ipf/ipftest/test/expected/14
U src/usr.sbin/ipf/ipftest/test/expected/2
U src/usr.sbin/ipf/ipftest/test/expected/3
U src/usr.sbin/ipf/ipftest/test/expected/4
U src/usr.sbin/ipf/ipftest/test/expected/5
U src/usr.sbin/ipf/ipftest/test/expected/6
U src/usr.sbin/ipf/ipftest/test/expected/7
U src/usr.sbin/ipf/ipftest/test/expected/8
U src/usr.sbin/ipf/ipftest/test/expected/9
U src/usr.sbin/ipf/ipftest/test/expected/i1
U src/usr.sbin/ipf/ipftest/test/expected/i10
U src/usr.sbin/ipf/ipftest/test/expected/i11
U src/usr.sbin/ipf/ipftest/test/expected/i2
U src/usr.sbin/ipf/ipftest/test/expected/i3
U src/usr.sbin/ipf/ipftest/test/expected/i4
U src/usr.sbin/ipf/ipftest/test/expected/i5
U src/usr.sbin/ipf/ipftest/test/expected/i6
U src/usr.sbin/ipf/ipftest/test/expected/i7
U src/usr.sbin/ipf/ipftest/test/expected/i8
U src/usr.sbin/ipf/ipftest/test/expected/i9
U src/usr.sbin/ipf/ipftest/test/input/1
U src/usr.sbin/ipf/ipftest/test/input/10
U src/usr.sbin/ipf/ipftest/test/input/11
U src/usr.sbin/ipf/ipftest/test/input/12
U src/usr.sbin/ipf/ipftest/test/input/13
U src/usr.sbin/ipf/ipftest/test/input/14
U src/usr.sbin/ipf/ipftest/test/input/2
U src/usr.sbin/ipf/ipftest/test/input/3
U src/usr.sbin/ipf/ipftest/test/input/4
U src/usr.sbin/ipf/ipftest/test/input/5
U src/usr.sbin/ipf/ipftest/test/input/6
U src/usr.sbin/ipf/ipftest/test/input/7
U src/usr.sbin/ipf/ipftest/test/input/8
U src/usr.sbin/ipf/ipftest/test/input/9
U src/usr.sbin/ipf/ipftest/test/input/input.sed
U src/usr.sbin/ipf/ipftest/test/regress/1
U src/usr.sbin/ipf/ipftest/test/regress/10
U src/usr.sbin/ipf/ipftest/test/regress/11
U src/usr.sbin/ipf/ipftest/test/regress/12
U src/usr.sbin/ipf/ipftest/test/regress/13
U src/usr.sbin/ipf/ipftest/test/regress/14
U src/usr.sbin/ipf/ipftest/test/regress/2
U src/usr.sbin/ipf/ipftest/test/regress/3
U src/usr.sbin/ipf/ipftest/test/regress/4
U src/usr.sbin/ipf/ipftest/test/regress/5
U src/usr.sbin/ipf/ipftest/test/regress/6
U src/usr.sbin/ipf/ipftest/test/regress/7
U src/usr.sbin/ipf/ipftest/test/regress/8
U src/usr.sbin/ipf/ipftest/test/regress/9
U src/usr.sbin/ipf/ipftest/test/regress/i1
U src/usr.sbin/ipf/ipftest/test/regress/i10
U src/usr.sbin/ipf/ipftest/test/regress/i11
U src/usr.sbin/ipf/ipftest/test/regress/i2
U src/usr.sbin/ipf/ipftest/test/regress/i3
U src/usr.sbin/ipf/ipftest/test/regress/i4
U src/usr.sbin/ipf/ipftest/test/regress/i5
U src/usr.sbin/ipf/ipftest/test/regress/i6
U src/usr.sbin/ipf/ipftest/test/regress/i7
U src/usr.sbin/ipf/ipftest/test/regress/i8
U src/usr.sbin/ipf/ipftest/test/regress/i9
C src/usr.sbin/ipf/ipmon/ipmon.c
U src/usr.sbin/ipf/ipmon/ipmon.8
C src/usr.sbin/ipf/ipmon/Makefile
C src/usr.sbin/ipf/ipnat/ipnat.c
U src/usr.sbin/ipf/ipnat/ipnat.4
U src/usr.sbin/ipf/ipnat/ipnat.5
U src/usr.sbin/ipf/ipnat/ipnat.8
C src/usr.sbin/ipf/ipnat/Makefile
U src/usr.sbin/ipf/ipresend/ipresend.c
C src/usr.sbin/ipf/ipresend/resend.c
N src/usr.sbin/ipf/ipresend/ipresend.1
C src/usr.sbin/ipf/ipresend/Makefile
C src/usr.sbin/ipf/ipsend/44arp.c
C src/usr.sbin/ipf/ipsend/ip.c
C src/usr.sbin/ipf/ipsend/ipsend.c
C src/usr.sbin/ipf/ipsend/ipsend.h
U src/usr.sbin/ipf/ipsend/ipsopt.c
C src/usr.sbin/ipf/ipsend/sbpf.c
N src/usr.sbin/ipf/ipsend/tcpip.h
N src/usr.sbin/ipf/ipsend/ipsend.1
N src/usr.sbin/ipf/ipsend/ipsend.5
N src/usr.sbin/ipf/ipsend/iplang_l.l
N src/usr.sbin/ipf/ipsend/iplang_y.y
N src/usr.sbin/ipf/ipsend/iplang.tst
N src/usr.sbin/ipf/ipsend/iplang.h
C src/usr.sbin/ipf/ipsend/Makefile
C src/usr.sbin/ipf/iptest/iptest.c
C src/usr.sbin/ipf/iptest/iptests.c
C src/usr.sbin/ipf/iptest/sock.c
N src/usr.sbin/ipf/iptest/iptest.1
C src/usr.sbin/ipf/iptest/Makefile
N src/usr.sbin/ipf/rules/example.1
N src/usr.sbin/ipf/rules/example.10
N src/usr.sbin/ipf/rules/example.11
N src/usr.sbin/ipf/rules/example.12
N src/usr.sbin/ipf/rules/example.13
N src/usr.sbin/ipf/rules/example.2
N src/usr.sbin/ipf/rules/example.3
N src/usr.sbin/ipf/rules/example.4
N src/usr.sbin/ipf/rules/example.5
N src/usr.sbin/ipf/rules/example.6
N src/usr.sbin/ipf/rules/example.7
N src/usr.sbin/ipf/rules/example.8
N src/usr.sbin/ipf/rules/example.9
N src/usr.sbin/ipf/rules/example.sr
N src/usr.sbin/ipf/rules/firewall
N src/usr.sbin/ipf/rules/ftp-proxy
N src/usr.sbin/ipf/rules/ftppxy
N src/usr.sbin/ipf/rules/nat-setup
N src/usr.sbin/ipf/rules/nat.eg
N src/usr.sbin/ipf/rules/server
N src/usr.sbin/ipf/rules/tcpstate
N src/usr.sbin/ipf/rules/Makefile
C src/sys/netinet/ip_auth.c
U src/sys/netinet/ip_auth.h
C src/sys/netinet/ip_fil.c
C src/sys/netinet/fil.c
C src/sys/netinet/ip_nat.c
C src/sys/netinet/ip_frag.c
C src/sys/netinet/ip_state.c
C src/sys/netinet/ip_fil.h
C src/sys/netinet/ip_compat.h
C src/sys/netinet/ip_frag.h
C src/sys/netinet/ip_nat.h
C src/sys/netinet/ip_state.h
C src/sys/netinet/ip_proxy.c
C src/sys/netinet/ip_proxy.h
C src/sys/netinet/ip_ftp_pxy.c
N src/sys/netinet/ip_log.c
C src/sys/lkm/netinet/if_ipl/mln_ipl.c
C src/sys/lkm/netinet/if_ipl/ipl.h
C src/sys/lkm/netinet/if_ipl/Makefile

43 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jDARRENR:yesterday -jDARRENR src