From owner-svn-src-vendor@FreeBSD.ORG Sun Aug 11 14:28:49 2013 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8458A8AE; Sun, 11 Aug 2013 14:28:49 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EDD0278D; Sun, 11 Aug 2013 14:28:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7BESnIA077377; Sun, 11 Aug 2013 14:28:49 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7BESl93077363; Sun, 11 Aug 2013 14:28:47 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201308111428.r7BESl93077363@svn.freebsd.org> From: Cy Schubert Date: Sun, 11 Aug 2013 14:28:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: 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... X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2013 14:28:49 -0000 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 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 Changes in other areas also in this revision: 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 Modified: vendor/ipfilter/dist/.cvsignore ============================================================================== --- vendor/ipfilter/dist/.cvsignore Sun Aug 11 14:15:01 2013 (r254218) +++ vendor/ipfilter/dist/.cvsignore Sun Aug 11 14:28:45 2013 (r254219) @@ -1,28 +1,43 @@ -ipf -sparcv7 -sparcv9 -h -ipf-darren -bugs -ipftest -patches -state -cbits CVS -old -new -netinet -import +amd64 bak -streams +bugs +cbits cvs.diff -threads +cvs.diffs +extern glibc +h hp -windows +i86 +import +ipf +ipf-darren +ipfstat +ipftest ipnat -opt_inet6.h ippool ipmon -ip_rules.c +ipscan +ipsyncm +ipsyncs ip_rules.h +ip_rules.c +net +netinet +new +old +opt_bpf.h +opt_inet6.h +opt_pfil.h +patches +sparcv7 +sparcv9 +state +streams +threads +windows +SunOS5/i386-5.10 +*.o +*/*.o +*/*/*.o Added: vendor/ipfilter/dist/4bsd/conf.c.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/conf.c.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,41 @@ +*** conf.c.orig Wed May 10 23:38:08 1995 +--- conf.c Thu May 11 00:33:19 1995 +*************** +*** 169,174 **** +--- 169,187 ---- + #endif + cdev_decl(lkm); + ++ /* open, close, read, ioctl */ ++ cdev_decl(ipl); ++ #define cdev_gen_ipf(c,n) { \ ++ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ ++ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ ++ (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \ ++ (dev_type_mmap((*))) enodev, 0 } ++ #ifdef IPFILTER ++ #define NIPF 1 ++ #else ++ #define NIPF 0 ++ #endif ++ + struct cdevsw cdevsw[] = + { + cdev_cn_init(1,cn), /* 0: virtual console */ +*************** +*** 232,238 **** + cdev_notdef(), /* 56 */ + cdev_notdef(), /* 57 */ + cdev_disk_init(NCD,cd), /* 58 SCSI CD-ROM */ +! cdev_notdef(), /* 59 */ + cdev_notdef(), /* 60 */ + cdev_notdef(), /* 61 */ + cdev_notdef(), /* 62 */ +--- 245,251 ---- + cdev_notdef(), /* 56 */ + cdev_notdef(), /* 57 */ + cdev_disk_init(NCD,cd), /* 58 SCSI CD-ROM */ +! cdev_gen_ipf(NIPF,ipl), /* 59 */ + cdev_notdef(), /* 60 */ + cdev_notdef(), /* 61 */ + cdev_notdef(), /* 62 */ Added: vendor/ipfilter/dist/4bsd/files.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/files.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,23 @@ +*** files.orig Sat Apr 29 19:59:31 1995 +--- files Sun Apr 23 17:54:18 1995 +*************** +*** 180,185 **** +--- 180,197 ---- + netinet/tcp_timer.c optional inet + netinet/tcp_usrreq.c optional inet + netinet/udp_usrreq.c optional inet ++ netinet/ip_fil.c optional ipfilter requires inet ++ netinet/fil.c optional ipfilter requires inet ++ netinet/ip_nat.c optional ipfilter requires inet ++ netinet/ip_auth.c optional ipfilter requires inet ++ netinet/ip_frag.c optional ipfilter requires inet ++ netinet/ip_state.c optional ipfilter requires inet ++ netinet/ip_proxy.c optional ipfilter requires inet ++ netinet/ip_log.c optional ipfilter requires inet ++ netinet/ip_scan.c optional ipfilter requires inet ++ netinet/ip_sync.c optional ipfilter requires inet ++ netinet/ip_pool.c optional ipfilter_pool requires inet ++ netinet/ip_rules.c optional ipfilter_compiled requires ipfilter + netiso/clnp_debug.c optional iso + netiso/clnp_er.c optional iso + netiso/clnp_frag.c optional iso Added: vendor/ipfilter/dist/4bsd/files.newconf.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/files.newconf.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,23 @@ +*** files.newconf.orig Sat Apr 29 20:00:02 1995 +--- files.newconf Sun Apr 23 17:53:58 1995 +*************** +*** 222,227 **** +--- 222,239 ---- + file netinet/tcp_timer.c inet + file netinet/tcp_usrreq.c inet + file netinet/udp_usrreq.c inet ++ file netinet/ip_fil.c ipfilter ++ file netinet/fil.c ipfilter ++ file netinet/ip_nat.c ipfilter ++ file netinet/ip_frag.c ipfilter ++ file netinet/ip_state.c ipfilter ++ file netinet/ip_auth.c ipfilter ++ file netinet/ip_proxy.c ipfilter ++ file netinet/ip_log.c ipfilter ++ file netinet/ip_scan.c ipfilter ++ file netinet/ip_sync.c ipfilter ++ file netinet/ip_pool.c ipfilter_pool ++ file netinet/ip_rules.c ipfilter_compiled + file netiso/clnp_debug.c iso + file netiso/clnp_er.c iso + file netiso/clnp_frag.c iso Added: vendor/ipfilter/dist/4bsd/files.oldconf.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/files.oldconf.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,23 @@ +*** files.oldconf.orig Sat Apr 29 19:59:31 1995 +--- files.oldconf Sun Apr 23 17:54:18 1995 +*************** +*** 180,185 **** +--- 180,197 ---- + netinet/tcp_timer.c optional inet + netinet/tcp_usrreq.c optional inet + netinet/udp_usrreq.c optional inet ++ netinet/ip_fil.c optional ipfilter requires inet ++ netinet/fil.c optional ipfilter requires inet ++ netinet/ip_nat.c optional ipfilter requires inet ++ netinet/ip_frag.c optional ipfilter requires inet ++ netinet/ip_state.c optional ipfilter requires inet ++ netinet/ip_proxy.c optional ipfilter requires inet ++ netinet/ip_log.c optional ipfilter requires inet ++ netinet/ip_auth.c optional ipfilter requires inet ++ netinet/ip_scan.c optional ipfilter requires inet ++ netinet/ip_sync.c optional ipfilter requires inet ++ netinet/ip_pool.c optional ipfilter_pool requires inet ++ netinet/ip_rules.c optional ipfilter_compiled requires ipfilter + netiso/clnp_debug.c optional iso + netiso/clnp_er.c optional iso + netiso/clnp_frag.c optional iso Added: vendor/ipfilter/dist/4bsd/filez.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/filez.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,23 @@ +*** files.orig Sat Apr 29 20:00:02 1995 +--- files Sun Apr 23 17:53:58 1995 +*************** +*** 222,227 **** +--- 222,239 ---- + file netinet/tcp_timer.c inet + file netinet/tcp_usrreq.c inet + file netinet/udp_usrreq.c inet ++ file netinet/ip_fil.c ipfilter ++ file netinet/fil.c ipfilter ++ file netinet/ip_nat.c ipfilter ++ file netinet/ip_frag.c ipfilter ++ file netinet/ip_state.c ipfilter ++ file netinet/ip_proxy.c ipfilter ++ file netinet/ip_auth.c ipfilter ++ file netinet/ip_log.c ipfilter ++ file netinet/ip_scan.c ipfilter ++ file netinet/ip_sync.c ipfilter ++ file netinet/ip_pool.c ipfilter_pool ++ file netinet/ip_rules.c ipfilter_compiled + file netiso/clnp_debug.c iso + file netiso/clnp_er.c iso + file netiso/clnp_frag.c iso Added: vendor/ipfilter/dist/4bsd/ip_input.c.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/ip_input.c.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,38 @@ +*** ip_input.c.orig Sun Apr 23 17:17:05 1995 +--- ip_input.c Sun Apr 23 17:30:03 1995 +*************** +*** 80,85 **** +--- 80,90 ---- + int ipqmaxlen = IFQ_MAXLEN; + struct in_ifaddr *in_ifaddr; /* first inet address */ + struct ifqueue ipintrq; ++ #if defined(IPFILTER) || defined(IPFILTER_LKM) ++ int fr_check __P((struct ip *, int, struct ifnet *, int, struct mbuf *)); ++ int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf *)); ++ #endif + + /* + * We need to save the IP options in case a protocol wants to respond +*************** +*** 225,231 **** +--- 233,252 ---- + m_adj(m, ip->ip_len - m->m_pkthdr.len); + } + ++ #if defined(IPFILTER) || defined(IPFILTER_LKM) + /* ++ * Check if we want to allow this packet to be processed. ++ * Consider it to be bad if not. ++ */ ++ if (fr_checkp) { ++ struct mbuf *m1 = m; ++ ++ if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1) ++ goto next; ++ ip = mtod(m = m1, struct ip *); ++ } ++ #endif ++ /* + * Process options and, if not destined for us, + * ship it on. ip_dooptions returns 1 when an + * error was detected (causing an icmp message Added: vendor/ipfilter/dist/4bsd/ip_output.c.diffs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/ip_output.c.diffs Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,36 @@ +*** ip_output.c.orig Sun Apr 23 17:17:05 1995 +--- ip_output.c Sun Apr 23 17:32:11 1995 +*************** +*** 60,65 **** +--- 60,69 ---- + static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *)); + static void ip_mloopback + __P((struct ifnet *, struct mbuf *, struct sockaddr_in *)); ++ #if defined(IPFILTER_LKM) || defined(IPFILTER) ++ extern int fr_check __P((struct ip *, int, struct ifnet *, int, struct mbuf *)); ++ extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf *)); ++ #endif + + /* + * IP output. The packet in mbuf chain m contains a skeletal IP +*************** +*** 277,282 **** +--- 284,303 ---- + } else + m->m_flags &= ~M_BCAST; + + sendit: ++ #if defined(IPFILTER) || defined(IPFILTER_LKM) ++ /* ++ * looks like most checking has been done now...do a filter check ++ */ ++ if (fr_checkp) { ++ struct mbuf *m1 = m; ++ ++ if ((error = (*fr_checkp)(ip, hlen, ifp, 1, &m1)) || !m1) ++ goto done; ++ ip = mtod(m = m1, struct ip *); ++ } ++ #endif + /* + * If small enough for interface, can just send directly. Added: vendor/ipfilter/dist/4bsd/kinstall ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/4bsd/kinstall Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,55 @@ +#!/bin/csh -f +# +set dir=`pwd` +set karch=`uname -m` +set archdir="/sys/arch/$karch" +set confdir="$archdir/conf" + +if ( $dir =~ *fil/4bsd ) cd .. +if ($0 =~ *kinstall) then + echo "Installing ip_fil.c and ip_fil.h" + cp ip_fil.{c,h} /sys/netinet + echo "Patching $archdir/$karch/conf.c" + cat conf.c.diffs | (cd $archdir/$karch; patch) +endif +echo "Patching ip_input.c and ip_output.c" +cat 4bsd/ip_{in,out}put.c.diffs | (cd /sys/netinet; patch) + +if ( -f /sys/conf/files.newconf ) then + echo "Patching /sys/conf/files.newconf" + cat 4bsd/files.newconf.diffs | (cd /sys/conf; patch) + echo "Patching /sys/conf/files" + cat 4bsd/files.diffs | (cd /sys/conf; patch) +endif +if ( -f /sys/conf/files.oldconf ) then + echo "Patching /sys/conf/files.oldconf" + cat 4bsd/files.oldconf.diffs | (cd /sys/conf; patch) + echo "Patching /sys/conf/files" + cat 4bsd/filez.diffs | (cd /sys/conf; patch) +endif + +set config=`/bin/ls -1t $confdir [0-9A-Z_]* | head -1` + +echo -n "Kernel configuration to update [$config] " +set newconfig=$< +if ( "$newconfig" != "" ) then + set config="$confdir/$newconfig" +else + set newconfig=$config +endif +echo "Re-config'ing $newconfig..." +if ( -f $confdir/$newconfig ) then + mv $confdir/$newconfig $confdir/$newconfig.bak +endif +if ( -d $archdir/$newconfig ) then + mv $archdir/$newconfig $archdir/$newconfig.bak +endif +if ($0 =~ *kinstall) then + awk '{print $0;if($2=="INET"){print"options IPFILTER"}}}' \ + $confdir/$newconfig.bak > $confdir/$newconfig +else + awk '{print $0;if($2=="INET"){print"options IPFILTER_LKM"}}' \ + $confdir/$newconfig.bak > $confdir/$newconfig +endif +echo 'You will now need to run "config" and build a new kernel.' +exit 0 Added: vendor/ipfilter/dist/AIX/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/AIX/Makefile Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,401 @@ +# +# Copyright (C) 2012 by Darren Reed. +# +# See the IPFILTER.LICENCE file for details on licencing. +# +BINDEST=/usr/sbin +SBINDEST=/sbin +MANDIR=/usr/share/man +CC=cc +CFLAGS=-g -I$(TOP) +DEBUG=-O3 +# +# For AIX 5.3 +# +CPU=`uname -p` +INC=-I/usr/include +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) +LKM=ipf +DLKM= +OBJ=. +TOP=.. +HERE=AIX/$(OSREV) +AIX=`uname -v` +DEST=. +MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$(SBINDEST)" "MANDIR=$(MANDIR)" \ + 'CFLAGS=$(CFLAGS)' "IPFLKM=$(IPFLKM)" \ + "IPFLOG=$(IPFLOG)" "LOGFAC=$(LOGFAC)" "POLICY=$(POLICY)" \ + "DEBUG=$(DEBUG)" "DCPU=$(CPU)" "CPUDIR=$(CPUDIR)" \ + "LOOKUP=$(LOOKUP)" "XID=$(XID)" "SCAN=$(SCAN)" "ALLOPTS=$(ALLOPTS)" +LIBS=-q$(BITS) -L. -lipf +CCARGS=$(DEBUG) $(CFLAGS) -I. -DAIX=$(AIX) -q$(BITS) +EXTRA=$(ALLOPTS) +MILLI=`../bootbits.sh` +FIXMILLI=-D_H_STRING=1 -Dbzero=bzero$(MILLI) \ +-Dmemcmp=memcmp$(MILLI) \ +-Dmemcpy=memcpy$(MILLI) \ +-Dmemccpy=memccpy$(MILLI) \ +-Dmemset=memset$(MILLI) \ +-Dmemmove=memmove$(MILLI) \ +-Dfill=fill$(MILLI) \ +-Dstrstr=strstr$(MILLI) +# +########## ########## ########## ########## ########## ########## ########## +# +CP=/bin/cp +RM=/bin/rm +CHMOD=/bin/chmod +INSTALL=$(TOP)/bsdinstall +# +MODOBJS=ip_fil.o fil.o md5.o ip_nat.o ip_frag.o ip_state.o ip_nat6.o \ + ip_proxy.o ip_auth.o ip_log.o ip_pool.o ip_htable.o ip_lookup.o \ + ip_sync.o ip_scan.o ip_rules.o +DFLAGS=$(DEBUG) -DAIX=$(AIX) $(IPFLKM) $(IPFLOG) $(DEF) $(CFLAGS) $(DLKM) \ + $(FIXMILLI) $(IPFBPF) $(LOOKUP) $(XID) -I. +IPF=ipf.o ipfcomp.o ipf_y.o ipf_l.o +IPT=ipftest.o fil_u.o ip_frag_u.o ip_state_u.o ip_nat_u.o ip_nat6_u.o \ + ip_proxy_u.o ip_auth_u.o ip_fil_u.o ip_sync_u.o ip_scan_u.o \ + ip_log_u.o ip_pool_u.o ip_htable_u.o ip_lookup_u.o ip_rules_u.o \ + ipf_y.o ipf_l.o ipnat_y.o ipnat_l.o ippool_y.o ippool_l.o \ + md5_u.o radix_ipf_u.o +IPNAT=ipnat.o ipnat_y.o ipnat_l.o +IPMON=ipmon.o ipmon_y.o ipmon_l.o +IPPOOL=ippool_y.o ippool_l.o kmem.o ippool.o +FILS=ipfstat.o +LIBSRC=$(TOP)/lib +RANLIB=ranlib +AROPTS=-X $(BITS) crs +TOOL=$(TOP)/tools + +include $(TOP)/lib/Makefile + +build all: ./libipf.a ipf.exe ipfs ipfstat ipftest ipmon \ + ipnat ippool ipscan ipsyncm ipsyncs cfg_ipf $(LKM) + -sh -c 'for i in ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done' + -ln -s `pwd`/ipf.exe $(TOP)/ipf + +ipfstat: $(FILS) ./libipf.a + $(CC) $(CCARGS) $(STATETOP_CFLAGS) $(STATETOP_INC) $(FILS) \ + -o $@ $(LIBS) $(STATETOP_LIB) + +ipf.exe: $(IPF) ./libipf.a + $(CC) $(CCARGS) $(IPF) -o $@ $(LIBS) $(LIBBPF) + +ipftest: $(IPT) ./libipf.a + $(CC) $(CCARGS) $(IPT) -o $@ $(LIBS) $(LIBBPF) + +ipnat: $(IPNAT) ./libipf.a + $(CC) $(CCARGS) $(IPNAT) -o $@ $(LIBS) + +ipfs: ipfs.o ./libipf.a + $(CC) $(CCARGS) ipfs.o -o $@ $(LIBS) + +ipsyncm: ipsyncm.o ./libipf.a + $(CC) $(CCARGS) ipsyncm.o -o $@ $(LIBS) + +ipsyncs: ipsyncs.o ./libipf.a + $(CC) $(CCARGS) ipsyncs.o -o $@ $(LIBS) + +ipsyncm.o: $(TOOL)/ipsyncm.c $(TOP)/ip_sync.h + $(CC) $(CCARGS) -c $(TOOL)/ipsyncm.c -o $@ + +ipsyncs.o: $(TOOL)/ipsyncs.c $(TOP)/ip_sync.h + $(CC) $(CCARGS) -c $(TOOL)/ipsyncs.c -o $@ + +tests: + (cd test; make ) + +ipfstat.o: $(TOOL)/ipfstat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_frag.h \ + $(TOP)/ip_compat.h $(TOP)/ip_state.h $(TOP)/ip_nat.h + $(CC) $(CCARGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ + -c $(TOOL)/ipfstat.c -o $@ + +ipfs.o: $(TOOL)/ipfs.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_state.h \ + $(TOP)/ip_nat.h + $(CC) $(CCARGS) -c $(TOOL)/ipfs.c -o $@ + +fil_u.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_compat.h + $(CC) $(CCARGS) $(EXTRA) $(FIXRADIX) $(IPFBPF) -c $(TOP)/fil.c -o $@ + +ipf.o: $(TOOL)/ipf.c $(TOP)/ip_fil.h $(TOP)/ipf.h + $(CC) $(CCARGS) -c $(TOOL)/ipf.c -o $@ + +ipf_y.o: ipf_y.c ipf_y.h $(TOP)/ipf.h ipf_l.h + $(CC) $(CCARGS) $(IPFBPF) -c ipf_y.c -o $@ + +ipf_l.o: ipf_l.c ipf_y.h $(TOP)/ipf.h ipf_l.h + $(CC) $(CCARGS) -I. -c ipf_l.c -o $@ + +ipf_y.h ipf_y.c: $(TOOL)/ipf_y.y $(TOP)/ip_pool.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipf_l.c ipf_l.h: $(TOOL)/lexer.c $(TOP)/ipf.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipfcomp.o: $(TOOL)/ipfcomp.c $(TOP)/ip_fil.h $(TOP)/ipf.h + $(CC) $(CCARGS) -c $(TOOL)/ipfcomp.c -o $@ + +ipftest.o: $(TOOL)/ipftest.c $(TOP)/ip_fil.h $(TOP)/ipt.h $(TOP)/ipf.h + $(CC) $(CCARGS) -c $(TOOL)/ipftest.c -o $@ + +ipnat.o: $(TOOL)/ipnat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_nat.h + $(CC) $(CCARGS) -c $(TOOL)/ipnat.c -o $@ + +ipnat_y.o: ipnat_y.c ipnat_y.h $(TOP)/ip_fil.h $(TOP)/ip_compat.h \ + $(TOP)/ipf.h $(TOP)/ip_nat.h ipnat_l.h + $(CC) $(CCARGS) -c ipnat_y.c -o $@ + +ipnat_l.o: ipnat_l.c ipnat_y.h $(TOP)/ip_fil.h $(TOP)/ip_compat.h \ + $(TOP)/ipf.h $(TOP)/ip_nat.h ipnat_l.h + $(CC) $(CCARGS) -I. -c ipnat_l.c -o $@ + +ipnat_y.h ipnat_y.c: $(TOOL)/ipnat_y.y $(TOP)/ip_nat.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipnat_l.c ipnat_l.h: $(TOOL)/lexer.c $(TOP)/ip_nat.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ip_rules.c: $(TOP)/rules/ip_rules $(TOP)/tools/ipfcomp.c ipf.exe + ./ipf.exe -cc -nf $(TOP)/rules/ip_rules + +$(TOP)/ip_rules.h: ip_rules.c + if [ ! -f $(TOP)/ip_rules.h ] ; then \ + /bin/mv -f ip_rules.h $(TOP); \ + else \ + touch $(TOP)/ip_rules.h; \ + fi + +ip_nat_u.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat.c -o $@ + +ip_nat6_u.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_nat6.c -o $@ + +ip_proxy_u.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ + $(TOP)/ip_ftp_pxy.c $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_raudio_pxy.c \ + $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h \ + $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_proxy.c -o $@ + +ip_frag_u.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h \ + $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_frag.c -o $@ + +ip_state_u.o: $(TOP)/ip_state.c $(TOP)/ip_state.h $(TOP)/ip_compat.h \ + $(TOP)/ip_fil.h $(TOP)/ip_nat.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_state.c -o $@ + +ip_auth_u.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \ + $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_auth.c -o $@ + +ip_fil_u.o: $(TOP)/ip_fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h + $(CC) $(CCARGS) $(EXTRA) $(FIXRADIX) -c $(TOP)/ip_fil.c -o $@ + +ip_scan_u.o: $(TOP)/ip_scan.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_scan.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_scan.c -o $@ + +ip_sync_u.o: $(TOP)/ip_sync.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_sync.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_sync.c -o $@ + +ip_rules_u.o: ip_rules.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_rules.h + $(CC) $(CCARGS) $(EXTRA) -c ip_rules.c -o $@ + +ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_log.c -o $@ + +ip_pool_u.o: $(TOP)/ip_pool.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_pool.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_pool.c -o $@ + +ip_htable_u.o: $(TOP)/ip_htable.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_htable.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_htable.c -o $@ + +ip_lookup_u.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_lookup.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_lookup.c -o $@ + +bpf_filter_u.o: $(TOP)/bpf_filter.c $(TOP)/pcap-ipf.h $(TOP)/bpf-ipf.h + $(CC) $(CCARGS) -c $(TOP)/bpf_filter.c -o $@ + +md5_u.o: $(TOP)/md5.c $(TOP)/md5.h + $(CC) $(CCARGS) -c $(TOP)/md5.c -o $@ + +radix_ipf_u.o: $(TOP)/radix_ipf.c $(TOP)/radix_ipf.h + $(CC) $(CCARGS) -c $(TOP)/radix_ipf.c -o $@ + +cfg_ipf: cfg_ipf.o +# ld -o cfg_ipf cfg_ipf.o -L/usr/lib/ia64l32 -L/usr/ccs/lib/ia64l32 \ +# -lodm -lrts -lcfg + $(CC) $(CCARGS) -o cfg_ipf cfg_ipf.o -lodm -lrts -lcfg + +cfg_ipf.o: ../aix_cfg_ipf.c + $(CC) -D_ALL_SOURCE -D_KERNEL $(CCARGS) -c ../aix_cfg_ipf.c -o $@ + +$(LKM): $(MODOBJS) ../ipfkext.exp /lib/kernex.exp /lib/syscalls.exp + ld -G -eipfconfig -bimport:/lib/syscalls.exp -bimport:/lib/kernex.exp \ + -bimport:/lib/kernex.exp -bimport:/lib/netinet.exp \ + -bimport:/lib/statcmd.exp \ + -lcsys -lsys -bexport:../ipfkext.exp -bmap:ipfkext.map \ + $(MODOBJS) -o $(LKM)32 + /bin/rm -f $(LKM) + ar -X $(BITS) cq $(LKM) $(LKM)32 + +fil.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_compat.h $(TOP)/ipl.h + $(CC) $(POLICY) $(DFLAGS) $(IPFBPF) -c $(TOP)/fil.c -o $@ + +ip_nat.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_nat.c -o $@ + +ip_nat6.o: $(TOP)/ip_nat6.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_nat6.c -o $@ + +ip_frag.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_frag.c -o $@ + +ip_state.o: $(TOP)/ip_state.c $(TOP)/ip_state.h $(TOP)/ip_compat.h \ + $(TOP)/ip_fil.h $(TOP)/ip_nat.h + $(CC) $(DFLAGS) -DIPSTATE_SIZE=127 -c $(TOP)/ip_state.c -o $@ + +ip_proxy.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ + $(TOP)/ip_ftp_pxy.c $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_raudio_pxy.c \ + $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h \ + $(TOP)/ip_nat.h $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_proxy.c -o $@ + +ip_auth.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \ + $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_auth.c -o $@ + +ip_fil.o: $(TOP)/ip_fil_aix.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ip_nat.h + $(CC) $(DFLAGS) $(COMPIPF) -c $(TOP)/ip_fil_aix.c -o $@ + +ip_log.o: $(TOP)/ip_log.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h + $(CC) $(DFLAGS) -c $(TOP)/ip_log.c -o $@ + +ip_scan.o: $(TOP)/ip_scan.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_scan.h + $(CC) $(DFLAGS) -c $(TOP)/ip_scan.c -o $@ + +ip_sync.o: $(TOP)/ip_sync.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_sync.h + $(CC) $(DFLAGS) -c $(TOP)/ip_sync.c -o $@ + +radix_ipf.o: $(TOP)/radix_ipf.c $(TOP)/radix_ipf.h + $(CC) $(DFLAGS) -c $(TOP)/radix_ipf.c -o $@ + +ip_pool.o: $(TOP)/ip_pool.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_pool.h $(TOP)/radix_ipf.h + $(CC) $(DFLAGS) $(FIXRADIX) -c $(TOP)/ip_pool.c -o $@ + +ip_htable.o: $(TOP)/ip_htable.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_htable.h + $(CC) $(DFLAGS) -c $(TOP)/ip_htable.c -o $@ + +ip_lookup.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_lookup.h + $(CC) $(DFLAGS) $(FIXRADIX) -c $(TOP)/ip_lookup.c -o $@ + +ip_rules.o: ip_rules.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_rules.h + $(CC) -I. $(DFLAGS) -c ip_rules.c -o $@ + +ip_rulesx.o: ip_rules.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(TOP)/ip_rules.h + $(CC) -I. -DIPFILTER_COMPILED $(DFLAGS) -c ip_rules.c -o $@ + +#aix.o: $(TOP)/aix.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h +# $(CC) $(DFLAGS) -c $(TOP)/aix.c -o $@ + +md5.o: $(TOP)/md5.c $(TOP)/md5.h + $(CC) $(DFLAGS) -c $(TOP)/md5.c -o $@ + +ipmon: $(IPMON) ./libipf.a + $(CC) $(CCARGS) $(LOGFAC) $(IPMON) -o $@ $(LIBS) -ll + +ipmon.o: $(TOOL)/ipmon.c $(TOP)/ipmon.h + $(CC) $(CCARGS) $(LOGFAC) -c $(TOOL)/ipmon.c -o $@ + +ipmon_y.o: ipmon_y.c ipmon_y.h $(TOP)/ipmon.h ipmon_l.h + $(CC) $(CCARGS) -c ipmon_y.c -o $@ + +ipmon_l.o: ipmon_l.c ipmon_y.h $(TOP)/ipmon.h ipmon_l.h + $(CC) $(CCARGS) -I. -c ipmon_l.c -o $@ + +ipmon_y.h ipmon_y.c: $(TOOL)/ipmon_y.y $(TOP)/ipmon.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipmon_l.c ipmon_l.h: $(TOOL)/lexer.c $(TOP)/ipmon.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipscan: ipscan_y.o ipscan_l.o + $(CC) $(DEBUG) ipscan_y.o ipscan_l.o -o $@ -ll $(LIBS) + +ipscan_y.o: ipscan_y.c ipscan_y.h $(TOP)/ip_scan.h ipscan_l.h + $(CC) $(CCARGS) -c ipscan_y.c -o $@ + +ipscan_l.o: ipscan_l.c ipscan_y.h $(TOP)/ip_scan.h ipscan_l.h + $(CC) $(CCARGS) -I. -c ipscan_l.c -o $@ + +ipscan_y.h ipscan_y.c: $(TOOL)/ipscan_y.y $(TOP)/ip_scan.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ipscan_l.c ipscan_l.h: $(TOOL)/lexer.c $(TOP)/ip_scan.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ippool: $(IPPOOL) + $(CC) $(DEBUG) -I. $(CFLAGS) $(IPPOOL) -o $@ $(LIBS) -ll + +ippool.o: $(TOOL)/ippool.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_pool.h + $(CC) $(CCARGS) -c $(TOOL)/ippool.c -o $@ + +ippool_y.o: ippool_y.c ippool_y.h $(TOP)/ip_pool.h ippool_l.h + $(CC) $(CCARGS) -c ippool_y.c -o $@ + +ippool_l.o: ippool_l.c ippool_y.h $(TOP)/ip_pool.h ippool_l.h + $(CC) $(CCARGS) -I. -c ippool_l.c -o $@ + +ippool_y.h ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +ippool_l.c ippool_l.h: $(TOOL)/lexer.c $(TOP)/ip_pool.h + (cd $(TOOL); make "DEST=../$(HERE)" ../$(HERE)/$@) + +.y.c: + +.l.c: + +clean: + ${RM} -f ../ipf.exe ../ipnat ../ipmon ../ippool ../ipftest + ${RM} -f ../ipscan ../ipsyncm ../ipsyncs cfg_ipf + ${RM} -f *.core *.o *.a *.o.d + ${RM} -f fils ipf.exe ipfstat ipftest ipmon if_ipl ipnat + ${RM} -f $(LKM) ioconf.h *.ko setdef1.c setdef0.c setdefs.h + ${RM} -f ip_fil.c ipf_l.c ipf_y.c ipf_y.h ipf_l.h + ${RM} -f ipscan ipscan_y.c ipscan_y.h ipscan_l.c ipscan_l.h + ${RM} -f ippool ippool_y.c ippool_y.h ippool_l.c ippool_l.h + ${RM} -f ipnat_y.c ipnat_y.h ipnat_l.c ipnat_l.h + ${RM} -f ipmon_y.c ipmon_y.h ipmon_l.c ipmon_l.h + ${RM} -f ipscan ipscan_y.c ipscan_y.h ipscan_l.c y.tab.? lex.yy.c ipfs + ${RM} -f ipsyncm ipsyncs ip_rules.c ip_rules.h + + ${MAKE} -f Makefile.ipsend ${MFLAGS} clean + -(for i in *; do \ + if [ -d $${i} -a -f $${i}/Makefile ] ; then \ + cd $${i}; (make TOP=../.. clean); cd ..; \ + rm $${i}/Makefile $${i}/Makefile.ipsend; \ + rmdir $${i}; \ + fi \ + done) + +install: + cp cfg_ipf /usr/lib/methods + cp $(LKM) /usr/lib/drivers/ipf + -for i in ipfs ipnat ipscan ipfstat; do \ + $(INSTALL) -s -c -g system -m 755 -o root $$i $(SBINDEST); \ + done + $(INSTALL) -s -c -g system -m 755 -o root ipf.exe $(SBINDEST)/ipf + -for i in ipmon ipftest ipsyncs ipsyncm; do \ + $(INSTALL) -s -c -g system -m 755 -o root $$i $(BINDEST); \ + done + (cd $(TOP)/man; make INSTALL=../bsdinstall MANDIR=$(MANDIR) install; cd $(TOP)) + sync Added: vendor/ipfilter/dist/AIX/Makefile.ipsend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/AIX/Makefile.ipsend Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,78 @@ +MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$(SBINDEST)" "MANDIR=$(MANDIR)" \ + "CC=$(CC)" "CFLAGS=$(CFLAGS)" "DEBUG=$(DEBUG)" \ + "IPFLKM=$(IPFLKM)" "IPFLOG=$(IPFLOG)" \ + "LOGFAC=$(LOGFAC)" "POLICY=$(POLICY)" "LOOKUP=$(LOOKUP)" +FIXRADIX=-Dradix_node=ipf_radix_node -Dradix_node_head=ipf_radix_node_head +OBJS=ipsend.o ip.o ipsopt.o iplang_y.o iplang_l.o +IPFTO=ipft_ef.o ipft_hx.o ipft_pc.o ipft_sn.o ipft_td.o ipft_tx.o +ROBJS=ipresend.o ip.o resend.o +TOBJS=iptest.o iptests.o ip.o +UNIXOBJS=dlcommon.o sbpf.o arp.o sock.o +OBJ=. +LIBS=-L$(OBJ) -lipf + +CC=cc +CFLAGS=-g -I$(TOP) +CCARGS=$(DEBUG) $(CFLAGS) -I. + +all nit sunos4 sunos4-nit build : ipsend ipresend iptest + +iplang_y.o: $(TOP)/iplang/iplang_y.y + (cd $(TOP)/iplang; $(MAKE) 'DESTDIR=../AIX/$(OSREV)' ) + +iplang_l.o: $(TOP)/iplang/iplang_l.l + (cd $(TOP)/iplang; $(MAKE) 'DESTDIR=../AIX/$(OSREV)' ) + +.c.o: + $(CC) $(CCARGS) -c $(TOP)/ipsend/$< -o $@ + +ipsend: $(OBJS) $(UNIXOBJS) + $(CC) $(DEBUG) $(OBJS) $(UNIXOBJS) -o $@ $(LIBS) -ll + +ipresend: $(ROBJS) $(UNIXOBJS) + $(CC) $(DEBUG) $(ROBJS) $(UNIXOBJS) -o $@ $(LIBS) + +iptest: $(TOBJS) $(UNIXOBJS) + $(CC) $(DEBUG) $(TOBJS) $(UNIXOBJS) -o $@ $(LIBS) + +clean: + rm -rf *.o core a.out ipsend ipresend iptest iplang_y.* iplang_l.* + +ipsend.o: $(TOP)/ipsend/ipsend.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsend.c -o $@ +ipsopt.o: $(TOP)/ipsend/ipsopt.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/ipsopt.c -o $@ +ipresend.o: $(TOP)/ipsend/ipresend.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/ipresend.c -o $@ +ip.o: $(TOP)/ipsend/ip.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/ip.c -o $@ +resend.o: $(TOP)/ipsend/resend.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/resend.c -o $@ +ipft_sn.o: $(TOP)/ipft_sn.c + $(CC) $(CCARGS) -c $(TOP)/ipft_sn.c -o $@ +ipft_pc.o: $(TOP)/ipft_pc.c + $(CC) $(CCARGS) -c $(TOP)/ipft_pc.c -o $@ +iptest.o: $(TOP)/ipsend/iptest.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/iptest.c -o $@ +iptests.o: $(TOP)/ipsend/iptests.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/iptests.c -o $@ +sbpf.o: $(TOP)/ipsend/sbpf.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/sbpf.c -o $@ +snit.o: $(TOP)/ipsend/snit.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/snit.c -o $@ +sock.o: $(TOP)/ipsend/sock.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/sock.c -o $@ +arp.o: $(TOP)/ipsend/arp.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/arp.c -o $@ +44arp.o: $(TOP)/ipsend/44arp.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/44arp.c -o $@ +lsock.o: $(TOP)/ipsend/lsock.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/lsock.c -o $@ +slinux.o: $(TOP)/ipsend/slinux.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/slinux.c -o $@ +larp.o: $(TOP)/ipsend/larp.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/larp.c -o $@ +dlcommon.o: $(TOP)/ipsend/dlcommon.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/dlcommon.c -o $@ +sdlpi.o: $(TOP)/ipsend/sdlpi.c + $(CC) $(CCARGS) -c $(TOP)/ipsend/sdlpi.c -o $@ Added: vendor/ipfilter/dist/AIX/aix_cfg_ipf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/ipfilter/dist/AIX/aix_cfg_ipf.c Sun Aug 11 14:28:45 2013 (r254219) @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2012 by Darren Reed. + * + * See the IPFILTER.LICENCE file for details on licencing. + * + * $Id$ + */ +#include +#include +#include +#include +/* + * This is a workaround for troubles on FreeBSD, HPUX, OpenBSD. + * Needed here because on some systems gets included by things + * like + */ +#include +#include +#include +#include +#define _TCP_DEBUG_H_ +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "netinet/ip_compat.h" +#include "netinet/ip_fil.h" + +#ifndef __P +# ifdef __STDC__ +# define __P(x) x +# else +# define __P(x) () +# endif +#endif +#ifndef __STDC__ +# undef const +# define const +#endif + +/* + * AIX requires a specific configure/unconfigure program + */ +#undef ASSERT +#include +#include + +void loadipf __P((int major, int minor, dev_t devno, char *)); +void unloadipf __P((int major, int minor, dev_t devno)); +void queryipf __P((int major, int minor, dev_t devno)); +int checkarg __P((int, char *arg)); +void usage __P((char *)); + +static char *ipf_devfiles[] = { IPL_NAME, IPNAT_NAME, IPSTATE_NAME, + IPAUTH_NAME, IPSYNC_NAME, IPSCAN_NAME, + IPLOOKUP_NAME, NULL }; + +int +main(int argc, char *argv[]) +{ + int major, minor, action; + dev_t devno; + + action = checkarg(argc, argv[1]); + if (action == -1) + usage(argv[0]); + + if (odm_initialize() == -1) { + fprintf(stderr, "odm_initialize() failed\n"); + exit(1); + } + + major = genmajor("ipf"); + if (major == -1) { + fprintf(stderr, "genmajor(ipf) failed\n"); + exit(1); + } + minor = 0; + + devno = makedev(major, minor); + if (devno == -1) { + fprintf(stderr, "makedev(%d,%d) failed\n", major, minor); + exit(1); + } + printf("Major %d\ndevno %x\n", major, devno); + + switch (action) + { + case 1 : + loadipf(major, minor, devno, argv[2]); + break; + case 2 : + unloadipf(major, minor, devno); + break; + case 3 : + queryipf(major, minor, devno); + break; + } + + odm_terminate(); + + return 0; +} + + +void usage(char *prog) +{ + fprintf(stderr, "Usage:\t%s -l\n\t%s -u\n\t%s -q\n", + prog, prog, prog); + exit(1); +} + + +int checkarg(int argc, char *arg) +{ + if (argc < 2) + return -1; + + if (!strcmp(arg, "-l") && (argc <= 3)) + return 1; + + if (!strcmp(arg, "-u") && (argc == 2)) + return 2; + + if (!strcmp(arg, "-q") && (argc == 2)) + return 3; + + return -1; +} + + +void +loadipf(int major, int minor, dev_t devno, char *path) +{ + struct cfg_dd ipfcfg; + struct cfg_load cfg; + char *buffer[1024]; + char *ipfpath; + int i; + + bzero(buffer, sizeof(buffer)); + if (path != NULL) + ipfpath = path; + else + ipfpath = "/usr/lib/drivers/ipf"; + +#if 0 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***