[src/netbsd-3]: src/regress/sys/kern/ipf Pull up revision 1.1.1.3 (requested ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1ebf82a6b878
branches:  netbsd-3
changeset: 575119:1ebf82a6b878
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 04 19:44:53 2005 +0000

description:
Pull up revision 1.1.1.3 (requested by martti in ticket #107):
Upgraded IPFilter to 4.1.8

diffstat:

 regress/sys/kern/ipf/expected/i6 |   3 +++
 regress/sys/kern/ipf/regress/i6  |   3 +++
 regress/sys/kern/ipf/vfycksum.pl |  11 +++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 848e8329e738 -r 1ebf82a6b878 regress/sys/kern/ipf/expected/i6
--- a/regress/sys/kern/ipf/expected/i6  Mon Apr 04 19:36:06 2005 +0000
+++ b/regress/sys/kern/ipf/expected/i6  Mon Apr 04 19:44:53 2005 +0000
@@ -5,3 +5,6 @@
 pass in on le0(!) dup-to qe0(!):127.0.0.1 from 127.0.0.1/32 to 127.0.0.1/32
 pass in on le0(!) dup-to qe0(!):127.0.0.1 to hme0(!):10.1.1.1 from 127.0.0.1/32 to 127.0.0.1/32
 block in quick on qe0(!) to qe1(!) from any to any
+block in quick to qe1(!) from any to any
+pass out quick dup-to hme0(!) from any to any
+pass in quick fastroute all
diff -r 848e8329e738 -r 1ebf82a6b878 regress/sys/kern/ipf/regress/i6
--- a/regress/sys/kern/ipf/regress/i6   Mon Apr 04 19:36:06 2005 +0000
+++ b/regress/sys/kern/ipf/regress/i6   Mon Apr 04 19:44:53 2005 +0000
@@ -5,3 +5,6 @@
 pass in on le0 dup-to qe0:127.0.0.1 from localhost to localhost
 pass in on le0 to hme0:10.1.1.1 dup-to qe0:127.0.0.1 from localhost to localhost
 block in quick on qe0 to qe1 from any to any
+block in quick to qe1 from any to any
+pass out quick dup-to hme0 from any to any
+pass in quick fastroute all
diff -r 848e8329e738 -r 1ebf82a6b878 regress/sys/kern/ipf/vfycksum.pl
--- a/regress/sys/kern/ipf/vfycksum.pl  Mon Apr 04 19:36:06 2005 +0000
+++ b/regress/sys/kern/ipf/vfycksum.pl  Mon Apr 04 19:44:53 2005 +0000
@@ -178,8 +178,15 @@
 
        local($len) = $bytes[$base + 1] - ($hl << 1);
 
-       if ($len > $cnt * 2) {
-               print "missing icmp data\n";
+       if ($bytes[$base + 1] > ($cnt - $base) * 2) {
+               print " ICMP: missing data(1)";
+               return;
+       } elsif ($bytes[$base + 1] < ($hl << 1) + 8) {
+               print " ICMP: missing data(2)";
+               return;
+       } elsif (($cnt - $base) * 2 < ($hl << 1) + 8) {
+               print " ICMP: missing data(3)";
+               return;
        }
 
        local($osum) = $bytes[$base + $hl + 1];