[src/netbsd-3]: src/dist/ipf Pull up revision 1.1.1.3 (requested by martti in...

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

details:   https://anonhg.NetBSD.org/src/rev/c920a2c32055
branches:  netbsd-3
changeset: 575115:c920a2c32055
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 04 19:34:09 2005 +0000

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

diffstat:

 dist/ipf/ip_sync.c        |   6 +++---
 dist/ipf/test/vfycksum.pl |  11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 790ccdc9a8c1 -r c920a2c32055 dist/ipf/ip_sync.c
--- a/dist/ipf/ip_sync.c        Mon Apr 04 19:34:03 2005 +0000
+++ b/dist/ipf/ip_sync.c        Mon Apr 04 19:34:09 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_sync.c,v 1.1.1.2 2005/02/08 06:53:02 martti Exp $   */
+/*     $NetBSD: ip_sync.c,v 1.1.1.2.2.1 2005/04/04 19:34:09 tron Exp $ */
 
 /*
  * Copyright (C) 1995-1998 by Darren Reed.
@@ -98,7 +98,7 @@
 /* END OF INCLUDES */
 
 #if !defined(lint)
-static const char rcsid[] = "@(#)Id: ip_sync.c,v 2.40.2.2 2004/10/31 18:45:58 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ip_sync.c,v 2.40.2.3 2005/02/18 13:06:29 darrenr Exp";
 #endif
 
 #define        SYNC_STATETABSZ 256
@@ -319,7 +319,7 @@
 
                        if (sh.sm_magic != SYNHDRMAGIC) {
                                if (ipf_sync_debug > 2)
-                                       printf("uiomove(header) invalud %x\n",
+                                       printf("uiomove(header) invalud %s\n",
                                                "magic");
                                return EINVAL;
                        }
diff -r 790ccdc9a8c1 -r c920a2c32055 dist/ipf/test/vfycksum.pl
--- a/dist/ipf/test/vfycksum.pl Mon Apr 04 19:34:03 2005 +0000
+++ b/dist/ipf/test/vfycksum.pl Mon Apr 04 19:34:09 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];