[src/netbsd-1-4]: src Pull up revision 1.2 (requested by darrenr):

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

details:   https://anonhg.NetBSD.org/src/rev/1fde185a2127
branches:  netbsd-1-4
changeset: 469976:1fde185a2127
user:      he <he%NetBSD.org@localhost>
date:      Sat Jan 08 16:41:20 2000 +0000

description:
Pull up revision 1.2 (requested by darrenr):
  Update IPF to version 3.3.6.

diffstat:

 dist/ipf/HISTORY            |  11 +++++++++++
 dist/ipf/man/ipmon.8        |   4 ++--
 dist/ipf/parse.c            |   8 ++++++--
 sys/netinet/ip_raudio_pxy.c |   4 ++--
 sys/netinet/ipl.h           |   4 ++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diffs (96 lines):

diff -r 357446056d82 -r 1fde185a2127 dist/ipf/HISTORY
--- a/dist/ipf/HISTORY  Sat Jan 08 16:27:53 2000 +0000
+++ b/dist/ipf/HISTORY  Sat Jan 08 16:41:20 2000 +0000
@@ -20,6 +20,17 @@
 # and especially those who have found the time to port IP Filter to new
 # platforms.
 #
+3.3.6  28/12/1999 - Released
+
+add in missing rwlock release in fr_checkicmpmatchingstate() and fix check
+for ICMP_ECHO to only be for packet, not state entry which we don't have yet.
+
+handle SIOCIPFFB in nat_ioctl() and fr_state_ioctl()
+
+fix size of friostat for SunOS4
+
+fix bug in running off the end of a buffer in real audio proxy
+
 3.3.5  11/12/1999 - Released
 
 fix parsing of "log level" and printing it back out too
diff -r 357446056d82 -r 1fde185a2127 dist/ipf/man/ipmon.8
--- a/dist/ipf/man/ipmon.8      Sat Jan 08 16:27:53 2000 +0000
+++ b/dist/ipf/man/ipmon.8      Sat Jan 08 16:41:20 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ipmon.8,v 1.1.1.1.2.2 1999/12/20 21:01:53 he Exp $
+.\"    $NetBSD: ipmon.8,v 1.1.1.1.2.3 2000/01/08 16:41:22 he Exp $
 .\"
 .TH ipmon 8
 .SH NAME
@@ -136,7 +136,7 @@
 .B \-X
 show the log header record data in hex.
 .SH DIAGNOSTICS
-\fBipmon\fP expects data that it reads to be consistant with how it should be
+\fBipmon\fP expects data that it reads to be consistent with how it should be
 saved and will abort if it fails an assertion which detects an anomoly in the
 recorded data.
 .SH FILES
diff -r 357446056d82 -r 1fde185a2127 dist/ipf/parse.c
--- a/dist/ipf/parse.c  Sat Jan 08 16:27:53 2000 +0000
+++ b/dist/ipf/parse.c  Sat Jan 08 16:41:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.1.1.1.2.2 1999/12/20 21:01:44 he Exp $     */
+/*     $NetBSD: parse.c,v 1.1.1.1.2.3 2000/01/08 16:41:21 he Exp $     */
 
 /*
  * Copyright (C) 1993-1998 by Darren Reed.
@@ -245,7 +245,11 @@
                return NULL;
 
        if (!strcasecmp("log", *cpp)) {
-               cpp++;
+               if (!*++cpp) {
+                       fprintf(stderr, "%d: missing source specification\n",
+                               linenum);
+                       return NULL;
+               }
                if (fil.fr_flags & FR_PASS)
                        fil.fr_flags |= FR_LOGP;
                else if (fil.fr_flags & FR_BLOCK)
diff -r 357446056d82 -r 1fde185a2127 sys/netinet/ip_raudio_pxy.c
--- a/sys/netinet/ip_raudio_pxy.c       Sat Jan 08 16:27:53 2000 +0000
+++ b/sys/netinet/ip_raudio_pxy.c       Sat Jan 08 16:41:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_raudio_pxy.c,v 1.1.1.1.2.2 1999/12/20 21:02:06 he Exp $     */
+/*     $NetBSD: ip_raudio_pxy.c,v 1.1.1.1.2.3 2000/01/08 16:41:20 he Exp $     */
 
 #if SOLARIS && defined(_KERNEL)
 extern kmutex_t        ipf_rw;
@@ -235,7 +235,7 @@
        } else
                return 0;
 
-       for (a3 = a1, a4 = a2; a4 > 0; a4--, a3++) {
+       for (a3 = a1, a4 = a2; (a4 > 0) && (a3 < 19) && (a3 >= 0); a4--,a3++) {
                rap->rap_sbf |= (1 << a3);
                rap->rap_svr[a3] = *s++;
        }
diff -r 357446056d82 -r 1fde185a2127 sys/netinet/ipl.h
--- a/sys/netinet/ipl.h Sat Jan 08 16:27:53 2000 +0000
+++ b/sys/netinet/ipl.h Sat Jan 08 16:41:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipl.h,v 1.1.1.1.2.2 1999/12/20 21:02:07 he Exp $       */
+/*     $NetBSD: ipl.h,v 1.1.1.1.2.3 2000/01/08 16:41:20 he Exp $       */
 
 /*
  * Copyright (C) 1993-1999 by Darren Reed.
@@ -13,6 +13,6 @@
 #ifndef        __IPL_H__
 #define        __IPL_H__
 
-#define        IPL_VERSION     "IP Filter: v3.3.5"
+#define        IPL_VERSION     "IP Filter: v3.3.6"
 
 #endif