CVS commit: src/dist/ipf

[Darren Reed <darrenr%netbsd.org@localhost>]

Module Name:    src
Committed By:   darrenr
Date:           Wed Aug 19 08:30:12 UTC 2009

Update of /cvsroot/src/dist/ipf
In directory ivanova.netbsd.org:/tmp/cvs-serv13495

Log Message:
Import IPFilter 4.1.33

4.1.33 - Release 16 August 2009

2837931 wrong mode selected in ipf program for hash-entries
2826168 load_http can make ippool core dump
2825150 IPL_LOGMAX used to index some arrays
2825084 ipv6 fragments should not be allowed past 64k
2824713 ipfstat top output alternates between entries and nothing
2824712 ipfstat top output is shows negative ttl
2820965 a single bad ipv6 extension header should not impact others
2818197 ignored fragment bits defined as being reserved
2817667 IPv6 fragment header verification needs attention
2817098 fr_getrulen() finds the wrong rule
2817096 fr_rulen is unused
2741019 Lingering states (Established/Listen - 5/0) in state table
2702887 use of PBR/fastroute causes panic with ipv6
2671913 regression test in7 fails to execute
2598625 parsing empty config file results in an error
2698656 test parsing empty config files
2597956 not all pointers in a clone are reset
2543934 nat_t gets assigned ifp too early
2535795 No need to always bump fr_ref
2535778 Bad IPv6 packets droped by default
2031730 4.1.31 Nat drops fragmented packets after the first
2214661 ipf does not handle IPv6 fragments
2473273 NAT removed before RST/ICMP sent
2216500 fin_state serves no purpose
2424604 adding random MD5 data causes panic
2304435 Ineffecient lock usage in logging
2216491 fin_nat serves little purpose
2055619 duplicating a free-d packet will fail
2042949 Excessive locking when creating nat_t
2035610 nat_update does not need to get locks
2214658 ipf mostly ignores locking in NetBSD
1979427 Memory leak in user utilities - token never freed (rel br)
* SunOS4 does not have a curproc, but it does have u.
* The fix for 2020447 generated random port numbers but not within the
  range specified in the map rule.  Add in a regression test to verify
  that the "random" part works.
2020447 NAT can undo name server random port selection
1988795 NetBSD does not build with kernel malloc stats
1988782 fr_movequeue can take a short cut
1988669 first nat creation failure prevents further success
1988668 hostmap searching does not work properly
* on some 64bit architectures (such as alpha), the addrfamily_t is packed
  differently, throwing off the calculations for adf_len
* one too many READ_ENTERs in ip_sync code.
* clean up fr_fastroute a little by removing some #ifdefs and pushing the
  code around a bit to use the same variables (NetBSD)
* more recent NetBSDs use VOP related macros differently

Status:

Vendor Tag:     DARRENR
Release Tags:   v4-1-33
                
U src/dist/ipf/mlf_rule.c
C src/dist/ipf/ip_proxy.c
C src/dist/ipf/ip_fil_freebsd.c
C src/dist/ipf/ip_h323_pxy.c
U src/dist/ipf/README
U src/dist/ipf/ip_htable.c
C src/dist/ipf/linux.c
U src/dist/ipf/pcap-ipf.h
U src/dist/ipf/ml_ipl.c
U src/dist/ipf/mlfk_rule.c
U src/dist/ipf/BugReport
U src/dist/ipf/ip_sync.c
U src/dist/ipf/ipmon.h
C src/dist/ipf/ip_fil_solaris.c
N src/dist/ipf/arc4random.c
U src/dist/ipf/QNX_OCL.txt
U src/dist/ipf/mlso_rule.c
U src/dist/ipf/ip_pool.h
U src/dist/ipf/ip_pptp_pxy.c
U src/dist/ipf/mls_rule.c
C src/dist/ipf/ip_fil.c
U src/dist/ipf/radix_ipf.h
C src/dist/ipf/ip_nat.c
U src/dist/ipf/ip_auth.h
U src/dist/ipf/bpf_filter.c
C src/dist/ipf/ip_ftp_pxy.c
U src/dist/ipf/mlo_rule.c
C src/dist/ipf/ip_fil_osf.c
U src/dist/ipf/ip_scan.c
U src/dist/ipf/IPFILTER.LICENCE
U src/dist/ipf/Y2K
U src/dist/ipf/snoop.h
U src/dist/ipf/ip_rpcb_pxy.c
U src/dist/ipf/hpux.c
U src/dist/ipf/mlo_ipl.c
U src/dist/ipf/md5.c
C src/dist/ipf/ip_fil_sunos4.c
U src/dist/ipf/kmem.h
U src/dist/ipf/opts.h
C src/dist/ipf/ip_state.c
C src/dist/ipf/HISTORY
C src/dist/ipf/ip_lookup.c
U src/dist/ipf/bpf-ipf.h
C src/dist/ipf/mln_ipl.c
C src/dist/ipf/ip_fil_hpux.c
U src/dist/ipf/todo
U src/dist/ipf/ip_irc_pxy.c
U src/dist/ipf/ipt.h
C src/dist/ipf/fil.c
C src/dist/ipf/ip_fil_irix.c
C src/dist/ipf/ip_frag.h
U src/dist/ipf/ip_pool.c
C src/dist/ipf/ip_fil.h
C src/dist/ipf/ip_ipsec_pxy.c
C src/dist/ipf/ip_nat.h
C src/dist/ipf/ip_auth.c
U src/dist/ipf/WhatsNew40.txt
U src/dist/ipf/IMPORTANT
C src/dist/ipf/ip_fil_netbsd.c
U src/dist/ipf/mln_rule.c
U src/dist/ipf/mli_ipl.c
C src/dist/ipf/solaris.c
U src/dist/ipf/ip_sync.h
C src/dist/ipf/tru64.c
C src/dist/ipf/ip_log.c
U src/dist/ipf/IPF.KANJI
U src/dist/ipf/ip_proxy.h
U src/dist/ipf/ip_htable.h
U src/dist/ipf/linux.h
U src/dist/ipf/BNF
C src/dist/ipf/ip_raudio_pxy.c
C src/dist/ipf/ipl.h
U src/dist/ipf/mls_ipl.c
C src/dist/ipf/ip_rcmd_pxy.c
U src/dist/ipf/radix.c
C src/dist/ipf/ip_fil_openbsd.c
C src/dist/ipf/ip_frag.c
U src/dist/ipf/mlfk_ipl.c
C src/dist/ipf/ip_state.h
U src/dist/ipf/ipf.h
C src/dist/ipf/Makefile
C src/dist/ipf/ip_lookup.h
C src/dist/ipf/ip_compat.h
U src/dist/ipf/md5.h
U src/dist/ipf/ip_netbios_pxy.c
C src/dist/ipf/ip_fil_aix.c
U src/dist/ipf/mlh_rule.c
U src/dist/ipf/mlf_ipl.c
U src/dist/ipf/STYLE.TXT
U src/dist/ipf/mkfilters
C src/dist/ipf/ip_fil_linux.c
C src/dist/ipf/buildsunos
U src/dist/ipf/ip_scan.h
U src/dist/ipf/bsdinstall
U src/dist/ipf/perl/Isbgraph
C src/dist/ipf/perl/logfilter.pl
U src/dist/ipf/perl/plog
U src/dist/ipf/perl/Ipfanaly.pl
U src/dist/ipf/perl/ipfmeta.pl
U src/dist/ipf/perl/Services
U src/dist/ipf/perl/LICENSE
U src/dist/ipf/perl/ipf-mrtg.pl
U src/dist/ipf/rules/ftp-proxy
U src/dist/ipf/rules/nat.eg
U src/dist/ipf/rules/example.7
U src/dist/ipf/rules/example.12
U src/dist/ipf/rules/BASIC.NAT
U src/dist/ipf/rules/example.9
U src/dist/ipf/rules/pool.conf
U src/dist/ipf/rules/example.3
U src/dist/ipf/rules/BASIC_2.FW
U src/dist/ipf/rules/example.sr
U src/dist/ipf/rules/nat-setup
U src/dist/ipf/rules/example.11
U src/dist/ipf/rules/example.4
U src/dist/ipf/rules/BASIC_1.FW
U src/dist/ipf/rules/ip_rules
U src/dist/ipf/rules/ftppxy
U src/dist/ipf/rules/tcpstate
U src/dist/ipf/rules/example.6
U src/dist/ipf/rules/example.13
U src/dist/ipf/rules/example.1
U src/dist/ipf/rules/firewall
U src/dist/ipf/rules/ipmon.conf
U src/dist/ipf/rules/example.10
U src/dist/ipf/rules/example.5
U src/dist/ipf/rules/example.2
U src/dist/ipf/rules/example.8
U src/dist/ipf/rules/server
U src/dist/ipf/ipsd/slinux.c
U src/dist/ipf/ipsd/snit.c
U src/dist/ipf/ipsd/README
U src/dist/ipf/ipsd/ipsd.c
U src/dist/ipf/ipsd/sbpf.c
U src/dist/ipf/ipsd/Makefile
U src/dist/ipf/ipsd/sdlpi.c
U src/dist/ipf/ipsd/ipsd.h
U src/dist/ipf/ipsd/linux.h
U src/dist/ipf/ipsd/ipsdr.c
U src/dist/ipf/ipsd/Celler/ip_compat.h
U src/dist/ipf/man/ipnat.8
U src/dist/ipf/man/ipnat.5
U src/dist/ipf/man/ipfilter.4.mandoc
U src/dist/ipf/man/ipftest.1
U src/dist/ipf/man/ipfilter.4
U src/dist/ipf/man/ipfstat.8
U src/dist/ipf/man/ipf.5
U src/dist/ipf/man/ipscan.5
U src/dist/ipf/man/ipscan.8
U src/dist/ipf/man/ipf.8
U src/dist/ipf/man/ipfilter.5
U src/dist/ipf/man/ippool.5
U src/dist/ipf/man/ipnat.4
U src/dist/ipf/man/ipmon.8
U src/dist/ipf/man/Makefile
U src/dist/ipf/man/ipmon.5
U src/dist/ipf/man/ippool.8
U src/dist/ipf/man/ipfs.8
U src/dist/ipf/man/ipf.4
U src/dist/ipf/man/mkfilters.1
U src/dist/ipf/man/ipl.4
U src/dist/ipf/samples/proxy.c
U src/dist/ipf/samples/userauth.c
U src/dist/ipf/samples/relay.c
U src/dist/ipf/samples/Makefile
C src/dist/ipf/samples/ipfilter-pb.gif
U src/dist/ipf/NetBSD/conf.c.diffs
U src/dist/ipf/NetBSD/files.newconf.diffs
U src/dist/ipf/NetBSD/unkinstall
U src/dist/ipf/NetBSD/files.oldconf.diffs
U src/dist/ipf/NetBSD/conf.c.old.diffs
U src/dist/ipf/NetBSD/in_proto.c.old.diffs
U src/dist/ipf/NetBSD/ip_output.c.diffs
U src/dist/ipf/NetBSD/filez.diffs
U src/dist/ipf/NetBSD/unminstall
U src/dist/ipf/NetBSD/kinstall
U src/dist/ipf/NetBSD/ip_input.c.diffs
U src/dist/ipf/NetBSD/in_proto.c.diffs
U src/dist/ipf/NetBSD/minstall
U src/dist/ipf/NetBSD/files.diffs
U src/dist/ipf/l4check/Makefile
U src/dist/ipf/l4check/l4check.conf
U src/dist/ipf/l4check/http.check
U src/dist/ipf/l4check/http.ok
U src/dist/ipf/l4check/l4check.c
U src/dist/ipf/lib/fill6bits.c
U src/dist/ipf/lib/addicmp.c
U src/dist/ipf/lib/nat_setgroupmap.c
U src/dist/ipf/lib/printpoolnode.c
U src/dist/ipf/lib/printhash_live.c
U src/dist/ipf/lib/kvatoname.c
U src/dist/ipf/lib/remove_hashnode.c
U src/dist/ipf/lib/buildopts.c
U src/dist/ipf/lib/tcp_flags.c
U src/dist/ipf/lib/printaps.c
U src/dist/ipf/lib/printhashdata.c
U src/dist/ipf/lib/load_hash.c
U src/dist/ipf/lib/ipft_pc.c
U src/dist/ipf/lib/optprint.c
U src/dist/ipf/lib/printactivenat.c
U src/dist/ipf/lib/getport.c
U src/dist/ipf/lib/printfr.c
U src/dist/ipf/lib/printlog.c
U src/dist/ipf/lib/load_poolnode.c
U src/dist/ipf/lib/kmemcpywrap.c
U src/dist/ipf/lib/ionames.c
U src/dist/ipf/lib/printifname.c
U src/dist/ipf/lib/getportproto.c
U src/dist/ipf/lib/icmpcode.c
U src/dist/ipf/lib/load_pool.c
U src/dist/ipf/lib/printhostmask.c
U src/dist/ipf/lib/printhashnode.c
U src/dist/ipf/lib/gethost.c
U src/dist/ipf/lib/remove_poolnode.c
U src/dist/ipf/lib/printstate.c
U src/dist/ipf/lib/ntomask.c
U src/dist/ipf/lib/getproto.c
U src/dist/ipf/lib/printpooldata.c
U src/dist/ipf/lib/v6ionames.c
U src/dist/ipf/lib/optprintv6.c
U src/dist/ipf/lib/var.c
U src/dist/ipf/lib/hostname.c
U src/dist/ipf/lib/load_hashnode.c
U src/dist/ipf/lib/kmem.c
U src/dist/ipf/lib/printportcmp.c
U src/dist/ipf/lib/facpri.c
U src/dist/ipf/lib/flags.c
U src/dist/ipf/lib/Makefile
U src/dist/ipf/lib/printsbuf.c
U src/dist/ipf/lib/ipft_hx.c
U src/dist/ipf/lib/print_toif.c
U src/dist/ipf/lib/printpacket.c
U src/dist/ipf/lib/printbuf.c
U src/dist/ipf/lib/printtqtable.c
U src/dist/ipf/lib/ipf_dotuning.c
U src/dist/ipf/lib/getnattype.c
U src/dist/ipf/lib/resetlexer.c
U src/dist/ipf/lib/printfraginfo.c
U src/dist/ipf/lib/printtunable.c
U src/dist/ipf/lib/addipopt.c
U src/dist/ipf/lib/bcopywrap.c
U src/dist/ipf/lib/ipoptsec.c
U src/dist/ipf/lib/nametokva.c
C src/dist/ipf/lib/printnat.c
U src/dist/ipf/lib/mutex_emul.c
U src/dist/ipf/lib/tcpflags.c
U src/dist/ipf/lib/remove_hash.c
U src/dist/ipf/lib/getifname.c
U src/dist/ipf/lib/initparse.c
U src/dist/ipf/lib/ipft_tx.c
U src/dist/ipf/lib/ipft_sn.c
U src/dist/ipf/lib/optname.c
U src/dist/ipf/lib/v6optvalue.c
U src/dist/ipf/lib/count6bits.c
U src/dist/ipf/lib/printpool.c
U src/dist/ipf/lib/debug.c
U src/dist/ipf/lib/alist_new.c
U src/dist/ipf/lib/facpri.h
U src/dist/ipf/lib/portname.c
U src/dist/ipf/lib/ipft_ef.c
U src/dist/ipf/lib/optvalue.c
U src/dist/ipf/lib/printpool_live.c
U src/dist/ipf/lib/rwlock_emul.c
U src/dist/ipf/lib/printmask.c
U src/dist/ipf/lib/printhostmap.c
U src/dist/ipf/lib/load_url.c
U src/dist/ipf/lib/kmem.h
U src/dist/ipf/lib/checkrev.c
C src/dist/ipf/lib/load_http.c
U src/dist/ipf/lib/inet_addr.c
U src/dist/ipf/lib/printhash.c
U src/dist/ipf/lib/printip.c
U src/dist/ipf/lib/verbose.c
U src/dist/ipf/lib/ipft_td.c
U src/dist/ipf/lib/load_file.c
U src/dist/ipf/lib/getsumd.c
U src/dist/ipf/lib/alist_free.c
U src/dist/ipf/lib/count4bits.c
U src/dist/ipf/lib/remove_pool.c
U src/dist/ipf/lib/binprint.c
U src/dist/ipf/lib/printpacket6.c
U src/dist/ipf/lib/printproto.c
U src/dist/ipf/NetBSD-1.2/files.oldconf-PATCH
U src/dist/ipf/NetBSD-1.2/ip_input.c-PATCH
U src/dist/ipf/NetBSD-1.2/in_proto.c-PATCH
U src/dist/ipf/NetBSD-1.2/files-PATCH
U src/dist/ipf/NetBSD-1.2/conf.c-PATCH
U src/dist/ipf/NetBSD-1.2/ip_output.c-PATCH
U src/dist/ipf/NetBSD-1.2/minstall
U src/dist/ipf/NetBSD-1.2/kinstall
U src/dist/ipf/test/dotest6
U src/dist/ipf/test/iptest
U src/dist/ipf/test/ptest
U src/dist/ipf/test/natipftest
U src/dist/ipf/test/test.format
U src/dist/ipf/test/README.TXT
U src/dist/ipf/test/mtest
U src/dist/ipf/test/logtest
U src/dist/ipf/test/vfycksum.pl
U src/dist/ipf/test/nattest
C src/dist/ipf/test/itest
C src/dist/ipf/test/Makefile
U src/dist/ipf/test/bpftest
U src/dist/ipf/test/intest
U src/dist/ipf/test/dotest
U src/dist/ipf/test/hextest
U src/dist/ipf/test/mhtest
U src/dist/ipf/test/regress/i8
U src/dist/ipf/test/regress/i2
C src/dist/ipf/test/regress/n5
U src/dist/ipf/test/regress/f10
U src/dist/ipf/test/regress/i15
U src/dist/ipf/test/regress/in3
U src/dist/ipf/test/regress/f5
U src/dist/ipf/test/regress/n14
U src/dist/ipf/test/regress/p1.ipf
U src/dist/ipf/test/regress/i20
C src/dist/ipf/test/regress/ni4.nat
U src/dist/ipf/test/regress/ni11.ipf
U src/dist/ipf/test/regress/ipv6.3
U src/dist/ipf/test/regress/ni3.nat
U src/dist/ipf/test/regress/f8
U src/dist/ipf/test/regress/ni16.ipf
U src/dist/ipf/test/regress/n13
U src/dist/ipf/test/regress/f2
U src/dist/ipf/test/regress/i12
U src/dist/ipf/test/regress/in4
U src/dist/ipf/test/regress/i18
U src/dist/ipf/test/regress/n8
U src/dist/ipf/test/regress/ni19.nat
C src/dist/ipf/test/regress/n2
U src/dist/ipf/test/regress/i5
U src/dist/ipf/test/regress/f17
U src/dist/ipf/test/regress/ni2.ipf
U src/dist/ipf/test/regress/ni23.ipf
U src/dist/ipf/test/regress/ni17.nat
U src/dist/ipf/test/regress/ni5.ipf
U src/dist/ipf/test/regress/ni10.nat
U src/dist/ipf/test/regress/f13
U src/dist/ipf/test/regress/n6
U src/dist/ipf/test/regress/i1
U src/dist/ipf/test/regress/f19
U src/dist/ipf/test/regress/i16
U src/dist/ipf/test/regress/p3.pool
U src/dist/ipf/test/regress/n17
U src/dist/ipf/test/regress/f6
U src/dist/ipf/test/regress/f1
U src/dist/ipf/test/regress/n10
U src/dist/ipf/test/regress/ni4.ipf
U src/dist/ipf/test/regress/ni11.nat
U src/dist/ipf/test/regress/ni3.ipf
U src/dist/ipf/test/regress/ni16.nat
N src/dist/ipf/test/regress/i23
N src/dist/ipf/test/regress/in7
U src/dist/ipf/test/regress/i11
U src/dist/ipf/test/regress/f14
U src/dist/ipf/test/regress/i6
U src/dist/ipf/test/regress/n1
U src/dist/ipf/test/regress/ni19.ipf
U src/dist/ipf/test/regress/bpf-f1
C src/dist/ipf/test/regress/ni2.nat
U src/dist/ipf/test/regress/ni23.nat
U src/dist/ipf/test/regress/ni5.nat
U src/dist/ipf/test/regress/ni10.ipf
U src/dist/ipf/test/regress/ni15.nat
U src/dist/ipf/test/regress/ni21.ipf
U src/dist/ipf/test/regress/p5.pool
U src/dist/ipf/test/regress/f16
U src/dist/ipf/test/regress/i4
U src/dist/ipf/test/regress/n3
U src/dist/ipf/test/regress/ni7.ipf
U src/dist/ipf/test/regress/n9
U src/dist/ipf/test/regress/ni12.nat
U src/dist/ipf/test/regress/ni9.ipf
U src/dist/ipf/test/regress/f24
U src/dist/ipf/test/regress/i21
U src/dist/ipf/test/regress/f3
C src/dist/ipf/test/regress/n12
N src/dist/ipf/test/regress/n18
U src/dist/ipf/test/regress/f9
U src/dist/ipf/test/regress/ni8.nat
U src/dist/ipf/test/regress/p1.pool
U src/dist/ipf/test/regress/ipv6.2
U src/dist/ipf/test/regress/i19
U src/dist/ipf/test/regress/in5
U src/dist/ipf/test/regress/ni6.nat
U src/dist/ipf/test/regress/i13
U src/dist/ipf/test/regress/ni13.ipf
C src/dist/ipf/test/regress/ni1.nat
U src/dist/ipf/test/regress/ni14.ipf
U src/dist/ipf/test/regress/ni20.nat
U src/dist/ipf/test/regress/in2
U src/dist/ipf/test/regress/p3.ipf
U src/dist/ipf/test/regress/i14
U src/dist/ipf/test/regress/f4
U src/dist/ipf/test/regress/ipv6.5
U src/dist/ipf/test/regress/f11
U src/dist/ipf/test/regress/n4
U src/dist/ipf/test/regress/i3
U src/dist/ipf/test/regress/ip1
U src/dist/ipf/test/regress/i9
U src/dist/ipf/test/regress/ni15.ipf
U src/dist/ipf/test/regress/ni21.nat
U src/dist/ipf/test/regress/i7
U src/dist/ipf/test/regress/f15
U src/dist/ipf/test/regress/ni7.nat
U src/dist/ipf/test/regress/ni12.ipf
U src/dist/ipf/test/regress/ni9.nat
U src/dist/ipf/test/regress/bpf1
U src/dist/ipf/test/regress/ipv6.1
U src/dist/ipf/test/regress/n11
U src/dist/ipf/test/regress/ni8.ipf
U src/dist/ipf/test/regress/l1
U src/dist/ipf/test/regress/ni6.ipf
U src/dist/ipf/test/regress/ni13.nat
U src/dist/ipf/test/regress/ni1.ipf
U src/dist/ipf/test/regress/i10
U src/dist/ipf/test/regress/ni14.nat
U src/dist/ipf/test/regress/ni20.ipf
U src/dist/ipf/test/regress/in6
U src/dist/ipf/test/regress/i17
U src/dist/ipf/test/regress/in1
U src/dist/ipf/test/regress/ipv6.6
U src/dist/ipf/test/regress/f7
U src/dist/ipf/test/regress/n16
U src/dist/ipf/test/regress/f20
U src/dist/ipf/test/regress/p2.ipf
U src/dist/ipf/test/regress/f18
U src/dist/ipf/test/regress/p5.ipf
U src/dist/ipf/test/regress/ip2
U src/dist/ipf/test/regress/n7
U src/dist/ipf/test/regress/f12
U src/dist/ipf/test/input/n14
U src/dist/ipf/test/input/ni5
U src/dist/ipf/test/input/f5
U src/dist/ipf/test/input/ni17
U src/dist/ipf/test/input/ipv6.6
U src/dist/ipf/test/input/f10
U src/dist/ipf/test/input/n5
U src/dist/ipf/test/input/n8
U src/dist/ipf/test/input/n2
U src/dist/ipf/test/input/f17
U src/dist/ipf/test/input/ni10
C src/dist/ipf/test/input/ipv6.1
U src/dist/ipf/test/input/f8
U src/dist/ipf/test/input/f2
U src/dist/ipf/test/input/p1
U src/dist/ipf/test/input/n13
U src/dist/ipf/test/input/ni8
U src/dist/ipf/test/input/ni2
U src/dist/ipf/test/input/p5
U src/dist/ipf/test/input/ni6
U src/dist/ipf/test/input/n17
U src/dist/ipf/test/input/ipv6.5
U src/dist/ipf/test/input/ni14
U src/dist/ipf/test/input/f6
U src/dist/ipf/test/input/f19
U src/dist/ipf/test/input/f13
U src/dist/ipf/test/input/n6
U src/dist/ipf/test/input/n1
U src/dist/ipf/test/input/f14
U src/dist/ipf/test/input/f1
U src/dist/ipf/test/input/ip2.data
U src/dist/ipf/test/input/ni19
U src/dist/ipf/test/input/ipv6.2
U src/dist/ipf/test/input/ni13
U src/dist/ipf/test/input/ni1
U src/dist/ipf/test/input/n10
U src/dist/ipf/test/input/ni21
U src/dist/ipf/test/input/p2
U src/dist/ipf/test/input/ni11
U src/dist/ipf/test/input/f3
U src/dist/ipf/test/input/f9
U src/dist/ipf/test/input/ni23
N src/dist/ipf/test/input/n18
U src/dist/ipf/test/input/ni3
U src/dist/ipf/test/input/ni9
U src/dist/ipf/test/input/n12
U src/dist/ipf/test/input/n3
U src/dist/ipf/test/input/f24
U src/dist/ipf/test/input/n9
U src/dist/ipf/test/input/f16
U src/dist/ipf/test/input/f11
U src/dist/ipf/test/input/n4
U src/dist/ipf/test/input/ni4
U src/dist/ipf/test/input/f4
U src/dist/ipf/test/input/ni16
U src/dist/ipf/test/input/ni12
U src/dist/ipf/test/input/ipv6.3
U src/dist/ipf/test/input/n11
U src/dist/ipf/test/input/l1
U src/dist/ipf/test/input/p3
U src/dist/ipf/test/input/ni20
U src/dist/ipf/test/input/f15
U src/dist/ipf/test/input/f12
U src/dist/ipf/test/input/f18
U src/dist/ipf/test/input/f20
U src/dist/ipf/test/input/n7
U src/dist/ipf/test/input/n16
U src/dist/ipf/test/input/ni7
U src/dist/ipf/test/input/ni15
U src/dist/ipf/test/input/f7
U src/dist/ipf/test/expected/i4
U src/dist/ipf/test/expected/f11
U src/dist/ipf/test/expected/n3
U src/dist/ipf/test/expected/ni21
U src/dist/ipf/test/expected/ip1
U src/dist/ipf/test/expected/n9
U src/dist/ipf/test/expected/ni13
U src/dist/ipf/test/expected/ni19
U src/dist/ipf/test/expected/ipv6.2
U src/dist/ipf/test/expected/f3
U src/dist/ipf/test/expected/ni4
U src/dist/ipf/test/expected/f9
U src/dist/ipf/test/expected/Makefile
U src/dist/ipf/test/expected/in2
U src/dist/ipf/test/expected/i14
U src/dist/ipf/test/expected/in5
U src/dist/ipf/test/expected/i13
U src/dist/ipf/test/expected/i21
U src/dist/ipf/test/expected/f4
U src/dist/ipf/test/expected/ni9
U src/dist/ipf/test/expected/n12
N src/dist/ipf/test/expected/n18
U src/dist/ipf/test/expected/ni3
U src/dist/ipf/test/expected/ipv6.5
U src/dist/ipf/test/expected/ni14
U src/dist/ipf/test/expected/f24
C src/dist/ipf/test/expected/n4
U src/dist/ipf/test/expected/f16
U src/dist/ipf/test/expected/i3
U src/dist/ipf/test/expected/i9
U src/dist/ipf/test/expected/f18
U src/dist/ipf/test/expected/ip2
U src/dist/ipf/test/expected/f12
U src/dist/ipf/test/expected/i7
U src/dist/ipf/test/expected/ipv6.1
U src/dist/ipf/test/expected/f20
U src/dist/ipf/test/expected/ni10
U src/dist/ipf/test/expected/ni7
U src/dist/ipf/test/expected/n16
U src/dist/ipf/test/expected/i17
U src/dist/ipf/test/expected/p3
U src/dist/ipf/test/expected/in1
U src/dist/ipf/test/expected/l1.b
U src/dist/ipf/test/expected/l1
U src/dist/ipf/test/expected/i10
U src/dist/ipf/test/expected/in6
U src/dist/ipf/test/expected/n11
U src/dist/ipf/test/expected/f7
U src/dist/ipf/test/expected/ipv6.6
U src/dist/ipf/test/expected/bpf1
U src/dist/ipf/test/expected/n7
U src/dist/ipf/test/expected/f15
U src/dist/ipf/test/expected/ni15
U src/dist/ipf/test/expected/i8
U src/dist/ipf/test/expected/i2
C src/dist/ipf/test/expected/n5
U src/dist/ipf/test/expected/f17
U src/dist/ipf/test/expected/i12
U src/dist/ipf/test/expected/in4
U src/dist/ipf/test/expected/i18
U src/dist/ipf/test/expected/i20
U src/dist/ipf/test/expected/ni2
U src/dist/ipf/test/expected/n13
U src/dist/ipf/test/expected/f5
U src/dist/ipf/test/expected/ni8
C src/dist/ipf/test/expected/ni5
U src/dist/ipf/test/expected/f8
U src/dist/ipf/test/expected/n14
U src/dist/ipf/test/expected/f2
U src/dist/ipf/test/expected/i15
U src/dist/ipf/test/expected/p1
U src/dist/ipf/test/expected/in3
U src/dist/ipf/test/expected/n8
U src/dist/ipf/test/expected/ni20
U src/dist/ipf/test/expected/f10
C src/dist/ipf/test/expected/n2
U src/dist/ipf/test/expected/i5
U src/dist/ipf/test/expected/ni12
U src/dist/ipf/test/expected/ipv6.3
U src/dist/ipf/test/expected/ni16
C src/dist/ipf/test/expected/n6
U src/dist/ipf/test/expected/f14
U src/dist/ipf/test/expected/i1
N src/dist/ipf/test/expected/in7
U src/dist/ipf/test/expected/i11
U src/dist/ipf/test/expected/p5
U src/dist/ipf/test/expected/f6
U src/dist/ipf/test/expected/n10
U src/dist/ipf/test/expected/ni1
U src/dist/ipf/test/expected/i19.dist
N src/dist/ipf/test/expected/i23
U src/dist/ipf/test/expected/bpf-f1
U src/dist/ipf/test/expected/f1
U src/dist/ipf/test/expected/n17
U src/dist/ipf/test/expected/ni6
U src/dist/ipf/test/expected/p2
U src/dist/ipf/test/expected/i16
U src/dist/ipf/test/expected/i6
U src/dist/ipf/test/expected/f13
C src/dist/ipf/test/expected/n1
U src/dist/ipf/test/expected/ni23
U src/dist/ipf/test/expected/f19
U src/dist/ipf/test/expected/ni11
U src/dist/ipf/ipsend/linux.h
U src/dist/ipf/ipsend/arp.c
U src/dist/ipf/ipsend/hpux.c
U src/dist/ipf/ipsend/sdlpi.c
U src/dist/ipf/ipsend/snit.c
U src/dist/ipf/ipsend/ipsend.c
U src/dist/ipf/ipsend/README
U src/dist/ipf/ipsend/in_var.h
U src/dist/ipf/ipsend/slinux.c
U src/dist/ipf/ipsend/ipresend.c
U src/dist/ipf/ipsend/iptest.1
U src/dist/ipf/ipsend/sockraw.c
U src/dist/ipf/ipsend/ipsend.h
U src/dist/ipf/ipsend/sirix.c
U src/dist/ipf/ipsend/sbpf.c
U src/dist/ipf/ipsend/iptest.c
U src/dist/ipf/ipsend/ipresend.1
U src/dist/ipf/ipsend/Makefile
U src/dist/ipf/ipsend/dlcommon.c
U src/dist/ipf/ipsend/ipsend.5
U src/dist/ipf/ipsend/ip_var.h
U src/dist/ipf/ipsend/dltest.h
C src/dist/ipf/ipsend/sock.c
U src/dist/ipf/ipsend/resend.c
U src/dist/ipf/ipsend/lsock.c
U src/dist/ipf/ipsend/44arp.c
C src/dist/ipf/ipsend/iptests.c
U src/dist/ipf/ipsend/ipsend.1
U src/dist/ipf/ipsend/larp.c
U src/dist/ipf/ipsend/ipsopt.c
U src/dist/ipf/ipsend/tcpip.h
U src/dist/ipf/ipsend/Crashable
U src/dist/ipf/ipsend/ip.c
C src/dist/ipf/tools/ipf_y.y
C src/dist/ipf/tools/ippool_y.y
U src/dist/ipf/tools/BNF.ipnat
U src/dist/ipf/tools/ipmon_y.y
U src/dist/ipf/tools/ipf.c
U src/dist/ipf/tools/ipsyncm.c
U src/dist/ipf/tools/ipfs.c
U src/dist/ipf/tools/ipfcomp.c
U src/dist/ipf/tools/Makefile
U src/dist/ipf/tools/ipftest.c
U src/dist/ipf/tools/BNF.ipf
C src/dist/ipf/tools/ipfstat.c
C src/dist/ipf/tools/ipmon.c
C src/dist/ipf/tools/lexer.c
U src/dist/ipf/tools/ipsyncs.c
U src/dist/ipf/tools/ipscan_y.y
U src/dist/ipf/tools/lexer.h
C src/dist/ipf/tools/ipnat_y.y
U src/dist/ipf/tools/ippool.c
U src/dist/ipf/tools/ipnat.c
U src/dist/ipf/tools/lex_var.h
U src/dist/ipf/etc/protocols
U src/dist/ipf/etc/services
U src/dist/ipf/FWTK/README.ipfilter
U src/dist/ipf/FWTK/Index
U src/dist/ipf/FWTK/fwtk_transparent.diff
U src/dist/ipf/FWTK/fwtkp
U src/dist/ipf/FWTK/README
U src/dist/ipf/FWTK/ftp-gw.diff
U src/dist/ipf/iplang/BNF
U src/dist/ipf/iplang/iplang.h
U src/dist/ipf/iplang/iplang.tst
U src/dist/ipf/iplang/iplang_l.l
U src/dist/ipf/iplang/Makefile
U src/dist/ipf/iplang/iplang_y.y

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

        cvs checkout -jDARRENR:yesterday -jDARRENR src/dist/ipf