[src/netbsd-3]: src/sys/dist/ipf/netinet Pull up revision 1.5 (requested by m...

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

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

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

diffstat:

 sys/dist/ipf/netinet/ip_compat.h |  11 ++++++-----
 sys/dist/ipf/netinet/ip_nat.h    |   7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r f6217b16ac03 -r d38727b33175 sys/dist/ipf/netinet/ip_compat.h
--- a/sys/dist/ipf/netinet/ip_compat.h  Mon Apr 04 18:25:17 2005 +0000
+++ b/sys/dist/ipf/netinet/ip_compat.h  Mon Apr 04 18:25:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_compat.h,v 1.4 2005/02/08 07:01:55 martti Exp $     */
+/*     $NetBSD: ip_compat.h,v 1.4.4.1 2005/04/04 18:25:24 tron Exp $   */
 
 /*
  * Copyright (C) 1993-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_compat.h     1.8 1/14/96
- * Id: ip_compat.h,v 2.142.2.24 2005/01/08 14:22:59 darrenr Exp
+ * Id: ip_compat.h,v 2.142.2.25 2005/03/28 09:33:36 darrenr Exp
  */
 
 #ifndef _NETINET_IP_COMPAT_H_
@@ -1280,12 +1280,13 @@
 #define        ipf_isw         ipf_lkun_s.ipf_sw
 #define        ipf_magic       ipf_lkun_s.ipf_magic
 
-#ifdef __GNUC__
-# define       INLINE  __inline__
-#else
+#if !defined(__GNUC__) || \
+    (defined(__FreeBSD_version) && (__FreeBSD_version >= 503000))
 # ifndef       INLINE
 #  define      INLINE
 # endif
+#else
+# define       INLINE  __inline__
 #endif
 
 #if defined(linux) && defined(_KERNEL)
diff -r f6217b16ac03 -r d38727b33175 sys/dist/ipf/netinet/ip_nat.h
--- a/sys/dist/ipf/netinet/ip_nat.h     Mon Apr 04 18:25:17 2005 +0000
+++ b/sys/dist/ipf/netinet/ip_nat.h     Mon Apr 04 18:25:24 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_nat.h,v 1.4 2005/02/19 21:30:25 martti Exp $        */
+/*     $NetBSD: ip_nat.h,v 1.4.2.1 2005/04/04 18:25:24 tron Exp $      */
 
 /*
  * Copyright (C) 1995-2001, 2003 by Darren Reed.
@@ -6,7 +6,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * @(#)ip_nat.h        1.5 2/4/96
- * Id: ip_nat.h,v 2.90.2.6 2005/02/04 09:56:15 darrenr Exp
+ * Id: ip_nat.h,v 2.90.2.9 2005/03/28 11:09:55 darrenr Exp
  */
 
 #ifndef        __IP_NAT_H__
@@ -137,7 +137,6 @@
 #define        nat_seq         nat_un.nat_uni.ici_seq
 #define        nat_id          nat_un.nat_uni.ici_id
 #define        nat_tcpstate    nat_tqe.tqe_state
-#define        nat_gre         nat_un.nat_ugre
 
 /*
  * Values for nat_dir
@@ -251,6 +250,8 @@
 #define        IPN_STICKY      0x80000
 #define        IPN_FRAG        0x100000
 #define        IPN_FIXEDDPORT  0x200000
+#define        IPN_FINDFORWARD 0x400000
+#define        IPN_IN          0x800000
 #define        IPN_USERFLAGS   (IPN_TCPUDP|IPN_AUTOPORTMAP|IPN_IPRANGE|IPN_SPLIT|\
                         IPN_ROUNDR|IPN_FILTER|IPN_NOTSRC|IPN_NOTDST|\
                         IPN_FRAG|IPN_STICKY|IPN_FIXEDDPORT|IPN_ICMPQUERY)