Date: Fri, 6 Sep 2013 23:11:20 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255332 - in head: contrib/ipfilter contrib/ipfilter/BSD contrib/ipfilter/FWTK contrib/ipfilter/FreeBSD contrib/ipfilter/FreeBSD-2.2 contrib/ipfilter/FreeBSD-3 contrib/ipfilter/FreeBSD-... Message-ID: <201309062311.r86NBKvM062396@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Sep 6 23:11:19 2013 New Revision: 255332 URL: http://svnweb.freebsd.org/changeset/base/255332 Log: Update ipfilter 4.1.28 --> 5.1.2. Approved by: glebius (mentor) BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author) Added: head/contrib/ipfilter/BSD/upgrade - copied unchanged from r254219, vendor/ipfilter/dist/BSD/upgrade head/contrib/ipfilter/WhatsNew50.txt - copied unchanged from r254219, vendor/ipfilter/dist/WhatsNew50.txt head/contrib/ipfilter/arc4random.c - copied unchanged from r254219, vendor/ipfilter/dist/arc4random.c head/contrib/ipfilter/genmask.c - copied unchanged from r254431, vendor/ipfilter/dist/lib/genmask.c head/contrib/ipfilter/ip_dstlist.c - copied unchanged from r254219, vendor/ipfilter/dist/ip_dstlist.c head/contrib/ipfilter/ip_dstlist.h - copied unchanged from r254219, vendor/ipfilter/dist/ip_dstlist.h head/contrib/ipfilter/ip_fil_compat.c - copied unchanged from r254219, vendor/ipfilter/dist/ip_fil_compat.c head/contrib/ipfilter/ipf_rb.h - copied unchanged from r254219, vendor/ipfilter/dist/ipf_rb.h head/contrib/ipfilter/lib/allocmbt.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/allocmbt.c head/contrib/ipfilter/lib/assigndefined.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/assigndefined.c head/contrib/ipfilter/lib/connecttcp.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/connecttcp.c head/contrib/ipfilter/lib/dupmbt.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/dupmbt.c head/contrib/ipfilter/lib/familyname.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/familyname.c head/contrib/ipfilter/lib/findword.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/findword.c head/contrib/ipfilter/lib/freembt.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/freembt.c head/contrib/ipfilter/lib/ftov.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/ftov.c head/contrib/ipfilter/lib/geticmptype.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/geticmptype.c head/contrib/ipfilter/lib/icmptypename.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/icmptypename.c head/contrib/ipfilter/lib/icmptypes.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/icmptypes.c head/contrib/ipfilter/lib/interror.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/interror.c head/contrib/ipfilter/lib/ipf_perror.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/ipf_perror.c head/contrib/ipfilter/lib/load_dstlist.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/load_dstlist.c head/contrib/ipfilter/lib/load_dstlistnode.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/load_dstlistnode.c head/contrib/ipfilter/lib/mb_hexdump.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/mb_hexdump.c head/contrib/ipfilter/lib/msgdsize.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/msgdsize.c head/contrib/ipfilter/lib/parsefields.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/parsefields.c head/contrib/ipfilter/lib/parseipfexpr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/parseipfexpr.c head/contrib/ipfilter/lib/parsewhoisline.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/parsewhoisline.c head/contrib/ipfilter/lib/poolio.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/poolio.c head/contrib/ipfilter/lib/prependmbt.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/prependmbt.c head/contrib/ipfilter/lib/printactiveaddr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printactiveaddr.c head/contrib/ipfilter/lib/printaddr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printaddr.c head/contrib/ipfilter/lib/printdstl_live.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printdstl_live.c head/contrib/ipfilter/lib/printdstlist.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printdstlist.c head/contrib/ipfilter/lib/printdstlistdata.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printdstlistdata.c head/contrib/ipfilter/lib/printdstlistnode.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printdstlistnode.c head/contrib/ipfilter/lib/printdstlistpolicy.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printdstlistpolicy.c head/contrib/ipfilter/lib/printfieldhdr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printfieldhdr.c head/contrib/ipfilter/lib/printhost.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printhost.c head/contrib/ipfilter/lib/printipfexpr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printipfexpr.c head/contrib/ipfilter/lib/printiphdr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printiphdr.c head/contrib/ipfilter/lib/printlookup.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printlookup.c head/contrib/ipfilter/lib/printnataddr.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printnataddr.c head/contrib/ipfilter/lib/printnatfield.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printnatfield.c head/contrib/ipfilter/lib/printnatside.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printnatside.c head/contrib/ipfilter/lib/printpoolfield.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printpoolfield.c head/contrib/ipfilter/lib/printstatefields.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printstatefields.c head/contrib/ipfilter/lib/printtcpflags.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printtcpflags.c head/contrib/ipfilter/lib/printunit.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/printunit.c head/contrib/ipfilter/lib/save_execute.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/save_execute.c head/contrib/ipfilter/lib/save_file.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/save_file.c head/contrib/ipfilter/lib/save_nothing.c - copied, changed from r254219, vendor/ipfilter/dist/lib/save_nothing.c head/contrib/ipfilter/lib/save_syslog.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/save_syslog.c head/contrib/ipfilter/lib/save_v1trap.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/save_v1trap.c head/contrib/ipfilter/lib/save_v2trap.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/save_v2trap.c head/contrib/ipfilter/lib/vtof.c - copied unchanged from r254219, vendor/ipfilter/dist/lib/vtof.c head/contrib/ipfilter/ml_ipl.c (contents, props changed) head/contrib/ipfilter/mlfk_ipl.c (contents, props changed) head/contrib/ipfilter/mli_ipl.c (contents, props changed) head/contrib/ipfilter/mln_ipl.c (contents, props changed) head/contrib/ipfilter/mln_rule.c - copied unchanged from r254689, vendor/ipfilter/dist/mln_rule.c head/contrib/ipfilter/mlo_ipl.c - copied, changed from r254219, vendor/ipfilter/dist/mlo_ipl.c head/contrib/ipfilter/mlo_rule.c - copied, changed from r254219, vendor/ipfilter/dist/mlo_rule.c head/contrib/ipfilter/mls_ipl.c (contents, props changed) head/contrib/ipfilter/mls_rule.c - copied, changed from r254219, vendor/ipfilter/dist/mls_rule.c head/contrib/ipfilter/mlso_rule.c - copied, changed from r254219, vendor/ipfilter/dist/mlso_rule.c head/contrib/ipfilter/radix_ipf.c - copied unchanged from r254219, vendor/ipfilter/dist/radix_ipf.c head/contrib/ipfilter/sys/ - copied from r254219, vendor/ipfilter/dist/sys/ head/contrib/ipfilter/test/e4to6 - copied unchanged from r254219, vendor/ipfilter/dist/test/e4to6 head/contrib/ipfilter/test/expected/f21 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f21 head/contrib/ipfilter/test/expected/f22 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f22 head/contrib/ipfilter/test/expected/f25 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f25 head/contrib/ipfilter/test/expected/f26 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f26 head/contrib/ipfilter/test/expected/f27 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f27 head/contrib/ipfilter/test/expected/f28 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f28 head/contrib/ipfilter/test/expected/f29 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f29 head/contrib/ipfilter/test/expected/f30 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/f30 head/contrib/ipfilter/test/expected/i22 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/i22 head/contrib/ipfilter/test/expected/i23 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/i23 head/contrib/ipfilter/test/expected/in100 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/in100 head/contrib/ipfilter/test/expected/in101 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/in101 head/contrib/ipfilter/test/expected/in102 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/in102 head/contrib/ipfilter/test/expected/in7 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/in7 head/contrib/ipfilter/test/expected/ip3 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/ip3 head/contrib/ipfilter/test/expected/ipv6.4 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/ipv6.4 head/contrib/ipfilter/test/expected/n100 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n100 head/contrib/ipfilter/test/expected/n101 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n101 head/contrib/ipfilter/test/expected/n102 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n102 head/contrib/ipfilter/test/expected/n103 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n103 head/contrib/ipfilter/test/expected/n104 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n104 head/contrib/ipfilter/test/expected/n105 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n105 head/contrib/ipfilter/test/expected/n106 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n106 head/contrib/ipfilter/test/expected/n11_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n11_6 head/contrib/ipfilter/test/expected/n12_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n12_6 head/contrib/ipfilter/test/expected/n13_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n13_6 head/contrib/ipfilter/test/expected/n14_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n14_6 head/contrib/ipfilter/test/expected/n15 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n15 head/contrib/ipfilter/test/expected/n15_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n15_6 head/contrib/ipfilter/test/expected/n17 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n17 head/contrib/ipfilter/test/expected/n18 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n18 head/contrib/ipfilter/test/expected/n1_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n1_6 head/contrib/ipfilter/test/expected/n200 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n200 head/contrib/ipfilter/test/expected/n2_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n2_6 head/contrib/ipfilter/test/expected/n4_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n4_6 head/contrib/ipfilter/test/expected/n5_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n5_6 head/contrib/ipfilter/test/expected/n6_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n6_6 head/contrib/ipfilter/test/expected/n7_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n7_6 head/contrib/ipfilter/test/expected/n8_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n8_6 head/contrib/ipfilter/test/expected/n9_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/n9_6 head/contrib/ipfilter/test/expected/ni17 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/ni17 head/contrib/ipfilter/test/expected/ni18 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/ni18 head/contrib/ipfilter/test/expected/p10 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p10 head/contrib/ipfilter/test/expected/p11 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p11 head/contrib/ipfilter/test/expected/p12 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p12 head/contrib/ipfilter/test/expected/p13 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p13 head/contrib/ipfilter/test/expected/p4 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p4 head/contrib/ipfilter/test/expected/p6 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p6 head/contrib/ipfilter/test/expected/p7 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p7 head/contrib/ipfilter/test/expected/p9 - copied unchanged from r254219, vendor/ipfilter/dist/test/expected/p9 head/contrib/ipfilter/test/h4to6 - copied unchanged from r254219, vendor/ipfilter/dist/test/h4to6 head/contrib/ipfilter/test/i4to6 - copied unchanged from r254219, vendor/ipfilter/dist/test/i4to6 head/contrib/ipfilter/test/input/f21 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f21 head/contrib/ipfilter/test/input/f22 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f22 head/contrib/ipfilter/test/input/f25 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f25 head/contrib/ipfilter/test/input/f26 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f26 head/contrib/ipfilter/test/input/f27 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f27 head/contrib/ipfilter/test/input/f28 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f28 head/contrib/ipfilter/test/input/f29 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f29 head/contrib/ipfilter/test/input/f30 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/f30 head/contrib/ipfilter/test/input/ipv6.4 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/ipv6.4 head/contrib/ipfilter/test/input/n100 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n100 head/contrib/ipfilter/test/input/n101 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n101 head/contrib/ipfilter/test/input/n102 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n102 head/contrib/ipfilter/test/input/n103 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n103 head/contrib/ipfilter/test/input/n104 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n104 head/contrib/ipfilter/test/input/n105 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n105 head/contrib/ipfilter/test/input/n106 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n106 head/contrib/ipfilter/test/input/n10_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n10_6 head/contrib/ipfilter/test/input/n11_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n11_6 head/contrib/ipfilter/test/input/n12_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n12_6 head/contrib/ipfilter/test/input/n13_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n13_6 head/contrib/ipfilter/test/input/n14_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n14_6 head/contrib/ipfilter/test/input/n15 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n15 head/contrib/ipfilter/test/input/n15_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n15_6 head/contrib/ipfilter/test/input/n17 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n17 head/contrib/ipfilter/test/input/n17_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n17_6 head/contrib/ipfilter/test/input/n18 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n18 head/contrib/ipfilter/test/input/n1_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n1_6 head/contrib/ipfilter/test/input/n200 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n200 head/contrib/ipfilter/test/input/n2_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n2_6 head/contrib/ipfilter/test/input/n4_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n4_6 head/contrib/ipfilter/test/input/n5_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n5_6 head/contrib/ipfilter/test/input/n6_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n6_6 head/contrib/ipfilter/test/input/n7_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n7_6 head/contrib/ipfilter/test/input/n8_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n8_6 head/contrib/ipfilter/test/input/n9_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/n9_6 head/contrib/ipfilter/test/input/ni18 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/ni18 head/contrib/ipfilter/test/input/p10 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p10 head/contrib/ipfilter/test/input/p11 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p11 head/contrib/ipfilter/test/input/p12 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p12 head/contrib/ipfilter/test/input/p13 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p13 head/contrib/ipfilter/test/input/p4 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p4 head/contrib/ipfilter/test/input/p6 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p6 head/contrib/ipfilter/test/input/p7 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p7 head/contrib/ipfilter/test/input/p9 - copied unchanged from r254219, vendor/ipfilter/dist/test/input/p9 head/contrib/ipfilter/test/ipflib.sh - copied unchanged from r254219, vendor/ipfilter/dist/test/ipflib.sh head/contrib/ipfilter/test/regress/f21 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f21 head/contrib/ipfilter/test/regress/f22 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f22 head/contrib/ipfilter/test/regress/f25 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f25 head/contrib/ipfilter/test/regress/f26 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f26 head/contrib/ipfilter/test/regress/f27 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f27 head/contrib/ipfilter/test/regress/f28.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f28.ipf head/contrib/ipfilter/test/regress/f28.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f28.pool head/contrib/ipfilter/test/regress/f29.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f29.ipf head/contrib/ipfilter/test/regress/f29.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f29.pool head/contrib/ipfilter/test/regress/f30 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/f30 head/contrib/ipfilter/test/regress/i22 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/i22 head/contrib/ipfilter/test/regress/i23 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/i23 head/contrib/ipfilter/test/regress/in100 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/in100 head/contrib/ipfilter/test/regress/in101 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/in101 head/contrib/ipfilter/test/regress/in102 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/in102 head/contrib/ipfilter/test/regress/in7 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/in7 head/contrib/ipfilter/test/regress/ip3 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/ip3 head/contrib/ipfilter/test/regress/ipv6.4 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/ipv6.4 head/contrib/ipfilter/test/regress/n100 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n100 head/contrib/ipfilter/test/regress/n101 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n101 head/contrib/ipfilter/test/regress/n102 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n102 head/contrib/ipfilter/test/regress/n103 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n103 head/contrib/ipfilter/test/regress/n104 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n104 head/contrib/ipfilter/test/regress/n105 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n105 head/contrib/ipfilter/test/regress/n106 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n106 head/contrib/ipfilter/test/regress/n10_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n10_6 head/contrib/ipfilter/test/regress/n11_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n11_6 head/contrib/ipfilter/test/regress/n12_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n12_6 head/contrib/ipfilter/test/regress/n13_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n13_6 head/contrib/ipfilter/test/regress/n14_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n14_6 head/contrib/ipfilter/test/regress/n15 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n15 head/contrib/ipfilter/test/regress/n15_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n15_6 head/contrib/ipfilter/test/regress/n16_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n16_6 head/contrib/ipfilter/test/regress/n17 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n17 head/contrib/ipfilter/test/regress/n17_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n17_6 head/contrib/ipfilter/test/regress/n18 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n18 head/contrib/ipfilter/test/regress/n1_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n1_6 head/contrib/ipfilter/test/regress/n200 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n200 head/contrib/ipfilter/test/regress/n2_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n2_6 head/contrib/ipfilter/test/regress/n4_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n4_6 head/contrib/ipfilter/test/regress/n5_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n5_6 head/contrib/ipfilter/test/regress/n6_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n6_6 head/contrib/ipfilter/test/regress/n7_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n7_6 head/contrib/ipfilter/test/regress/n8_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n8_6 head/contrib/ipfilter/test/regress/n9_6 - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/n9_6 head/contrib/ipfilter/test/regress/ni17.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/ni17.ipf head/contrib/ipfilter/test/regress/ni18.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/ni18.ipf head/contrib/ipfilter/test/regress/ni18.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/ni18.nat head/contrib/ipfilter/test/regress/p10.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p10.nat head/contrib/ipfilter/test/regress/p10.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p10.pool head/contrib/ipfilter/test/regress/p11.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p11.nat head/contrib/ipfilter/test/regress/p11.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p11.pool head/contrib/ipfilter/test/regress/p12.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p12.nat head/contrib/ipfilter/test/regress/p12.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p12.pool head/contrib/ipfilter/test/regress/p13.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p13.ipf head/contrib/ipfilter/test/regress/p13.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p13.pool head/contrib/ipfilter/test/regress/p4.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p4.nat head/contrib/ipfilter/test/regress/p4.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p4.pool head/contrib/ipfilter/test/regress/p6.ipf - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p6.ipf head/contrib/ipfilter/test/regress/p6.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p6.pool head/contrib/ipfilter/test/regress/p6.whois - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p6.whois head/contrib/ipfilter/test/regress/p7.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p7.nat head/contrib/ipfilter/test/regress/p7.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p7.pool head/contrib/ipfilter/test/regress/p9.nat - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p9.nat head/contrib/ipfilter/test/regress/p9.pool - copied unchanged from r254219, vendor/ipfilter/dist/test/regress/p9.pool head/contrib/ipfilter/tools/ipfsyncd.c - copied unchanged from r254219, vendor/ipfilter/dist/tools/ipfsyncd.c head/sys/contrib/ipfilter/netinet/ip_dns_pxy.c - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/ip_dns_pxy.c head/sys/contrib/ipfilter/netinet/ip_dstlist.c - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/ip_dstlist.c head/sys/contrib/ipfilter/netinet/ip_dstlist.h - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/ip_dstlist.h head/sys/contrib/ipfilter/netinet/ip_nat6.c - copied, changed from r254572, vendor-sys/ipfilter/dist/netinet/ip_nat6.c head/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c - copied, changed from r254572, vendor-sys/ipfilter/dist/netinet/ip_tftp_pxy.c head/sys/contrib/ipfilter/netinet/ipf_rb.h - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/ipf_rb.h head/sys/contrib/ipfilter/netinet/radix_ipf.c - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/radix_ipf.c head/sys/contrib/ipfilter/netinet/radix_ipf.h - copied unchanged from r254572, vendor-sys/ipfilter/dist/netinet/radix_ipf.h Deleted: head/contrib/ipfilter/.cvsignore head/contrib/ipfilter/BSD/.cvsignore head/contrib/ipfilter/iplang/.cvsignore head/contrib/ipfilter/ipsend/.cvsignore head/contrib/ipfilter/ipsend/README head/contrib/ipfilter/ipsend/hpux.c head/contrib/ipfilter/ipsend/in_var.h head/contrib/ipfilter/ipsend/ip_var.h head/contrib/ipfilter/ipsend/tcpip.h head/contrib/ipfilter/lib/ipft_ef.c head/contrib/ipfilter/lib/ipft_sn.c head/contrib/ipfilter/lib/ipft_td.c head/contrib/ipfilter/net/.cvsignore head/contrib/ipfilter/radix.c head/contrib/ipfilter/rules/.cvsignore head/contrib/ipfilter/samples/.cvsignore head/contrib/ipfilter/test/.cvsignore head/contrib/ipfilter/test/hextest head/contrib/ipfilter/test/input/ipf6-1 head/contrib/ipfilter/test/mhtest head/sys/contrib/ipfilter/netinet/QNX_OCL.txt Modified: head/contrib/ipfilter/BNF head/contrib/ipfilter/BSD/Makefile head/contrib/ipfilter/BSD/Makefile.ipsend head/contrib/ipfilter/BSD/ipfadm-rcd head/contrib/ipfilter/BSD/kupgrade head/contrib/ipfilter/FAQ.FreeBSD head/contrib/ipfilter/FWTK/ftp-gw.diff head/contrib/ipfilter/FWTK/fwtk_transparent.diff head/contrib/ipfilter/FreeBSD-2.2/kinstall head/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 head/contrib/ipfilter/FreeBSD-3/kinstall head/contrib/ipfilter/FreeBSD-4.0/kinstall head/contrib/ipfilter/FreeBSD/kinstall head/contrib/ipfilter/HISTORY head/contrib/ipfilter/INSTALL.FreeBSD head/contrib/ipfilter/Makefile head/contrib/ipfilter/NAT.FreeBSD head/contrib/ipfilter/etc/protocols head/contrib/ipfilter/etc/services head/contrib/ipfilter/ip_fil.c head/contrib/ipfilter/ipf.h head/contrib/ipfilter/iplang/Makefile head/contrib/ipfilter/iplang/iplang.h head/contrib/ipfilter/iplang/iplang.tst head/contrib/ipfilter/iplang/iplang_l.l head/contrib/ipfilter/iplang/iplang_y.y head/contrib/ipfilter/ipmon.h head/contrib/ipfilter/ipsd/Makefile head/contrib/ipfilter/ipsd/ipsd.c head/contrib/ipfilter/ipsd/ipsdr.c head/contrib/ipfilter/ipsd/linux.h head/contrib/ipfilter/ipsd/sbpf.c head/contrib/ipfilter/ipsd/sdlpi.c head/contrib/ipfilter/ipsd/slinux.c head/contrib/ipfilter/ipsd/snit.c head/contrib/ipfilter/ipsend/44arp.c head/contrib/ipfilter/ipsend/Makefile head/contrib/ipfilter/ipsend/arp.c head/contrib/ipfilter/ipsend/dlcommon.c head/contrib/ipfilter/ipsend/ip.c head/contrib/ipfilter/ipsend/ipresend.c head/contrib/ipfilter/ipsend/ipsend.5 head/contrib/ipfilter/ipsend/ipsend.c head/contrib/ipfilter/ipsend/ipsend.h head/contrib/ipfilter/ipsend/ipsopt.c head/contrib/ipfilter/ipsend/iptest.c head/contrib/ipfilter/ipsend/iptests.c head/contrib/ipfilter/ipsend/larp.c head/contrib/ipfilter/ipsend/linux.h head/contrib/ipfilter/ipsend/lsock.c head/contrib/ipfilter/ipsend/resend.c head/contrib/ipfilter/ipsend/sbpf.c head/contrib/ipfilter/ipsend/sdlpi.c head/contrib/ipfilter/ipsend/sirix.c head/contrib/ipfilter/ipsend/slinux.c head/contrib/ipfilter/ipsend/snit.c head/contrib/ipfilter/ipsend/sock.c head/contrib/ipfilter/ipt.h head/contrib/ipfilter/kmem.h head/contrib/ipfilter/l4check/Makefile head/contrib/ipfilter/l4check/l4check.c head/contrib/ipfilter/lib/Makefile head/contrib/ipfilter/lib/addicmp.c head/contrib/ipfilter/lib/addipopt.c head/contrib/ipfilter/lib/alist_free.c head/contrib/ipfilter/lib/alist_new.c head/contrib/ipfilter/lib/bcopywrap.c head/contrib/ipfilter/lib/binprint.c head/contrib/ipfilter/lib/buildopts.c head/contrib/ipfilter/lib/checkrev.c head/contrib/ipfilter/lib/count4bits.c head/contrib/ipfilter/lib/count6bits.c head/contrib/ipfilter/lib/debug.c head/contrib/ipfilter/lib/facpri.c head/contrib/ipfilter/lib/facpri.h head/contrib/ipfilter/lib/fill6bits.c head/contrib/ipfilter/lib/flags.c head/contrib/ipfilter/lib/gethost.c head/contrib/ipfilter/lib/getifname.c head/contrib/ipfilter/lib/getnattype.c head/contrib/ipfilter/lib/getport.c head/contrib/ipfilter/lib/getportproto.c head/contrib/ipfilter/lib/getproto.c head/contrib/ipfilter/lib/getsumd.c head/contrib/ipfilter/lib/hostname.c head/contrib/ipfilter/lib/icmpcode.c head/contrib/ipfilter/lib/initparse.c head/contrib/ipfilter/lib/ionames.c head/contrib/ipfilter/lib/ipf_dotuning.c head/contrib/ipfilter/lib/ipft_hx.c head/contrib/ipfilter/lib/ipft_pc.c head/contrib/ipfilter/lib/ipft_tx.c head/contrib/ipfilter/lib/ipoptsec.c head/contrib/ipfilter/lib/kmem.c head/contrib/ipfilter/lib/kmem.h head/contrib/ipfilter/lib/kmemcpywrap.c head/contrib/ipfilter/lib/kvatoname.c head/contrib/ipfilter/lib/load_file.c head/contrib/ipfilter/lib/load_hash.c head/contrib/ipfilter/lib/load_hashnode.c head/contrib/ipfilter/lib/load_http.c head/contrib/ipfilter/lib/load_pool.c head/contrib/ipfilter/lib/load_poolnode.c head/contrib/ipfilter/lib/load_url.c head/contrib/ipfilter/lib/mutex_emul.c head/contrib/ipfilter/lib/nametokva.c head/contrib/ipfilter/lib/nat_setgroupmap.c head/contrib/ipfilter/lib/ntomask.c head/contrib/ipfilter/lib/optname.c head/contrib/ipfilter/lib/optprint.c head/contrib/ipfilter/lib/optprintv6.c head/contrib/ipfilter/lib/optvalue.c head/contrib/ipfilter/lib/portname.c head/contrib/ipfilter/lib/print_toif.c head/contrib/ipfilter/lib/printactivenat.c head/contrib/ipfilter/lib/printaps.c head/contrib/ipfilter/lib/printbuf.c head/contrib/ipfilter/lib/printfr.c head/contrib/ipfilter/lib/printfraginfo.c head/contrib/ipfilter/lib/printhash.c head/contrib/ipfilter/lib/printhash_live.c head/contrib/ipfilter/lib/printhashdata.c head/contrib/ipfilter/lib/printhashnode.c head/contrib/ipfilter/lib/printhostmap.c head/contrib/ipfilter/lib/printhostmask.c head/contrib/ipfilter/lib/printifname.c head/contrib/ipfilter/lib/printip.c head/contrib/ipfilter/lib/printlog.c head/contrib/ipfilter/lib/printmask.c head/contrib/ipfilter/lib/printnat.c head/contrib/ipfilter/lib/printpacket.c head/contrib/ipfilter/lib/printpacket6.c head/contrib/ipfilter/lib/printpool.c head/contrib/ipfilter/lib/printpool_live.c head/contrib/ipfilter/lib/printpooldata.c head/contrib/ipfilter/lib/printpoolnode.c head/contrib/ipfilter/lib/printportcmp.c head/contrib/ipfilter/lib/printproto.c head/contrib/ipfilter/lib/printsbuf.c head/contrib/ipfilter/lib/printstate.c head/contrib/ipfilter/lib/printtqtable.c head/contrib/ipfilter/lib/printtunable.c head/contrib/ipfilter/lib/remove_hash.c head/contrib/ipfilter/lib/remove_hashnode.c head/contrib/ipfilter/lib/remove_pool.c head/contrib/ipfilter/lib/remove_poolnode.c head/contrib/ipfilter/lib/resetlexer.c head/contrib/ipfilter/lib/rwlock_emul.c head/contrib/ipfilter/lib/tcpflags.c head/contrib/ipfilter/lib/tcpoptnames.c head/contrib/ipfilter/lib/v6ionames.c head/contrib/ipfilter/lib/v6optvalue.c head/contrib/ipfilter/lib/var.c head/contrib/ipfilter/lib/verbose.c head/contrib/ipfilter/man/Makefile head/contrib/ipfilter/man/ipf.4 head/contrib/ipfilter/man/ipf.5 head/contrib/ipfilter/man/ipfilter.4 head/contrib/ipfilter/man/ipfilter.4.mandoc head/contrib/ipfilter/man/ipfstat.8 head/contrib/ipfilter/man/ipftest.1 head/contrib/ipfilter/man/ipmon.5 head/contrib/ipfilter/man/ipnat.4 head/contrib/ipfilter/man/ipnat.5 head/contrib/ipfilter/man/ipnat.8 head/contrib/ipfilter/man/ippool.5 head/contrib/ipfilter/man/ippool.8 head/contrib/ipfilter/md5.c head/contrib/ipfilter/mkfilters head/contrib/ipfilter/mlf_ipl.c head/contrib/ipfilter/mlf_rule.c head/contrib/ipfilter/mlfk_rule.c head/contrib/ipfilter/mlh_rule.c (contents, props changed) head/contrib/ipfilter/opts.h head/contrib/ipfilter/pcap-ipf.h head/contrib/ipfilter/perl/Ipfanaly.pl head/contrib/ipfilter/perl/Isbgraph head/contrib/ipfilter/perl/Services head/contrib/ipfilter/perl/ipfmeta.pl head/contrib/ipfilter/perl/logfilter.pl head/contrib/ipfilter/radix_ipf.h head/contrib/ipfilter/rules/BASIC_1.FW head/contrib/ipfilter/rules/BASIC_2.FW head/contrib/ipfilter/rules/firewall head/contrib/ipfilter/rules/ipmon.conf head/contrib/ipfilter/rules/server head/contrib/ipfilter/samples/proxy.c head/contrib/ipfilter/samples/relay.c head/contrib/ipfilter/snoop.h head/contrib/ipfilter/test/Makefile head/contrib/ipfilter/test/bpftest head/contrib/ipfilter/test/dotest head/contrib/ipfilter/test/expected/f11 head/contrib/ipfilter/test/expected/f13 head/contrib/ipfilter/test/expected/f18 head/contrib/ipfilter/test/expected/i1 head/contrib/ipfilter/test/expected/i10 head/contrib/ipfilter/test/expected/i11 head/contrib/ipfilter/test/expected/i12 head/contrib/ipfilter/test/expected/i14 head/contrib/ipfilter/test/expected/i17 head/contrib/ipfilter/test/expected/i18 head/contrib/ipfilter/test/expected/i2 head/contrib/ipfilter/test/expected/i20 head/contrib/ipfilter/test/expected/i3 head/contrib/ipfilter/test/expected/i4 head/contrib/ipfilter/test/expected/i5 head/contrib/ipfilter/test/expected/i6 head/contrib/ipfilter/test/expected/i7 head/contrib/ipfilter/test/expected/i8 head/contrib/ipfilter/test/expected/i9 head/contrib/ipfilter/test/expected/in1 head/contrib/ipfilter/test/expected/in2 head/contrib/ipfilter/test/expected/in3 head/contrib/ipfilter/test/expected/in5 head/contrib/ipfilter/test/expected/in6 head/contrib/ipfilter/test/expected/ip1 head/contrib/ipfilter/test/expected/ip2 head/contrib/ipfilter/test/expected/ipv6.6 head/contrib/ipfilter/test/expected/l1 head/contrib/ipfilter/test/expected/l1.b head/contrib/ipfilter/test/expected/n1 head/contrib/ipfilter/test/expected/n10 head/contrib/ipfilter/test/expected/n11 head/contrib/ipfilter/test/expected/n12 head/contrib/ipfilter/test/expected/n13 head/contrib/ipfilter/test/expected/n14 head/contrib/ipfilter/test/expected/n16 head/contrib/ipfilter/test/expected/n2 head/contrib/ipfilter/test/expected/n3 head/contrib/ipfilter/test/expected/n4 head/contrib/ipfilter/test/expected/n5 head/contrib/ipfilter/test/expected/n6 head/contrib/ipfilter/test/expected/n7 head/contrib/ipfilter/test/expected/n8 head/contrib/ipfilter/test/expected/n9 head/contrib/ipfilter/test/expected/ni10 head/contrib/ipfilter/test/expected/ni11 head/contrib/ipfilter/test/expected/ni12 head/contrib/ipfilter/test/expected/ni19 head/contrib/ipfilter/test/expected/ni2 head/contrib/ipfilter/test/expected/ni20 head/contrib/ipfilter/test/expected/ni21 head/contrib/ipfilter/test/expected/ni23 head/contrib/ipfilter/test/expected/ni4 head/contrib/ipfilter/test/expected/ni5 head/contrib/ipfilter/test/expected/ni6 head/contrib/ipfilter/test/expected/ni8 head/contrib/ipfilter/test/expected/p1 head/contrib/ipfilter/test/expected/p2 head/contrib/ipfilter/test/expected/p3 head/contrib/ipfilter/test/expected/p5 head/contrib/ipfilter/test/input/f13 head/contrib/ipfilter/test/input/f24 head/contrib/ipfilter/test/input/ipv6.1 head/contrib/ipfilter/test/input/ipv6.3 head/contrib/ipfilter/test/input/ipv6.6 head/contrib/ipfilter/test/input/n10 head/contrib/ipfilter/test/input/n12 head/contrib/ipfilter/test/input/n16 head/contrib/ipfilter/test/input/n8 head/contrib/ipfilter/test/input/n9 head/contrib/ipfilter/test/input/ni1 head/contrib/ipfilter/test/input/ni10 head/contrib/ipfilter/test/input/ni11 head/contrib/ipfilter/test/input/ni12 head/contrib/ipfilter/test/input/ni13 head/contrib/ipfilter/test/input/ni14 head/contrib/ipfilter/test/input/ni15 head/contrib/ipfilter/test/input/ni16 head/contrib/ipfilter/test/input/ni19 head/contrib/ipfilter/test/input/ni2 head/contrib/ipfilter/test/input/ni20 head/contrib/ipfilter/test/input/ni3 head/contrib/ipfilter/test/input/ni4 head/contrib/ipfilter/test/input/ni5 head/contrib/ipfilter/test/input/ni7 head/contrib/ipfilter/test/input/ni8 head/contrib/ipfilter/test/input/ni9 head/contrib/ipfilter/test/intest head/contrib/ipfilter/test/iptest head/contrib/ipfilter/test/itest head/contrib/ipfilter/test/logtest head/contrib/ipfilter/test/mtest head/contrib/ipfilter/test/natipftest head/contrib/ipfilter/test/nattest head/contrib/ipfilter/test/ptest head/contrib/ipfilter/test/regress/f13 head/contrib/ipfilter/test/regress/i11 head/contrib/ipfilter/test/regress/i12 head/contrib/ipfilter/test/regress/i14 head/contrib/ipfilter/test/regress/i17 head/contrib/ipfilter/test/regress/i18 head/contrib/ipfilter/test/regress/i2 head/contrib/ipfilter/test/regress/i21 head/contrib/ipfilter/test/regress/i7 head/contrib/ipfilter/test/regress/i8 head/contrib/ipfilter/test/regress/in2 head/contrib/ipfilter/test/regress/ipv6.5 head/contrib/ipfilter/test/regress/ipv6.6 head/contrib/ipfilter/test/regress/ni13.nat head/contrib/ipfilter/test/regress/ni14.nat head/contrib/ipfilter/test/regress/p1.pool head/contrib/ipfilter/test/regress/p3.ipf head/contrib/ipfilter/test/test.format head/contrib/ipfilter/test/vfycksum.pl head/contrib/ipfilter/todo head/contrib/ipfilter/tools/BNF.ipf head/contrib/ipfilter/tools/Makefile head/contrib/ipfilter/tools/ipf.c head/contrib/ipfilter/tools/ipf_y.y head/contrib/ipfilter/tools/ipfcomp.c head/contrib/ipfilter/tools/ipfs.c head/contrib/ipfilter/tools/ipfstat.c head/contrib/ipfilter/tools/ipftest.c head/contrib/ipfilter/tools/ipmon.c head/contrib/ipfilter/tools/ipmon_y.y head/contrib/ipfilter/tools/ipnat.c head/contrib/ipfilter/tools/ipnat_y.y head/contrib/ipfilter/tools/ippool.c head/contrib/ipfilter/tools/ippool_y.y head/contrib/ipfilter/tools/ipscan_y.y head/contrib/ipfilter/tools/ipsyncm.c head/contrib/ipfilter/tools/ipsyncs.c head/contrib/ipfilter/tools/lex_var.h head/contrib/ipfilter/tools/lexer.c head/contrib/ipfilter/tools/lexer.h head/sbin/ipf/ipf/Makefile head/sbin/ipf/ipftest/Makefile head/sbin/ipf/libipf/Makefile head/sys/conf/files head/sys/contrib/ipfilter/netinet/fil.c head/sys/contrib/ipfilter/netinet/ip_auth.c head/sys/contrib/ipfilter/netinet/ip_auth.h head/sys/contrib/ipfilter/netinet/ip_compat.h head/sys/contrib/ipfilter/netinet/ip_fil.h head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) head/sys/contrib/ipfilter/netinet/ip_frag.c head/sys/contrib/ipfilter/netinet/ip_frag.h head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c head/sys/contrib/ipfilter/netinet/ip_htable.c head/sys/contrib/ipfilter/netinet/ip_htable.h head/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c head/sys/contrib/ipfilter/netinet/ip_irc_pxy.c head/sys/contrib/ipfilter/netinet/ip_log.c head/sys/contrib/ipfilter/netinet/ip_lookup.c head/sys/contrib/ipfilter/netinet/ip_lookup.h head/sys/contrib/ipfilter/netinet/ip_nat.c head/sys/contrib/ipfilter/netinet/ip_nat.h head/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c head/sys/contrib/ipfilter/netinet/ip_pool.c head/sys/contrib/ipfilter/netinet/ip_pool.h head/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c head/sys/contrib/ipfilter/netinet/ip_proxy.c head/sys/contrib/ipfilter/netinet/ip_proxy.h head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c (contents, props changed) head/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c head/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c head/sys/contrib/ipfilter/netinet/ip_rules.c head/sys/contrib/ipfilter/netinet/ip_scan.c head/sys/contrib/ipfilter/netinet/ip_scan.h head/sys/contrib/ipfilter/netinet/ip_state.c head/sys/contrib/ipfilter/netinet/ip_state.h head/sys/contrib/ipfilter/netinet/ip_sync.c head/sys/contrib/ipfilter/netinet/ip_sync.h head/sys/contrib/ipfilter/netinet/ipl.h head/sys/contrib/ipfilter/netinet/mlfk_ipl.c head/sys/modules/ipfilter/Makefile Directory Properties: head/contrib/ipfilter/test/expected/i19 (props changed) Modified: head/contrib/ipfilter/BNF ============================================================================== --- head/contrib/ipfilter/BNF Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/BNF Fri Sep 6 23:11:19 2013 (r255332) @@ -67,7 +67,7 @@ facility = "kern" | "user" | "mail" | "d "audit" | "logalert" | "local0" | "local1" | "local2" | "local3" | "local4" | "local5" | "local6" | "local7" . priority = "emerg" | "alert" | "crit" | "err" | "warn" | "notice" | - "info" | "debug" . + "info" | "debug" . hexnumber = "0" "x" hexstring . hexstring = hexdigit [ hexstring ] . Modified: head/contrib/ipfilter/BSD/Makefile ============================================================================== --- head/contrib/ipfilter/BSD/Makefile Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/BSD/Makefile Fri Sep 6 23:11:19 2013 (r255332) @@ -1,9 +1,8 @@ # -# Copyright (C) 1993-1998 by Darren Reed. +# Copyright (C) 2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. # -TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man @@ -17,13 +16,14 @@ CFLAGS=-g -I$(TOP) # DEVFS!=/usr/bin/lsvfs 2>&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m -INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch +COMPDIR!=/bin/ls -1tr /usr/src/sys/arch/${CPU}/compile | tail -1 +INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -I/usr/src/sys/arch/${CPU}/compile/${COMPDIR} DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) ML=mln_ipl.c -LKM=if_ipl.o +LKM=ipflkm.o LKMR=ipfrule.o DLKM= OBJ=. @@ -44,15 +44,15 @@ INSTALL=install # MODOBJS=ip_fil.o fil.o ml_ipl.o ip_nat.o ip_frag.o ip_state.o ip_proxy.o \ ip_auth.o ip_log.o ip_pool.o ip_htable.o ip_lookup.o ip_rules.o \ - ip_scan.o ip_sync.o + ip_scan.o ip_sync.o ip_nat6.o ip_dstlist.o radix_ipf.o # ip_trafcon.o DFLAGS=$(IPFLKM) $(IPFLOG) $(LOOKUP) $(SYNC) $(DEF) $(DLKM) $(IPFBPF) -IPF=ipf.o ipfcomp.o ipf_y.o ipf_l.o bpf_filter_u.o -IPT=ipftest.o fil_u.o ip_frag_u.o ip_state_u.o ip_nat_u.o \ +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_htable_u.o ip_lookup_u.o ip_pool_u.o \ ip_scan_u.o ip_sync_u.o ip_rules_u.o ip_fil_u.o ip_log_u.o \ ippool_y.o ippool_l.o ipf_y.o ipf_l.o ipnat_y.o ipnat_l.o \ - md5_u.o radix_u.o bpf_filter_u.o + md5_u.o radix_ipf_u.o ip_dstlist_u.o # ip_syn_u.o #ip_trafcon_u.o TOOL=$(TOP)/tools @@ -60,9 +60,9 @@ 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 IPTRAFCON=iptrafcon.o -PROXYLIST=$(TOP)/ip_ftp_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_irc_pxy.c \ - $(TOP)/ip_netbios_pxy.c $(TOP)/ip_raudio_pxy.c $(TOP)/ip_rcmd_pxy.c \ - $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_pptp_pxy.c +PROXYLIST=$(TOP)/ip_dns_pxy.c $(TOP)/ip_ftp_pxy.c $(TOP)/ip_ipsec_pxy.c \ + $(TOP)/ip_irc_pxy.c $(TOP)/ip_netbios_pxy.c $(TOP)/ip_raudio_pxy.c \ + $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_rpcb_pxy.c $(TOP)/ip_pptp_pxy.c FILS=ipfstat.o LIBSRC=$(TOP)/lib RANLIB=ranlib @@ -70,6 +70,11 @@ AROPTS=cq HERE!=pwd CCARGS=-I. $(DEBUG) $(CFLAGS) $(UFLAGS) KCARGS=-I. $(DEBUG) $(CFLAGS) +.if ${MACHINE_ARCH} == amd64 +KCARGS+=-mcmodel=kernel -mno-red-zone -fno-omit-frame-pointer \ + -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow \ + -msoft-float -fno-asynchronous-unwind-tables +.endif # # Extra is option kernel things we always want in user space. # @@ -77,9 +82,11 @@ EXTRA=$(ALLOPTS) include $(TOP)/lib/Makefile -build all: machine $(OBJ)/libipf.a ipf ipfs ipfstat ipftest ipmon ipnat \ - ippool ipscan ipsyncm ipsyncs $(LKM) $(LKMR) - -sh -c 'for i in ipf ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done' +build all: machine $(OBJ)/libipf.a tools $(LKM) $(LKMR) + +tools: ipf ipfs ipfstat ipftest ipmon ipnat ippool ipscan ipsyncm \ + ipsyncs ipfsyncd + -sh -c 'for i in ipf ipftest ipmon ippool ipnat ipscan ipsyncm ipsyncs ipfsyncd; do /bin/rm -f $(TOP)/$$i; ln -s `pwd`/$$i $(TOP); done' -/bin/rm -f ../tools ./tools -ln -s ../tools . -ln -s ../tools .. @@ -122,12 +129,18 @@ ipsyncm: ipsyncm.o $(OBJ)/libipf.a ipsyncs: ipsyncs.o $(OBJ)/libipf.a $(CC) $(CCARGS) ipsyncs.o -o $@ $(LIBS) +ipfsyncd: ipfsyncd.o $(OBJ)/libipf.a + $(CC) $(CCARGS) ipfsyncd.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 $@ +ipfsyncd.o: $(TOOL)/ipfsyncd.c $(TOP)/ip_sync.h + $(CC) $(CCARGS) -c $(TOOL)/ipfsyncd.c -o $@ + tests: (cd test; make ) @@ -146,7 +159,7 @@ fil_u.o: $(TOP)/fil.c $(TOP)/ip_fil.h $( fil.o: $(TOP)/fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ipl.h \ $(TOP)/ip_rules.h - $(CC) $(KCARGS) $(POLICY) $(DFLAGS) $(IPFBPF) $(COMPIPF) \ + $(CC) $(KCARGS) $(POLICY) $(DFLAGS) $(IPFBPF) $(COMPIPF) $(COMPATIPF) \ -c $(TOP)/fil.c -o $@ ipf.o: $(TOOL)/ipf.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/opts.h @@ -163,7 +176,7 @@ ipnat.o: $(TOOL)/ipnat.c $(TOP)/ip_fil.h $(TOP)/opts.h $(CC) $(CCARGS) -c $(TOOL)/ipnat.c -o $@ -ipnat_y.o: ipnat_y.c ipnat_y.h ipnat_l.h +ipnat_y.o: ipnat_y.c ipnat_y.h ipnat_l.h $(TOP)/ip_fil.h $(TOP)/ip_nat.h $(CC) $(CCARGS) -c ipnat_y.c -o $@ ipnat_l.o: ipnat_l.c ipnat_y.h @@ -183,6 +196,9 @@ ipnat_l.h: $(TOOL)/lexer.h 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_fil.h $(PROXYLIST) $(TOP)/ip_nat.h $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_proxy.c -o $@ @@ -222,8 +238,13 @@ ip_htable_u.o: $(TOP)/ip_htable.c $(TOP) $(TOP)/ip_htable.h $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_htable.c -o $@ +ip_dstlist_u.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_dstlist.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_dstlist.c -o $@ + ip_lookup_u.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_lookup.h $(TOP)/ip_pool.h $(TOP)/ip_htable.h + $(TOP)/ip_lookup.h $(TOP)/ip_pool.h $(TOP)/ip_htable.h \ + $(TOP)/ip_dstlist.h $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/ip_lookup.c -o $@ ip_trafcon_u.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ @@ -236,19 +257,28 @@ ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_fi md5_u.o: $(TOP)/md5.c $(TOP)/md5.h $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/md5.c -o $@ -radix_u.o: $(TOP)/md5.c $(TOP)/radix_ipf.h - $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/radix.c -o $@ +radix_ipf_u.o: $(TOP)/md5.c $(TOP)/radix_ipf.h + $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/radix_ipf.c -o $@ bpf_filter_u.o: $(TOP)/bpf_filter.c $(TOP)/pcap-ipf.h $(CC) $(CCARGS) $(EXTRA) -c $(TOP)/bpf_filter.c -o $@ -if_ipl.o: $(MODOBJS) +ipflkm.o: $(MODOBJS) ld -r $(MODOBJS) -o $(LKM) - ${RM} -f if_ipl + ${RM} -f ipflkm ipfrule.ko.5: ip_rulesx.o $(MLR) +.if ${MACHINE_ARCH} != amd64 ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) ip_rulesx.o $(MLR) - ld -Bshareable -d -warn-common -o $(LKMR:S/.5$//) $(.TARGET:S/.ko/.kld/) + ld -Bshareable -d -warn-common -o $(LKMR:S/.5$//) $(.TARGET:S/.ko/.kld/) +.else + ld -warn-common -r -d -o $(.TARGET:S/.5$//) ip_rulesx.o $(MLR) + nm -g $(.TARGET:S/.5$//) | \ + awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \ + xargs -J% objcopy % $(.TARGET:S/.5$//) + +.endif + ipfrule.ko: ip_rulesx.o $(MLR) gensetdefs ip_rulesx.o $(MLR) $(CC) $(KCARGS) -c setdef0.c @@ -256,10 +286,17 @@ ipfrule.ko: ip_rulesx.o $(MLR) ld -Bshareable -o $@ setdef0.o ip_rulesx.o $(MLR) setdef1.o ipf.ko.5 ipl.ko.5: $(MODOBJS) +.if ${MACHINE_ARCH} != amd64 ld -warn-common -r -d -o $(.TARGET:S/.ko/.kld/) $(MODOBJS) ld -Bshareable -d -warn-common -o $(LKM:S/.5$//) $(.TARGET:S/.ko/.kld/) +.else + ld -warn-common -r -d -o $(.TARGET:S/.5$//) $(MODOBJS) + nm -g $(.TARGET:S/.5$//) | \ + awk '/^[^[:space:]]+ [^AU] (.*)$$/ { print ($$2=="C" ? "-N" : "-L") $$3 }' | \ + xargs -J% objcopy % $(.TARGET:S/.5$//) +.endif -ipf.ko ipl.ko: $(MODOBJS) +ipf.ko ipl.ko: $(MODOBJS) gensetdefs $(MODOBJS) $(CC) $(KCARGS) -c setdef0.c $(CC) $(KCARGS) -c setdef1.c @@ -268,6 +305,9 @@ ipf.ko ipl.ko: $(MODOBJS) ip_nat.o: $(TOP)/ip_nat.c $(TOP)/ip_nat.h $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(CC) $(KCARGS) $(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) $(KCARGS) $(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) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_frag.c -o $@ @@ -290,6 +330,11 @@ ip_fil.c: ip_fil.o: ip_fil.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(TOP)/ip_nat.h $(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) -c ip_fil.c -o $@ +ip_fil_compat.o: $(TOP)/ip_fil_compat.c $(TOP)/ipl.h $(TOP)/ip_fil.h \ + $(TOP)/ip_compat.h $(TOP)/ip_nat.h $(TOP)/ip_state.h + $(CC) $(KCARGS) $(DFLAGS) $(COMPIPF) $(COMPATIPF) \ + -c $(TOP)/ip_fil_compat.c -o $@ + ip_log.o: $(TOP)/ip_log.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_log.c -o $@ @@ -307,16 +352,26 @@ ip_htable.o: $(TOP)/ip_htable.c $(TOP)/i $(TOP)/ip_lookup.h $(TOP)/ip_htable.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_htable.c -o $@ +ip_dstlist.o: $(TOP)/ip_dstlist.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ + $(TOP)/ip_lookup.h $(TOP)/ip_dstlist.h + $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_dstlist.c -o $@ + ip_lookup.o: $(TOP)/ip_lookup.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ - $(TOP)/ip_pool.h $(TOP)/ip_htable.h $(TOP)/ip_lookup.h + $(TOP)/ip_pool.h $(TOP)/ip_htable.h $(TOP)/ip_lookup.h \ + $(TOP)/ip_dstlist.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_lookup.c -o $@ +radix_ipf.o: $(TOP)/md5.c $(TOP)/radix_ipf.h + $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/radix_ipf.c -o $@ + ip_trafcon.o: $(TOP)/ip_trafcon.c $(TOP)/ip_compat.h $(TOP)/ip_fil.h \ $(TOP)/ip_trafcon.h $(CC) $(KCARGS) $(DFLAGS) -c $(TOP)/ip_trafcon.c -o $@ vnode_if.h: $(VNODESHDIR)/vnode_if.src mkdir -p ../sys + mkdir -p ../rump/include/rump + mkdir -p ../rump/librump/rumpvfs if [ -f $(VNODESHDIR)/vnode_if.sh ] ; then \ sh $(VNODESHDIR)/vnode_if.sh $(VNODESHDIR)/vnode_if.src; \ fi @@ -325,10 +380,11 @@ vnode_if.h: $(VNODESHDIR)/vnode_if.src fi if [ -f ../sys/vnode_if.h ] ; then mv ../sys/vnode_if.h .; fi rmdir ../sys + rm -rf ../rump ml_ipl.o: vnode_if.h $(TOP)/$(MLD) $(TOP)/ipl.h -/bin/rm -f vnode_if.c - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/$(ML) -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/$(ML) -o $@ ip_rules.o: ip_rules.c $(TOP)/ip_rules.h $(CC) -I. $(CFLAGS) $(DFLAGS) $(COMPIPF) -c ip_rules.c -o $@ @@ -344,7 +400,7 @@ $(TOP)/ip_rules.h: ip_rules.c fi ip_rulesx.o: ip_rules.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -DIPFILTER_COMPILED -c ip_rules.c -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -DIPFILTER_COMPILED -c ip_rules.c -o $@ mlf_rule.o: $(TOP)/mlf_rule.c $(TOP)/ip_rules.h $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlf_rule.c -o $@ @@ -356,7 +412,7 @@ mlo_rule.o: $(TOP)/mlo_rule.c $(TOP)/ip_ $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlo_rule.c -o $@ mlfk_rule.o: $(TOP)/mlfk_rule.c $(TOP)/ip_rules.h - $(CC) -I. $(CFLAGS) $(DFLAGS) -c $(TOP)/mlfk_rule.c -o $@ + $(CC) -I. $(KCARGS) $(DFLAGS) -c $(TOP)/mlfk_rule.c -o $@ ipf_y.o: ipf_y.c ipf_y.h $(TOP)/ipf.h ipf_l.h $(TOP)/opts.h $(CC) $(CCARGS) $(IPFBPF) -c ipf_y.c -o $@ @@ -427,10 +483,11 @@ ippool_y.o: ippool_y.c ippool_y.h $(TOP) ippool_l.o: ippool_l.c ippool_y.h $(TOP)/ip_pool.h $(CC) $(CCARGS) -I. -c ippool_l.c -o $@ -ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h ippool_l.h +ippool_y.c: $(TOOL)/ippool_y.y $(TOP)/ip_pool.h ippool_l.h ippool_y.h (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) -ippool_y.h: ippool_y.c +ippool_y.h: $(TOOL)/ippool_y.y + (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) ippool_l.c: $(TOOL)/lexer.c $(TOP)/ip_pool.h (cd $(TOOL); make "DEST=$(HERE)" $(HERE)/$@) @@ -449,10 +506,10 @@ iptrafcon: $(IPTRAFCON) $(OBJ)/libipf.a .l.c: clean: - ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest + ${RM} -f ../ipf ../ipnat ../ipmon ../ippool ../ipftest ${RM} -f ../ipscan ../ipsyncm ../ipsyncs ${RM} -f *.core *.o *.a ipt ipfstat ipf ipfstat ipftest ipmon - ${RM} -f if_ipl ipnat ipfrule.ko* ipf.kld* ipfrule.kld* + ${RM} -f ipflkm ipnat ipfrule.ko* ipf.kld* ipfrule.kld* ${RM} -f vnode_if.h $(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 @@ -481,8 +538,8 @@ install: /bin/cp $(TOP)/$$i /usr/include/netinet/; \ $(CHMOD) 444 /usr/include/netinet/$$i; \ done - -if [ -d /lkm -a -f if_ipl.o ] ; then \ - cp if_ipl.o /lkm; \ + -if [ -d /lkm -a -f ipflkm.o ] ; then \ + cp ipflkm.o /lkm; \ fi -if [ -d /modules -a -f ipf.ko ] ; then \ if [ -f /modules/ipl.ko ] ; then \ @@ -494,6 +551,7 @@ install: -if [ -d /modules -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /modules; \ fi +.if ${MACHINE_ARCH} != amd64 -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ if [ -f /boot/kernel/ipl.ko ] ; then \ cp ipf.ko /boot/kernel/ipl.ko; \ @@ -504,8 +562,29 @@ install: -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ cp ipfrule.ko /boot/kernel; \ fi - -if [ -d /usr/lkm -a -f if_ipl.o ] ; then \ - cp if_ipl.o /usr/lkm; \ +.else + -if [ -d /boot/kernel -a -f ipf.ko ] ; then \ + if [ -f /boot/kernel/ipl.ko ] ; then \ + objcopy --only-keep-debug ipf.ko + /boot/kernel/ipl.ko.symbols; \ + objcopy --strip-debug \ + --add-gnu-debuglink=ipl.ko.symbols \ + ipf.ko /boot/kernel/ipl.ko; \ + else \ + objcopy --only-keep-debug ipf.ko \ + /boot/kernel/ipf.ko.symbols; \ + objcopy --strip-debug \ + --add-gnu-debuglink=ipl.ko.symbols \ + ipf.ko /boot/kernel/ipf.ko; \ + fi \ + fi + -if [ -d /boot/kernel -a -f ipfrule.ko ] ; then \ + objcopy --only-keep-debug ipfrule.ko /boot/kernel/ipfrule.ko.symbols; \ + objcopy --strip-debug --add-gnu-debuglink=ipfrule.ko.symbols ipfrule.ko /boot/kernel/ipfrule.ko; \ + fi +.endif + -if [ -d /usr/lkm -a -f ipflkm.o ] ; then \ + cp ipflkm.o /usr/lkm; \ fi -$(INSTALL) -cs -g wheel -m 755 -o root ipscan $(SBINDEST) (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) @@ -533,8 +612,8 @@ install: (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report - sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report + sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da Modified: head/contrib/ipfilter/BSD/Makefile.ipsend ============================================================================== --- head/contrib/ipfilter/BSD/Makefile.ipsend Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/BSD/Makefile.ipsend Fri Sep 6 23:11:19 2013 (r255332) @@ -1,5 +1,5 @@ # -# $Id: Makefile.ipsend,v 2.8 2002/05/22 16:15:36 darrenr Exp $ +# $Id$ # BINDEST=/usr/sbin @@ -23,7 +23,8 @@ MFLAGS="BINDEST=$(BINDEST)" "SBINDEST=$( "SOLARIS2=$(SOLARIS2)" "DEBUG=$(DEBUG)" "DCPU=$(CPU)" \ "CPUDIR=$(CPUDIR)" "LOOKUP=$(LOOKUP)" # -all build bsd-bpf : ipsend ipresend iptest +build: +all bsd-bpf : ipsend ipresend iptest iplang_y.o: $(TOP)/iplang/iplang_y.y (cd $(TOP)/iplang; $(MAKE) ../BSD/$(CPUDIR)/$@ $(MFLAGS) 'DESTDIR=../BSD/$(CPUDIR)' ) @@ -103,6 +104,6 @@ dlcommon.o: $(TOP)/ipsend/dlcommon.c sdlpi.o: $(TOP)/ipsend/sdlpi.c $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipsend/sdlpi.c -o $@ -install: +install: -$(INSTALL) -cs -g wheel -m 755 -o root ipsend ipresend iptest $(BINDEST) Modified: head/contrib/ipfilter/BSD/ipfadm-rcd ============================================================================== --- head/contrib/ipfilter/BSD/ipfadm-rcd Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/BSD/ipfadm-rcd Fri Sep 6 23:11:19 2013 (r255332) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2006 by Darren Reed. +# Copyright (C) 2012 by Darren Reed. # # See the IPFILTER.LICENCE file for details on licencing. # Modified: head/contrib/ipfilter/BSD/kupgrade ============================================================================== --- head/contrib/ipfilter/BSD/kupgrade Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/BSD/kupgrade Fri Sep 6 23:11:19 2013 (r255332) @@ -2,7 +2,7 @@ # PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH argv0=`basename $0` - + os=`uname -s` rev=`uname -r` maj=`expr $rev : '\([0-9]*\)\.'` @@ -23,6 +23,7 @@ fi if [ -d /sys/dist/ipf ] ; then ipfdir=/sys/dist/ipf/netinet fi +mkdir -m 755 -p $ipfdir/../net confdir="$archdir/conf" if [ -f /dev/ipnat ] ; then major=`ls -l /dev/ipnat | sed -e 's/.* \([0-9]*\),.*/\1/'` @@ -30,7 +31,7 @@ if [ -f /dev/ipnat ] ; then else major=x fi - + if [ ! -f ip_rules.c -o ! -f ip_rules.h ] ; then echo "Trying to build ip_rules.c and ip_rules.h" make ip_rules.c @@ -43,8 +44,9 @@ if [ ! -f ip_rules.c -o ! -f ip_rules.h fi fi -echo -n "Installing " -for j in auth frag nat proxy scan state sync pool htable lookup rules; do +echo -n "Installing into $ipfdir" +for j in auth frag nat proxy scan state sync pool dstlist htable lookup rules \ + dstlist; do for i in ip_$j.[ch]; do if [ -f "$i" ] ; then echo -n " $i" @@ -53,6 +55,12 @@ for j in auth frag nat proxy scan state fi done done +echo -n " net/radix_ipf.h" +cp radix_ipf.h $ipfdir +chmod 644 $ipfdir/radix_ipf.h +echo -n " radix_ipf.c -> $ipfdir/radix_ipf.c" +cp radix_ipf.c $ipfdir/radix_ipf.c +chmod 644 $ipfdir/radix_ipf.c case $os in SunOS) @@ -88,14 +96,16 @@ if [ -f $ipfdir/ip_fil.c ] ; then chmod 644 $ipfdir/ip_fil.c fi -for i in ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c; do +for i in ip_nat6.c ip_fil.h fil.c ip_log.c ip_compat.h ipl.h ip_*_pxy.c \ + ip_fil_compat.c ipf_rb.h; do echo -n " $i" cp $i $ipfdir chmod 644 $ipfdir/$i done echo "" echo -n "Installing into /usr/include/netinet" -for j in auth compat fil frag nat proxy scan state sync pool htable lookup; do +for j in auth compat fil frag nat proxy scan state sync pool htable dstlist \ + lookup; do i=ip_$j.h if [ -f "$i" ] ; then echo -n " $i" @@ -103,7 +113,7 @@ for j in auth compat fil frag nat proxy chmod 644 /usr/include/netinet/$i fi done -for j in ipl.h; do +for j in ipl.h ipf_rb.h; do if [ -f "$j" ] ; then echo -n " $j" cp $j /usr/include/netinet/$j @@ -157,15 +167,19 @@ if [ $os = FreeBSD -a -f /sys/conf/files mv files files.preipf4 cp -p files.preipf4 files fi - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "contrib/ipfilter/netinet/ip_$i.c optional ipfilter inet ipfilter_lookup" >> files fi done + grep ip_fil_compat.c files >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo 'contrib/ipfilter/netinet/ip_fil_compat.c optional ipfilter inet ipfilter_compat' >> files + fi grep ip_sync.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then - echo 'contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet ipfilter_sync' >> files + echo 'contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -177,13 +191,19 @@ if [ $os = FreeBSD -a -f /sys/conf/files fi fi if [ $os = NetBSD -a -f /sys/conf/files ] ; then + if [ -f /sys/netinet/files.ipfilter ] ; then + if ! grep -q ip_fil_compat.c /sys/netinet/files.ipfilter; then + echo 'file dist/ipf/netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> /sys/netinet/files.ipfilter + echo 'defflag opt_ipfilter.h IPFILTER_COMPAT' >> /sys/netinet/files.ipfilter + fi + fi cd /sys/conf if [ ! -f files.preipf4 ] ; then mv files files.preipf4 cp -p files.preipf4 files fi if [ $fullrev -ge 010600 -a $fullrev -lt 020000 ] ; then - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files @@ -191,7 +211,7 @@ if [ $os = NetBSD -a -f /sys/conf/files done grep ip_sync.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter & ipfilter_sync' >> files + echo 'file netinet/ip_sync.c ipfilter' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -210,15 +230,18 @@ if [ $os = OpenBSD -a -f /sys/conf/files cp -p files.preipf4 files fi if [ $fullrev -ge 030400 ] ; then - for i in htable pool lookup; do + for i in dstlist htable pool lookup; do grep ip_$i.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then echo "file netinet/ip_$i.c ipfilter & ipfilter_lookup" >> files fi done - grep ip_sync.c files >/dev/null 2>&1 + grep ip_fil_compat.c files >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo 'file netinet/ip_fil_compat.c ipfilter & ipfilter_compat' >> files + fi if [ $? -ne 0 ] ; then - echo 'file netinet/ip_sync.c ipfilter & ipfilter_sync' >> files + echo 'file netinet/ip_sync.c ipfilter' >> files fi grep ip_scan.c files >/dev/null 2>&1 if [ $? -ne 0 ] ; then @@ -241,7 +264,7 @@ cat | (cd /usr/src/sys/modules/ipfilter; KMOD= ipl SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ ! ip_log.c ip_fil.c fil.c - + .if !defined(NOINET6) CFLAGS+= -DUSE_INET6 .endif @@ -249,10 +272,10 @@ cat | (cd /usr/src/sys/modules/ipfilter; ! CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS --- 5,15 ---- KMOD= ipl - SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ -! ip_log.c ip_fil.c fil.c ip_lookup.c ip_pool.c ip_htable.c \\ -! ip_sync.c ip_scan.c ip_rules.c - + SRCS= mlfk_ipl.c ip_nat.c ip_nat6.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \\ +! ip_log.c ip_fil.c fil.c ip_lookup.c ip_pool.c ip_dstlist.c ip_htable.c \\ +! ip_sync.c ip_scan.c ip_rules.c ip_fil_compat.c + .if !defined(NOINET6) CFLAGS+= -DUSE_INET6 .endif @@ -261,4 +284,29 @@ cat | (cd /usr/src/sys/modules/ipfilter; ! -DIPFILTER_LOOKUP -DIPFILTER_COMPILED __EOF__ fi + +CONF=/sys/netinet/files.ipfilter +if [ -f $CONF -a $os = NetBSD ] ; then + for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do + echo "Checking for $i in $CONF" + grep $i $CONF >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo "Adding $i to $CONF" + sed -n -e /ip_nat.c/s/ip_nat.c/$i/p $CONF >> $CONF + fi + done +fi + +CONF=/sys/conf/files +if [ -f $CONF -a $os = FreeBSD ] ; then + for i in ip_nat6.c ip_dstlist.c radix_ipf.c; do + echo "Checking for $i in $CONF" + grep $i $CONF >/dev/null 2>&1 + if [ $? -ne 0 ] ; then + echo "Adding $i to $CONF" + sed -n -e /ip_nat.c/,/NORMAL/p $CONF | \ + sed -e s/ip_nat.c/$i/p >> $CONF + fi + done +fi exit 0 Copied: head/contrib/ipfilter/BSD/upgrade (from r254219, vendor/ipfilter/dist/BSD/upgrade) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/ipfilter/BSD/upgrade Fri Sep 6 23:11:19 2013 (r255332, copy of r254219, vendor/ipfilter/dist/BSD/upgrade) @@ -0,0 +1,46 @@ +#!/bin/sh +# +PATH=/sbin:/usr/sbin:/bin:/usr/bin; export PATH +argv0=`basename $0` + +case `pwd` in +*BSD) + ;; +*) + cd BSD + ;; +esac +os=`uname -s` +rev=`uname -r` +maj=`expr $rev : '\([0-9]*\)\.'` +min=`expr $rev : '[0-9]*\.\([0-9]*\)'` +sub=`expr $rev : '[0-9]*\.[0-9]*\.\([0-9]*\)'` +plat=`uname -p` +objdir=${os}-${rev}-${plat} + +# try to bomb out fast if anything fails.... +set -e + +for i in ipf ipfstat ipmon ipnat ippool; do + if [ ! -f /sbin/${i}.dist -a -f /sbin/${i} ] ; then + mv /sbin/${i} /sbin/${i}.dist + cp -p /sbin/${i}.dist /sbin/${i} + cp ${objdir}/${i} /sbin/ + fi + if [ ! -f /usr/sbin/${i}.dist -a -f /usr/sbin/${i} ] ; then + mv /usr/sbin/${i} /usr/sbin/${i}.dist + cp -p /usr/sbin/${i}.dist /usr/sbin/${i} + cp ${objdir}/${i} /usr/sbin/ + fi +done +if [ -f /boot/kernel/ipl.ko ] ; then + if [ ! -f /boot/kernel/ipl.ko.dist ] ; then + mv /boot/kernel/ipl.ko /boot/kernel/ipl.ko.dist + cp -p /boot/kernel/ipl.ko.dist /boot/kernel/ipl.ko + fi + if [ ! -f /boot/kernel/ipl.ko.symbols.dist ] ; then + mv /boot/kernel/ipl.ko.symbols /boot/kernel/ipl.ko.symbols.dist + fi + cp ${objdir}/ipf.ko /boot/kernel/ipl.ko +fi +exit 0 Modified: head/contrib/ipfilter/FAQ.FreeBSD ============================================================================== --- head/contrib/ipfilter/FAQ.FreeBSD Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FAQ.FreeBSD Fri Sep 6 23:11:19 2013 (r255332) @@ -1,4 +1,4 @@ -These are Instructions for Configuring A FreeBSD Box For NAT +These are Instructions for Configuring A FreeBSD Box For NAT After you have installed IP-Filter. You will need to change three files: @@ -54,7 +54,7 @@ fpx0 is the interface with the real inte /32 is the subnet mask 255.255.255.255, ie only use this ip address. -portmap tcp/udp 10000:65000 +portmap tcp/udp 10000:65000 tells it to use the ports to redirect the tcp/udp calls through @@ -67,7 +67,7 @@ reboots. In your /etc/rc.local put the line: -ipnat -f /etc/natrules +ipnat -f /etc/natrules To check and see if it is loaded, as root type ipnat -ls Modified: head/contrib/ipfilter/FWTK/ftp-gw.diff ============================================================================== --- head/contrib/ipfilter/FWTK/ftp-gw.diff Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FWTK/ftp-gw.diff Fri Sep 6 23:11:19 2013 (r255332) @@ -4,7 +4,7 @@ *** 11,31 **** --- 11,41 ---- */ - static char RcsId[] = "$Header: /devel/CVS/IP-Filter/FWTK/ftp-gw.diff,v 2.1 1999/08/04 17:30:30 darrenr Exp $"; + static char RcsId[] = "$Header$"; + /* + * Patches for IP Filter NAT extensions written by Darren Reed, 7/7/96 Modified: head/contrib/ipfilter/FWTK/fwtk_transparent.diff ============================================================================== --- head/contrib/ipfilter/FWTK/fwtk_transparent.diff Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FWTK/fwtk_transparent.diff Fri Sep 6 23:11:19 2013 (r255332) @@ -124,7 +124,7 @@ diff -cr ../TIS.orig/fwtk/Makefile.confi *************** *** 11,30 **** # - # RcsId: "$Header: /devel/CVS/IP-Filter/FWTK/fwtk_transparent.diff,v 2.2 2001/02/28 09:36:06 darrenr Exp $" + # RcsId: "$Header$" # Your C compiler (eg, "cc" or "gcc") @@ -145,7 +145,7 @@ diff -cr ../TIS.orig/fwtk/Makefile.confi -Dgethostbyaddr=res_gethostbyaddr -Dgetnetbyname=res_getnetbyname \ --- 11,34 ---- # - # RcsId: "$Header: /devel/CVS/IP-Filter/FWTK/fwtk_transparent.diff,v 2.2 2001/02/28 09:36:06 darrenr Exp $" + # RcsId: "$Header$" + # + # Path to sources of ip_filter (ip_nat.h required in lib/hnam.c) Modified: head/contrib/ipfilter/FreeBSD-2.2/kinstall ============================================================================== --- head/contrib/ipfilter/FreeBSD-2.2/kinstall Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FreeBSD-2.2/kinstall Fri Sep 6 23:11:19 2013 (r255332) @@ -17,8 +17,8 @@ foreach i (ip_{auth,fil,frag,nat,pool,pr case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" echo "Copying /usr/include/osreldate.h to /sys/sys" Modified: head/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 ============================================================================== --- head/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 Fri Sep 6 23:11:19 2013 (r255332) @@ -10,7 +10,7 @@ To build a kernel with the IP filter, fo 4. build a new kernel 5. install the new kernel - + 6. If not using DEVFS, create devices for IP Filter as follows: mknod /dev/ipl c 79 0 mknod /dev/ipnat c 79 1 @@ -18,7 +18,7 @@ To build a kernel with the IP filter, fo mknod /dev/ipauth c 79 3 mknod /dev/ipsync c 79 4 mknod /dev/ipscan c 79 5 - + 7. reboot Modified: head/contrib/ipfilter/FreeBSD-3/kinstall ============================================================================== --- head/contrib/ipfilter/FreeBSD-3/kinstall Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FreeBSD-3/kinstall Fri Sep 6 23:11:19 2013 (r255332) @@ -18,8 +18,8 @@ foreach i (ip_fil.[ch] ip_nat.[ch] ip_fr case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" Modified: head/contrib/ipfilter/FreeBSD-4.0/kinstall ============================================================================== --- head/contrib/ipfilter/FreeBSD-4.0/kinstall Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FreeBSD-4.0/kinstall Fri Sep 6 23:11:19 2013 (r255332) @@ -20,8 +20,8 @@ foreach i (ip_{auth,fil,nat,pool,proxy,s case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" Modified: head/contrib/ipfilter/FreeBSD/kinstall ============================================================================== --- head/contrib/ipfilter/FreeBSD/kinstall Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/FreeBSD/kinstall Fri Sep 6 23:11:19 2013 (r255332) @@ -17,8 +17,8 @@ foreach i (ip_{auth,fil,frag,nat,pool,pr case *.h: /bin/cp $i /usr/include/netinet/$i chmod 644 /usr/include/netinet/$i - breaksw - endsw + breaksw + endsw end echo "" grep iplopen $archdir/$karch/conf.c >& /dev/null Modified: head/contrib/ipfilter/HISTORY ============================================================================== --- head/contrib/ipfilter/HISTORY Fri Sep 6 22:17:02 2013 (r255331) +++ head/contrib/ipfilter/HISTORY Fri Sep 6 23:11:19 2013 (r255332) @@ -10,745 +10,268 @@ # and especially those who have found the time to port IP Filter to new # platforms. # -4.1.28 - Release 16 October 2007 +5.1.2 - RELEASED - 22 Jul 2012 -backout changes (B1) & (B2) as they've caused NAT entries to persist for -too long and possibly other side effects. +3546266 macro letters could be more consistent +3546265 not all of the state statistics are displayed +3546261 scripts for updating BSD environment out of date +3546260 compiler warnings about non-integer array subscript +3546259 asserting numdereflists == 0 is not correct +3546258 expression matching does not see IPF_EXP_END +3544317 ipnat/ipfstat are not using ipfexp_t +3545324 proxy checksum calculation is not hardware aware +3545321 FTP sequence number adjustment incorrectly applied +3545320 EPSV is not recognised +3545319 move nat rule creation to ip_proxy.c +3545317 better feedback of checksum requirements for proxies +3545314 ftp proxy levels do not make sense +3545312 EPRT is not supported by ftp proxy +3544318 ipnat.conf parsing ignores LHS address family +3545309 non-ipv6 safe proxies do not fail with ipv6 +3545323 NAT updates the source port twice +3545322 ipv6 nat rules cannot start proxies +3544314 bucket copyout tries to copy too much data +3544313 remove nat encap feature +3546248 compat rule pointer type mismatch +3546247 UDP hardware checksum offload not recognised +3545311 ifp_ifaddr does not find the first set address +3545310 ipmon needs ipl_sec on 64bit boundary +3545326 reference count changes made without lock +3544315 stateful matching does not use ipfexp_t +3543493 tokens are not flushed when disabled +3543487 NAT rules do not always release lookup objects +3543491 function comments in ip_state.c are old +3543404 ipnat.conf parsing uses family/ip version badly +3543403 incorrect line number printed in ipnat parsing errors +3543402 Not all NAT statistics are printed +3542979 NAT session list management is too simple +3542978 ipv4 and ipv6 nat insert have common hash insertion +3542977 ipnat_t refence tracking incomplete +3542975 proxies must use ipnat_t separately +3542980 printing ipv6 expressions is wrong +3542983 ippool cannot handle more than one ipv6 address +3543018 mask array shifted incorrectly. +3542974 reason for dropping packet is lost +3542982 line numbers not recorded/displayed correctly by ipf +3542981 exclamation mark cuases trouble with pools +3541655 test suite checksums incorrect +3541653 display proxy fail status correctly +3540993 IP header offset excluded in pullup calculations +3540994 pullupmsg does not work as required +3540992 pointer to ipv6 frag header not updated on pullup +3541645 netmask management adds /32 for /0 +3541637 ipnat parser does not zero port fields for non-port protocol +3541635 pool names cannot by numbers +3540995 IPv6 fragment tracking does not always work +3540996 printing of nextip for ipv6 nat rules is wrong +3540999 ipnat.conf parsing has trouble with icmpidmap for ipv6 +3540825 whois output parsing error for ipv6 +3540814 ipfd_lock serves no purpose +3540810 lookup objects need tail pointers +3540809 refactor hash table lookups for nat +3540819 radix tree does not work with ipv6 +3540820 mutex emulation should be logged +3540828 ipfstat filtering with -m fails tests +3536480 ippool could be more like the others +3536477 pool printing not uniform +3536483 flushing empty destination lists causes panic +3536481 more use of bzero after KMALLOC required +3536479 ipnat.conf line numbers not stored +3536484 Makefile missing dependency for ippool +3536199 TFTP proxy requires something extra +3536198 ICMP checksum out by one +3536203 ipnat does not return an error +3536201 ipf.conf parsing too address friendly +3536200 printing of bytes/packets not indented +3497941 ipv4 multicast detection incorrect on little endian +3535361 to interfaces printed out of order +3535363 ipf parser is inconsistent +3532306 deleting ipnat rules does not work +3532054 new error required for ipf_rx_create +3532053 icmp6 checksums wrong +3532052 icmpv6 state check with incorrect length +3531871 checksum verification wants too many icmp6 bytes +3531870 ipnat.conf parsing needs to support inet6 +3532048 error in ipf group parsing +3531868 ICMPV6 checksum not validated +3531893 ipftest exits without error for bad input +3531890 whois pool parsing builds bad structures +3531891 icmpv6 text parsing ignorant of icmp types +3531653 rewrite with icmp does not work +3530563 NAT operations fail with EPERM +3530544 first pass at gcc -Wextra cleanup +3530540 lookup create functions do not set error properly +3530539 ipf_main_soft_destroy doesn't need 2nd arg +3530541 reorder structure for better packing +3530543 ipnat purge needs documentation +3530515 BSD upgrade script required +3528029 ipmon bad-mutex panic +3530247 loading address pools light on input validation +3530255 radix tree delete uses wrong lookup +3530254 radix tree allocation support wrong +3530264 ipmon prints qd for some 64bit numbers +3530260 decapsulate rules not printed correctly. +3530266 ipfstat -v/-d flags confused +2939220 why a packet is blocked is not discernable +2939218 output interface not recorded +2941850 use of destination lists with to/dup-to beneficial +3457747 build errors introduced with radix change +3535360 timeout groups leak +3535359 memory leak with tokens +3535358 listing rules in groups requires tracking groups +3535357 rule head removal is problematic +3530259 not all ioctl error checked wth SIOCIPFINTERROR +3530258 error routine that uses fd required +3530253 inadequate function comment blocks +3530249 walking lookup tables leaks memory +3530241 extra lock padding required for freebsd +3529901 ipf returns 0 when rules fail to load +3529491 checksum validation could be better +3529486 tcp checksum wrong for ipv6 +3533779 ipv6 nat rules missing inet6 keyword +3532693 ipnat.conf rejects some ipv6 addresses +3532691 ipv4 should not be forced for icmp +3532689 ipv6 nat rules do not print inet6 +3532688 ipv6 address always printed with "to <if>" +3532687 with v6hdrs not supported like with ipopts +3532686 ipf expressions do not work with ipv6 +3540825 whois output parsing error for ipv6 +3540818 NAT for certain IPv6 ICMP packets should not be allowed +3540815 memory leak with destination lists +3540814 ipfd_lock serves no purpose +3540810 lookup objects need tail pointers +3540809 refactor hash table lookups for nat +3540808 completed tokens do not stop iteration +3530492 address hash table name not used +3528029 ipmon bad-mutex panic +3530256 hook memory leaked +3530271 pools parsing produces badly formed address structures +3488061 cleanup for illumos build +3484434 SIOCIPFINTERROR must work for all devices +3484067 mandoc -Tlint warnings to be fixed +3483343 compile warning in ipfcomp.c +3482893 building without IPFILTER_LOG fails +3482765 building netbsd kernel without inet6 fails +3482116 ipf_check frees packet from ipftest +3481663 does not compile on solaris 11 + +5.1.1 - RELEASED - 9 May 2012 + +3481322 ip_fil_compat.c needs a cleanup +3481211 add user errors to dtrace +3481152 compatibility for 4.1 needs more work +3481153 PRIu64 problems on FreeBSD +3481155 ipnat listing incorrect +3480543 change leads to compat problems +3480538 compiler errors from earlier patch +3480537 ipf_instance_destroy is incomplete +3480536 _fini order leads to panic +3479991 compiler warnings about size mismatches +3479974 copyright dates are wrong (fix) +3479464 add support for leaks testing +3479457 %qu is not the prefered way +3479451 iterators leak memory +3479453 nat rules with pools leak +3479454 memory leak in hostmap table +3479461 load_hash uses memory after free +3479462 printpool leaks memory +3479452 missing FREE_MB_T to freembt leaks +3479450 ipfdetach is called when detached +3479448 group mapping rules memory leak +3479455 memory leak from tuning +3479458 ipf must be running in global zone +3479460 driver replace is wrong +3479459 radix tree tries to free null pointer +3479463 rwlock emulation does not free memory +3479465 parser leaks memory +3475959 hardware checksum not correctly used +3475426 ip pseudo checksum wrong +3473566 radix tree does not delete dups right +3472987 compile is not clean +3472337 not everything is zero'd +3472344 interface setup needs to be after insert +3472340 wildcard counter drops twice *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309062311.r86NBKvM062396>