Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Back out the recent import of IPFilter 5.1.1 for the upcomin...



details:   https://anonhg.NetBSD.org/src/rev/d7bea97a2c02
branches:  trunk
changeset: 773759:d7bea97a2c02
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Feb 15 17:55:03 2012 +0000

description:
Back out the recent import of IPFilter 5.1.1 for the upcoming branch,
which will now have IPFilter 4.1.34.  IPFilter 5.1.1 will be restored
post-branch.

ok: core, releng.

diffstat:

 dist/ipf/BNF                          |    81 +
 dist/ipf/BugReport                    |    12 +
 dist/ipf/HISTORY                      |   978 ++++-
 dist/ipf/IMPORTANT                    |    11 +
 dist/ipf/IPF.KANJI                    |   465 ++
 dist/ipf/Makefile                     |   418 +
 dist/ipf/QNX_OCL.txt                  |   275 +
 dist/ipf/README                       |   101 +
 dist/ipf/STYLE.TXT                    |    57 +
 dist/ipf/WhatsNew40.txt               |    90 +
 dist/ipf/Y2K                          |     3 +
 dist/ipf/arc4random.c                 |   275 +
 dist/ipf/bpf-ipf.h                    |     4 +-
 dist/ipf/bpf_filter.c                 |    27 +-
 dist/ipf/etc/protocols                |     2 +-
 dist/ipf/etc/services                 |     6 +-
 dist/ipf/ip_dns_pxy.c                 |   401 -
 dist/ipf/ip_dstlist.c                 |  1314 -----
 dist/ipf/ip_dstlist.h                 |    71 -
 dist/ipf/ip_fil.c                     |   592 +-
 dist/ipf/ip_fil_compat.c              |  3572 ++-------------
 dist/ipf/ip_htable.c                  |  1220 +----
 dist/ipf/ip_htable.h                  |    46 +-
 dist/ipf/ip_irc_pxy.c                 |   107 +-
 dist/ipf/ip_lookup.c                  |  1073 +---
 dist/ipf/ip_lookup.h                  |    75 +-
 dist/ipf/ip_nat6.c                    |  4773 ---------------------
 dist/ipf/ip_pool.c                    |  1168 +---
 dist/ipf/ip_pool.h                    |    88 +-
 dist/ipf/ip_pptp_pxy.c                |   214 +-
 dist/ipf/ip_rpcb_pxy.c                |   389 +-
 dist/ipf/ip_scan.c                    |   191 +-
 dist/ipf/ip_scan.h                    |    22 +-
 dist/ipf/ip_sync.c                    |   977 +---
 dist/ipf/ip_sync.h                    |    38 +-
 dist/ipf/ip_tftp_pxy.c                |   302 -
 dist/ipf/ipf.h                        |   342 +-
 dist/ipf/ipf_rb.h                     |   366 -
 dist/ipf/iplang/Makefile              |    32 +
 dist/ipf/iplang/iplang.h              |     4 +-
 dist/ipf/iplang/iplang.tst            |     2 +-
 dist/ipf/iplang/iplang_l.l            |     6 +-
 dist/ipf/iplang/iplang_y.y            |    14 +-
 dist/ipf/ipmon.h                      |    92 +-
 dist/ipf/ipsd/Makefile                |    61 +
 dist/ipf/ipsd/ipsd.c                  |    26 +-
 dist/ipf/ipsd/ipsdr.c                 |    34 +-
 dist/ipf/ipsd/linux.h                 |     4 +-
 dist/ipf/ipsd/sbpf.c                  |    12 +-
 dist/ipf/ipsd/sdlpi.c                 |    12 +-
 dist/ipf/ipsd/slinux.c                |    12 +-
 dist/ipf/ipsd/snit.c                  |    12 +-
 dist/ipf/ipsend/44arp.c               |     9 +-
 dist/ipf/ipsend/Makefile              |   183 +
 dist/ipf/ipsend/README                |     8 +
 dist/ipf/ipsend/arp.c                 |    13 +-
 dist/ipf/ipsend/dlcommon.c            |   218 +-
 dist/ipf/ipsend/hpux.c                |   114 +
 dist/ipf/ipsend/ip.c                  |    50 +-
 dist/ipf/ipsend/ipresend.c            |    21 +-
 dist/ipf/ipsend/ipsend.c              |    22 +-
 dist/ipf/ipsend/ipsopt.c              |    20 +-
 dist/ipf/ipsend/iptest.c              |    10 +-
 dist/ipf/ipsend/iptests.c             |    79 +-
 dist/ipf/ipsend/larp.c                |    10 +-
 dist/ipf/ipsend/linux.h               |     4 +-
 dist/ipf/ipsend/lsock.c               |    22 +-
 dist/ipf/ipsend/resend.c              |    33 +-
 dist/ipf/ipsend/sbpf.c                |    13 +-
 dist/ipf/ipsend/sdlpi.c               |    13 +-
 dist/ipf/ipsend/slinux.c              |    12 +-
 dist/ipf/ipsend/snit.c                |    12 +-
 dist/ipf/ipsend/sock.c                |    29 +-
 dist/ipf/ipsend/tcpip.h               |     4 +-
 dist/ipf/ipt.h                        |    27 +-
 dist/ipf/kmem.h                       |    19 +-
 dist/ipf/l4check/Makefile             |    10 +
 dist/ipf/l4check/l4check.c            |    85 +-
 dist/ipf/lib/Makefile                 |   310 +
 dist/ipf/lib/addicmp.c                |     6 +-
 dist/ipf/lib/addipopt.c               |    24 +-
 dist/ipf/lib/alist_free.c             |     8 +-
 dist/ipf/lib/alist_new.c              |    81 +-
 dist/ipf/lib/allocmbt.c               |    24 -
 dist/ipf/lib/assigndefined.c          |    29 -
 dist/ipf/lib/bcopywrap.c              |    10 +-
 dist/ipf/lib/binprint.c               |    10 +-
 dist/ipf/lib/buildopts.c              |    16 +-
 dist/ipf/lib/checkrev.c               |    24 +-
 dist/ipf/lib/connecttcp.c             |    50 -
 dist/ipf/lib/count4bits.c             |     8 +-
 dist/ipf/lib/count6bits.c             |     8 +-
 dist/ipf/lib/debug.c                  |    39 +-
 dist/ipf/lib/dupmbt.c                 |    26 -
 dist/ipf/lib/facpri.c                 |    24 +-
 dist/ipf/lib/facpri.h                 |     6 +-
 dist/ipf/lib/familyname.c             |    14 -
 dist/ipf/lib/fill6bits.c              |    10 +-
 dist/ipf/lib/findword.c               |    27 -
 dist/ipf/lib/flags.c                  |     6 +-
 dist/ipf/lib/freembt.c                |    18 -
 dist/ipf/lib/ftov.c                   |    18 -
 dist/ipf/lib/genmask.c                |    70 -
 dist/ipf/lib/gethost.c                |    63 +-
 dist/ipf/lib/geticmptype.c            |    31 -
 dist/ipf/lib/getifname.c              |    12 +-
 dist/ipf/lib/getnattype.c             |    45 +-
 dist/ipf/lib/getport.c                |    25 +-
 dist/ipf/lib/getportproto.c           |    10 +-
 dist/ipf/lib/getproto.c               |     9 +-
 dist/ipf/lib/getsumd.c                |     8 +-
 dist/ipf/lib/hostname.c               |    18 +-
 dist/ipf/lib/icmpcode.c               |     6 +-
 dist/ipf/lib/icmptypename.c           |    30 -
 dist/ipf/lib/icmptypes.c              |   109 -
 dist/ipf/lib/inet_addr.c              |    18 +-
 dist/ipf/lib/initparse.c              |     6 +-
 dist/ipf/lib/interror.c               |   569 --
 dist/ipf/lib/ionames.c                |    51 +-
 dist/ipf/lib/ipf_dotuning.c           |    12 +-
 dist/ipf/lib/ipf_perror.c             |    14 -
 dist/ipf/lib/ipferror.c               |    26 -
 dist/ipf/lib/ipft_ef.c                |    54 +-
 dist/ipf/lib/ipft_hx.c                |    44 +-
 dist/ipf/lib/ipft_pc.c                |   163 +-
 dist/ipf/lib/ipft_sn.c                |    31 +-
 dist/ipf/lib/ipft_td.c                |    44 +-
 dist/ipf/lib/ipft_tx.c                |   240 +-
 dist/ipf/lib/ipoptsec.c               |    17 +-
 dist/ipf/lib/kmem.c                   |    34 +-
 dist/ipf/lib/kmem.h                   |     6 +-
 dist/ipf/lib/kmemcpywrap.c            |    10 +-
 dist/ipf/lib/kvatoname.c              |    12 +-
 dist/ipf/lib/load_dstlist.c           |    71 -
 dist/ipf/lib/load_dstlistnode.c       |    65 -
 dist/ipf/lib/load_file.c              |    40 +-
 dist/ipf/lib/load_hash.c              |    30 +-
 dist/ipf/lib/load_hashnode.c          |    30 +-
 dist/ipf/lib/load_http.c              |    62 +-
 dist/ipf/lib/load_pool.c              |    28 +-
 dist/ipf/lib/load_poolnode.c          |    35 +-
 dist/ipf/lib/load_url.c               |     6 +-
 dist/ipf/lib/mb_hexdump.c             |    34 -
 dist/ipf/lib/msgdsize.c               |    22 -
 dist/ipf/lib/mutex_emul.c             |    60 +-
 dist/ipf/lib/nametokva.c              |    12 +-
 dist/ipf/lib/nat_setgroupmap.c        |    22 +-
 dist/ipf/lib/ntomask.c                |    23 +-
 dist/ipf/lib/optname.c                |    12 +-
 dist/ipf/lib/optprint.c               |    10 +-
 dist/ipf/lib/optprintv6.c             |    10 +-
 dist/ipf/lib/optvalue.c               |    10 +-
 dist/ipf/lib/parsefields.c            |    50 -
 dist/ipf/lib/parseipfexpr.c           |   281 -
 dist/ipf/lib/parsewhoisline.c         |   126 -
 dist/ipf/lib/poolio.c                 |    49 -
 dist/ipf/lib/portname.c               |    17 +-
 dist/ipf/lib/prependmbt.c             |    19 -
 dist/ipf/lib/print_toif.c             |    49 +-
 dist/ipf/lib/printactiveaddr.c        |    39 -
 dist/ipf/lib/printactivenat.c         |   132 +-
 dist/ipf/lib/printaddr.c              |    77 -
 dist/ipf/lib/printaps.c               |    64 +-
 dist/ipf/lib/printbuf.c               |    15 +-
 dist/ipf/lib/printdstl_live.c         |    93 -
 dist/ipf/lib/printdstlist.c           |    67 -
 dist/ipf/lib/printdstlistdata.c       |    49 -
 dist/ipf/lib/printdstlistnode.c       |    79 -
 dist/ipf/lib/printdstlistpolicy.c     |    33 -
 dist/ipf/lib/printfieldhdr.c          |    57 -
 dist/ipf/lib/printfr.c                |   436 +-
 dist/ipf/lib/printfraginfo.c          |    34 +-
 dist/ipf/lib/printhash.c              |    24 +-
 dist/ipf/lib/printhash_live.c         |    42 +-
 dist/ipf/lib/printhashdata.c          |    54 +-
 dist/ipf/lib/printhashnode.c          |    58 +-
 dist/ipf/lib/printhost.c              |    37 -
 dist/ipf/lib/printhostmap.c           |    29 +-
 dist/ipf/lib/printhostmask.c          |    35 +-
 dist/ipf/lib/printifname.c            |    18 +-
 dist/ipf/lib/printip.c                |    37 +-
 dist/ipf/lib/printipfexpr.c           |   160 -
 dist/ipf/lib/printlog.c               |    23 +-
 dist/ipf/lib/printlookup.c            |    47 -
 dist/ipf/lib/printmask.c              |    28 +-
 dist/ipf/lib/printnat.c               |   345 +-
 dist/ipf/lib/printnataddr.c           |    50 -
 dist/ipf/lib/printnatfield.c          |   222 -
 dist/ipf/lib/printnatside.c           |    59 -
 dist/ipf/lib/printpacket.c            |    69 +-
 dist/ipf/lib/printpacket6.c           |    33 +-
 dist/ipf/lib/printpool.c              |    23 +-
 dist/ipf/lib/printpool_live.c         |    47 +-
 dist/ipf/lib/printpooldata.c          |    54 +-
 dist/ipf/lib/printpoolfield.c         |   170 -
 dist/ipf/lib/printpoolnode.c          |    60 +-
 dist/ipf/lib/printportcmp.c           |    19 +-
 dist/ipf/lib/printproto.c             |    39 +-
 dist/ipf/lib/printsbuf.c              |    19 +-
 dist/ipf/lib/printstate.c             |   170 +-
 dist/ipf/lib/printstatefields.c       |   360 -
 dist/ipf/lib/printtcpflags.c          |    32 -
 dist/ipf/lib/printtqtable.c           |    19 +-
 dist/ipf/lib/printtunable.c           |    23 +-
 dist/ipf/lib/printunit.c              |    49 -
 dist/ipf/lib/remove_hash.c            |    21 +-
 dist/ipf/lib/remove_hashnode.c        |    25 +-
 dist/ipf/lib/remove_pool.c            |    21 +-
 dist/ipf/lib/remove_poolnode.c        |    25 +-
 dist/ipf/lib/resetlexer.c             |     6 +-
 dist/ipf/lib/rwlock_emul.c            |    44 +-
 dist/ipf/lib/save_execute.c           |    82 -
 dist/ipf/lib/save_file.c              |   132 -
 dist/ipf/lib/save_nothing.c           |    56 -
 dist/ipf/lib/save_syslog.c            |   139 -
 dist/ipf/lib/save_v1trap.c            |   466 --
 dist/ipf/lib/save_v2trap.c            |   466 --
 dist/ipf/lib/tcp_flags.c              |    12 +-
 dist/ipf/lib/tcpflags.c               |     8 +-
 dist/ipf/lib/tcpoptnames.c            |    22 -
 dist/ipf/lib/v6ionames.c              |     6 +-
 dist/ipf/lib/v6optvalue.c             |    10 +-
 dist/ipf/lib/var.c                    |    20 +-
 dist/ipf/lib/verbose.c                |    34 +-
 dist/ipf/lib/vtof.c                   |    18 -
 dist/ipf/man/Makefile                 |    28 +
 dist/ipf/man/ipf.5                    |  2130 ++-------
 dist/ipf/man/ipfilter.4.mandoc        |    22 +-
 dist/ipf/man/ipmon.5                  |   240 +-
 dist/ipf/man/ipnat.1                  |    47 -
 dist/ipf/man/ipnat.5                  |   914 +---
 dist/ipf/man/ippool.5                 |   377 +-
 dist/ipf/man/ippool.8                 |    13 +-
 dist/ipf/md5.c                        |    35 +-
 dist/ipf/md5.h                        |    15 +-
 dist/ipf/ml_ipl.c                     |   159 +
 dist/ipf/mlf_rule.c                   |   163 +
 dist/ipf/mlfk_ipl.c                   |   361 +
 dist/ipf/mlfk_rule.c                  |    69 +
 dist/ipf/mlh_rule.c                   |   116 +
 dist/ipf/mln_rule.c                   |    29 +-
 dist/ipf/mlo_ipl.c                    |   260 +
 dist/ipf/mlo_rule.c                   |    78 +
 dist/ipf/mls_rule.c                   |   112 +
 dist/ipf/mlso_rule.c                  |   129 +
 dist/ipf/opts.h                       |    15 +-
 dist/ipf/pcap-ipf.h                   |     4 +-
 dist/ipf/perl/Ipfanaly.pl             |    62 +-
 dist/ipf/perl/Isbgraph                |    14 +-
 dist/ipf/perl/Services                |   164 +-
 dist/ipf/perl/ipfmeta.pl              |     4 +-
 dist/ipf/perl/logfilter.pl            |    36 +-
 dist/ipf/radix.c                      |  1181 +++++
 dist/ipf/radix_ipf.c                  |  1324 -----
 dist/ipf/radix_ipf.h                  |   275 +-
 dist/ipf/rules/BASIC_1.FW             |     4 +-
 dist/ipf/rules/BASIC_2.FW             |     2 +-
 dist/ipf/rules/firewall               |     2 +-
 dist/ipf/rules/ipmon.conf             |    29 +-
 dist/ipf/rules/server                 |     2 +-
 dist/ipf/samples/Makefile             |    24 +
 dist/ipf/samples/proxy.c              |    14 +-
 dist/ipf/samples/relay.c              |     8 +-
 dist/ipf/snoop.h                      |     6 +-
 dist/ipf/sys/tree.h                   |   750 ---
 dist/ipf/test/bpftest                 |    44 +-
 dist/ipf/test/expected/Makefile       |    41 +
 dist/ipf/test/expected/f18            |    22 -
 dist/ipf/test/expected/f21            |     5 -
 dist/ipf/test/expected/f22            |     5 -
 dist/ipf/test/expected/f25            |    35 -
 dist/ipf/test/expected/f26            |    84 -
 dist/ipf/test/expected/f27            |    90 -
 dist/ipf/test/expected/f28            |    32 -
 dist/ipf/test/expected/f29            |    64 -
 dist/ipf/test/expected/f30            |    68 -
 dist/ipf/test/expected/i14            |    12 +-
 dist/ipf/test/expected/i17            |    19 -
 dist/ipf/test/expected/i19.dist       |    44 +-
 dist/ipf/test/expected/i20            |     8 +-
 dist/ipf/test/expected/i22            |     5 -
 dist/ipf/test/expected/in100          |     3 -
 dist/ipf/test/expected/in101          |     4 -
 dist/ipf/test/expected/in102          |     5 -
 dist/ipf/test/expected/in5            |    46 +-
 dist/ipf/test/expected/in6            |    16 +-
 dist/ipf/test/expected/ip1            |    92 +-
 dist/ipf/test/expected/ip2            |     2 +-
 dist/ipf/test/expected/ip3            |    14 -
 dist/ipf/test/expected/ipv6.4         |    51 -
 dist/ipf/test/expected/ipv6.6         |     2 -
 dist/ipf/test/expected/n10            |    63 -
 dist/ipf/test/expected/n100           |    33 -
 dist/ipf/test/expected/n101           |    29 -
 dist/ipf/test/expected/n102           |    29 -
 dist/ipf/test/expected/n103           |    33 -
 dist/ipf/test/expected/n104           |    50 -
 dist/ipf/test/expected/n105           |    25 -
 dist/ipf/test/expected/n106           |    25 -
 dist/ipf/test/expected/n11            |   169 +-
 dist/ipf/test/expected/n11_6          |   124 -
 dist/ipf/test/expected/n12            |    21 -
 dist/ipf/test/expected/n12_6          |    28 -
 dist/ipf/test/expected/n13            |    35 +-
 dist/ipf/test/expected/n13_6          |    32 -
 dist/ipf/test/expected/n14            |    33 +-
 dist/ipf/test/expected/n14_6          |    30 -
 dist/ipf/test/expected/n15            |    47 -
 dist/ipf/test/expected/n15_6          |    47 -
 dist/ipf/test/expected/n16            |    10 +-
 dist/ipf/test/expected/n17            |    10 +-
 dist/ipf/test/expected/n18            |   120 +-
 dist/ipf/test/expected/n1_6           |   197 -
 dist/ipf/test/expected/n200           |    25 -
 dist/ipf/test/expected/n201           |    28 -
 dist/ipf/test/expected/n202           |    23 -
 dist/ipf/test/expected/n2_6           |   191 -
 dist/ipf/test/expected/n4_6           |   190 -
 dist/ipf/test/expected/n5_6           |   533 --
 dist/ipf/test/expected/n6_6           |   173 -
 dist/ipf/test/expected/n7_6           |    98 -
 dist/ipf/test/expected/n8             |    21 -
 dist/ipf/test/expected/n8_6           |    30 -
 dist/ipf/test/expected/n9             |    20 -
 dist/ipf/test/expected/n9_6           |    29 -
 dist/ipf/test/expected/ni10           |     3 +-
 dist/ipf/test/expected/ni11           |     3 +-
 dist/ipf/test/expected/ni12           |     7 +-
 dist/ipf/test/expected/ni17           |     7 -
 dist/ipf/test/expected/ni18           |     5 -
 dist/ipf/test/expected/ni19           |    18 +-
 dist/ipf/test/expected/ni20           |    40 +-
 dist/ipf/test/expected/ni21           |     8 +-
 dist/ipf/test/expected/ni23           |    34 +-
 dist/ipf/test/expected/ni6            |    74 +-
 dist/ipf/test/expected/p1             |    13 +-
 dist/ipf/test/expected/p10            |    40 -
 dist/ipf/test/expected/p11            |    40 -
 dist/ipf/test/expected/p12            |    40 -
 dist/ipf/test/expected/p13            |    30 -
 dist/ipf/test/expected/p2             |    18 +-
 dist/ipf/test/expected/p3             |    18 +-
 dist/ipf/test/expected/p4             |    38 -
 dist/ipf/test/expected/p5             |    11 +-
 dist/ipf/test/expected/p6             |    24 -
 dist/ipf/test/expected/p7             |    40 -
 dist/ipf/test/expected/p9             |    40 -
 dist/ipf/test/input/f21               |    31 -
 dist/ipf/test/input/f22               |    31 -
 dist/ipf/test/input/f25               |    41 -
 dist/ipf/test/input/f26               |    13 -
 dist/ipf/test/input/f27               |    84 -
 dist/ipf/test/input/f28               |     7 -
 dist/ipf/test/input/f29               |    11 -
 dist/ipf/test/input/f30               |    16 -
 dist/ipf/test/input/ipv6.4            |   522 --
 dist/ipf/test/input/ipv6.6            |     7 -
 dist/ipf/test/input/n10               |     4 +-
 dist/ipf/test/input/n100              |     8 -
 dist/ipf/test/input/n101              |     8 -
 dist/ipf/test/input/n102              |     8 -
 dist/ipf/test/input/n103              |     8 -
 dist/ipf/test/input/n104              |    48 -
 dist/ipf/test/input/n105              |     8 -
 dist/ipf/test/input/n106              |     8 -
 dist/ipf/test/input/n10_6             |     6 -
 dist/ipf/test/input/n11_6             |    16 -
 dist/ipf/test/input/n12               |    12 +-
 dist/ipf/test/input/n12_6             |    18 -
 dist/ipf/test/input/n13_6             |     4 -
 dist/ipf/test/input/n14_6             |     4 -
 dist/ipf/test/input/n15               |     2 -
 dist/ipf/test/input/n15_6             |     2 -
 dist/ipf/test/input/n16               |    26 +-
 dist/ipf/test/input/n17               |    28 +-
 dist/ipf/test/input/n17_6             |    24 -
 dist/ipf/test/input/n1_6              |    34 -
 dist/ipf/test/input/n200              |     6 -
 dist/ipf/test/input/n201              |    24 -
 dist/ipf/test/input/n202              |     7 -
 dist/ipf/test/input/n2_6              |    19 -
 dist/ipf/test/input/n4_6              |    10 -
 dist/ipf/test/input/n5_6              |    54 -
 dist/ipf/test/input/n6_6              |    13 -
 dist/ipf/test/input/n7_6              |     9 -
 dist/ipf/test/input/n8                |    12 +-
 dist/ipf/test/input/n8_6              |    34 -
 dist/ipf/test/input/n9                |    12 +-
 dist/ipf/test/input/n9_6              |    34 -
 dist/ipf/test/input/ni10              |    10 +-
 dist/ipf/test/input/ni11              |     4 +-
 dist/ipf/test/input/ni12              |    14 +-
 dist/ipf/test/input/ni13              |   130 +-
 dist/ipf/test/input/ni14              |   126 +-
 dist/ipf/test/input/ni15              |     2 +-
 dist/ipf/test/input/ni16              |     2 +-
 dist/ipf/test/input/ni18              |     4 -
 dist/ipf/test/input/ni19              |    14 +-
 dist/ipf/test/input/ni20              |    48 +-
 dist/ipf/test/input/ni7               |    10 +-
 dist/ipf/test/input/ni8               |    11 +-
 dist/ipf/test/input/ni9               |     7 +-
 dist/ipf/test/input/p10               |    10 -
 dist/ipf/test/input/p11               |    10 -
 dist/ipf/test/input/p12               |    10 -
 dist/ipf/test/input/p13               |     8 -
 dist/ipf/test/input/p4                |    12 -
 dist/ipf/test/input/p6                |     2 -
 dist/ipf/test/input/p7                |    10 -
 dist/ipf/test/input/p9                |    10 -
 dist/ipf/test/ipflib.sh               |    59 -
 dist/ipf/test/iptest                  |    30 +-
 dist/ipf/test/ptest                   |    47 +-
 dist/ipf/test/regress/f21             |     2 -
 dist/ipf/test/regress/f22             |     2 -
 dist/ipf/test/regress/f25             |     1 -
 dist/ipf/test/regress/f26             |     6 -
 dist/ipf/test/regress/f27             |     6 -
 dist/ipf/test/regress/f28.ipf         |     2 -
 dist/ipf/test/regress/f28.pool        |     2 -
 dist/ipf/test/regress/f29.ipf         |     2 -
 dist/ipf/test/regress/f29.pool        |     2 -
 dist/ipf/test/regress/f30             |     4 -
 dist/ipf/test/regress/i14             |     2 -
 dist/ipf/test/regress/i17             |     4 +-
 dist/ipf/test/regress/i18             |     6 +-
 dist/ipf/test/regress/i21             |     6 +-
 dist/ipf/test/regress/i22             |     5 -
 dist/ipf/test/regress/in100           |     3 -
 dist/ipf/test/regress/in101           |     4 -
 dist/ipf/test/regress/in102           |     5 -
 dist/ipf/test/regress/ip3             |    14 -
 dist/ipf/test/regress/ipv6.4          |     3 -
 dist/ipf/test/regress/ipv6.5          |     4 +-
 dist/ipf/test/regress/n100            |     1 -
 dist/ipf/test/regress/n101            |     1 -
 dist/ipf/test/regress/n102            |     1 -
 dist/ipf/test/regress/n103            |     1 -
 dist/ipf/test/regress/n104            |     1 -
 dist/ipf/test/regress/n105            |     1 -
 dist/ipf/test/regress/n106            |     1 -
 dist/ipf/test/regress/n10_6           |     3 -
 dist/ipf/test/regress/n11_6           |     3 -
 dist/ipf/test/regress/n12_6           |     1 -
 dist/ipf/test/regress/n13_6           |     1 -
 dist/ipf/test/regress/n14_6           |     1 -
 dist/ipf/test/regress/n15             |     2 -
 dist/ipf/test/regress/n15_6           |     2 -
 dist/ipf/test/regress/n16_6           |     1 -
 dist/ipf/test/regress/n17_6           |     1 -
 dist/ipf/test/regress/n18             |     6 +-
 dist/ipf/test/regress/n1_6            |     3 -
 dist/ipf/test/regress/n200            |     1 -
 dist/ipf/test/regress/n201            |     1 -
 dist/ipf/test/regress/n202            |     1 -
 dist/ipf/test/regress/n2_6            |     4 -
 dist/ipf/test/regress/n4_6            |     6 -
 dist/ipf/test/regress/n5_6            |     6 -
 dist/ipf/test/regress/n6_6            |     5 -
 dist/ipf/test/regress/n7_6            |     3 -
 dist/ipf/test/regress/n8_6            |     1 -
 dist/ipf/test/regress/n9_6            |     1 -
 dist/ipf/test/regress/ni13.nat        |     2 +-
 dist/ipf/test/regress/ni14.nat        |     2 +-
 dist/ipf/test/regress/ni18.nat        |     4 -
 dist/ipf/test/regress/p1.pool         |     2 +-
 dist/ipf/test/regress/p10.nat         |     1 -
 dist/ipf/test/regress/p10.pool        |     2 -
 dist/ipf/test/regress/p11.nat         |     1 -
 dist/ipf/test/regress/p11.pool        |     2 -
 dist/ipf/test/regress/p12.nat         |     1 -
 dist/ipf/test/regress/p12.pool        |     2 -
 dist/ipf/test/regress/p13.ipf         |     1 -
 dist/ipf/test/regress/p13.pool        |     2 -
 dist/ipf/test/regress/p3.ipf          |     4 +-
 dist/ipf/test/regress/p4.nat          |     1 -
 dist/ipf/test/regress/p4.pool         |     2 -
 dist/ipf/test/regress/p6.ipf          |     1 -
 dist/ipf/test/regress/p6.pool         |     1 -
 dist/ipf/test/regress/p6.whois        |   241 -
 dist/ipf/test/regress/p7.nat          |     1 -
 dist/ipf/test/regress/p7.pool         |     2 -
 dist/ipf/test/regress/p9.nat          |     1 -
 dist/ipf/test/regress/p9.pool         |     2 -
 dist/ipf/test/test.format             |   105 +-
 dist/ipf/test/vfycksum.pl             |   277 +-
 dist/ipf/todo                         |    10 +-
 dist/ipf/tools/BNF.ipf                |     2 +-
 dist/ipf/tools/Makefile               |   107 +
 dist/ipf/tools/ipf.c                  |   133 +-
 dist/ipf/tools/ipf_y.y                |  1183 +---
 dist/ipf/tools/ipfcomp.c              |   144 +-
 dist/ipf/tools/ipfs.c                 |    48 +-
 dist/ipf/tools/ipfstat.c              |   852 +--
 dist/ipf/tools/ipfsyncd.c             |   673 ---
 dist/ipf/tools/ipftest.c              |   424 +-
 dist/ipf/tools/ipmon.c                |  1208 ++---
 dist/ipf/tools/ipmon_y.y              |   718 +--
 dist/ipf/tools/ipnat.c                |   447 +-
 dist/ipf/tools/ipnat_y.y              |  1478 +-----
 dist/ipf/tools/ippool.c               |   426 +-
 dist/ipf/tools/ippool_y.y             |   525 +-
 dist/ipf/tools/ipscan_y.y             |     5 +-
 dist/ipf/tools/ipsyncm.c              |    10 +-
 dist/ipf/tools/ipsyncs.c              |    11 +-
 dist/ipf/tools/lex_var.h              |     4 +-
 dist/ipf/tools/lexer.c                |   119 +-
 dist/ipf/tools/lexer.h                |    10 +-
 dist/pf/usr.sbin/ftp-proxy/ipf.c      |   130 +-
 distrib/sets/lists/comp/mi            |     3 +-
 distrib/sets/lists/tests/mi           |   169 +-
 regress/sys/kern/ipf/expected/f21     |     5 -
 regress/sys/kern/ipf/expected/f22     |     5 -
 regress/sys/kern/ipf/expected/f25     |    35 -
 regress/sys/kern/ipf/expected/f26     |    84 -
 regress/sys/kern/ipf/expected/f27     |    90 -
 regress/sys/kern/ipf/expected/f28     |    32 -
 regress/sys/kern/ipf/expected/f29     |    64 -
 regress/sys/kern/ipf/expected/f30     |    68 -
 regress/sys/kern/ipf/expected/i22     |     5 -
 regress/sys/kern/ipf/expected/in100   |     3 -
 regress/sys/kern/ipf/expected/in101   |     4 -
 regress/sys/kern/ipf/expected/in102   |     5 -
 regress/sys/kern/ipf/expected/ip3     |    14 -
 regress/sys/kern/ipf/expected/ipv6.4  |    51 -
 regress/sys/kern/ipf/expected/n100    |    33 -
 regress/sys/kern/ipf/expected/n101    |    29 -
 regress/sys/kern/ipf/expected/n102    |    29 -
 regress/sys/kern/ipf/expected/n103    |    33 -
 regress/sys/kern/ipf/expected/n104    |    50 -
 regress/sys/kern/ipf/expected/n105    |    25 -
 regress/sys/kern/ipf/expected/n106    |    25 -
 regress/sys/kern/ipf/expected/n11_6   |   124 -
 regress/sys/kern/ipf/expected/n12_6   |    28 -
 regress/sys/kern/ipf/expected/n13_6   |    32 -
 regress/sys/kern/ipf/expected/n14_6   |    30 -
 regress/sys/kern/ipf/expected/n15     |    47 -
 regress/sys/kern/ipf/expected/n15_6   |    47 -
 regress/sys/kern/ipf/expected/n18     |   120 +-
 regress/sys/kern/ipf/expected/n1_6    |   197 -
 regress/sys/kern/ipf/expected/n200    |    25 -
 regress/sys/kern/ipf/expected/n201    |    28 -
 regress/sys/kern/ipf/expected/n202    |    23 -
 regress/sys/kern/ipf/expected/n2_6    |   191 -
 regress/sys/kern/ipf/expected/n4_6    |   190 -
 regress/sys/kern/ipf/expected/n5_6    |   533 --
 regress/sys/kern/ipf/expected/n6_6    |   173 -
 regress/sys/kern/ipf/expected/n7_6    |    98 -
 regress/sys/kern/ipf/expected/n8_6    |    30 -
 regress/sys/kern/ipf/expected/n9_6    |    29 -
 regress/sys/kern/ipf/expected/ni17    |     7 -
 regress/sys/kern/ipf/expected/ni18    |     5 -
 regress/sys/kern/ipf/expected/p10     |    40 -
 regress/sys/kern/ipf/expected/p11     |    40 -
 regress/sys/kern/ipf/expected/p12     |    40 -
 regress/sys/kern/ipf/expected/p13     |    30 -
 regress/sys/kern/ipf/expected/p4      |    38 -
 regress/sys/kern/ipf/expected/p6      |    24 -
 regress/sys/kern/ipf/expected/p7      |    40 -
 regress/sys/kern/ipf/expected/p9      |    40 -
 regress/sys/kern/ipf/input/f21        |    31 -
 regress/sys/kern/ipf/input/f22        |    31 -
 regress/sys/kern/ipf/input/f25        |    41 -
 regress/sys/kern/ipf/input/f26        |    13 -
 regress/sys/kern/ipf/input/f27        |    84 -
 regress/sys/kern/ipf/input/f28        |     7 -
 regress/sys/kern/ipf/input/f29        |    11 -
 regress/sys/kern/ipf/input/f30        |    16 -
 regress/sys/kern/ipf/input/ipv6.4     |   522 --
 regress/sys/kern/ipf/input/n100       |     8 -
 regress/sys/kern/ipf/input/n101       |     8 -
 regress/sys/kern/ipf/input/n102       |     8 -
 regress/sys/kern/ipf/input/n103       |     8 -
 regress/sys/kern/ipf/input/n104       |    48 -
 regress/sys/kern/ipf/input/n105       |     8 -
 regress/sys/kern/ipf/input/n106       |     8 -
 regress/sys/kern/ipf/input/n10_6      |     6 -
 regress/sys/kern/ipf/input/n11_6      |    16 -
 regress/sys/kern/ipf/input/n12_6      |    18 -
 regress/sys/kern/ipf/input/n13_6      |     4 -
 regress/sys/kern/ipf/input/n14_6      |     4 -
 regress/sys/kern/ipf/input/n15        |     2 -
 regress/sys/kern/ipf/input/n15_6      |     2 -
 regress/sys/kern/ipf/input/n17_6      |    24 -
 regress/sys/kern/ipf/input/n1_6       |    34 -
 regress/sys/kern/ipf/input/n200       |     6 -
 regress/sys/kern/ipf/input/n201       |    24 -
 regress/sys/kern/ipf/input/n202       |     7 -
 regress/sys/kern/ipf/input/n2_6       |    19 -
 regress/sys/kern/ipf/input/n4_6       |    10 -
 regress/sys/kern/ipf/input/n5_6       |    54 -
 regress/sys/kern/ipf/input/n6_6       |    13 -
 regress/sys/kern/ipf/input/n7_6       |     9 -
 regress/sys/kern/ipf/input/n8_6       |    34 -
 regress/sys/kern/ipf/input/n9_6       |    34 -
 regress/sys/kern/ipf/input/ni18       |     4 -
 regress/sys/kern/ipf/input/p10        |    10 -
 regress/sys/kern/ipf/input/p11        |    10 -
 regress/sys/kern/ipf/input/p12        |    10 -
 regress/sys/kern/ipf/input/p13        |     8 -
 regress/sys/kern/ipf/input/p4         |    12 -
 regress/sys/kern/ipf/input/p6         |     2 -
 regress/sys/kern/ipf/input/p7         |    10 -
 regress/sys/kern/ipf/input/p9         |    10 -
 regress/sys/kern/ipf/ipflib.sh        |    59 -
 regress/sys/kern/ipf/regress/f21      |     2 -
 regress/sys/kern/ipf/regress/f22      |     2 -
 regress/sys/kern/ipf/regress/f25      |     1 -
 regress/sys/kern/ipf/regress/f26      |     6 -
 regress/sys/kern/ipf/regress/f27      |     6 -
 regress/sys/kern/ipf/regress/f28.ipf  |     2 -
 regress/sys/kern/ipf/regress/f28.pool |     2 -
 regress/sys/kern/ipf/regress/f29.ipf  |     2 -
 regress/sys/kern/ipf/regress/f29.pool |     2 -
 regress/sys/kern/ipf/regress/f30      |     4 -
 regress/sys/kern/ipf/regress/i22      |     5 -
 regress/sys/kern/ipf/regress/in100    |     3 -
 regress/sys/kern/ipf/regress/in101    |     4 -
 regress/sys/kern/ipf/regress/in102    |     5 -
 regress/sys/kern/ipf/regress/ip3      |    14 -
 regress/sys/kern/ipf/regress/ipv6.4   |     3 -
 regress/sys/kern/ipf/regress/n100     |     1 -
 regress/sys/kern/ipf/regress/n101     |     1 -
 regress/sys/kern/ipf/regress/n102     |     1 -
 regress/sys/kern/ipf/regress/n103     |     1 -
 regress/sys/kern/ipf/regress/n104     |     1 -
 regress/sys/kern/ipf/regress/n105     |     1 -
 regress/sys/kern/ipf/regress/n106     |     1 -
 regress/sys/kern/ipf/regress/n10_6    |     3 -
 regress/sys/kern/ipf/regress/n11_6    |     3 -
 regress/sys/kern/ipf/regress/n12_6    |     1 -
 regress/sys/kern/ipf/regress/n13_6    |     1 -
 regress/sys/kern/ipf/regress/n14_6    |     1 -
 regress/sys/kern/ipf/regress/n15      |     2 -
 regress/sys/kern/ipf/regress/n15_6    |     2 -
 regress/sys/kern/ipf/regress/n16_6    |     1 -
 regress/sys/kern/ipf/regress/n17_6    |     1 -
 regress/sys/kern/ipf/regress/n18      |     6 +-
 regress/sys/kern/ipf/regress/n1_6     |     3 -
 regress/sys/kern/ipf/regress/n200     |     1 -
 regress/sys/kern/ipf/regress/n201     |     1 -
 regress/sys/kern/ipf/regress/n202     |     1 -
 regress/sys/kern/ipf/regress/n2_6     |     4 -
 regress/sys/kern/ipf/regress/n4_6     |     6 -
 regress/sys/kern/ipf/regress/n5_6     |     6 -
 regress/sys/kern/ipf/regress/n6_6     |     5 -
 regress/sys/kern/ipf/regress/n7_6     |     3 -
 regress/sys/kern/ipf/regress/n8_6     |     1 -
 regress/sys/kern/ipf/regress/n9_6     |     1 -
 regress/sys/kern/ipf/regress/ni18.nat |     4 -
 regress/sys/kern/ipf/regress/p10.nat  |     1 -
 regress/sys/kern/ipf/regress/p10.pool |     2 -
 regress/sys/kern/ipf/regress/p11.nat  |     1 -
 regress/sys/kern/ipf/regress/p11.pool |     2 -
 regress/sys/kern/ipf/regress/p12.nat  |     1 -
 regress/sys/kern/ipf/regress/p12.pool |     2 -
 regress/sys/kern/ipf/regress/p13.ipf  |     1 -
 regress/sys/kern/ipf/regress/p13.pool |     2 -
 regress/sys/kern/ipf/regress/p4.nat   |     1 -
 regress/sys/kern/ipf/regress/p4.pool  |     2 -
 regress/sys/kern/ipf/regress/p6.ipf   |     1 -
 regress/sys/kern/ipf/regress/p6.pool  |     1 -
 regress/sys/kern/ipf/regress/p6.whois |   241 -
 regress/sys/kern/ipf/regress/p7.nat   |     1 -
 regress/sys/kern/ipf/regress/p7.pool  |     2 -
 regress/sys/kern/ipf/regress/p9.nat   |     1 -
 regress/sys/kern/ipf/regress/p9.pool  |     2 -
 sys/dist/ipf/netinet/fil.c            |  6919 ++++++++++--------------------
 sys/dist/ipf/netinet/ip_auth.c        |   927 +--
 sys/dist/ipf/netinet/ip_auth.h        |    48 +-
 sys/dist/ipf/netinet/ip_compat.h      |   726 +--
 sys/dist/ipf/netinet/ip_dns_pxy.c     |   373 -
 sys/dist/ipf/netinet/ip_dstlist.c     |  1254 -----
 sys/dist/ipf/netinet/ip_dstlist.h     |    70 -
 sys/dist/ipf/netinet/ip_fil.h         |  1363 ++---
 sys/dist/ipf/netinet/ip_fil_compat.c  |  3451 ++-------------
 sys/dist/ipf/netinet/ip_fil_netbsd.c  |  1080 ++--
 sys/dist/ipf/netinet/ip_frag.c        |  1068 +--
 sys/dist/ipf/netinet/ip_frag.h        |   104 +-
 sys/dist/ipf/netinet/ip_ftp_pxy.c     |   902 +--
 sys/dist/ipf/netinet/ip_h323_pxy.c    |   129 +-
 sys/dist/ipf/netinet/ip_htable.c      |  1143 +----
 sys/dist/ipf/netinet/ip_htable.h      |    46 +-
 sys/dist/ipf/netinet/ip_ipsec_pxy.c   |   265 +-
 sys/dist/ipf/netinet/ip_irc_pxy.c     |   103 +-
 sys/dist/ipf/netinet/ip_log.c         |   503 +-
 sys/dist/ipf/netinet/ip_lookup.c      |  1028 +--
 sys/dist/ipf/netinet/ip_lookup.h      |    75 +-
 sys/dist/ipf/netinet/ip_nat.c         |  7302 ++++++++------------------------
 sys/dist/ipf/netinet/ip_nat.h         |   641 +--
 sys/dist/ipf/netinet/ip_nat6.c        |  4678 ---------------------
 sys/dist/ipf/netinet/ip_netbios_pxy.c |    27 +-
 sys/dist/ipf/netinet/ip_pool.c        |  1106 +---
 sys/dist/ipf/netinet/ip_pool.h        |    88 +-
 sys/dist/ipf/netinet/ip_pptp_pxy.c    |   201 +-
 sys/dist/ipf/netinet/ip_proxy.c       |   856 +--
 sys/dist/ipf/netinet/ip_proxy.h       |   168 +-
 sys/dist/ipf/netinet/ip_raudio_pxy.c  |    72 +-
 sys/dist/ipf/netinet/ip_rcmd_pxy.c    |   244 +-
 sys/dist/ipf/netinet/ip_rpcb_pxy.c    |   316 +-
 sys/dist/ipf/netinet/ip_scan.c        |   195 +-
 sys/dist/ipf/netinet/ip_scan.h        |    22 +-
 sys/dist/ipf/netinet/ip_state.c       |  3176 +++++--------
 sys/dist/ipf/netinet/ip_state.h       |   207 +-
 sys/dist/ipf/netinet/ip_sync.c        |   938 +---
 sys/dist/ipf/netinet/ip_sync.h        |    38 +-
 sys/dist/ipf/netinet/ip_tftp_pxy.c    |   281 -
 sys/dist/ipf/netinet/ipf_rb.h         |   366 -
 sys/dist/ipf/netinet/ipl.h            |    10 +-
 sys/dist/ipf/netinet/radix_ipf.c      |  1297 -----
 sys/dist/ipf/netinet/radix_ipf.h      |    98 -
 sys/netinet/Makefile                  |     4 +-
 sys/netinet/files.ipfilter            |     7 +-
 tests/ipf/expected/Makefile           |   257 +-
 tests/ipf/expected/f11                |   128 +-
 tests/ipf/expected/f13                |    20 -
 tests/ipf/expected/f18                |    22 -
 tests/ipf/expected/f21                |     5 -
 tests/ipf/expected/f22                |     5 -
 tests/ipf/expected/f25                |    35 -
 tests/ipf/expected/f26                |    84 -
 tests/ipf/expected/f27                |    90 -
 tests/ipf/expected/f28                |    32 -
 tests/ipf/expected/f29                |    64 -
 tests/ipf/expected/f30                |    68 -
 tests/ipf/expected/i1                 |     6 +-
 tests/ipf/expected/i10                |    10 +-
 tests/ipf/expected/i11                |    11 +-
 tests/ipf/expected/i12                |    68 +-
 tests/ipf/expected/i14                |    12 +-
 tests/ipf/expected/i17                |    19 -
 tests/ipf/expected/i19                |    22 -
 tests/ipf/expected/i19.dist           |    44 +-
 tests/ipf/expected/i2                 |     3 +-
 tests/ipf/expected/i20                |     8 +-
 tests/ipf/expected/i22                |     5 -
 tests/ipf/expected/i3                 |    16 +-
 tests/ipf/expected/i4                 |     2 +-
 tests/ipf/expected/i5                 |     4 +-
 tests/ipf/expected/i6                 |    12 +-
 tests/ipf/expected/i7                 |     7 +-
 tests/ipf/expected/i8                 |   101 +-
 tests/ipf/expected/i9                 |    12 +-
 tests/ipf/expected/in1                |    44 +-
 tests/ipf/expected/in100              |     3 -
 tests/ipf/expected/in101              |     4 -
 tests/ipf/expected/in102              |     5 -
 tests/ipf/expected/in2                |   106 +-
 tests/ipf/expected/in3                |     4 +-
 tests/ipf/expected/in5                |    46 +-
 tests/ipf/expected/in6                |    16 +-
 tests/ipf/expected/ip1                |    92 +-
 tests/ipf/expected/ip2                |     2 +-
 tests/ipf/expected/ip3                |    14 -
 tests/ipf/expected/ipv6.4             |    51 -
 tests/ipf/expected/ipv6.6             |     7 -
 tests/ipf/expected/l1                 |    11 +-
 tests/ipf/expected/l1.b               |    13 +-
 tests/ipf/expected/n1                 |   296 +-
 tests/ipf/expected/n10                |    63 -
 tests/ipf/expected/n100               |    33 -
 tests/ipf/expected/n101               |    29 -
 tests/ipf/expected/n102               |    29 -
 tests/ipf/expected/n103               |    33 -
 tests/ipf/expected/n104               |    50 -
 tests/ipf/expected/n105               |    25 -
 tests/ipf/expected/n106               |    25 -
 tests/ipf/expected/n11                |   169 +-
 tests/ipf/expected/n11_6              |   124 -
 tests/ipf/expected/n12                |    21 -
 tests/ipf/expected/n12_6              |    28 -
 tests/ipf/expected/n13                |    35 +-
 tests/ipf/expected/n13_6              |    32 -
 tests/ipf/expected/n14                |    33 +-
 tests/ipf/expected/n14_6              |    30 -
 tests/ipf/expected/n15                |    47 -
 tests/ipf/expected/n15_6              |    47 -
 tests/ipf/expected/n16                |    10 +-
 tests/ipf/expected/n17                |    10 +-
 tests/ipf/expected/n18                |   111 -
 tests/ipf/expected/n1_6               |   197 -
 tests/ipf/expected/n2                 |   263 +-
 tests/ipf/expected/n200               |    25 -
 tests/ipf/expected/n201               |    28 -
 tests/ipf/expected/n202               |    23 -
 tests/ipf/expected/n2_6               |   191 -
 tests/ipf/expected/n3                 |    74 +-
 tests/ipf/expected/n4                 |   244 +-
 tests/ipf/expected/n4_6               |   190 -
 tests/ipf/expected/n5                 |   851 +--
 tests/ipf/expected/n5_6               |   533 --
 tests/ipf/expected/n6                 |   233 +-
 tests/ipf/expected/n6_6               |   173 -
 tests/ipf/expected/n7                 |   122 +-
 tests/ipf/expected/n7_6               |    98 -
 tests/ipf/expected/n8                 |    21 -
 tests/ipf/expected/n8_6               |    30 -
 tests/ipf/expected/n9                 |    20 -
 tests/ipf/expected/n9_6               |    29 -
 tests/ipf/expected/ni10               |     3 +-
 tests/ipf/expected/ni11               |     3 +-
 tests/ipf/expected/ni12               |     7 +-
 tests/ipf/expected/ni17               |     7 -
 tests/ipf/expected/ni18               |     5 -
 tests/ipf/expected/ni19               |    18 +-
 tests/ipf/expected/ni2                |     2 +-
 tests/ipf/expected/ni20               |    40 +-
 tests/ipf/expected/ni21               |     8 +-
 tests/ipf/expected/ni23               |    34 +-
 tests/ipf/expected/ni5                |    33 +-
 tests/ipf/expected/ni6                |    74 +-
 tests/ipf/expected/p1                 |    13 +-
 tests/ipf/expected/p10                |    40 -
 tests/ipf/expected/p11                |    40 -
 tests/ipf/expected/p12                |    40 -
 tests/ipf/expected/p13                |    30 -
 tests/ipf/expected/p2                 |    18 +-
 tests/ipf/expected/p3                 |    18 +-
 tests/ipf/expected/p4                 |    38 -
 tests/ipf/expected/p5                 |    11 +-
 tests/ipf/expected/p6                 |    24 -
 tests/ipf/expected/p7                 |    40 -
 tests/ipf/expected/p9                 |    40 -
 tests/ipf/input/Makefile              |   190 +-
 tests/ipf/input/f13                   |     2 +-
 tests/ipf/input/f21                   |    31 -
 tests/ipf/input/f22                   |    31 -
 tests/ipf/input/f25                   |    41 -
 tests/ipf/input/f26                   |    13 -
 tests/ipf/input/f27                   |    84 -
 tests/ipf/input/f28                   |     7 -
 tests/ipf/input/f29                   |    11 -
 tests/ipf/input/f30                   |    16 -
 tests/ipf/input/ipv6.1                |     4 +-
 tests/ipf/input/ipv6.4                |   522 --
 tests/ipf/input/ipv6.6                |    14 -
 tests/ipf/input/n10                   |     4 +-
 tests/ipf/input/n100                  |     8 -
 tests/ipf/input/n101                  |     8 -
 tests/ipf/input/n102                  |     8 -
 tests/ipf/input/n103                  |     8 -
 tests/ipf/input/n104                  |    48 -
 tests/ipf/input/n105                  |     8 -
 tests/ipf/input/n106                  |     8 -
 tests/ipf/input/n10_6                 |     6 -
 tests/ipf/input/n11_6                 |    16 -
 tests/ipf/input/n12                   |    12 +-
 tests/ipf/input/n12_6                 |    18 -
 tests/ipf/input/n13_6                 |     4 -
 tests/ipf/input/n14_6                 |     4 -
 tests/ipf/input/n15                   |     2 -
 tests/ipf/input/n15_6                 |     2 -
 tests/ipf/input/n16                   |    26 +-
 tests/ipf/input/n17                   |    28 +-
 tests/ipf/input/n17_6                 |    24 -
 tests/ipf/input/n18                   |     8 -
 tests/ipf/input/n1_6                  |    34 -
 tests/ipf/input/n200                  |     6 -
 tests/ipf/input/n201                  |    24 -
 tests/ipf/input/n202                  |     7 -
 tests/ipf/input/n2_6                  |    19 -
 tests/ipf/input/n4_6                  |    10 -
 tests/ipf/input/n5_6                  |    54 -
 tests/ipf/input/n6_6                  |    13 -
 tests/ipf/input/n7_6                  |     9 -
 tests/ipf/input/n8                    |    12 +-
 tests/ipf/input/n8_6                  |    34 -
 tests/ipf/input/n9                    |    12 +-
 tests/ipf/input/n9_6                  |    34 -
 tests/ipf/input/ni1                   |    45 +-
 tests/ipf/input/ni10                  |    10 +-
 tests/ipf/input/ni11                  |     4 +-
 tests/ipf/input/ni12                  |    14 +-
 tests/ipf/input/ni13                  |   130 +-
 tests/ipf/input/ni14                  |   126 +-
 tests/ipf/input/ni15                  |     2 +-
 tests/ipf/input/ni16                  |     2 +-
 tests/ipf/input/ni18                  |     4 -
 tests/ipf/input/ni19                  |    14 +-
 tests/ipf/input/ni2                   |    42 +-
 tests/ipf/input/ni20                  |    48 +-
 tests/ipf/input/ni3                   |    16 +-
 tests/ipf/input/ni4                   |    14 +-
 tests/ipf/input/ni5                   |     2 +-
 tests/ipf/input/ni7                   |    10 +-
 tests/ipf/input/ni8                   |    11 +-
 tests/ipf/input/ni9                   |     7 +-
 tests/ipf/input/p10                   |    10 -
 tests/ipf/input/p11                   |    10 -
 tests/ipf/input/p12                   |    10 -
 tests/ipf/input/p13                   |     8 -
 tests/ipf/input/p4                    |    12 -
 tests/ipf/input/p6                    |     2 -
 tests/ipf/input/p7                    |    10 -
 tests/ipf/input/p9                    |    10 -
 tests/ipf/regress/Makefile            |   317 +-
 tests/ipf/regress/f13                 |     1 -
 tests/ipf/regress/f21                 |     2 -
 tests/ipf/regress/f22                 |     2 -
 tests/ipf/regress/f25                 |     1 -
 tests/ipf/regress/f26                 |     6 -
 tests/ipf/regress/f27                 |     6 -
 tests/ipf/regress/f28.ipf             |     2 -
 tests/ipf/regress/f28.pool            |     2 -
 tests/ipf/regress/f29.ipf             |     2 -
 tests/ipf/regress/f29.pool            |     2 -
 tests/ipf/regress/f30                 |     4 -
 tests/ipf/regress/i11                 |     1 -
 tests/ipf/regress/i12                 |    10 +-
 tests/ipf/regress/i14                 |     2 -
 tests/ipf/regress/i17                 |     4 +-
 tests/ipf/regress/i18                 |     6 +-
 tests/ipf/regress/i2                  |     1 -
 tests/ipf/regress/i21                 |     6 +-
 tests/ipf/regress/i22                 |     5 -
 tests/ipf/regress/i23                 |     1 -
 tests/ipf/regress/i7                  |     5 -
 tests/ipf/regress/i8                  |    33 +-
 tests/ipf/regress/in100               |     3 -
 tests/ipf/regress/in101               |     4 -
 tests/ipf/regress/in102               |     5 -
 tests/ipf/regress/in2                 |     4 +-
 tests/ipf/regress/in7                 |     1 -
 tests/ipf/regress/ip3                 |    14 -
 tests/ipf/regress/ipv6.4              |     3 -
 tests/ipf/regress/ipv6.5              |     4 +-
 tests/ipf/regress/ipv6.6              |     1 -
 tests/ipf/regress/n100                |     1 -
 tests/ipf/regress/n101                |     1 -
 tests/ipf/regress/n102                |     1 -
 tests/ipf/regress/n103                |     1 -
 tests/ipf/regress/n104                |     1 -
 tests/ipf/regress/n105                |     1 -
 tests/ipf/regress/n106                |     1 -
 tests/ipf/regress/n10_6               |     3 -
 tests/ipf/regress/n11_6               |     3 -
 tests/ipf/regress/n12_6               |     1 -
 tests/ipf/regress/n13_6               |     1 -
 tests/ipf/regress/n14_6               |     1 -
 tests/ipf/regress/n15                 |     2 -
 tests/ipf/regress/n15_6               |     2 -
 tests/ipf/regress/n16_6               |     1 -
 tests/ipf/regress/n17_6               |     1 -
 tests/ipf/regress/n18                 |     3 -
 tests/ipf/regress/n1_6                |     3 -
 tests/ipf/regress/n200                |     1 -
 tests/ipf/regress/n201                |     1 -
 tests/ipf/regress/n202                |     1 -
 tests/ipf/regress/n2_6                |     4 -
 tests/ipf/regress/n4_6                |     6 -
 tests/ipf/regress/n5_6                |     6 -
 tests/ipf/regress/n6_6                |     5 -
 tests/ipf/regress/n7_6                |     3 -
 tests/ipf/regress/n8_6                |     1 -
 tests/ipf/regress/n9_6                |     1 -
 tests/ipf/regress/ni13.nat            |     2 +-
 tests/ipf/regress/ni14.nat            |     2 +-
 tests/ipf/regress/ni18.nat            |     4 -
 tests/ipf/regress/p1.pool             |     2 +-
 tests/ipf/regress/p10.nat             |     1 -
 tests/ipf/regress/p10.pool            |     2 -
 tests/ipf/regress/p11.nat             |     1 -
 tests/ipf/regress/p11.pool            |     2 -
 tests/ipf/regress/p12.nat             |     1 -
 tests/ipf/regress/p12.pool            |     2 -
 tests/ipf/regress/p13.ipf             |     1 -
 tests/ipf/regress/p13.pool            |     2 -
 tests/ipf/regress/p3.ipf              |     4 +-
 tests/ipf/regress/p4.nat              |     1 -
 tests/ipf/regress/p4.pool             |     2 -
 tests/ipf/regress/p6.ipf              |     1 -
 tests/ipf/regress/p6.pool             |     1 -
 tests/ipf/regress/p6.whois            |   241 -
 tests/ipf/regress/p7.nat              |     1 -
 tests/ipf/regress/p7.pool             |     2 -
 tests/ipf/regress/p9.nat              |     1 -
 tests/ipf/regress/p9.pool             |     2 -
 tests/ipf/t_filter_exec.sh            |    60 +-
 tests/ipf/t_filter_parse.sh           |     6 +-
 tests/ipf/t_nat_exec.sh               |    97 +-
 tests/ipf/t_nat_ipf_exec.sh           |    74 +-
 tests/ipf/t_nat_parse.sh              |    15 +-
 tests/ipf/t_pools.sh                  |    36 +-
 usr.sbin/ipf/ipftest/Makefile         |    10 +-
 usr.sbin/ipf/libipf/Makefile          |   160 +-
 985 files changed, 28641 insertions(+), 85167 deletions(-)

diffs (truncated from 153252 to 300 lines):

diff -r 2fef7cdbbd9e -r d7bea97a2c02 dist/ipf/BNF
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/ipf/BNF      Wed Feb 15 17:55:03 2012 +0000
@@ -0,0 +1,81 @@
+filter-rule = [ insert ] action in-out [ options ] [ tos ] [ ttl ]
+             [ proto ] [ ip ] [ group ] [ tag ] [ pps ] .
+
+insert = "@" decnumber .
+action = block | "pass" | log | "count" | auth | call .
+in-out = "in" | "out" .
+options        = [ log ] [ "quick" ] [ onif [ dup ] [ froute ] ] .
+tos    = "tos" decnumber | "tos" hexnumber .
+ttl    = "ttl" decnumber .
+proto  = "proto" protocol .
+ip     = srcdst [ flags ] [ with withopt ] [ icmp ] [ keep ] .
+group  = [ "head" decnumber ] [ "group" decnumber ] .
+pps    = "pps" decnumber .
+
+onif   = "on" interface-name [ "out-via" interface-name ] .
+block  = "block" [ return-icmp[return-code] | "return-rst" ] .
+auth   = "auth" | "preauth" .
+log    = "log" [ "body" ] [ "first" ] [ "or-block" ] [ "level" loglevel ] .
+tag    = "tag" tagid .
+call   = "call" [ "now" ] function-name "/" decnumber.
+dup    = "dup-to" interface-name[":"ipaddr] .
+froute = "fastroute" | "to" interface-name .
+replyto = "reply-to" interface-name [ ":" ipaddr ] .
+protocol = "tcp/udp" | "udp" | "tcp" | "icmp" | decnumber .
+srcdst = "all" | fromto .
+fromto = "from" object "to" object .
+
+return-icmp = "return-icmp" | "return-icmp-as-dest" .
+loglevel = facility"."priority | priority .
+object = addr [ port-comp | port-range ] .
+addr   = "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] .
+port-comp = "port" compare port-num .
+port-range = "port" port-num range port-num .
+flags  = "flags" flag { flag } [ "/" flag { flag } ] .
+with   = "with" | "and" .
+icmp   = "icmp-type" icmp-type [ "code" decnumber ] .
+return-code = "("icmp-code")" .
+keep   = "keep" "state" [ "limit" number ] | "keep" "frags" .
+
+nummask        = host-name [ "/" decnumber ] .
+host-name = ipaddr | hostname | "any" .
+ipaddr = host-num "." host-num "." host-num "." host-num .
+host-num = digit [ digit [ digit ] ] .
+port-num = service-name | decnumber .
+
+withopt = [ "not" | "no" ] opttype [ [ "," ] withopt ] .
+opttype = "ipopts" | "short" | "nat" | "bad-src" | "lowttl" | "frag" |
+          "mbcast" | "opt" ipopts  .
+optname        = ipopts [ "," optname ] .
+ipopts  = optlist | "sec-class" [ secname ] .
+secname        = seclvl [ "," secname ] .
+seclvl  = "unclass" | "confid" | "reserv-1" | "reserv-2" | "reserv-3" |
+         "reserv-4" | "secret" | "topsecret" .
+icmp-type = "unreach" | "echo" | "echorep" | "squench" | "redir" |
+           "timex" | "paramprob" | "timest" | "timestrep" | "inforeq" |
+           "inforep" | "maskreq" | "maskrep"  | "routerad" |
+           "routersol" | decnumber .
+icmp-code = decumber | "net-unr" | "host-unr" | "proto-unr" | "port-unr" |
+           "needfrag" | "srcfail" | "net-unk" | "host-unk" | "isolate" |
+           "net-prohib" | "host-prohib" | "net-tos" | "host-tos" |
+           "filter-prohib" | "host-preced" | "cutoff-preced" .
+optlist        = "nop" | "rr" | "zsu" | "mtup" | "mtur" | "encode" | "ts" | "tr" |
+         "sec" | "lsrr" | "e-sec" | "cipso" | "satid" | "ssrr" | "addext" |
+         "visa" | "imitd" | "eip" | "finn" .
+facility = "kern" | "user" | "mail" | "daemon" | "auth" | "syslog" |
+          "lpr" | "news" | "uucp" | "cron" | "ftp" | "authpriv" |
+          "audit" | "logalert" | "local0" | "local1" | "local2" |
+          "local3" | "local4" | "local5" | "local6" | "local7" .
+priority = "emerg" | "alert" | "crit" | "err" | "warn" | "notice" |
+          "info" | "debug" .
+
+hexnumber = "0" "x" hexstring .
+hexstring = hexdigit [ hexstring ] .
+decnumber = digit [ decnumber ] .
+
+compare = "=" | "!=" | "<" | ">" | "<=" | ">=" | "eq" | "ne" | "lt" | "gt" |
+         "le" | "ge" .
+range  = "<>" | "><" .
+hexdigit = digit | "a" | "b" | "c" | "d" | "e" | "f" .
+digit  = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" .
+flag   = "F" | "S" | "R" | "P" | "A" | "U" | "C" | "W" .
diff -r 2fef7cdbbd9e -r d7bea97a2c02 dist/ipf/BugReport
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/ipf/BugReport        Wed Feb 15 17:55:03 2012 +0000
@@ -0,0 +1,12 @@
+Please submit this information at SourceForge using this URL:
+http://sourceforge.net/tracker/?func=add&group_id=169098&atid=849053
+
+Please also send an email to darrenr%reed.wattle.id.au@localhost.
+
+Some information that I generally find important:
+--------------------------
+* IP Filter Version
+* Operating System and its Version
+* Configuration: (LKM or compiled-into-kernel)
+* Description of problem
+* How to repeat
diff -r 2fef7cdbbd9e -r d7bea97a2c02 dist/ipf/HISTORY
--- a/dist/ipf/HISTORY  Wed Feb 15 16:30:29 2012 +0000
+++ b/dist/ipf/HISTORY  Wed Feb 15 17:55:03 2012 +0000
@@ -10,9 +10,981 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
-5.1 - RELEASED - 9 May 2010
-
-* See WhatsNew50.txt
+4.1.34 - Release 11 MArch 2010
+
+2964907 uninitialised use compile error
+
+2959506 ipfstat does not display rules with compat
+
+2949139 FR_T_BUILTIN masked out incorrectly
+
+2937422 packets filtered with pools should not be cached'
+
+2935529 use of rules with tags leads to deadlock
+
+2917501 whitespace cleanup required
+
+2898915 Does not build on newer FreeBSD
+
+2898337 Does not build on newer FreeBSD
+
+2881514 in/out  object functions not wired for compatibility
+
+2841771 ipf/ippool rule maintenace bugs: memory leak, ref-counter bug
+
+2839698 H.323 proxy does not clear fin_state/fin_nat
+
+4.1.33 - Release 16 August 2009
+
+2838417 tru64 compile is not error free
+
+2837931 wrong mode selected in ipf program for hash-entries
+
+2828188 soft lockups on Linux
+
+2826168 load_http can make ippool core dump
+
+2825150 IPL_LOGMAX used to index some arrays
+
+2825084 ipv6 fragments should not be allowed past 64k
+
+2824713 ipfstat top output alternates between entries and nothing
+
+2824712 ipfstat top output is shows negative ttl
+
+2820965 a single bad ipv6 extension header should not impact others
+
+2818197 ignored fragment bits defined as being reserved
+
+2817667 IPv6 fragment header verification needs attention
+
+2817098 fr_getrulen() finds the wrong rule
+
+2817096 fr_rulen is unused
+
+2814988 4.1.32 RC5 does not compile on Tru64 5.1B-5
+
+2825387 ipfilter 4-1-RELEASE won't build on RHEL 5.3 kernel 2.6.18..
+
+2792185 no proxy modules are built on linux
+
+2787359 ipmon prints loopback name incorrectly for linux
+
+4.1.32 - Release 20 June 2009
+
+2741019 Lingering states (Established/Listen - 5/0) in state table
+
+2790920 Solaris U7 breaks ipfilter compilation
+
+2790910 OOW issue on Solaris 10 v4.1.9
+
+2706155 Reference to .symbol file missing in ipf.ko on FreeBSD/AMD64
+
+2787870 4.1.32rc2 ipfstat -nio causes oops on Fedora 10
+
+2785189 Networking stops on x86_64 RHEL ES4 U6 (2.6.9-67.ELsmp)
+
+2706137 FreeBSD/AMD64 build is still broken in 4.1.32 RC5
+
+2702887 use of PBR/fastroute causes panic with ipv6
+
+2657365 IPFilter 4.1.32 RC4 fails to compile on FreeBSD7/AMD64
+
+2671913 regression test in7 fails to execute
+
+2650040 cannot compile updated kernel source for 4.10
+
+2598625 parsing empty config file results in an error
+
+2698656 test parsing empty config files
+
+2597956 not all pointers in a clone are reset
+
+2543934 nat_t gets assigned ifp too early
+
+2539808 Compiling with Solaris10 patch 138889-03 fails
+
+2535795 No need to always bump fr_ref
+
+2535778 Bad IPv6 packets droped by default
+
+4.1.32 RC1 - Release 1 January 2009
+
+2031730 4.1.31 Nat drops fragmented packets after the first
+
+2214661 ipf doesn't handle IPv6 fragments
+
+2473273 NAT removed before RST/ICMP sent
+
+2216500 fin_state serves no purpose
+
+2424604 adding random MD5 data causes panic
+
+2304435 Ineffecient lock usage in logging
+
+2216491 fin_nat serves little purpose
+
+1859718 IPF 4.1.28 repeated kernel panic Solaris 9 32bit
+
+2055619 duplicating a free'd packet will fail
+
+2042949 Excessive locking when creating nat_t
+
+2035610 nat_update does not need to get locks
+
+2214658 ipf mostly ignores locking in NetBSD
+
+1979427 Memory leak in user utilities - token never freed (rel br)
+
+* try to guess if SUNWspro wants -m64
+
+2063742 4.1.30 breaks builds on Solaris 8
+
+4.1.31 - Release 27 July 2008
+
+* compiling arc4random.c is challenging on solaris 10 or solaris without gcc
+
+* SunOS4 doesn't have a curproc, but it does have u.
+
+* The fix for 2020447 generated random port numbers but not within the
+  range specified in the map rule.  Add in a regression test to verify
+  that the "random" part works.
+
+4.1.30 - Release 24 July 2008
+
+2022104 solaris's driver.conf cannot set timeout values
+
+2020447 IPFilter's NAT can undo name server random port selection
+
+1988795 NetBSD doesn't build with kernel malloc stats
+
+1988782 fr_movequeue can take a short cut
+
+1988669 first nat creation failure prevents further success
+
+1988668 hostmap searching does not work properly
+
+* on some 64bit architectures (such as alpha), the addrfamily_t is packed
+  differently, throwing off the calculations for adf_len
+
+* one too many READ_ENTERs in ip_sync code.
+
+* clean up fr_fastroute a little by removing some #ifdefs and pushing the
+  code around a bit to use the same variables (NetBSD)
+
+* more recent NetBSDs use VOP related macros differently
+
+4.1.29 - Release 14 April 2008
+
+* #ifdef warning fixes from Victor M Blood (FreeBSD) - #1821249
+
+* An error in NAT'ing a packet that is being fed through the fastroute
+  code (i.e return-icmp/return-rst/to/dup-to) can lead to a memory leak
+  with mbufs
+
+* NetBSD has removed rnh_walktree
+
+* Remove exit/enter of ipf_global lock as they are now no longer held by
+  what calls fr_auth_ioctl()
+
+* add in checks to see that a symbol is defined before using it in a test
+  case with C preprocessor #if statements
+
+* add setting TCP TIME_WAIT timer to list of tuneables
+
+* call of _pullup() high up in _icmp() means later checks for fin_dlen
+  that are less than 8 are not required.
+
+* cleanup some errors in merging patches
+
+* merge changes from netbsd for updated poll apis
+



Home | Main Index | Thread Index | Old Index