svn commit: r254219 - vendor-sys/ipfilter/dist/netinet vendor/ipfilter/dist vendor/ipfilter/dist/4bsd vendor/ipfilter/dist/AIX vendor/ipfilter/dist/BSD vendor/ipfilter/dist/BSDOS vendor/ipfilter/di...
Cy Schubert
cy at FreeBSD.org
Sun Aug 11 14:28:47 UTC 2013
Author: cy
Date: Sun Aug 11 14:28:45 2013
New Revision: 254219
URL: http://svnweb.freebsd.org/changeset/base/254219
Log:
Import IP-Filter 5.1.2 into vendor branches using the existing license that
the current version of IP-Filter in FreeBSD is under as per email received
from Darren Reed on Mon, 08 Jul 2013 23:54:16 +1000.
Approved by: glebius (Mentor), Darren Reed <darrenr at reed.wattle.id.au>
Deleted:
vendor-sys/ipfilter/dist/netinet/QNX_OCL.txt
vendor-sys/ipfilter/dist/netinet/ip_h323_pxy.c
vendor-sys/ipfilter/dist/netinet/y
vendor-sys/ipfilter/dist/netinet/y.pub
Modified:
vendor-sys/ipfilter/dist/netinet/IPFILTER.LICENCE
vendor-sys/ipfilter/dist/netinet/fil.c
vendor-sys/ipfilter/dist/netinet/ip_auth.c
vendor-sys/ipfilter/dist/netinet/ip_auth.h
vendor-sys/ipfilter/dist/netinet/ip_compat.h
vendor-sys/ipfilter/dist/netinet/ip_fil.c
vendor-sys/ipfilter/dist/netinet/ip_fil.h
vendor-sys/ipfilter/dist/netinet/ip_fil_freebsd.c
vendor-sys/ipfilter/dist/netinet/ip_frag.c
vendor-sys/ipfilter/dist/netinet/ip_frag.h
vendor-sys/ipfilter/dist/netinet/ip_ftp_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_htable.c
vendor-sys/ipfilter/dist/netinet/ip_htable.h
vendor-sys/ipfilter/dist/netinet/ip_ipsec_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_irc_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_log.c
vendor-sys/ipfilter/dist/netinet/ip_lookup.c
vendor-sys/ipfilter/dist/netinet/ip_lookup.h
vendor-sys/ipfilter/dist/netinet/ip_nat.c
vendor-sys/ipfilter/dist/netinet/ip_nat.h
vendor-sys/ipfilter/dist/netinet/ip_netbios_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_pool.c
vendor-sys/ipfilter/dist/netinet/ip_pool.h
vendor-sys/ipfilter/dist/netinet/ip_pptp_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_proxy.c
vendor-sys/ipfilter/dist/netinet/ip_proxy.h
vendor-sys/ipfilter/dist/netinet/ip_raudio_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_rcmd_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_rpcb_pxy.c
vendor-sys/ipfilter/dist/netinet/ip_rules.c
vendor-sys/ipfilter/dist/netinet/ip_rules.h
vendor-sys/ipfilter/dist/netinet/ip_scan.c
vendor-sys/ipfilter/dist/netinet/ip_scan.h
vendor-sys/ipfilter/dist/netinet/ip_state.c
vendor-sys/ipfilter/dist/netinet/ip_state.h
vendor-sys/ipfilter/dist/netinet/ip_sync.c
vendor-sys/ipfilter/dist/netinet/ip_sync.h
vendor-sys/ipfilter/dist/netinet/ipl.h
vendor-sys/ipfilter/dist/netinet/mlfk_ipl.c
Changes in other areas also in this revision:
Added:
vendor/ipfilter/dist/4bsd/
vendor/ipfilter/dist/4bsd/conf.c.diffs
vendor/ipfilter/dist/4bsd/files.diffs
vendor/ipfilter/dist/4bsd/files.newconf.diffs
vendor/ipfilter/dist/4bsd/files.oldconf.diffs
vendor/ipfilter/dist/4bsd/filez.diffs
vendor/ipfilter/dist/4bsd/ip_input.c.diffs
vendor/ipfilter/dist/4bsd/ip_output.c.diffs
vendor/ipfilter/dist/4bsd/kinstall (contents, props changed)
vendor/ipfilter/dist/AIX/
vendor/ipfilter/dist/AIX/Makefile (contents, props changed)
vendor/ipfilter/dist/AIX/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/AIX/aix_cfg_ipf.c
vendor/ipfilter/dist/AIX/bootbits.sh (contents, props changed)
vendor/ipfilter/dist/AIX/cpurev (contents, props changed)
vendor/ipfilter/dist/AIX/ipfkext.exp
vendor/ipfilter/dist/AIX/ipfkext.map
vendor/ipfilter/dist/BSD/upgrade (contents, props changed)
vendor/ipfilter/dist/BSDOS/
vendor/ipfilter/dist/BSDOS/files.diffs
vendor/ipfilter/dist/BSDOS/ioconf.c.i386.diffs
vendor/ipfilter/dist/BSDOS/ip_input.c.diffs
vendor/ipfilter/dist/BSDOS/ip_output.c.diffs
vendor/ipfilter/dist/BSDOS/kinstall (contents, props changed)
vendor/ipfilter/dist/BSDOS3/
vendor/ipfilter/dist/BSDOS3/OBJS/
vendor/ipfilter/dist/BSDOS3/OBJS/README
vendor/ipfilter/dist/BSDOS3/OBJS/files
vendor/ipfilter/dist/BSDOS3/OBJS/ioconf.c
vendor/ipfilter/dist/BSDOS3/files.diffs
vendor/ipfilter/dist/BSDOS3/in_proto.c.diffs
vendor/ipfilter/dist/BSDOS3/ioconf.c.i386.diffs
vendor/ipfilter/dist/BSDOS3/ip_input.c.diffs
vendor/ipfilter/dist/BSDOS3/ip_output.c.diffs
vendor/ipfilter/dist/BSDOS3/kinstall
vendor/ipfilter/dist/BSDOS3/unkinstall
vendor/ipfilter/dist/BSDOS4/
vendor/ipfilter/dist/BSDOS4/files.diffs
vendor/ipfilter/dist/BSDOS4/in_proto.c.diffs
vendor/ipfilter/dist/BSDOS4/ioconf.c.i386.diffs
vendor/ipfilter/dist/BSDOS4/ip_input.c.diffs
vendor/ipfilter/dist/BSDOS4/ip_output.c.diffs
vendor/ipfilter/dist/BSDOS4/kinstall
vendor/ipfilter/dist/BSDOS4/unkinstall
vendor/ipfilter/dist/HPUX/
vendor/ipfilter/dist/HPUX/INSTALL.TXT
vendor/ipfilter/dist/HPUX/IPF-ALL/
vendor/ipfilter/dist/HPUX/IPF-ALL/checkinstall (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/checkremove (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/description (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/postinstall (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/postremove (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/preinstall (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/preremove (contents, props changed)
vendor/ipfilter/dist/HPUX/IPF-ALL/verify (contents, props changed)
vendor/ipfilter/dist/HPUX/Makefile (contents, props changed)
vendor/ipfilter/dist/HPUX/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/HPUX/cpurev (contents, props changed)
vendor/ipfilter/dist/HPUX/ethers.c
vendor/ipfilter/dist/HPUX/installmod (contents, props changed)
vendor/ipfilter/dist/HPUX/ipf.psf.dist
vendor/ipfilter/dist/HPUX/ipfboot
vendor/ipfilter/dist/HPUX/ipfconf
vendor/ipfilter/dist/HPUX/makeargs (contents, props changed)
vendor/ipfilter/dist/HPUX/master
vendor/ipfilter/dist/HPUX/space.h
vendor/ipfilter/dist/HPUX/system
vendor/ipfilter/dist/INSTALL.Tru64
vendor/ipfilter/dist/IRIX/
vendor/ipfilter/dist/IRIX/Makefile (contents, props changed)
vendor/ipfilter/dist/IRIX/Makefile.common (contents, props changed)
vendor/ipfilter/dist/IRIX/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/IRIX/Makefile.ipsend.std (contents, props changed)
vendor/ipfilter/dist/IRIX/Makefile.std (contents, props changed)
vendor/ipfilter/dist/IRIX/cpurev (contents, props changed)
vendor/ipfilter/dist/IRIX/getkflags (contents, props changed)
vendor/ipfilter/dist/IRIX/getrev (contents, props changed)
vendor/ipfilter/dist/IRIX/ipfboot
vendor/ipfilter/dist/IRIX/ipl
vendor/ipfilter/dist/Linux/
vendor/ipfilter/dist/Linux/Makefile (contents, props changed)
vendor/ipfilter/dist/Linux/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/Linux/Makefile.kbuild (contents, props changed)
vendor/ipfilter/dist/Linux/Tips_SuSE91.txt
vendor/ipfilter/dist/Linux/howchkconfig (contents, props changed)
vendor/ipfilter/dist/Linux/initscript
vendor/ipfilter/dist/Linux/ipf-linux.h
vendor/ipfilter/dist/Linux/ipfilter (contents, props changed)
vendor/ipfilter/dist/Linux/ipfilter-redhat (contents, props changed)
vendor/ipfilter/dist/Linux/ipfilter-suse (contents, props changed)
vendor/ipfilter/dist/Linux/ipfilter.spec.dist
vendor/ipfilter/dist/Linux/linuxversion (contents, props changed)
vendor/ipfilter/dist/Linux/minstall (contents, props changed)
vendor/ipfilter/dist/Linux/mkinit (contents, props changed)
vendor/ipfilter/dist/NetBSD/
vendor/ipfilter/dist/NetBSD-1.2/
vendor/ipfilter/dist/NetBSD-1.2/conf.c-PATCH
vendor/ipfilter/dist/NetBSD-1.2/files-PATCH
vendor/ipfilter/dist/NetBSD-1.2/files.oldconf-PATCH
vendor/ipfilter/dist/NetBSD-1.2/in_proto.c-PATCH
vendor/ipfilter/dist/NetBSD-1.2/ip_input.c-PATCH
vendor/ipfilter/dist/NetBSD-1.2/ip_output.c-PATCH
vendor/ipfilter/dist/NetBSD-1.2/kinstall (contents, props changed)
vendor/ipfilter/dist/NetBSD-1.2/minstall (contents, props changed)
vendor/ipfilter/dist/NetBSD/conf.c.diffs
vendor/ipfilter/dist/NetBSD/conf.c.old.diffs
vendor/ipfilter/dist/NetBSD/files.diffs
vendor/ipfilter/dist/NetBSD/files.newconf.diffs
vendor/ipfilter/dist/NetBSD/files.oldconf.diffs
vendor/ipfilter/dist/NetBSD/filez.diffs
vendor/ipfilter/dist/NetBSD/in_proto.c.diffs
vendor/ipfilter/dist/NetBSD/in_proto.c.old.diffs
vendor/ipfilter/dist/NetBSD/ip_input.c.diffs
vendor/ipfilter/dist/NetBSD/ip_output.c.diffs
vendor/ipfilter/dist/NetBSD/kinstall (contents, props changed)
vendor/ipfilter/dist/NetBSD/minstall (contents, props changed)
vendor/ipfilter/dist/NetBSD/unkinstall (contents, props changed)
vendor/ipfilter/dist/NetBSD/unminstall (contents, props changed)
vendor/ipfilter/dist/OSF/
vendor/ipfilter/dist/OSF/Makefile (contents, props changed)
vendor/ipfilter/dist/OSF/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/OSF/cpurev (contents, props changed)
vendor/ipfilter/dist/OSF/ipfboot
vendor/ipfilter/dist/OSF/sysconfigtab
vendor/ipfilter/dist/OpenBSD/
vendor/ipfilter/dist/OpenBSD-2/
vendor/ipfilter/dist/OpenBSD-2/2.9-IPv6.diffs
vendor/ipfilter/dist/OpenBSD-2/files.diffs
vendor/ipfilter/dist/OpenBSD-2/ipf-fastroute.patch-2.7
vendor/ipfilter/dist/OpenBSD-2/kinstall (contents, props changed)
vendor/ipfilter/dist/OpenBSD-2/mknewipf.sh
vendor/ipfilter/dist/OpenBSD-2/patch.1
vendor/ipfilter/dist/OpenBSD-2/unkinstall
vendor/ipfilter/dist/OpenBSD-3/
vendor/ipfilter/dist/OpenBSD-3/3.0-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.0-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.0-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/3.1-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.1-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.1-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/3.2-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.2-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.2-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/3.3-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.3-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.3-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/3.4-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.4-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.4-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/3.5-MAKEDEV-diffs
vendor/ipfilter/dist/OpenBSD-3/3.5-rc-diffs
vendor/ipfilter/dist/OpenBSD-3/3.5-sys-diffs
vendor/ipfilter/dist/OpenBSD-3/README.3_0
vendor/ipfilter/dist/OpenBSD-3/README.3_1
vendor/ipfilter/dist/OpenBSD-3/README.3_2
vendor/ipfilter/dist/OpenBSD-3/README.3_3
vendor/ipfilter/dist/OpenBSD-3/README.3_4
vendor/ipfilter/dist/OpenBSD-3/README.3_5
vendor/ipfilter/dist/OpenBSD-3/fixdist-3.0 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/fixdist-3.2 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/fixdist-3.3 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/fixdist-3.4 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/fixdist-3.5 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.0 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.1 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.2 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.3 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.4 (contents, props changed)
vendor/ipfilter/dist/OpenBSD-3/makedevs-3.5 (contents, props changed)
vendor/ipfilter/dist/OpenBSD/files.diffs
vendor/ipfilter/dist/OpenBSD/kinstall (contents, props changed)
vendor/ipfilter/dist/OpenBSD/mknewipf.sh
vendor/ipfilter/dist/OpenBSD/patch.1
vendor/ipfilter/dist/OpenBSD/unkinstall
vendor/ipfilter/dist/SunOS4/
vendor/ipfilter/dist/SunOS4/Makefile (contents, props changed)
vendor/ipfilter/dist/SunOS4/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/SunOS4/conf.c.diff
vendor/ipfilter/dist/SunOS4/files.cmn.diff
vendor/ipfilter/dist/SunOS4/in_proto.c.diffs
vendor/ipfilter/dist/SunOS4/kinstall (contents, props changed)
vendor/ipfilter/dist/SunOS4/minstall (contents, props changed)
vendor/ipfilter/dist/SunOS4/mkroutes (contents, props changed)
vendor/ipfilter/dist/SunOS4/rc.ipf (contents, props changed)
vendor/ipfilter/dist/SunOS4/reload (contents, props changed)
vendor/ipfilter/dist/SunOS4/unkinstall (contents, props changed)
vendor/ipfilter/dist/SunOS4/unminstall (contents, props changed)
vendor/ipfilter/dist/SunOS5/
vendor/ipfilter/dist/SunOS5/Makefile (contents, props changed)
vendor/ipfilter/dist/SunOS5/Makefile.ipsend (contents, props changed)
vendor/ipfilter/dist/SunOS5/copyright
vendor/ipfilter/dist/SunOS5/depend
vendor/ipfilter/dist/SunOS5/ipf.conf
vendor/ipfilter/dist/SunOS5/ipfboot
vendor/ipfilter/dist/SunOS5/makeargs (contents, props changed)
vendor/ipfilter/dist/SunOS5/mblk_misc.c
vendor/ipfilter/dist/SunOS5/pkginfo
vendor/ipfilter/dist/SunOS5/postinstall (contents, props changed)
vendor/ipfilter/dist/SunOS5/postremove (contents, props changed)
vendor/ipfilter/dist/SunOS5/preremove (contents, props changed)
vendor/ipfilter/dist/SunOS5/prototype
vendor/ipfilter/dist/SunOS5/prototype32
vendor/ipfilter/dist/SunOS5/prototype64
vendor/ipfilter/dist/SunOS5/prototype_amd64
vendor/ipfilter/dist/SunOS5/prototype_ia32
vendor/ipfilter/dist/SunOS5/replace (contents, props changed)
vendor/ipfilter/dist/SunOS5/solinstall (contents, props changed)
vendor/ipfilter/dist/SunOS5/uninstall (contents, props changed)
vendor/ipfilter/dist/WhatsNew50.txt
vendor/ipfilter/dist/arc4random.c
vendor/ipfilter/dist/hpux.c
vendor/ipfilter/dist/ip_dns_pxy.c
vendor/ipfilter/dist/ip_dstlist.c
vendor/ipfilter/dist/ip_dstlist.h
vendor/ipfilter/dist/ip_fil_aix.c
vendor/ipfilter/dist/ip_fil_compat.c
vendor/ipfilter/dist/ip_fil_hpux.c
vendor/ipfilter/dist/ip_fil_irix.c
vendor/ipfilter/dist/ip_fil_linux.c
vendor/ipfilter/dist/ip_fil_netbsd.c
vendor/ipfilter/dist/ip_fil_openbsd.c
vendor/ipfilter/dist/ip_fil_osf.c
vendor/ipfilter/dist/ip_fil_solaris.c
vendor/ipfilter/dist/ip_fil_sunos4.c
vendor/ipfilter/dist/ip_nat6.c
vendor/ipfilter/dist/ip_tftp_pxy.c
vendor/ipfilter/dist/ipf_rb.h
vendor/ipfilter/dist/lib/allocmbt.c
vendor/ipfilter/dist/lib/assigndefined.c
vendor/ipfilter/dist/lib/connecttcp.c
vendor/ipfilter/dist/lib/dupmbt.c
vendor/ipfilter/dist/lib/familyname.c
vendor/ipfilter/dist/lib/findword.c
vendor/ipfilter/dist/lib/freembt.c
vendor/ipfilter/dist/lib/ftov.c
vendor/ipfilter/dist/lib/geticmptype.c
vendor/ipfilter/dist/lib/icmptypename.c
vendor/ipfilter/dist/lib/icmptypes.c
vendor/ipfilter/dist/lib/interror.c
vendor/ipfilter/dist/lib/ipf_perror.c
vendor/ipfilter/dist/lib/load_dstlist.c
vendor/ipfilter/dist/lib/load_dstlistnode.c
vendor/ipfilter/dist/lib/mb_hexdump.c
vendor/ipfilter/dist/lib/msgdsize.c
vendor/ipfilter/dist/lib/parsefields.c
vendor/ipfilter/dist/lib/parseipfexpr.c
vendor/ipfilter/dist/lib/parsewhoisline.c
vendor/ipfilter/dist/lib/poolio.c
vendor/ipfilter/dist/lib/prependmbt.c
vendor/ipfilter/dist/lib/printactiveaddr.c
vendor/ipfilter/dist/lib/printaddr.c
vendor/ipfilter/dist/lib/printdstl_live.c
vendor/ipfilter/dist/lib/printdstlist.c
vendor/ipfilter/dist/lib/printdstlistdata.c
vendor/ipfilter/dist/lib/printdstlistnode.c
vendor/ipfilter/dist/lib/printdstlistpolicy.c
vendor/ipfilter/dist/lib/printfieldhdr.c
vendor/ipfilter/dist/lib/printhost.c
vendor/ipfilter/dist/lib/printipfexpr.c
vendor/ipfilter/dist/lib/printiphdr.c
vendor/ipfilter/dist/lib/printlookup.c
vendor/ipfilter/dist/lib/printnataddr.c
vendor/ipfilter/dist/lib/printnatfield.c
vendor/ipfilter/dist/lib/printnatside.c
vendor/ipfilter/dist/lib/printpoolfield.c
vendor/ipfilter/dist/lib/printstatefields.c
vendor/ipfilter/dist/lib/printtcpflags.c
vendor/ipfilter/dist/lib/printunit.c
vendor/ipfilter/dist/lib/save_execute.c
vendor/ipfilter/dist/lib/save_file.c
vendor/ipfilter/dist/lib/save_nothing.c
vendor/ipfilter/dist/lib/save_syslog.c
vendor/ipfilter/dist/lib/save_v1trap.c
vendor/ipfilter/dist/lib/save_v2trap.c
vendor/ipfilter/dist/lib/vtof.c
vendor/ipfilter/dist/linux.c
vendor/ipfilter/dist/mln_rule.c
vendor/ipfilter/dist/mlo_ipl.c
vendor/ipfilter/dist/mlo_rule.c
vendor/ipfilter/dist/mls_rule.c
vendor/ipfilter/dist/mlso_rule.c
vendor/ipfilter/dist/radix_ipf.c
vendor/ipfilter/dist/sys/
vendor/ipfilter/dist/sys/tree.h
vendor/ipfilter/dist/test/e4to6
vendor/ipfilter/dist/test/expected/.cvsignore
vendor/ipfilter/dist/test/expected/f21
vendor/ipfilter/dist/test/expected/f22
vendor/ipfilter/dist/test/expected/f25
vendor/ipfilter/dist/test/expected/f26
vendor/ipfilter/dist/test/expected/f27
vendor/ipfilter/dist/test/expected/f28
vendor/ipfilter/dist/test/expected/f29
vendor/ipfilter/dist/test/expected/f30
vendor/ipfilter/dist/test/expected/i22
vendor/ipfilter/dist/test/expected/i23
vendor/ipfilter/dist/test/expected/in100
vendor/ipfilter/dist/test/expected/in101
vendor/ipfilter/dist/test/expected/in102
vendor/ipfilter/dist/test/expected/in7
vendor/ipfilter/dist/test/expected/ip3
vendor/ipfilter/dist/test/expected/ipv6.4
vendor/ipfilter/dist/test/expected/n100
vendor/ipfilter/dist/test/expected/n101
vendor/ipfilter/dist/test/expected/n102
vendor/ipfilter/dist/test/expected/n103
vendor/ipfilter/dist/test/expected/n104
vendor/ipfilter/dist/test/expected/n105
vendor/ipfilter/dist/test/expected/n106
vendor/ipfilter/dist/test/expected/n11_6
vendor/ipfilter/dist/test/expected/n12_6
vendor/ipfilter/dist/test/expected/n13_6
vendor/ipfilter/dist/test/expected/n14_6
vendor/ipfilter/dist/test/expected/n15
vendor/ipfilter/dist/test/expected/n15_6
vendor/ipfilter/dist/test/expected/n17
vendor/ipfilter/dist/test/expected/n18
vendor/ipfilter/dist/test/expected/n1_6
vendor/ipfilter/dist/test/expected/n200
vendor/ipfilter/dist/test/expected/n2_6
vendor/ipfilter/dist/test/expected/n4_6
vendor/ipfilter/dist/test/expected/n5_6
vendor/ipfilter/dist/test/expected/n6_6
vendor/ipfilter/dist/test/expected/n7_6
vendor/ipfilter/dist/test/expected/n8_6
vendor/ipfilter/dist/test/expected/n9_6
vendor/ipfilter/dist/test/expected/ni17
vendor/ipfilter/dist/test/expected/ni18
vendor/ipfilter/dist/test/expected/p10
vendor/ipfilter/dist/test/expected/p11
vendor/ipfilter/dist/test/expected/p12
vendor/ipfilter/dist/test/expected/p13
vendor/ipfilter/dist/test/expected/p4
vendor/ipfilter/dist/test/expected/p6
vendor/ipfilter/dist/test/expected/p7
vendor/ipfilter/dist/test/expected/p9
vendor/ipfilter/dist/test/h4to6
vendor/ipfilter/dist/test/i4to6
vendor/ipfilter/dist/test/input/f21
vendor/ipfilter/dist/test/input/f22
vendor/ipfilter/dist/test/input/f25
vendor/ipfilter/dist/test/input/f26
vendor/ipfilter/dist/test/input/f27
vendor/ipfilter/dist/test/input/f28
vendor/ipfilter/dist/test/input/f29
vendor/ipfilter/dist/test/input/f30
vendor/ipfilter/dist/test/input/ipv6.4
vendor/ipfilter/dist/test/input/n100
vendor/ipfilter/dist/test/input/n101
vendor/ipfilter/dist/test/input/n102
vendor/ipfilter/dist/test/input/n103
vendor/ipfilter/dist/test/input/n104
vendor/ipfilter/dist/test/input/n105
vendor/ipfilter/dist/test/input/n106
vendor/ipfilter/dist/test/input/n10_6
vendor/ipfilter/dist/test/input/n11_6
vendor/ipfilter/dist/test/input/n12_6
vendor/ipfilter/dist/test/input/n13_6
vendor/ipfilter/dist/test/input/n14_6
vendor/ipfilter/dist/test/input/n15
vendor/ipfilter/dist/test/input/n15_6
vendor/ipfilter/dist/test/input/n17
vendor/ipfilter/dist/test/input/n17_6
vendor/ipfilter/dist/test/input/n18
vendor/ipfilter/dist/test/input/n1_6
vendor/ipfilter/dist/test/input/n200
vendor/ipfilter/dist/test/input/n2_6
vendor/ipfilter/dist/test/input/n4_6
vendor/ipfilter/dist/test/input/n5_6
vendor/ipfilter/dist/test/input/n6_6
vendor/ipfilter/dist/test/input/n7_6
vendor/ipfilter/dist/test/input/n8_6
vendor/ipfilter/dist/test/input/n9_6
vendor/ipfilter/dist/test/input/ni18
vendor/ipfilter/dist/test/input/p10
vendor/ipfilter/dist/test/input/p11
vendor/ipfilter/dist/test/input/p12
vendor/ipfilter/dist/test/input/p13
vendor/ipfilter/dist/test/input/p4
vendor/ipfilter/dist/test/input/p6
vendor/ipfilter/dist/test/input/p7
vendor/ipfilter/dist/test/input/p9
vendor/ipfilter/dist/test/ipflib.sh
vendor/ipfilter/dist/test/regress/f21
vendor/ipfilter/dist/test/regress/f22
vendor/ipfilter/dist/test/regress/f25
vendor/ipfilter/dist/test/regress/f26
vendor/ipfilter/dist/test/regress/f27
vendor/ipfilter/dist/test/regress/f28.ipf
vendor/ipfilter/dist/test/regress/f28.pool
vendor/ipfilter/dist/test/regress/f29.ipf
vendor/ipfilter/dist/test/regress/f29.pool
vendor/ipfilter/dist/test/regress/f30
vendor/ipfilter/dist/test/regress/i22
vendor/ipfilter/dist/test/regress/i23
vendor/ipfilter/dist/test/regress/in100
vendor/ipfilter/dist/test/regress/in101
vendor/ipfilter/dist/test/regress/in102
vendor/ipfilter/dist/test/regress/in7
vendor/ipfilter/dist/test/regress/ip3
vendor/ipfilter/dist/test/regress/ipv6.4
vendor/ipfilter/dist/test/regress/n100
vendor/ipfilter/dist/test/regress/n101
vendor/ipfilter/dist/test/regress/n102
vendor/ipfilter/dist/test/regress/n103
vendor/ipfilter/dist/test/regress/n104
vendor/ipfilter/dist/test/regress/n105
vendor/ipfilter/dist/test/regress/n106
vendor/ipfilter/dist/test/regress/n10_6
vendor/ipfilter/dist/test/regress/n11_6
vendor/ipfilter/dist/test/regress/n12_6
vendor/ipfilter/dist/test/regress/n13_6
vendor/ipfilter/dist/test/regress/n14_6
vendor/ipfilter/dist/test/regress/n15
vendor/ipfilter/dist/test/regress/n15_6
vendor/ipfilter/dist/test/regress/n16_6
vendor/ipfilter/dist/test/regress/n17
vendor/ipfilter/dist/test/regress/n17_6
vendor/ipfilter/dist/test/regress/n18
vendor/ipfilter/dist/test/regress/n1_6
vendor/ipfilter/dist/test/regress/n200
vendor/ipfilter/dist/test/regress/n2_6
vendor/ipfilter/dist/test/regress/n4_6
vendor/ipfilter/dist/test/regress/n5_6
vendor/ipfilter/dist/test/regress/n6_6
vendor/ipfilter/dist/test/regress/n7_6
vendor/ipfilter/dist/test/regress/n8_6
vendor/ipfilter/dist/test/regress/n9_6
vendor/ipfilter/dist/test/regress/ni17.ipf
vendor/ipfilter/dist/test/regress/ni18.ipf
vendor/ipfilter/dist/test/regress/ni18.nat
vendor/ipfilter/dist/test/regress/p10.nat
vendor/ipfilter/dist/test/regress/p10.pool
vendor/ipfilter/dist/test/regress/p11.nat
vendor/ipfilter/dist/test/regress/p11.pool
vendor/ipfilter/dist/test/regress/p12.nat
vendor/ipfilter/dist/test/regress/p12.pool
vendor/ipfilter/dist/test/regress/p13.ipf
vendor/ipfilter/dist/test/regress/p13.pool
vendor/ipfilter/dist/test/regress/p4.nat
vendor/ipfilter/dist/test/regress/p4.pool
vendor/ipfilter/dist/test/regress/p6.ipf
vendor/ipfilter/dist/test/regress/p6.pool
vendor/ipfilter/dist/test/regress/p6.whois
vendor/ipfilter/dist/test/regress/p7.nat
vendor/ipfilter/dist/test/regress/p7.pool
vendor/ipfilter/dist/test/regress/p9.nat
vendor/ipfilter/dist/test/regress/p9.pool
vendor/ipfilter/dist/tools/ipfsyncd.c
vendor/ipfilter/dist/tru64.c
Deleted:
vendor/ipfilter/dist/BSD/.cvsignore
vendor/ipfilter/dist/FWTK/FWTK.sed
vendor/ipfilter/dist/FWTK/fwtk-2.1-transparency.txt
vendor/ipfilter/dist/FWTK/tproxy.diff
vendor/ipfilter/dist/FreeBSD-4.0/ipv6-patch
vendor/ipfilter/dist/QNX_OCL.txt
vendor/ipfilter/dist/UPGRADE_NOTICE
vendor/ipfilter/dist/bpf-ipf.h
vendor/ipfilter/dist/bpf.h
vendor/ipfilter/dist/bpf_filter.c
vendor/ipfilter/dist/buildlinux
vendor/ipfilter/dist/common.c
vendor/ipfilter/dist/etc/etc.sed
vendor/ipfilter/dist/facpri.c
vendor/ipfilter/dist/facpri.h
vendor/ipfilter/dist/fils.c
vendor/ipfilter/dist/inet_addr.c
vendor/ipfilter/dist/ip_h323_pxy.c
vendor/ipfilter/dist/ip_lfil.c
vendor/ipfilter/dist/ip_msnrpc_pxy.c
vendor/ipfilter/dist/ip_sfil.c
vendor/ipfilter/dist/ipf.c
vendor/ipfilter/dist/ipfs.c
vendor/ipfilter/dist/ipft_ef.c
vendor/ipfilter/dist/ipft_hx.c
vendor/ipfilter/dist/ipft_pc.c
vendor/ipfilter/dist/ipft_sn.c
vendor/ipfilter/dist/ipft_td.c
vendor/ipfilter/dist/ipft_tx.c
vendor/ipfilter/dist/ipl_ldev.c
vendor/ipfilter/dist/iplang/.cvsignore
vendor/ipfilter/dist/ipmon.c
vendor/ipfilter/dist/ipnat.c
vendor/ipfilter/dist/ipsd/ip_compat.h
vendor/ipfilter/dist/ipsd/ipsd.sed
vendor/ipfilter/dist/ipsend/.cvsignore
vendor/ipfilter/dist/ipsend/README
vendor/ipfilter/dist/ipsend/hpux.c
vendor/ipfilter/dist/ipsend/in_var.h
vendor/ipfilter/dist/ipsend/ip_compat.h
vendor/ipfilter/dist/ipsend/ip_var.h
vendor/ipfilter/dist/ipsend/ipsend.sed
vendor/ipfilter/dist/ipsend/tcpip.h
vendor/ipfilter/dist/ipsend/ultrix.c
vendor/ipfilter/dist/ipt.c
vendor/ipfilter/dist/kmem.c
vendor/ipfilter/dist/lib/addkeep.c
vendor/ipfilter/dist/lib/extras.c
vendor/ipfilter/dist/lib/getline.c
vendor/ipfilter/dist/lib/hexdump.c
vendor/ipfilter/dist/lib/hostmask.c
vendor/ipfilter/dist/lib/hostnum.c
vendor/ipfilter/dist/lib/inet_addr.c
vendor/ipfilter/dist/lib/ipft_ef.c
vendor/ipfilter/dist/lib/ipft_sn.c
vendor/ipfilter/dist/lib/ipft_td.c
vendor/ipfilter/dist/lib/loglevel.c
vendor/ipfilter/dist/lib/make_range.c
vendor/ipfilter/dist/lib/natparse.c
vendor/ipfilter/dist/lib/parse.c
vendor/ipfilter/dist/lib/portnum.c
vendor/ipfilter/dist/lib/ports.c
vendor/ipfilter/dist/lib/ratoi.c
vendor/ipfilter/dist/lib/ratoui.c
vendor/ipfilter/dist/lib/tcp_flags.c
vendor/ipfilter/dist/lib/to_interface.c
vendor/ipfilter/dist/man/ipf.1
vendor/ipfilter/dist/man/ipnat.1
vendor/ipfilter/dist/man/man.sed
vendor/ipfilter/dist/misc.c
vendor/ipfilter/dist/natparse.c
vendor/ipfilter/dist/net/.cvsignore
vendor/ipfilter/dist/opt.c
vendor/ipfilter/dist/opt_inet6.h
vendor/ipfilter/dist/parse.c
vendor/ipfilter/dist/pcap.h
vendor/ipfilter/dist/printnat.c
vendor/ipfilter/dist/printstate.c
vendor/ipfilter/dist/radix.c
vendor/ipfilter/dist/relay.c
vendor/ipfilter/dist/rules/.cvsignore
vendor/ipfilter/dist/rules/rules.sed
vendor/ipfilter/dist/samples/.cvsignore
vendor/ipfilter/dist/test/expected/1
vendor/ipfilter/dist/test/expected/10
vendor/ipfilter/dist/test/expected/11
vendor/ipfilter/dist/test/expected/12
vendor/ipfilter/dist/test/expected/14
vendor/ipfilter/dist/test/expected/2
vendor/ipfilter/dist/test/expected/3
vendor/ipfilter/dist/test/expected/4
vendor/ipfilter/dist/test/expected/5
vendor/ipfilter/dist/test/expected/6
vendor/ipfilter/dist/test/expected/7
vendor/ipfilter/dist/test/expected/8
vendor/ipfilter/dist/test/expected/9
vendor/ipfilter/dist/test/expected/expected.sed
vendor/ipfilter/dist/test/expected/i19
vendor/ipfilter/dist/test/hextest
vendor/ipfilter/dist/test/input/1
vendor/ipfilter/dist/test/input/10
vendor/ipfilter/dist/test/input/11
vendor/ipfilter/dist/test/input/12
vendor/ipfilter/dist/test/input/13
vendor/ipfilter/dist/test/input/14
vendor/ipfilter/dist/test/input/2
vendor/ipfilter/dist/test/input/3
vendor/ipfilter/dist/test/input/4
vendor/ipfilter/dist/test/input/5
vendor/ipfilter/dist/test/input/6
vendor/ipfilter/dist/test/input/7
vendor/ipfilter/dist/test/input/8
vendor/ipfilter/dist/test/input/9
vendor/ipfilter/dist/test/input/input.sed
vendor/ipfilter/dist/test/input/ipf6-1
vendor/ipfilter/dist/test/mhtest
vendor/ipfilter/dist/test/regress/1
vendor/ipfilter/dist/test/regress/10
vendor/ipfilter/dist/test/regress/11
vendor/ipfilter/dist/test/regress/12
vendor/ipfilter/dist/test/regress/13
vendor/ipfilter/dist/test/regress/14
vendor/ipfilter/dist/test/regress/2
vendor/ipfilter/dist/test/regress/3
vendor/ipfilter/dist/test/regress/4
vendor/ipfilter/dist/test/regress/5
vendor/ipfilter/dist/test/regress/6
vendor/ipfilter/dist/test/regress/7
vendor/ipfilter/dist/test/regress/8
vendor/ipfilter/dist/test/regress/9
vendor/ipfilter/dist/test/regress/ipf6-1
vendor/ipfilter/dist/test/regress/regress.sed
vendor/ipfilter/dist/test/test.sed
Modified:
vendor/ipfilter/dist/.cvsignore
vendor/ipfilter/dist/BNF
vendor/ipfilter/dist/BSD/Makefile
vendor/ipfilter/dist/BSD/Makefile.ipsend
vendor/ipfilter/dist/BSD/ipfadm-rcd
vendor/ipfilter/dist/BSD/kupgrade
vendor/ipfilter/dist/FAQ.FreeBSD
vendor/ipfilter/dist/FWTK/ftp-gw.diff
vendor/ipfilter/dist/FWTK/fwtk_transparent.diff
vendor/ipfilter/dist/FreeBSD-2.2/kinstall
vendor/ipfilter/dist/FreeBSD-3/INST.FreeBSD-3
vendor/ipfilter/dist/FreeBSD-3/kinstall
vendor/ipfilter/dist/FreeBSD-4.0/INST.FreeBSD-4
vendor/ipfilter/dist/FreeBSD-4.0/kinstall
vendor/ipfilter/dist/FreeBSD/kinstall
vendor/ipfilter/dist/HISTORY
vendor/ipfilter/dist/INSTALL.FreeBSD
vendor/ipfilter/dist/INSTALL.IRIX
vendor/ipfilter/dist/INSTALL.Linux
vendor/ipfilter/dist/INSTALL.Sol2
vendor/ipfilter/dist/Makefile
vendor/ipfilter/dist/NAT.FreeBSD
vendor/ipfilter/dist/buildsunos
vendor/ipfilter/dist/etc/protocols
vendor/ipfilter/dist/etc/services
vendor/ipfilter/dist/fil.c
vendor/ipfilter/dist/ip_auth.c
vendor/ipfilter/dist/ip_auth.h
vendor/ipfilter/dist/ip_compat.h
vendor/ipfilter/dist/ip_fil.c
vendor/ipfilter/dist/ip_fil.h
vendor/ipfilter/dist/ip_fil_freebsd.c
vendor/ipfilter/dist/ip_frag.c
vendor/ipfilter/dist/ip_frag.h
vendor/ipfilter/dist/ip_ftp_pxy.c
vendor/ipfilter/dist/ip_htable.c
vendor/ipfilter/dist/ip_htable.h
vendor/ipfilter/dist/ip_ipsec_pxy.c
vendor/ipfilter/dist/ip_irc_pxy.c
vendor/ipfilter/dist/ip_log.c
vendor/ipfilter/dist/ip_lookup.c
vendor/ipfilter/dist/ip_lookup.h
vendor/ipfilter/dist/ip_nat.c
vendor/ipfilter/dist/ip_nat.h
vendor/ipfilter/dist/ip_netbios_pxy.c
vendor/ipfilter/dist/ip_pool.c
vendor/ipfilter/dist/ip_pool.h
vendor/ipfilter/dist/ip_pptp_pxy.c
vendor/ipfilter/dist/ip_proxy.c
vendor/ipfilter/dist/ip_proxy.h
vendor/ipfilter/dist/ip_raudio_pxy.c
vendor/ipfilter/dist/ip_rcmd_pxy.c
vendor/ipfilter/dist/ip_rpcb_pxy.c
vendor/ipfilter/dist/ip_scan.c
vendor/ipfilter/dist/ip_scan.h
vendor/ipfilter/dist/ip_state.c
vendor/ipfilter/dist/ip_state.h
vendor/ipfilter/dist/ip_sync.c
vendor/ipfilter/dist/ip_sync.h
vendor/ipfilter/dist/ipf.h
vendor/ipfilter/dist/ipl.h
vendor/ipfilter/dist/iplang/Makefile
vendor/ipfilter/dist/iplang/iplang.h
vendor/ipfilter/dist/iplang/iplang.tst
vendor/ipfilter/dist/iplang/iplang_l.l
vendor/ipfilter/dist/iplang/iplang_y.y
vendor/ipfilter/dist/ipmon.h
vendor/ipfilter/dist/ipsd/Makefile
vendor/ipfilter/dist/ipsd/ipsd.c
vendor/ipfilter/dist/ipsd/ipsdr.c
vendor/ipfilter/dist/ipsd/linux.h
vendor/ipfilter/dist/ipsd/sbpf.c
vendor/ipfilter/dist/ipsd/sdlpi.c
vendor/ipfilter/dist/ipsd/slinux.c
vendor/ipfilter/dist/ipsd/snit.c
vendor/ipfilter/dist/ipsend/44arp.c
vendor/ipfilter/dist/ipsend/Makefile
vendor/ipfilter/dist/ipsend/arp.c
vendor/ipfilter/dist/ipsend/dlcommon.c
vendor/ipfilter/dist/ipsend/ip.c
vendor/ipfilter/dist/ipsend/ipresend.c
vendor/ipfilter/dist/ipsend/ipsend.5
vendor/ipfilter/dist/ipsend/ipsend.c
vendor/ipfilter/dist/ipsend/ipsend.h
vendor/ipfilter/dist/ipsend/ipsopt.c
vendor/ipfilter/dist/ipsend/iptest.c
vendor/ipfilter/dist/ipsend/iptests.c
vendor/ipfilter/dist/ipsend/larp.c
vendor/ipfilter/dist/ipsend/linux.h
vendor/ipfilter/dist/ipsend/lsock.c
vendor/ipfilter/dist/ipsend/resend.c
vendor/ipfilter/dist/ipsend/sbpf.c
vendor/ipfilter/dist/ipsend/sdlpi.c
vendor/ipfilter/dist/ipsend/sirix.c
vendor/ipfilter/dist/ipsend/slinux.c
vendor/ipfilter/dist/ipsend/snit.c
vendor/ipfilter/dist/ipsend/sock.c
vendor/ipfilter/dist/ipt.h
vendor/ipfilter/dist/kmem.h
vendor/ipfilter/dist/l4check/Makefile
vendor/ipfilter/dist/l4check/l4check.c
vendor/ipfilter/dist/lib/Makefile
vendor/ipfilter/dist/lib/addicmp.c
vendor/ipfilter/dist/lib/addipopt.c
vendor/ipfilter/dist/lib/alist_free.c
vendor/ipfilter/dist/lib/alist_new.c
vendor/ipfilter/dist/lib/bcopywrap.c
vendor/ipfilter/dist/lib/binprint.c
vendor/ipfilter/dist/lib/buildopts.c
vendor/ipfilter/dist/lib/checkrev.c
vendor/ipfilter/dist/lib/count4bits.c
vendor/ipfilter/dist/lib/count6bits.c
vendor/ipfilter/dist/lib/debug.c
vendor/ipfilter/dist/lib/facpri.c
vendor/ipfilter/dist/lib/facpri.h
vendor/ipfilter/dist/lib/fill6bits.c
vendor/ipfilter/dist/lib/flags.c
vendor/ipfilter/dist/lib/genmask.c
vendor/ipfilter/dist/lib/gethost.c
vendor/ipfilter/dist/lib/getifname.c
vendor/ipfilter/dist/lib/getnattype.c
vendor/ipfilter/dist/lib/getport.c
vendor/ipfilter/dist/lib/getportproto.c
vendor/ipfilter/dist/lib/getproto.c
vendor/ipfilter/dist/lib/getsumd.c
vendor/ipfilter/dist/lib/hostname.c
vendor/ipfilter/dist/lib/icmpcode.c
vendor/ipfilter/dist/lib/initparse.c
vendor/ipfilter/dist/lib/ionames.c
vendor/ipfilter/dist/lib/ipf_dotuning.c
vendor/ipfilter/dist/lib/ipft_hx.c
vendor/ipfilter/dist/lib/ipft_pc.c
vendor/ipfilter/dist/lib/ipft_tx.c
vendor/ipfilter/dist/lib/ipoptsec.c
vendor/ipfilter/dist/lib/kmem.c
vendor/ipfilter/dist/lib/kmem.h
vendor/ipfilter/dist/lib/kmemcpywrap.c
vendor/ipfilter/dist/lib/kvatoname.c
vendor/ipfilter/dist/lib/load_file.c
vendor/ipfilter/dist/lib/load_hash.c
vendor/ipfilter/dist/lib/load_hashnode.c
vendor/ipfilter/dist/lib/load_http.c
vendor/ipfilter/dist/lib/load_pool.c
vendor/ipfilter/dist/lib/load_poolnode.c
vendor/ipfilter/dist/lib/load_url.c
vendor/ipfilter/dist/lib/mutex_emul.c
vendor/ipfilter/dist/lib/nametokva.c
vendor/ipfilter/dist/lib/nat_setgroupmap.c
vendor/ipfilter/dist/lib/ntomask.c
vendor/ipfilter/dist/lib/optname.c
vendor/ipfilter/dist/lib/optprint.c
vendor/ipfilter/dist/lib/optprintv6.c
vendor/ipfilter/dist/lib/optvalue.c
vendor/ipfilter/dist/lib/portname.c
vendor/ipfilter/dist/lib/print_toif.c
vendor/ipfilter/dist/lib/printactivenat.c
vendor/ipfilter/dist/lib/printaps.c
vendor/ipfilter/dist/lib/printbuf.c
vendor/ipfilter/dist/lib/printfr.c
vendor/ipfilter/dist/lib/printfraginfo.c
vendor/ipfilter/dist/lib/printhash.c
vendor/ipfilter/dist/lib/printhash_live.c
vendor/ipfilter/dist/lib/printhashdata.c
vendor/ipfilter/dist/lib/printhashnode.c
vendor/ipfilter/dist/lib/printhostmap.c
vendor/ipfilter/dist/lib/printhostmask.c
vendor/ipfilter/dist/lib/printifname.c
vendor/ipfilter/dist/lib/printip.c
vendor/ipfilter/dist/lib/printlog.c
vendor/ipfilter/dist/lib/printmask.c
vendor/ipfilter/dist/lib/printnat.c
vendor/ipfilter/dist/lib/printpacket.c
vendor/ipfilter/dist/lib/printpacket6.c
vendor/ipfilter/dist/lib/printpool.c
vendor/ipfilter/dist/lib/printpool_live.c
vendor/ipfilter/dist/lib/printpooldata.c
vendor/ipfilter/dist/lib/printpoolnode.c
vendor/ipfilter/dist/lib/printportcmp.c
vendor/ipfilter/dist/lib/printproto.c
vendor/ipfilter/dist/lib/printsbuf.c
vendor/ipfilter/dist/lib/printstate.c
vendor/ipfilter/dist/lib/printtqtable.c
vendor/ipfilter/dist/lib/printtunable.c
vendor/ipfilter/dist/lib/remove_hash.c
vendor/ipfilter/dist/lib/remove_hashnode.c
vendor/ipfilter/dist/lib/remove_pool.c
vendor/ipfilter/dist/lib/remove_poolnode.c
vendor/ipfilter/dist/lib/resetlexer.c
vendor/ipfilter/dist/lib/rwlock_emul.c
vendor/ipfilter/dist/lib/tcpflags.c
vendor/ipfilter/dist/lib/tcpoptnames.c
vendor/ipfilter/dist/lib/v6ionames.c
vendor/ipfilter/dist/lib/v6optvalue.c
vendor/ipfilter/dist/lib/var.c
vendor/ipfilter/dist/lib/verbose.c
vendor/ipfilter/dist/linux.h
vendor/ipfilter/dist/man/Makefile
vendor/ipfilter/dist/man/ipf.4
vendor/ipfilter/dist/man/ipf.5
vendor/ipfilter/dist/man/ipfilter.4
vendor/ipfilter/dist/man/ipfilter.4.mandoc
vendor/ipfilter/dist/man/ipfstat.8
vendor/ipfilter/dist/man/ipftest.1
vendor/ipfilter/dist/man/ipmon.5
vendor/ipfilter/dist/man/ipmon.8
vendor/ipfilter/dist/man/ipnat.4
vendor/ipfilter/dist/man/ipnat.5
vendor/ipfilter/dist/man/ipnat.8
vendor/ipfilter/dist/man/ippool.5
vendor/ipfilter/dist/man/ippool.8
vendor/ipfilter/dist/md5.c
vendor/ipfilter/dist/mkfilters
vendor/ipfilter/dist/ml_ipl.c
vendor/ipfilter/dist/mlf_ipl.c
vendor/ipfilter/dist/mlf_rule.c
vendor/ipfilter/dist/mlfk_ipl.c
vendor/ipfilter/dist/mlfk_rule.c
vendor/ipfilter/dist/mlh_rule.c
vendor/ipfilter/dist/mli_ipl.c
vendor/ipfilter/dist/mln_ipl.c
vendor/ipfilter/dist/mls_ipl.c
vendor/ipfilter/dist/opts.h
vendor/ipfilter/dist/pcap-ipf.h
vendor/ipfilter/dist/perl/Ipfanaly.pl
vendor/ipfilter/dist/perl/Isbgraph
vendor/ipfilter/dist/perl/Services
vendor/ipfilter/dist/perl/ipfmeta.pl
vendor/ipfilter/dist/perl/logfilter.pl
vendor/ipfilter/dist/radix_ipf.h
vendor/ipfilter/dist/rules/BASIC_1.FW
vendor/ipfilter/dist/rules/BASIC_2.FW
vendor/ipfilter/dist/rules/firewall
vendor/ipfilter/dist/rules/ipmon.conf
vendor/ipfilter/dist/rules/server
vendor/ipfilter/dist/samples/proxy.c
vendor/ipfilter/dist/samples/relay.c
vendor/ipfilter/dist/snoop.h
vendor/ipfilter/dist/solaris.c
vendor/ipfilter/dist/test/.cvsignore
vendor/ipfilter/dist/test/Makefile
vendor/ipfilter/dist/test/bpftest
vendor/ipfilter/dist/test/dotest
vendor/ipfilter/dist/test/expected/f11
vendor/ipfilter/dist/test/expected/f13
vendor/ipfilter/dist/test/expected/f18
vendor/ipfilter/dist/test/expected/i1
vendor/ipfilter/dist/test/expected/i10
vendor/ipfilter/dist/test/expected/i11
vendor/ipfilter/dist/test/expected/i12
vendor/ipfilter/dist/test/expected/i14
vendor/ipfilter/dist/test/expected/i17
vendor/ipfilter/dist/test/expected/i18
vendor/ipfilter/dist/test/expected/i2
vendor/ipfilter/dist/test/expected/i20
vendor/ipfilter/dist/test/expected/i3
vendor/ipfilter/dist/test/expected/i4
vendor/ipfilter/dist/test/expected/i5
vendor/ipfilter/dist/test/expected/i6
vendor/ipfilter/dist/test/expected/i7
vendor/ipfilter/dist/test/expected/i8
vendor/ipfilter/dist/test/expected/i9
vendor/ipfilter/dist/test/expected/in1
vendor/ipfilter/dist/test/expected/in2
vendor/ipfilter/dist/test/expected/in3
vendor/ipfilter/dist/test/expected/in5
vendor/ipfilter/dist/test/expected/in6
vendor/ipfilter/dist/test/expected/ip1
vendor/ipfilter/dist/test/expected/ip2
vendor/ipfilter/dist/test/expected/ipv6.6
vendor/ipfilter/dist/test/expected/l1
vendor/ipfilter/dist/test/expected/l1.b
vendor/ipfilter/dist/test/expected/n1
vendor/ipfilter/dist/test/expected/n10
vendor/ipfilter/dist/test/expected/n11
vendor/ipfilter/dist/test/expected/n12
vendor/ipfilter/dist/test/expected/n13
vendor/ipfilter/dist/test/expected/n14
vendor/ipfilter/dist/test/expected/n16
vendor/ipfilter/dist/test/expected/n2
vendor/ipfilter/dist/test/expected/n3
vendor/ipfilter/dist/test/expected/n4
vendor/ipfilter/dist/test/expected/n5
vendor/ipfilter/dist/test/expected/n6
vendor/ipfilter/dist/test/expected/n7
vendor/ipfilter/dist/test/expected/n8
vendor/ipfilter/dist/test/expected/n9
vendor/ipfilter/dist/test/expected/ni10
vendor/ipfilter/dist/test/expected/ni11
vendor/ipfilter/dist/test/expected/ni12
vendor/ipfilter/dist/test/expected/ni19
vendor/ipfilter/dist/test/expected/ni2
vendor/ipfilter/dist/test/expected/ni20
vendor/ipfilter/dist/test/expected/ni21
vendor/ipfilter/dist/test/expected/ni23
vendor/ipfilter/dist/test/expected/ni4
vendor/ipfilter/dist/test/expected/ni5
vendor/ipfilter/dist/test/expected/ni6
vendor/ipfilter/dist/test/expected/ni8
vendor/ipfilter/dist/test/expected/p1
vendor/ipfilter/dist/test/expected/p2
vendor/ipfilter/dist/test/expected/p3
vendor/ipfilter/dist/test/expected/p5
vendor/ipfilter/dist/test/input/f13
vendor/ipfilter/dist/test/input/f24
vendor/ipfilter/dist/test/input/ipv6.1
vendor/ipfilter/dist/test/input/ipv6.3
vendor/ipfilter/dist/test/input/ipv6.6
vendor/ipfilter/dist/test/input/n10
vendor/ipfilter/dist/test/input/n12
vendor/ipfilter/dist/test/input/n16
vendor/ipfilter/dist/test/input/n8
vendor/ipfilter/dist/test/input/n9
vendor/ipfilter/dist/test/input/ni1
vendor/ipfilter/dist/test/input/ni10
vendor/ipfilter/dist/test/input/ni11
vendor/ipfilter/dist/test/input/ni12
vendor/ipfilter/dist/test/input/ni13
vendor/ipfilter/dist/test/input/ni14
vendor/ipfilter/dist/test/input/ni15
vendor/ipfilter/dist/test/input/ni16
vendor/ipfilter/dist/test/input/ni19
vendor/ipfilter/dist/test/input/ni2
vendor/ipfilter/dist/test/input/ni20
vendor/ipfilter/dist/test/input/ni3
vendor/ipfilter/dist/test/input/ni4
vendor/ipfilter/dist/test/input/ni5
vendor/ipfilter/dist/test/input/ni7
vendor/ipfilter/dist/test/input/ni8
vendor/ipfilter/dist/test/input/ni9
vendor/ipfilter/dist/test/intest
vendor/ipfilter/dist/test/iptest
vendor/ipfilter/dist/test/itest
vendor/ipfilter/dist/test/logtest
vendor/ipfilter/dist/test/mtest
vendor/ipfilter/dist/test/natipftest
vendor/ipfilter/dist/test/nattest
vendor/ipfilter/dist/test/ptest
vendor/ipfilter/dist/test/regress/f13
vendor/ipfilter/dist/test/regress/i11
vendor/ipfilter/dist/test/regress/i12
vendor/ipfilter/dist/test/regress/i14
vendor/ipfilter/dist/test/regress/i17
vendor/ipfilter/dist/test/regress/i18
vendor/ipfilter/dist/test/regress/i2
vendor/ipfilter/dist/test/regress/i21
vendor/ipfilter/dist/test/regress/i7
vendor/ipfilter/dist/test/regress/i8
vendor/ipfilter/dist/test/regress/in2
vendor/ipfilter/dist/test/regress/ipv6.5
vendor/ipfilter/dist/test/regress/ipv6.6
vendor/ipfilter/dist/test/regress/n12
vendor/ipfilter/dist/test/regress/n2
vendor/ipfilter/dist/test/regress/n5
vendor/ipfilter/dist/test/regress/ni1.nat
vendor/ipfilter/dist/test/regress/ni13.nat
vendor/ipfilter/dist/test/regress/ni14.nat
vendor/ipfilter/dist/test/regress/ni2.nat
vendor/ipfilter/dist/test/regress/ni4.nat
vendor/ipfilter/dist/test/regress/p1.pool
vendor/ipfilter/dist/test/regress/p3.ipf
vendor/ipfilter/dist/test/test.format
vendor/ipfilter/dist/test/vfycksum.pl
vendor/ipfilter/dist/todo
vendor/ipfilter/dist/tools/BNF.ipf
vendor/ipfilter/dist/tools/Makefile
vendor/ipfilter/dist/tools/ipf.c
vendor/ipfilter/dist/tools/ipf_y.y
vendor/ipfilter/dist/tools/ipfcomp.c
vendor/ipfilter/dist/tools/ipfs.c
vendor/ipfilter/dist/tools/ipfstat.c
vendor/ipfilter/dist/tools/ipftest.c
vendor/ipfilter/dist/tools/ipmon.c
vendor/ipfilter/dist/tools/ipmon_y.y
vendor/ipfilter/dist/tools/ipnat.c
vendor/ipfilter/dist/tools/ipnat_y.y
vendor/ipfilter/dist/tools/ippool.c
vendor/ipfilter/dist/tools/ippool_y.y
vendor/ipfilter/dist/tools/ipscan_y.y
vendor/ipfilter/dist/tools/ipsyncm.c
vendor/ipfilter/dist/tools/ipsyncs.c
vendor/ipfilter/dist/tools/lex_var.h
vendor/ipfilter/dist/tools/lexer.c
vendor/ipfilter/dist/tools/lexer.h
Modified: vendor-sys/ipfilter/dist/netinet/IPFILTER.LICENCE
==============================================================================
--- vendor-sys/ipfilter/dist/netinet/IPFILTER.LICENCE Sun Aug 11 14:15:01 2013 (r254218)
+++ vendor-sys/ipfilter/dist/netinet/IPFILTER.LICENCE Sun Aug 11 14:28:45 2013 (r254219)
@@ -1,29 +1,340 @@
-/*
- * Copyright (C) 1993-2001 by Darren Reed.
- *
- * The author accepts no responsibility for the use of this software and
- * provides it on an ``as is'' basis without express or implied warranty.
- *
- * Redistribution and use, with or without modification, in source and binary
- * forms, are permitted provided that this notice is preserved in its entirety
- * and due credit is given to the original author and the contributors.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed. i.e. this code cannot simply be
- * copied, in part or in whole, and put under another distribution licence
- * [including the GNU Public Licence.]
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * I hate legalese, don't you ?
- */
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Modified: vendor-sys/ipfilter/dist/netinet/fil.c
==============================================================================
--- vendor-sys/ipfilter/dist/netinet/fil.c Sun Aug 11 14:15:01 2013 (r254218)
+++ vendor-sys/ipfilter/dist/netinet/fil.c Sun Aug 11 14:28:45 2013 (r254219)
@@ -1,7 +1,12 @@
/*
- * Copyright (C) 1993-2003 by Darren Reed.
+ * Copyright (C) 2012 by Darren Reed.
*
* See the IPFILTER.LICENCE file for details on licencing.
+ *
+ * Copyright 2008 Sun Microsystems.
+ *
+ * $Id$
+ *
*/
#if defined(KERNEL) || defined(_KERNEL)
# undef KERNEL
@@ -13,15 +18,6 @@
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
-#if defined(__NetBSD__)
-# if (NetBSD >= 199905) && !defined(IPFILTER_LKM) && defined(_KERNEL)
-# if (__NetBSD_Version__ < 399001400)
-# include "opt_ipfilter_log.h"
-# else
-# include "opt_ipfilter.h"
-# endif
-# endif
-#endif
#if defined(_KERNEL) && defined(__FreeBSD_version) && \
(__FreeBSD_version >= 220000)
# if (__FreeBSD_version >= 400000)
@@ -80,23 +76,9 @@ struct file;
#ifdef sun
# include <net/af.h>
#endif
-#if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(SOLARIS2))
-# if (__FreeBSD_version >= 504000)
-# undef _RADIX_H_
-# endif
-# include "radix_ipf.h"
-#endif
-#ifdef __osf__
-# include "radix_ipf.h"
-#else
-# include <net/route.h>
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
-#if !defined(linux)
-# include <netinet/ip_var.h>
-#endif
#if defined(__sgi) && defined(IFF_DRVRLOCK) /* IRIX 6 */
# include <sys/hashing.h>
# include <netinet/in_var.h>
@@ -119,7 +101,6 @@ struct file;
# include <netinet6/in6_var.h>
# endif
#endif
-#include <netinet/tcpip.h>
#include "netinet/ip_fil.h"
#include "netinet/ip_nat.h"
#include "netinet/ip_frag.h"
@@ -129,9 +110,8 @@ struct file;
#ifdef IPFILTER_SCAN
# include "netinet/ip_scan.h"
#endif
-#ifdef IPFILTER_SYNC
-# include "netinet/ip_sync.h"
-#endif
+#include "netinet/ip_sync.h"
+#include "netinet/ip_lookup.h"
#include "netinet/ip_pool.h"
#include "netinet/ip_htable.h"
#ifdef IPFILTER_COMPILED
@@ -142,116 +122,101 @@ struct file;
#endif
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
-# if defined(_KERNEL) && !defined(IPFILTER_LKM)
-# include "opt_ipfilter.h"
-# endif
#endif
#include "netinet/ipl.h"
+
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104230000)
+# include <sys/callout.h>
+extern struct callout ipf_slowtimer_ch;
+#endif
+#if defined(__OpenBSD__)
+# include <sys/timeout.h>
+extern struct timeout ipf_slowtimer_ch;
+#endif
/* END OF INCLUDES */
#if !defined(lint)
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $";
+static const char rcsid[] = "@(#)$Id$";
#endif
#ifndef _KERNEL
# include "ipf.h"
# include "ipt.h"
-# include "bpf-ipf.h"
extern int opts;
+extern int blockreason;
#endif /* _KERNEL */
+#define LBUMP(x) softc->x++
+#define LBUMPD(x, y) do { softc->x.y++; DT(y); } while (0)
-fr_info_t frcache[2][8];
-struct filterstats frstats[2];
-struct frentry *ipfilter[2][2] = { { NULL, NULL }, { NULL, NULL } },
- *ipfilter6[2][2] = { { NULL, NULL }, { NULL, NULL } },
- *ipacct6[2][2] = { { NULL, NULL }, { NULL, NULL } },
- *ipacct[2][2] = { { NULL, NULL }, { NULL, NULL } },
- *ipnatrules[2][2] = { { NULL, NULL }, { NULL, NULL } };
-struct frgroup *ipfgroups[IPL_LOGSIZE][2];
-char ipfilter_version[] = IPL_VERSION;
-int fr_refcnt = 0;
-/*
- * For fr_running:
- * 0 == loading, 1 = running, -1 = disabled, -2 = unloading
- */
-int fr_running = 0;
-int fr_flags = IPF_LOGGING;
-int fr_active = 0;
-int fr_control_forwarding = 0;
-int fr_update_ipid = 0;
-u_short fr_ip_id = 0;
-int fr_chksrc = 0; /* causes a system crash if enabled */
-int fr_minttl = 4;
-int fr_icmpminfragmtu = 68;
-u_long fr_frouteok[2] = {0, 0};
-u_long fr_userifqs = 0;
-u_long fr_badcoalesces[2] = {0, 0};
-u_char ipf_iss_secret[32];
-#if defined(IPFILTER_DEFAULT_BLOCK)
-int fr_pass = FR_BLOCK|FR_NOMATCH;
-#else
-int fr_pass = (IPF_DEFAULT_PASS)|FR_NOMATCH;
-#endif
-int fr_features = 0
-#ifdef IPFILTER_LKM
- | IPF_FEAT_LKM
-#endif
-#ifdef IPFILTER_LOG
- | IPF_FEAT_LOG
-#endif
-#ifdef IPFILTER_LOOKUP
- | IPF_FEAT_LOOKUP
-#endif
-#ifdef IPFILTER_BPF
- | IPF_FEAT_BPF
-#endif
-#ifdef IPFILTER_COMPILED
- | IPF_FEAT_COMPILED
-#endif
-#ifdef IPFILTER_CKSUM
- | IPF_FEAT_CKSUM
-#endif
-#ifdef IPFILTER_SYNC
- | IPF_FEAT_SYNC
-#endif
-#ifdef IPFILTER_SCAN
- | IPF_FEAT_SCAN
+static INLINE int ipf_check_ipf __P((fr_info_t *, frentry_t *, int));
+static u_32_t ipf_checkcipso __P((fr_info_t *, u_char *, int));
+static u_32_t ipf_checkripso __P((u_char *));
+static u_32_t ipf_decaps __P((fr_info_t *, u_32_t, int));
+#ifdef IPFILTER_LOG
+static frentry_t *ipf_dolog __P((fr_info_t *, u_32_t *));
#endif
-#ifdef USE_INET6
- | IPF_FEAT_IPV6
+static int ipf_flushlist __P((ipf_main_softc_t *, int *,
+ frentry_t **));
+static int ipf_flush_groups __P((ipf_main_softc_t *, frgroup_t **,
+ int));
+static ipfunc_t ipf_findfunc __P((ipfunc_t));
+static void *ipf_findlookup __P((ipf_main_softc_t *, int,
+ frentry_t *,
+ i6addr_t *, i6addr_t *));
+static frentry_t *ipf_firewall __P((fr_info_t *, u_32_t *));
+static int ipf_fr_matcharray __P((fr_info_t *, int *));
+static int ipf_frruleiter __P((ipf_main_softc_t *, void *, int,
+ void *));
+static void ipf_funcfini __P((ipf_main_softc_t *, frentry_t *));
+static int ipf_funcinit __P((ipf_main_softc_t *, frentry_t *));
+static int ipf_geniter __P((ipf_main_softc_t *, ipftoken_t *,
+ ipfgeniter_t *));
+static void ipf_getstat __P((ipf_main_softc_t *,
+ struct friostat *, int));
+static int ipf_group_flush __P((ipf_main_softc_t *, frgroup_t *));
+static void ipf_group_free __P((frgroup_t *));
+static int ipf_grpmapfini __P((struct ipf_main_softc_s *,
+ frentry_t *));
+static int ipf_grpmapinit __P((struct ipf_main_softc_s *,
+ frentry_t *));
+static frentry_t *ipf_nextrule __P((ipf_main_softc_t *, int, int,
+ frentry_t *, int));
+static int ipf_portcheck __P((frpcmp_t *, u_32_t));
+static INLINE int ipf_pr_ah __P((fr_info_t *));
+static INLINE void ipf_pr_esp __P((fr_info_t *));
+static INLINE void ipf_pr_gre __P((fr_info_t *));
+static INLINE void ipf_pr_udp __P((fr_info_t *));
+static INLINE void ipf_pr_tcp __P((fr_info_t *));
+static INLINE void ipf_pr_icmp __P((fr_info_t *));
+static INLINE void ipf_pr_ipv4hdr __P((fr_info_t *));
+static INLINE void ipf_pr_short __P((fr_info_t *, int));
+static INLINE int ipf_pr_tcpcommon __P((fr_info_t *));
+static INLINE int ipf_pr_udpcommon __P((fr_info_t *));
+static void ipf_rule_delete __P((ipf_main_softc_t *, frentry_t *f,
+ int, int));
+static void ipf_rule_expire_insert __P((ipf_main_softc_t *,
+ frentry_t *, int));
+static int ipf_synclist __P((ipf_main_softc_t *, frentry_t *,
+ void *));
+static void ipf_token_flush __P((ipf_main_softc_t *));
+static void ipf_token_unlink __P((ipf_main_softc_t *,
+ ipftoken_t *));
+static ipftuneable_t *ipf_tune_findbyname __P((ipftuneable_t *,
+ const char *));
+static ipftuneable_t *ipf_tune_findbycookie __P((ipftuneable_t **, void *,
+ void **));
+static int ipf_updateipid __P((fr_info_t *));
+static int ipf_settimeout __P((struct ipf_main_softc_s *,
+ struct ipftuneable *,
+ ipftuneval_t *));
+#if !defined(_KERNEL) || (!defined(__NetBSD__) && !defined(__OpenBSD__) && \
+ !defined(__FreeBSD__)) || \
+ FREEBSD_LT_REV(501000) || NETBSD_LT_REV(105000000) || \
+ OPENBSD_LT_REV(200006)
+static int ppsratecheck(struct timeval *, int *, int);
#endif
- ;
-
-static INLINE int fr_ipfcheck __P((fr_info_t *, frentry_t *, int));
-static int fr_portcheck __P((frpcmp_t *, u_short *));
-static int frflushlist __P((int, minor_t, int *, frentry_t **));
-static ipfunc_t fr_findfunc __P((ipfunc_t));
-static frentry_t *fr_firewall __P((fr_info_t *, u_32_t *));
-static int fr_funcinit __P((frentry_t *fr));
-static INLINE void frpr_ah __P((fr_info_t *));
-static INLINE void frpr_esp __P((fr_info_t *));
-static INLINE void frpr_gre __P((fr_info_t *));
-static INLINE void frpr_udp __P((fr_info_t *));
-static INLINE void frpr_tcp __P((fr_info_t *));
-static INLINE void frpr_icmp __P((fr_info_t *));
-static INLINE void frpr_ipv4hdr __P((fr_info_t *));
-static INLINE int frpr_pullup __P((fr_info_t *, int));
-static INLINE void frpr_short __P((fr_info_t *, int));
-static INLINE int frpr_tcpcommon __P((fr_info_t *));
-static INLINE int frpr_udpcommon __P((fr_info_t *));
-static int fr_updateipid __P((fr_info_t *));
-#ifdef IPFILTER_LOOKUP
-static int fr_grpmapinit __P((frentry_t *fr));
-static INLINE void *fr_resolvelookup __P((u_int, u_int, i6addr_t *, lookupfunc_t *));
-#endif
-static void frsynclist __P((frentry_t *, void *));
-static ipftuneable_t *fr_findtunebyname __P((const char *));
-static ipftuneable_t *fr_findtunebycookie __P((void *, void **));
-static int ipf_geniter __P((ipftoken_t *, ipfgeniter_t *));
-static int ipf_frruleiter __P((void *, int, void *));
-static void ipf_unlinktoken __P((ipftoken_t *));
/*
@@ -260,7 +225,7 @@ static void ipf_unlinktoken __P((ipftok
* hand side to allow for binary searching of the array and include a trailer
* with a 0 for the bitmask for linear searches to easily find the end with.
*/
-const struct optlist ipopts[20] = {
+static const struct optlist ipopts[20] = {
{ IPOPT_NOP, 0x000001 },
{ IPOPT_RR, 0x000002 },
{ IPOPT_ZSU, 0x000004 },
@@ -284,7 +249,7 @@ const struct optlist ipopts[20] = {
};
#ifdef USE_INET6
-struct optlist ip6exthdr[] = {
+static struct optlist ip6exthdr[] = {
{ IPPROTO_HOPOPTS, 0x000001 },
{ IPPROTO_IPV6, 0x000002 },
{ IPPROTO_ROUTING, 0x000004 },
@@ -298,20 +263,10 @@ struct optlist ip6exthdr[] = {
};
#endif
-struct optlist tcpopts[] = {
- { TCPOPT_NOP, 0x000001 },
- { TCPOPT_MAXSEG, 0x000002 },
- { TCPOPT_WINDOW, 0x000004 },
- { TCPOPT_SACK_PERMITTED, 0x000008 },
- { TCPOPT_SACK, 0x000010 },
- { TCPOPT_TIMESTAMP, 0x000020 },
- { 0, 0x000000 }
-};
-
/*
* bit values for identifying presence of individual IP security options
*/
-const struct optlist secopt[8] = {
+static const struct optlist secopt[8] = {
{ IPSO_CLASS_RES4, 0x01 },
{ IPSO_CLASS_TOPS, 0x02 },
{ IPSO_CLASS_SECR, 0x04 },
@@ -322,16 +277,143 @@ const struct optlist secopt[8] = {
{ IPSO_CLASS_RES1, 0x80 }
};
+char ipfilter_version[] = IPL_VERSION;
+
+int ipf_features = 0
+#ifdef IPFILTER_LKM
+ | IPF_FEAT_LKM
+#endif
+#ifdef IPFILTER_LOG
+ | IPF_FEAT_LOG
+#endif
+ | IPF_FEAT_LOOKUP
+#ifdef IPFILTER_BPF
+ | IPF_FEAT_BPF
+#endif
+#ifdef IPFILTER_COMPILED
+ | IPF_FEAT_COMPILED
+#endif
+#ifdef IPFILTER_CKSUM
+ | IPF_FEAT_CKSUM
+#endif
+ | IPF_FEAT_SYNC
+#ifdef IPFILTER_SCAN
+ | IPF_FEAT_SCAN
+#endif
+#ifdef USE_INET6
+ | IPF_FEAT_IPV6
+#endif
+ ;
+
/*
* Table of functions available for use with call rules.
*/
-static ipfunc_resolve_t fr_availfuncs[] = {
-#ifdef IPFILTER_LOOKUP
- { "fr_srcgrpmap", fr_srcgrpmap, fr_grpmapinit },
- { "fr_dstgrpmap", fr_dstgrpmap, fr_grpmapinit },
-#endif
- { "", NULL, NULL }
+static ipfunc_resolve_t ipf_availfuncs[] = {
+ { "srcgrpmap", ipf_srcgrpmap, ipf_grpmapinit, ipf_grpmapfini },
+ { "dstgrpmap", ipf_dstgrpmap, ipf_grpmapinit, ipf_grpmapfini },
+ { "", NULL, NULL, NULL }
+};
+
+static ipftuneable_t ipf_main_tuneables[] = {
+ { { (void *)offsetof(struct ipf_main_softc_s, ipf_flags) },
+ "ipf_flags", 0, 0xffffffff,
+ stsizeof(ipf_main_softc_t, ipf_flags),
+ 0, NULL, NULL },
+ { { (void *)offsetof(struct ipf_main_softc_s, ipf_active) },
+ "active", 0, 0,
+ stsizeof(ipf_main_softc_t, ipf_active),
+ IPFT_RDONLY, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_control_forwarding) },
+ "control_forwarding", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_control_forwarding),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_update_ipid) },
+ "update_ipid", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_update_ipid),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_chksrc) },
+ "chksrc", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_chksrc),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_minttl) },
+ "min_ttl", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_minttl),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_icmpminfragmtu) },
+ "icmp_minfragmtu", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_icmpminfragmtu),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_pass) },
+ "default_pass", 0, 0xffffffff,
+ stsizeof(ipf_main_softc_t, ipf_pass),
+ 0, NULL, NULL },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcpidletimeout) },
+ "tcp_idle_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcpidletimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcpclosewait) },
+ "tcp_close_wait", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcpclosewait),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcplastack) },
+ "tcp_last_ack", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcplastack),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcptimeout) },
+ "tcp_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcptimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcpsynsent) },
+ "tcp_syn_sent", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcpsynsent),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcpsynrecv) },
+ "tcp_syn_received", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcpsynrecv),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcpclosed) },
+ "tcp_closed", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcpclosed),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcphalfclosed) },
+ "tcp_half_closed", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcphalfclosed),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_tcptimewait) },
+ "tcp_time_wait", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_tcptimewait),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_udptimeout) },
+ "udp_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_udptimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_udpacktimeout) },
+ "udp_ack_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_udpacktimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_icmptimeout) },
+ "icmp_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_icmptimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_icmpacktimeout) },
+ "icmp_ack_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_icmpacktimeout),
+ 0, NULL, ipf_settimeout },
+ { { (void *)offsetof(ipf_main_softc_t, ipf_iptimeout) },
+ "ip_timeout", 1, 0x7fffffff,
+ stsizeof(ipf_main_softc_t, ipf_iptimeout),
+ 0, NULL, ipf_settimeout },
+#if defined(INSTANCES) && defined(_KERNEL)
+ { { (void *)offsetof(ipf_main_softc_t, ipf_get_loopback) },
+ "intercept_loopback", 0, 1,
+ stsizeof(ipf_main_softc_t, ipf_get_loopback),
+ 0, NULL, ipf_set_loopback },
+#endif
+ { { 0 },
+ NULL, 0, 0,
+ 0,
+ 0, NULL, NULL }
};
@@ -341,39 +423,41 @@ static ipfunc_resolve_t fr_availfuncs[]
* current packet. There are different routines for the same protocol
* for each of IPv4 and IPv6. Adding a new protocol, for which there
* will "special" inspection for setup, is now more easily done by adding
- * a new routine and expanding the frpr_ipinit*() function rather than by
+ * a new routine and expanding the ipf_pr_ipinit*() function rather than by
* adding more code to a growing switch statement.
*/
#ifdef USE_INET6
-static INLINE int frpr_ah6 __P((fr_info_t *));
-static INLINE void frpr_esp6 __P((fr_info_t *));
-static INLINE void frpr_gre6 __P((fr_info_t *));
-static INLINE void frpr_udp6 __P((fr_info_t *));
-static INLINE void frpr_tcp6 __P((fr_info_t *));
-static INLINE void frpr_icmp6 __P((fr_info_t *));
-static INLINE int frpr_ipv6hdr __P((fr_info_t *));
-static INLINE void frpr_short6 __P((fr_info_t *, int));
-static INLINE int frpr_hopopts6 __P((fr_info_t *));
-static INLINE int frpr_mobility6 __P((fr_info_t *));
-static INLINE int frpr_routing6 __P((fr_info_t *));
-static INLINE int frpr_dstopts6 __P((fr_info_t *));
-static INLINE int frpr_fragment6 __P((fr_info_t *));
-static INLINE int frpr_ipv6exthdr __P((fr_info_t *, int, int));
+static INLINE int ipf_pr_ah6 __P((fr_info_t *));
+static INLINE void ipf_pr_esp6 __P((fr_info_t *));
+static INLINE void ipf_pr_gre6 __P((fr_info_t *));
+static INLINE void ipf_pr_udp6 __P((fr_info_t *));
+static INLINE void ipf_pr_tcp6 __P((fr_info_t *));
+static INLINE void ipf_pr_icmp6 __P((fr_info_t *));
+static INLINE void ipf_pr_ipv6hdr __P((fr_info_t *));
+static INLINE void ipf_pr_short6 __P((fr_info_t *, int));
+static INLINE int ipf_pr_hopopts6 __P((fr_info_t *));
+static INLINE int ipf_pr_mobility6 __P((fr_info_t *));
+static INLINE int ipf_pr_routing6 __P((fr_info_t *));
+static INLINE int ipf_pr_dstopts6 __P((fr_info_t *));
+static INLINE int ipf_pr_fragment6 __P((fr_info_t *));
+static INLINE struct ip6_ext *ipf_pr_ipv6exthdr __P((fr_info_t *, int, int));
/* ------------------------------------------------------------------------ */
-/* Function: frpr_short6 */
+/* Function: ipf_pr_short6 */
/* Returns: void */
-/* Parameters: fin(I) - pointer to packet information */
+/* Parameters: fin(I) - pointer to packet information */
+/* xmin(I) - minimum header size */
/* */
/* IPv6 Only */
/* This is function enforces the 'is a packet too short to be legit' rule */
/* for IPv6 and marks the packet with FI_SHORT if so. See function comment */
-/* for frpr_short() for more details. */
+/* for ipf_pr_short() for more details. */
/* ------------------------------------------------------------------------ */
-static INLINE void frpr_short6(fin, xmin)
-fr_info_t *fin;
-int xmin;
+static INLINE void
+ipf_pr_short6(fin, xmin)
+ fr_info_t *fin;
+ int xmin;
{
if (fin->fin_dlen < xmin)
@@ -382,8 +466,8 @@ int xmin;
/* ------------------------------------------------------------------------ */
-/* Function: frpr_ipv6hdr */
-/* Returns: int - 0 = IPv6 packet intact, -1 = packet lost */
+/* Function: ipf_pr_ipv6hdr */
+/* Returns: void */
/* Parameters: fin(I) - pointer to packet information */
/* */
/* IPv6 Only */
@@ -392,8 +476,9 @@ int xmin;
/* analyzer may pullup or free the packet itself so we need to be vigiliant */
/* of that possibility arising. */
/* ------------------------------------------------------------------------ */
-static INLINE int frpr_ipv6hdr(fin)
-fr_info_t *fin;
+static INLINE void
+ipf_pr_ipv6hdr(fin)
+ fr_info_t *fin;
{
ip6_t *ip6 = (ip6_t *)fin->fin_ip;
int p, go = 1, i, hdrcount;
@@ -407,57 +492,68 @@ fr_info_t *fin;
fi->fi_auth = 0;
p = ip6->ip6_nxt;
+ fin->fin_crc = p;
fi->fi_ttl = ip6->ip6_hlim;
fi->fi_src.in6 = ip6->ip6_src;
+ fin->fin_crc += fi->fi_src.i6[0];
+ fin->fin_crc += fi->fi_src.i6[1];
+ fin->fin_crc += fi->fi_src.i6[2];
+ fin->fin_crc += fi->fi_src.i6[3];
fi->fi_dst.in6 = ip6->ip6_dst;
- fin->fin_id = (u_short)(ip6->ip6_flow & 0xffff);
+ fin->fin_crc += fi->fi_dst.i6[0];
+ fin->fin_crc += fi->fi_dst.i6[1];
+ fin->fin_crc += fi->fi_dst.i6[2];
+ fin->fin_crc += fi->fi_dst.i6[3];
+ fin->fin_id = 0;
+ if (IN6_IS_ADDR_MULTICAST(&fi->fi_dst.in6))
+ fin->fin_flx |= FI_MULTICAST|FI_MBCAST;
hdrcount = 0;
- while (go && !(fin->fin_flx & (FI_BAD|FI_SHORT))) {
+ while (go && !(fin->fin_flx & FI_SHORT)) {
switch (p)
{
case IPPROTO_UDP :
- frpr_udp6(fin);
+ ipf_pr_udp6(fin);
go = 0;
break;
case IPPROTO_TCP :
- frpr_tcp6(fin);
+ ipf_pr_tcp6(fin);
go = 0;
break;
case IPPROTO_ICMPV6 :
- frpr_icmp6(fin);
+ ipf_pr_icmp6(fin);
go = 0;
break;
case IPPROTO_GRE :
- frpr_gre6(fin);
+ ipf_pr_gre6(fin);
go = 0;
break;
case IPPROTO_HOPOPTS :
- p = frpr_hopopts6(fin);
+ p = ipf_pr_hopopts6(fin);
break;
case IPPROTO_MOBILITY :
- p = frpr_mobility6(fin);
+ p = ipf_pr_mobility6(fin);
break;
case IPPROTO_DSTOPTS :
- p = frpr_dstopts6(fin);
+ p = ipf_pr_dstopts6(fin);
break;
case IPPROTO_ROUTING :
- p = frpr_routing6(fin);
+ p = ipf_pr_routing6(fin);
break;
case IPPROTO_AH :
- p = frpr_ah6(fin);
+ p = ipf_pr_ah6(fin);
break;
case IPPROTO_ESP :
- frpr_esp6(fin);
+ ipf_pr_esp6(fin);
go = 0;
break;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list