[Midnightbsd-cvs] src: ipfilter/netinet: work in progress..

[laffer1 at midnightbsd.org]

Log Message:
-----------
work in progress.. add __MidnightBSD__ checks in the code

Modified Files:
--------------
    src/sys/contrib/ipfilter/netinet:
        ip_pool.c (r1.2 -> r1.3)
        ip_proxy.c (r1.2 -> r1.3)
        ip_rules.c (r1.1.1.1 -> r1.2)
        ip_scan.c (r1.2 -> r1.3)
        ip_state.c (r1.2 -> r1.3)

-------------- next part --------------
Index: ip_scan.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_scan.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_scan.c -L sys/contrib/ipfilter/netinet/ip_scan.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_scan.c
+++ sys/contrib/ipfilter/netinet/ip_scan.c
@@ -35,7 +35,7 @@
 #if !defined(__hpux) && !defined(__osf__) && !defined(linux) && !defined(AIX)
 # include <sys/ioccom.h>
 #endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 # include <sys/filio.h>
 # include <sys/malloc.h>
 #else
Index: ip_state.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_state.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_state.c -L sys/contrib/ipfilter/netinet/ip_state.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_state.c
+++ sys/contrib/ipfilter/netinet/ip_state.c
@@ -23,8 +23,9 @@
 #  include "opt_ipfilter.h"
 # endif
 #endif
-#if defined(_KERNEL) && defined(__FreeBSD_version) && \
-    (__FreeBSD_version >= 400000) && !defined(KLD_MODULE)
+#if defined(_KERNEL) && (defined(__FreeBSD_version) && \
+    (__FreeBSD_version >= 400000) || defined(__MidnightBSD__)) && \
+    !defined(KLD_MODULE)
 #include "opt_inet6.h"
 #endif
 #if !defined(_KERNEL) && !defined(__KERNEL__)
@@ -38,10 +39,12 @@
 # include <sys/uio.h>
 # undef _KERNEL
 #endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 220000)
+#if defined(_KERNEL) && \
+    ((__FreeBSD_version >= 220000) || defined(__MidnightBSD__))
 # include <sys/filio.h>
 # include <sys/fcntl.h>
-# if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
+# if ((__FreeBSD_version >= 300000) || defined(__MidnightBSD__)) && \
+    !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
 #else
@@ -101,7 +104,7 @@
 #ifdef	USE_INET6
 #include <netinet/icmp6.h>
 #endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
 # include <sys/malloc.h>
 # if defined(_KERNEL) && !defined(IPFILTER_LKM)
 #  include <sys/libkern.h>
@@ -209,7 +212,7 @@
 		/*
 		 * XXX - ips_seed[X] should be a random number of sorts.
 		 */
-#if  (__FreeBSD_version >= 400000)
+#if  (__FreeBSD_version >= 400000) || defined(__MidnightBSD__)
 		ips_seed[i] = arc4random();
 #else
 		ips_seed[i] = ((u_long)ips_seed + i) * fr_statesize;
Index: ip_rules.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_rules.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/contrib/ipfilter/netinet/ip_rules.c -L sys/contrib/ipfilter/netinet/ip_rules.c -u -r1.1.1.1 -r1.2
--- sys/contrib/ipfilter/netinet/ip_rules.c
+++ sys/contrib/ipfilter/netinet/ip_rules.c
@@ -11,7 +11,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi)
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi) && \
+    defined(__MidnightBSD__)
 # include <sys/systm.h>
 #endif
 #include <sys/errno.h>
@@ -19,7 +20,8 @@
 #if !defined(__SVR4) && !defined(__svr4__) && !defined(__hpux)
 # include <sys/mbuf.h>
 #endif
-#if defined(__FreeBSD__) && (__FreeBSD_version > 220000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD__) && \
+    (__FreeBSD_version > 220000)
 # include <sys/sockio.h>
 #else
 # include <sys/ioctl.h>
Index: ip_proxy.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_proxy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_proxy.c -L sys/contrib/ipfilter/netinet/ip_proxy.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_proxy.c
+++ sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -46,10 +46,12 @@
 #  include <sys/mbuf.h>
 # endif
 #endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 220000)
+#if defined(_KERNEL) && \
+    ((__FreeBSD_version >= 220000) || defined(__MidnightBSD__))
 # include <sys/filio.h>
 # include <sys/fcntl.h>
-# if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM)
+# if (defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)) && \
+    !defined(IPFILTER_LKM)
 #  include "opt_ipfilter.h"
 # endif
 #else
@@ -63,7 +65,7 @@
 # include <sys/stream.h>
 # include <sys/kmem.h>
 #endif
-#if __FreeBSD__ > 2
+#if __FreeBSD__ > 2 || defined(__MidnightBSD__)
 # include <sys/queue.h>
 #endif
 #include <net/if.h>
@@ -86,7 +88,7 @@
 #include "netinet/ip_nat.h"
 #include "netinet/ip_state.h"
 #include "netinet/ip_proxy.h"
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
 # include <sys/malloc.h>
 #endif
 
Index: ip_pool.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_pool.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_pool.c -L sys/contrib/ipfilter/netinet/ip_pool.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_pool.c
+++ sys/contrib/ipfilter/netinet/ip_pool.c
@@ -49,7 +49,7 @@
 # include <sys/stream.h>
 # include <sys/kmem.h>
 #endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
 # include <sys/malloc.h>
 #endif