[Midnightbsd-cvs] src: contrib/ipfilter: switch to defined(__MidnightBSD__) checks
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 6 15:34:30 EST 2008
Log Message:
-----------
switch to defined(__MidnightBSD__) checks
Modified Files:
--------------
src/contrib/ipfilter:
ip_fil.c (r1.1.1.3 -> r1.2)
ipf.h (r1.1.1.2 -> r1.2)
mlf_ipl.c (r1.1.1.1 -> r1.2)
mlf_rule.c (r1.1.1.1 -> r1.2)
pcap-bpf.h (r1.1.1.2 -> r1.2)
src/contrib/ipfilter/iplang:
iplang_y.y (r1.1.1.2 -> r1.2)
src/contrib/ipfilter/ipsend:
44arp.c (r1.1.1.2 -> r1.2)
ip.c (r1.1.1.2 -> r1.2)
iptests.c (r1.1.1.2 -> r1.2)
resend.c (r1.1.1.2 -> r1.2)
sbpf.c (r1.1.1.2 -> r1.2)
sock.c (r1.1.1.2 -> r1.2)
src/contrib/ipfilter/lib:
getifname.c (r1.1.1.2 -> r1.2)
kmem.c (r1.1.1.2 -> r1.2)
printaps.c (r1.1.1.2 -> r1.2)
src/contrib/ipfilter/tools:
ipf.c (r1.1.1.2 -> r1.2)
ipfcomp.c (r1.1.1.2 -> r1.2)
ipfs.c (r1.1.1.2 -> r1.2)
ipfstat.c (r1.1.1.2 -> r1.2)
ipftest.c (r1.1.1.2 -> r1.2)
ipmon.c (r1.1.1.2 -> r1.2)
ipnat.c (r1.1.1.2 -> r1.2)
ipnat_y.y (r1.1.1.2 -> r1.2)
ippool.c (r1.1.1.2 -> r1.2)
ippool_y.y (r1.1.1.2 -> r1.2)
-------------- next part --------------
Index: iplang_y.y
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/iplang/iplang_y.y,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/iplang/iplang_y.y -L contrib/ipfilter/iplang/iplang_y.y -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/iplang/iplang_y.y
+++ contrib/ipfilter/iplang/iplang_y.y
@@ -663,7 +663,7 @@
if (!e)
fprintf(stderr, "Invalid ethernet address: %s\n", arg);
else
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__MidnightBSD__)
bcopy(e->octet, buf->octet, sizeof(e->octet));
# else
bcopy(e->ether_addr_octet, buf->ether_addr_octet,
Index: sock.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/sock.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/sock.c -L contrib/ipfilter/ipsend/sock.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/sock.c
+++ contrib/ipfilter/ipsend/sock.c
@@ -24,7 +24,7 @@
#ifndef ultrix
#include <fcntl.h>
#endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/dirent.h>
#else
# include <sys/dir.h>
@@ -66,7 +66,7 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <net/if.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include "radix_ipf.h"
#endif
#ifndef __osf__
@@ -301,7 +301,8 @@
fd = (struct filedesc *)malloc(sizeof(*fd));
if (fd == NULL)
return NULL;
-#if defined( __FreeBSD_version) && __FreeBSD_version >= 500013
+#if defined(__MidnightBSD__) || \
+ defined( __FreeBSD_version) && __FreeBSD_version >= 500013
if (KMCPY(fd, p->ki_fd, sizeof(*fd)) == -1)
{
fprintf(stderr, "read(%#lx,%#lx) failed\n",
Index: 44arp.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/44arp.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/44arp.c -L contrib/ipfilter/ipsend/44arp.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/44arp.c
+++ contrib/ipfilter/ipsend/44arp.c
@@ -8,12 +8,12 @@
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
#endif
#include <net/if_dl.h>
#include <net/if_types.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include "radix_ipf.h"
#endif
#ifndef __osf__
Index: resend.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/resend.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/resend.c -L contrib/ipfilter/ipsend/resend.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/resend.c
+++ contrib/ipfilter/ipsend/resend.c
@@ -25,7 +25,7 @@
#ifndef linux
# include <netinet/ip_var.h>
# include <netinet/if_ether.h>
-# if __FreeBSD_version >= 300000
+# if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
# endif
#endif
Index: ip.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/ip.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/ip.c -L contrib/ipfilter/ipsend/ip.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/ip.c
+++ contrib/ipfilter/ipsend/ip.c
@@ -23,7 +23,7 @@
#ifndef linux
# include <netinet/if_ether.h>
# include <netinet/ip_var.h>
-# if __FreeBSD_version >= 300000
+# if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
# endif
#endif
Index: sbpf.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/sbpf.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/sbpf.c -L contrib/ipfilter/ipsend/sbpf.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/sbpf.c
+++ contrib/ipfilter/ipsend/sbpf.c
@@ -16,7 +16,7 @@
#if BSD < 199103
#include <sys/fcntlcom.h>
#endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/dirent.h>
#else
# include <sys/dir.h>
Index: iptests.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipsend/iptests.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipsend/iptests.c -L contrib/ipfilter/ipsend/iptests.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipsend/iptests.c
+++ contrib/ipfilter/ipsend/iptests.c
@@ -75,7 +75,7 @@
# include <asm/atomic.h>
#endif
#if !defined(linux)
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include "radix_ipf.h"
# endif
# include <net/route.h>
Index: printaps.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/lib/printaps.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/lib/printaps.c -L contrib/ipfilter/lib/printaps.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/lib/printaps.c
+++ contrib/ipfilter/lib/printaps.c
@@ -46,7 +46,7 @@
ap.aps_state[0], ap.aps_state[1],
ap.aps_sel[0], ap.aps_sel[1]);
#if (defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011)) || \
- (__FreeBSD_version >= 300000) || defined(OpenBSD)
+ (__FreeBSD_version >= 300000) || defined(OpenBSD) || defined(__MidnightBSD__)
printf("\t\tseq: off %hd/%hd min %x/%x\n",
ap.aps_seqoff[0], ap.aps_seqoff[1],
ap.aps_seqmin[0], ap.aps_seqmin[1]);
Index: getifname.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/lib/getifname.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/lib/getifname.c -L contrib/ipfilter/lib/getifname.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/lib/getifname.c
+++ contrib/ipfilter/lib/getifname.c
@@ -47,7 +47,7 @@
return ifname;
#else
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__) || \
+ defined(__OpenBSD__) || defined(__MidnightBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
#else
char buf[32];
@@ -63,7 +63,7 @@
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X";
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
- defined(__OpenBSD__) || defined(linux) || \
+ defined(__OpenBSD__) || defined(linux) || defined(__MidnightBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname);
# else
Index: kmem.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/lib/kmem.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/lib/kmem.c -L contrib/ipfilter/lib/kmem.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/lib/kmem.c
+++ contrib/ipfilter/lib/kmem.c
@@ -29,7 +29,7 @@
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#if defined(linux) || defined(__osf__) || defined(__sgi) || defined(__hpux)
Index: pcap-bpf.h
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/pcap-bpf.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/pcap-bpf.h -L contrib/ipfilter/pcap-bpf.h -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/pcap-bpf.h
+++ contrib/ipfilter/pcap-bpf.h
@@ -163,7 +163,7 @@
* for DLT_SLIP_BSDOS and DLT_PPP_BSDOS, which are 15 and 16, but they
* didn't. So it goes.
*/
-#if defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
#ifndef DLT_SLIP_BSDOS
#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
Index: mlf_ipl.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/mlf_ipl.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L contrib/ipfilter/mlf_ipl.c -L contrib/ipfilter/mlf_ipl.c -u -r1.1.1.1 -r1.2
--- contrib/ipfilter/mlf_ipl.c
+++ contrib/ipfilter/mlf_ipl.c
@@ -32,7 +32,8 @@
# endif
#endif
#include <sys/systm.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
+#if defined(__MidnightBSD__) || \
+ defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
# ifndef ACTUALLY_LKM_NOT_KERNEL
# include "opt_devfs.h"
# endif
@@ -44,7 +45,7 @@
#endif
#include <sys/conf.h>
#include <sys/file.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/lock.h>
#endif
#include <sys/stat.h>
@@ -59,7 +60,7 @@
#if BSD >= 199506
# include <sys/sysctl.h>
#endif
-#if (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
# include <sys/socket.h>
#endif
#include <net/if.h>
@@ -140,7 +141,7 @@
static void *ipf_devfs[IPL_LOGSIZE];
#endif
-#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
+#if !defined(__MidnightBSD__) || !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
int ipl_major = 0;
static struct cdevsw ipldevsw =
@@ -168,7 +169,7 @@
static struct cdevsw ipl_cdevsw = {
iplopen, iplclose, iplread, nowrite, /* 79 */
iplioctl, nostop, noreset, nodevtotty,
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
seltrue, nommap, nostrategy, "ipl",
#else
noselect, nommap, nostrategy, "ipl",
@@ -195,7 +196,7 @@
struct lkm_table *lkmtp;
int cmd;
{
-#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
+#if !defined(__MidnightBSD__) || !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
int i = ipl_major;
struct lkm_dev *args = lkmtp->private.lkm_dev;
#endif
@@ -207,7 +208,7 @@
if (lkmexists(lkmtp))
return EEXIST;
-#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
+#if !defined(__MidnightBSD__) || !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
for (i = 0; i < nchrdev; i++)
if (cdevsw[i].d_open == lkmenodev ||
cdevsw[i].d_open == iplopen)
@@ -270,7 +271,7 @@
if ((error = namei(&nd)))
return (error);
VOP_LEASE(nd.ni_vp, curproc, curproc->p_ucred, LEASE_WRITE);
-#if (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
VOP_LOCK(nd.ni_vp, LK_RETRY | LK_EXCLUSIVE, curproc);
VOP_LEASE(nd.ni_dvp, curproc, curproc->p_ucred, LEASE_WRITE);
(void) VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
@@ -338,7 +339,7 @@
vattr.va_rdev = (ipl_major << 8) | i;
VOP_LEASE(nd.ni_dvp, curproc, curproc->p_ucred, LEASE_WRITE);
error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
-#if (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
vput(nd.ni_dvp);
#endif
if (error)
@@ -374,7 +375,7 @@
# ifdef IPFILTER_LKM
# include <sys/exec.h>
-# if (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
MOD_DEV(if_ipl, LM_DT_CHAR, CDEV_MAJOR, &ipl_cdevsw);
# else
MOD_DECL(if_ipl);
@@ -398,7 +399,7 @@
struct lkm_table *lkmtp;
int cmd, ver;
{
-# if (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
MOD_DISPATCH(if_ipl, lkmtp, cmd, ver, iplaction, iplaction, iplaction);
# else
DISPATCH(lkmtp, cmd, ver, iplaction, iplaction, iplaction);
@@ -462,7 +463,7 @@
#endif
-# if defined(IPFILTER_LKM) || \
+# if defined(IPFILTER_LKM) || defined(__MidnightBSD__) || \
defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
SYSINIT(ipldev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ipl_drvinit,NULL)
# endif /* IPFILTER_LKM */
Index: ip_fil.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ip_fil.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -L contrib/ipfilter/ip_fil.c -L contrib/ipfilter/ip_fil.c -u -r1.1.1.3 -r1.2
--- contrib/ipfilter/ip_fil.c
+++ contrib/ipfilter/ip_fil.c
@@ -15,9 +15,9 @@
#endif
#include <sys/param.h>
-#if defined(__FreeBSD__) && !defined(__FreeBSD_version)
+#if defined(__FreeBSD__) && !defined(__FreeBSD_version) || (defined(__MidnightBSD__) && !defined(__MidnightBSD_version))
# if defined(IPFILTER_LKM)
-# ifndef __FreeBSD_cc_version
+# ifndef __FreeBSD_cc_version || __MidnightBSD_cc_version
# include <osreldate.h>
# else
# if __FreeBSD_cc_version < 430000
@@ -46,7 +46,8 @@
#endif
#include <sys/time.h>
#if !SOLARIS
-# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >= 300000)
+# if (NetBSD > 199609) || (OpenBSD > 199603) || \
+ (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/dirent.h>
# else
# include <sys/dir.h>
@@ -72,7 +73,7 @@
#ifdef sun
# include <net/af.h>
#endif
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
#endif
#ifdef __sgi
@@ -81,7 +82,7 @@
#include <sys/hashing.h>
# endif
#endif
-#if defined(__FreeBSD__) || defined(SOLARIS2)
+#if defined(__FreeBSD__) || defined(SOLARIS2) || defined(__MidnightBSD__)
# include "radix_ipf.h"
#endif
#ifndef __osf__
@@ -131,7 +132,7 @@
#ifdef IPFILTER_COMPILED
# include "netinet/ip_rules.h"
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) || defined(__MidnightBSD_version)
# include <sys/malloc.h>
#endif
#ifdef __hpux
@@ -293,7 +294,8 @@
#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
+ (defined(__MidnightBSD__))
sprintf(fname, "/tmp/%s", ifp->if_xname);
#else
sprintf(fname, "/tmp/%s%d", ifp->if_name, ifp->if_unit);
@@ -319,7 +321,7 @@
struct ifaddr *ifa;
#endif
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__MidnightBSD__)
if (ifp->if_addrlist.tqh_first != NULL)
#else
# ifdef __sgi
@@ -331,7 +333,8 @@
return;
ifa = (struct ifaddr *)malloc(sizeof(*ifa));
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
+ defined(__MidnightBSD__)
ifp->if_addrlist.tqh_first = ifa;
#else
# ifdef __sgi
@@ -363,7 +366,8 @@
char *addr;
#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
+ (defined(__MidnightBSD__))
if (name == NULL)
name = "anon0";
@@ -429,12 +433,14 @@
}
ifp = ifneta[nifs - 1];
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
+ defined(__MidnightBSD__)
TAILQ_INIT(&ifp->if_addrlist);
#endif
#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
+ defined(__MidnightBSD__)
(void) strncpy(ifp->if_xname, name, sizeof(ifp->if_xname));
#else
for (s = name; *s && !ISDIGIT(*s); s++)
@@ -465,7 +471,8 @@
static char ifname[LIFNAMSIZ];
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(linux) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
+ defined(__MidnightBSD__)
sprintf(ifname, "%s", ifp->if_xname);
#else
sprintf(ifname, "%s%d", ifp->if_name, ifp->if_unit);
@@ -483,7 +490,8 @@
#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
+ defined(__MidnightBSD__)
for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) {
ifp->if_output = (void *)write_output;
sprintf(fname, "/tmp/%s", ifp->if_xname);
@@ -771,7 +779,8 @@
struct ifaddr *ifa;
#endif
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
+ defined(__MidnightBSD__)
ifa = ifp->if_addrlist.tqh_first;
#else
# ifdef __sgi
Index: mlf_rule.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/mlf_rule.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L contrib/ipfilter/mlf_rule.c -L contrib/ipfilter/mlf_rule.c -u -r1.1.1.1 -r1.2
--- contrib/ipfilter/mlf_rule.c
+++ contrib/ipfilter/mlf_rule.c
@@ -13,7 +13,7 @@
#include <sys/param.h>
-#if defined(__FreeBSD__) && (__FreeBSD__ > 1)
+#if defined(__MidnightBSD__) || defined(__FreeBSD__) && (__FreeBSD__ > 1)
# ifdef IPFILTER_LKM
# include <osreldate.h>
# define ACTUALLY_LKM_NOT_KERNEL
@@ -22,7 +22,7 @@
# endif
#endif
#include <sys/systm.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 220000)
# include <sys/conf.h>
# include <sys/kernel.h>
# ifdef DEVFS
@@ -31,7 +31,7 @@
#endif
#include <sys/conf.h>
#include <sys/file.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/lock.h>
#endif
#include <sys/stat.h>
@@ -46,10 +46,10 @@
#if BSD >= 199506
# include <sys/sysctl.h>
#endif
-#if (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
# include <sys/socket.h>
#endif
-#if (__FreeBSD_version >= 199511)
+#if defined(__MidnightBSD__) || (__FreeBSD_version >= 199511)
#include <net/if.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
@@ -59,7 +59,7 @@
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
#endif
-#if (__FreeBSD__ > 1)
+#if defined(__MidnightBSD__) || (__FreeBSD__ > 1)
# include <sys/sysent.h>
#endif
#include <sys/lkm.h>
@@ -70,7 +70,7 @@
int xxxinit __P((struct lkm_table *, int, int));
-#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
+#if !defined(__MidnightBSD__) || !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
MOD_DEV(IPL_VERSION, LM_DT_CHAR, -1, &ipldevsw);
#endif
@@ -88,7 +88,7 @@
# ifdef IPFILTER_LKM
# include <sys/exec.h>
-# if (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
MOD_MISC(ipfrule);
# else
MOD_DECL(ipfrule);
@@ -110,7 +110,7 @@
struct lkm_table *lkmtp;
int cmd, ver;
{
-# if (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
MOD_DISPATCH(ipfrule, lkmtp, cmd, ver, ipfrule_ioctl, ipfrule_ioctl,
ipfrule_ioctl);
# else
Index: ipf.h
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/ipf.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/ipf.h -L contrib/ipfilter/ipf.h -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/ipf.h
+++ contrib/ipfilter/ipf.h
@@ -42,7 +42,7 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
#endif
#include <netinet/in.h>
@@ -98,7 +98,7 @@
#ifndef U_32_T
# define U_32_T 1
# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
- defined(__sgi)
+ defined(__sgi) || defined(__MidnightBSD__)
typedef u_int32_t u_32_t;
# else
# if defined(__alpha__) || defined(__alpha) || defined(_LP64)
@@ -110,7 +110,7 @@
typedef unsigned int u_32_t;
# endif
# endif
-# endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi */
+# endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ || __sgi || __MidnightBSD__ */
#endif /* U_32_T */
#ifndef MAXHOSTNAMELEN
@@ -151,6 +151,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || \
+ defined(__MidnightBSD__) || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000) || \
SOLARIS || defined(__sgi) || defined(__osf__) || defined(linux)
# include <stdarg.h>
Index: ipnat.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipnat.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipnat.c -L contrib/ipfilter/tools/ipnat.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipnat.c
+++ contrib/ipfilter/tools/ipnat.c
@@ -37,7 +37,7 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#include <netdb.h>
Index: ipmon.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipmon.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipmon.c -L contrib/ipfilter/tools/ipmon.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipmon.c
+++ contrib/ipfilter/tools/ipmon.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include <time.h>
#if !defined(__SVR4) && !defined(__svr4__)
-# if (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 300000)
# include <sys/dirent.h>
# else
# include <sys/dir.h>
@@ -1035,7 +1035,7 @@
(void) sprintf(t, "%dx ", ipl->ipl_count);
t += strlen(t);
}
-#if (defined(MENTAT) || \
+#if (defined(MENTAT) || defined(__MidnightBSD__) || \
(defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
(defined(OpenBSD) && (OpenBSD >= 199603))) || defined(linux)
Index: ipfs.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipfs.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipfs.c -L contrib/ipfilter/tools/ipfs.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipfs.c
+++ contrib/ipfilter/tools/ipfs.c
@@ -5,7 +5,7 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# ifndef __FreeBSD_cc_version
# include <osreldate.h>
# else
@@ -33,7 +33,7 @@
#include <netinet/in_systm.h>
#include <sys/time.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#include <netinet/ip.h>
Index: ipftest.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipftest.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipftest.c -L contrib/ipfilter/tools/ipftest.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipftest.c
+++ contrib/ipfilter/tools/ipftest.c
@@ -46,7 +46,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || SOLARIS || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000) || \
- defined(__osf__) || defined(linux)
+ defined(__osf__) || defined(linux) || defined(__MidnightBSD__)
int ipftestioctl __P((int, ioctlcmd_t, ...));
int ipnattestioctl __P((int, ioctlcmd_t, ...));
int ipstatetestioctl __P((int, ioctlcmd_t, ...));
@@ -325,7 +325,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__) || SOLARIS || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000) || \
- defined(__osf__) || defined(linux)
+ defined(__osf__) || defined(linux) || defined(__MidnightBSD__)
int ipftestioctl(int dev, ioctlcmd_t cmd, ...)
{
caddr_t data;
Index: ipfcomp.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipfcomp.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipfcomp.c -L contrib/ipfilter/tools/ipfcomp.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipfcomp.c
+++ contrib/ipfilter/tools/ipfcomp.c
@@ -98,7 +98,7 @@
fprintf(fp, "#include <sys/types.h>\n");
fprintf(fp, "#include <sys/time.h>\n");
fprintf(fp, "#include <sys/socket.h>\n");
- fprintf(fp, "#if (__FreeBSD_version >= 40000)\n");
+ fprintf(fp, "#if (__FreeBSD_version >= 40000) || defined(__MidnightBSD__)\n");
fprintf(fp, "# if defined(_KERNEL)\n");
fprintf(fp, "# include <sys/libkern.h>\n");
fprintf(fp, "# else\n");
@@ -107,7 +107,7 @@
fprintf(fp, "#endif\n");
fprintf(fp, "#if (__NetBSD_Version__ >= 399000000)\n");
fprintf(fp, "#else\n");
- fprintf(fp, "# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi)\n");
+ fprintf(fp, "# if !defined(__MidnightBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi)\n");
fprintf(fp, "# include <sys/systm.h>\n");
fprintf(fp, "# endif\n");
fprintf(fp, "#endif\n");
@@ -118,7 +118,7 @@
fprintf(fp, "# include <sys/mbuf.h>\n");
fprintf(fp, "#endif\n");
fprintf(fp,
-"#if defined(__FreeBSD__) && (__FreeBSD_version > 220000)\n");
+"#if defined(__MidnightBSD__) || defined(__FreeBSD__) && (__FreeBSD_version > 220000)\n");
fprintf(fp, "# include <sys/sockio.h>\n");
fprintf(fp, "#else\n");
fprintf(fp, "# include <sys/ioctl.h>\n");
Index: ipf.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipf.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipf.c -L contrib/ipfilter/tools/ipf.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipf.c
+++ contrib/ipfilter/tools/ipf.c
@@ -5,7 +5,7 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*/
-#ifdef __FreeBSD__
+#ifdef __FreeBSD__ || defined(__MidnightBSD__)
# ifndef __FreeBSD_cc_version
# include <osreldate.h>
# else
Index: ippool.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ippool.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ippool.c -L contrib/ipfilter/tools/ippool.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ippool.c
+++ contrib/ipfilter/tools/ippool.c
@@ -15,7 +15,7 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#include <netinet/in.h>
Index: ippool_y.y
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ippool_y.y,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ippool_y.y -L contrib/ipfilter/tools/ippool_y.y -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ippool_y.y
+++ contrib/ipfilter/tools/ippool_y.y
@@ -16,7 +16,7 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#include <netinet/in.h>
Index: ipnat_y.y
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipnat_y.y,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipnat_y.y -L contrib/ipfilter/tools/ipnat_y.y -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipnat_y.y
+++ contrib/ipfilter/tools/ipnat_y.y
@@ -35,7 +35,7 @@
#include <sys/time.h>
#include <syslog.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if defined(__MidnightBSD__) || __FreeBSD_version >= 300000
# include <net/if_var.h>
#endif
#include <netdb.h>
Index: ipfstat.c
===================================================================
RCS file: /home/cvs/src/contrib/ipfilter/tools/ipfstat.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ipfilter/tools/ipfstat.c -L contrib/ipfilter/tools/ipfstat.c -u -r1.1.1.2 -r1.2
--- contrib/ipfilter/tools/ipfstat.c
+++ contrib/ipfilter/tools/ipfstat.c
@@ -5,7 +5,7 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*/
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# ifndef __FreeBSD_cc_version
# include <osreldate.h>
# else
More information about the Midnightbsd-cvs
mailing list