mrg
Wed Oct 29 23:13:54 PST 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/var/slash-tmp/cvs-serv27156

Modified Files:
      Tag: netbsd-1-3
	fil.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_log.c ip_nat.c ip_nat.h 
	ip_proxy.c ip_proxy.h ip_state.c ip_state.h 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:00 PST 1997
Update of /cvsroot/src/usr.sbin/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv27438

Modified Files:
      Tag: netbsd-1-3
	Makefile.inc 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:11 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipf
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipf

Modified Files:
      Tag: netbsd-1-3
	ipf.8 ipf.c ipf.h opt.c parse.c 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:22 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipfstat
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipfstat

Modified Files:
      Tag: netbsd-1-3
	Makefile fils.c kmem.c kmem.h 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:47 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipftest

Modified Files:
      Tag: netbsd-1-3
	Makefile ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c ipft_td.c 
	ipft_tx.c ipt.c ipt.h misc.c pcap.h snoop.h 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:49 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipftest/test/input
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipftest/test/input

Removed Files:
      Tag: netbsd-1-3
	input.sed 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:54 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipmon
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipmon

Modified Files:
      Tag: netbsd-1-3
	Makefile ipmon.c 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:16:59 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipnat
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipnat

Modified Files:
      Tag: netbsd-1-3
	Makefile ipnat.c 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:17:05 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipresend
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipresend

Modified Files:
      Tag: netbsd-1-3
	Makefile ipresend.c resend.c 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:17:34 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/ipsend
In directory netbsd1:/var/slash-tmp/cvs-serv27438/ipsend

Modified Files:
      Tag: netbsd-1-3
	44arp.c Makefile ip.c iplang.h iplang.tst iplang_l.l 
	iplang_y.y ipsend.1 ipsend.5 ipsend.c ipsend.h ipsopt.c sbpf.c 
	tcpip.h 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:17:46 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/iptest
In directory netbsd1:/var/slash-tmp/cvs-serv27438/iptest

Modified Files:
      Tag: netbsd-1-3
	Makefile iptest.c iptests.c sock.c 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:17:56 PST 1997
Update of /cvsroot/src/usr.sbin/ipf/rules
In directory netbsd1:/var/slash-tmp/cvs-serv27438/rules

Modified Files:
      Tag: netbsd-1-3
	Makefile example.10 
Added Files:
      Tag: netbsd-1-3
	BASIC.NAT BASIC_1.FW BASIC_2.FW 
Log Message:
merge ipfilter 3.2

mrg
Wed Oct 29 23:19:51 PST 1997
Update of /cvsroot/src/sys/lkm/netinet/if_ipl
In directory netbsd1:/var/slash-tmp/cvs-serv28366

Modified Files:
      Tag: netbsd-1-3
	ipl.h mln_ipl.c 
Log Message:
merge ipfilter 3.2