[src/netbsd-3]: src Pull up revision 1.4 (requested by martti in ticket #106):

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

details:   https://anonhg.NetBSD.org/src/rev/f6217b16ac03
branches:  netbsd-3
changeset: 575106:f6217b16ac03
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 04 18:25:17 2005 +0000

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

diffstat:

 dist/ipf/lib/getport.c            |  19 ++++++++++++-------
 regress/sys/kern/ipf/expected/ni5 |   1 -
 sys/dist/ipf/netinet/ipl.h        |   8 ++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diffs (85 lines):

diff -r 822f71851835 -r f6217b16ac03 dist/ipf/lib/getport.c
--- a/dist/ipf/lib/getport.c    Mon Apr 04 18:25:11 2005 +0000
+++ b/dist/ipf/lib/getport.c    Mon Apr 04 18:25:17 2005 +0000
@@ -1,8 +1,9 @@
 #include "ipf.h"
 
-int getport(fr, name)
+int getport(fr, name, port)
 frentry_t *fr;
 char *name;
+u_short *port;
 {
        struct protoent *p;
        struct servent *s;
@@ -10,8 +11,10 @@
 
        if (fr == NULL || fr->fr_type != FR_T_IPF) {
                s = getservbyname(name, NULL);
-               if (s != NULL)
-                       return s->s_port;
+               if (s != NULL) {
+                       *port = s->s_port;
+                       return 0;
+               }
                return -1;
        }
 
@@ -27,13 +30,15 @@
                s = getservbyname(name, "udp");
                if (s == NULL || s->s_port != p1)
                        return -1;
-               return p1;
+               *port = p1;
+               return 0;
        }
 
        p = getprotobynumber(fr->fr_proto);
        s = getservbyname(name, p ? p->p_name : NULL);
-       if (s != NULL)
-               return s->s_port;
-
+       if (s != NULL) {
+               *port = s->s_port;
+               return 0;
+       }
        return -1;
 }
diff -r 822f71851835 -r f6217b16ac03 regress/sys/kern/ipf/expected/ni5
--- a/regress/sys/kern/ipf/expected/ni5 Mon Apr 04 18:25:11 2005 +0000
+++ b/regress/sys/kern/ipf/expected/ni5 Mon Apr 04 18:25:17 2005 +0000
@@ -3,7 +3,6 @@
 4500 0028 0001 4000 ff06 02ff 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 76c5 5010 269c 5aa0 0000 
 4500 006f ffde 4000 ef06 5330 96cb e002 c0a8 0103 0015 8032 3786 76c5 bd6b c9c9 5018 269c 967e 0000 3232 302d 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 7520 4e63 4654 5064 2053 6572 7665 7220 2866 
7265 6520 6564 7563 6174 696f 6e61 6c20 6c69 6365 6e73 6529 2072 6561 6479 2e0d 0a 
 4500 0028 0002 4000 ff06 02fe 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 770c 5010 269c 5a59 0000 
-ippr_ftp_server_valid:junk after cmd[220-Maintained by RSSS and RSPAS IT Staff (previously known as Coombs Comp]
 4500 00c7 ffdf 4000 ef06 52d7 96cb e002 c0a8 0103 0015 8032 3786 770c bd6b c9c9 5018 269c 1087 0000 3232 302d 0d0a 3232 302d 4d61 696e 7461 696e 6564 2062 7920 5253 5353 2061 6e64 2052 5350 4153 
2049 5420 5374 6166 6620 2870 7265 7669 6f75 736c 7920 6b6e 6f77 6e20 6173 2043 6f6f 6d62 7320 436f 6d70 7574 696e 6720 556e 6974 290d 0a32 3230 2d41 6e79 2070 726f 626c 656d 7320 636f 6e74 6163 7420 
6674 706d 6173 7465 7240 636f 6f6d 6273 2e61 6e75 2e65 6475 2e61 750d 0a32 3230 2d0d 0a32 3230 200d 0a 
 4500 0028 0003 4000 ff06 02fd 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5010 269c 59ba 0000 
 4500 0038 0004 4000 ff06 02ec 0101 0101 96cb e002 8032 0015 bd6b c9c9 3786 77ab 5018 269c d1c5 0000 5553 4552 2061 6e6f 6e79 6d6f 7573 0d0a 
diff -r 822f71851835 -r f6217b16ac03 sys/dist/ipf/netinet/ipl.h
--- a/sys/dist/ipf/netinet/ipl.h        Mon Apr 04 18:25:11 2005 +0000
+++ b/sys/dist/ipf/netinet/ipl.h        Mon Apr 04 18:25:17 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipl.h,v 1.3 2005/02/19 21:30:25 martti Exp $   */
+/*     $NetBSD: ipl.h,v 1.3.2.1 2005/04/04 18:25:17 tron Exp $ */
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,14 +6,14 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ipl.h   1.21 6/5/96
- * Id: ipl.h,v 2.52.2.7 2005/02/19 01:33:24 darrenr Exp
+ * Id: ipl.h,v 2.52.2.9 2005/03/30 14:14:05 darrenr Exp
  */
 
 #ifndef        __IPL_H__
 #define        __IPL_H__
 
-#define        IPL_VERSION     "IP Filter: v4.1.6"
+#define        IPL_VERSION     "IP Filter: v4.1.8"
 
-#define        IPFILTER_VERSION        4010600
+#define        IPFILTER_VERSION        4010800
 
 #endif