[Midnightbsd-cvs] src: ipfilter/netinet: work in progress..
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 6 19:18:56 EST 2008
Log Message:
-----------
work in progress.. add __MidnightBSD__ checks in the code
Modified Files:
--------------
src/sys/contrib/ipfilter/netinet:
fil.c (r1.2 -> r1.3)
ip_auth.c (r1.2 -> r1.3)
ip_compat.h (r1.2 -> r1.3)
ip_fil.h (r1.2 -> r1.3)
ip_fil_freebsd.c (r1.2 -> r1.3)
ip_frag.c (r1.2 -> r1.3)
ip_htable.c (r1.2 -> r1.3)
ip_log.c (r1.2 -> r1.3)
ip_lookup.c (r1.2 -> r1.3)
ip_nat.c (r1.2 -> r1.3)
-------------- next part --------------
Index: ip_log.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_log.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_log.c -L sys/contrib/ipfilter/netinet/ip_log.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_log.c
+++ sys/contrib/ipfilter/netinet/ip_log.c
@@ -23,9 +23,10 @@
# include "opt_ipfilter.h"
# endif
#endif
-#if defined(__FreeBSD__) && !defined(IPFILTER_LKM)
+#if (defined(__MidnightBSD__) || defined(__FreeBSD__)) && !defined(IPFILTER_LKM)
# if defined(_KERNEL)
-# if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+# if defined(__MidnightBSD__) || \
+ defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include "opt_ipfilter.h"
# endif
# else
@@ -52,7 +53,7 @@
# undef _KERNEL
# undef KERNEL
#endif
-#if __FreeBSD_version >= 220000 && defined(_KERNEL)
+#if (defined(__MidnightBSD__) || __FreeBSD_version >= 220000) && defined(_KERNEL)
# include <sys/fcntl.h>
# include <sys/filio.h>
#else
@@ -68,14 +69,14 @@
#if !SOLARIS && !defined(__hpux) && !defined(linux)
# if (defined(NetBSD) && NetBSD > 199609) || \
(defined(OpenBSD) && OpenBSD > 199603) || \
- (__FreeBSD_version >= 300000)
+ (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/dirent.h>
# else
# include <sys/dir.h>
# endif
# include <sys/mbuf.h>
# include <sys/select.h>
-# if __FreeBSD_version >= 500000
+# if __FreeBSD_version >= 500000 || defined(__MidnightBSD__)
# include <sys/selinfo.h>
# endif
#else
@@ -100,7 +101,7 @@
#ifdef sun
# include <net/af.h>
#endif
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
#endif
#include <net/route.h>
@@ -136,7 +137,8 @@
#include "netinet/ip_frag.h"
#include "netinet/ip_state.h"
#include "netinet/ip_auth.h"
-#if (__FreeBSD_version >= 300000) || defined(__NetBSD__)
+#if (__FreeBSD_version >= 300000) || defined(__NetBSD__) || \
+ defined(__MidnightBSD__)
# include <sys/malloc.h>
#endif
/* END OF INCLUDES */
@@ -346,7 +348,7 @@
# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
(defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) || \
- (SOLARIS && defined(_INET_IP_STACK_H))
+ (SOLARIS && defined(_INET_IP_STACK_H)) || defined(__MidnightBSD__)
COPYIFNAME(fin->fin_v, ifp, ipfl.fl_ifname);
# else
ipfl.fl_unit = (u_int)ifp->if_unit;
@@ -618,7 +620,8 @@
# endif /* SOLARIS */
}
-# if (BSD >= 199101) || defined(__FreeBSD__) || defined(__osf__)
+# if (BSD >= 199101) || defined(__FreeBSD__) || defined(__osf__) || \
+ defined(__MidnightBSD__)
uio->uio_rw = UIO_READ;
# endif
Index: ip_fil_freebsd.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_fil_freebsd.c -L sys/contrib/ipfilter/netinet/ip_fil_freebsd.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -16,16 +16,16 @@
# define KERNEL 1
# define _KERNEL 1
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
+#if (defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) && \
!defined(KLD_MODULE) && !defined(IPFILTER_LKM)
# include "opt_inet6.h"
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \
+#if (defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 440000)) && \
!defined(KLD_MODULE) && !defined(IPFILTER_LKM)
# include "opt_random_ip_id.h"
#endif
#include <sys/param.h>
-#if defined(__FreeBSD__) && !defined(__FreeBSD_version)
+#if defined(__MidnightBSD__) || defined(__FreeBSD__) && !defined(__FreeBSD_version)
# if defined(IPFILTER_LKM)
# ifndef __FreeBSD_cc_version
# include <osreldate.h>
@@ -39,7 +39,7 @@
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/file.h>
-#if __FreeBSD_version >= 220000
+#if __FreeBSD_version >= 220000 || defined(__MidnightBSD__)
# include <sys/fcntl.h>
# include <sys/filio.h>
#else
@@ -47,7 +47,7 @@
#endif
#include <sys/time.h>
#include <sys/systm.h>
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/dirent.h>
#else
# include <sys/dir.h>
@@ -57,16 +57,16 @@
#endif
#include <sys/protosw.h>
#include <sys/socket.h>
-#if __FreeBSD_version >= 500043
+#if __FreeBSD_version >= 500043 || defined(__MidnightBSD__)
# include <sys/selinfo.h>
#else
# include <sys/select.h>
#endif
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
-# if __FreeBSD_version >= 500043
+# if __FreeBSD_version >= 500043 || defined(__MidnightBSD__)
# include <net/netisr.h>
# endif
# if !defined(IPFILTER_LKM)
@@ -106,7 +106,8 @@
#include "netinet/ip_scan.h"
#endif
#include "netinet/ip_pool.h"
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || \
+ defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
#endif
#include <sys/kernel.h>
@@ -115,7 +116,7 @@
#endif
extern int ip_optcopy __P((struct ip *, struct ip *));
-#if (__FreeBSD_version > 460000)
+#if (__FreeBSD_version > 460000) || defined(__MidnightBSD__)
extern int path_mtu_discovery;
#endif
@@ -138,12 +139,12 @@
# endif
int ipf_locks_done = 0;
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
struct callout_handle fr_slowtimer_ch;
#endif
struct selinfo ipfselwait[IPL_LOGSIZE];
-#if (__FreeBSD_version >= 500011)
+#if (__FreeBSD_version >= 500011) || defined(__MidnightBSD__)
# include <sys/conf.h>
# if defined(NETBSD_PF)
# include <net/pfil.h>
@@ -156,7 +157,7 @@
#endif /* __FreeBSD_version >= 500011 */
-#if (__FreeBSD_version >= 502103)
+#if (__FreeBSD_version >= 502103) || defined(__MidnightBSD__)
static eventhandler_tag ipf_arrivetag, ipf_departtag, ipf_clonetag;
static void ipf_ifevent(void *arg);
@@ -169,7 +170,8 @@
#endif
-#if (__FreeBSD_version >= 501108) && defined(_KERNEL)
+#if (defined(__MidnightBSD__) || (__FreeBSD_version >= 501108)) && \
+ defined(_KERNEL)
static int
fr_check_wrapper(void *arg, struct mbuf **mp, struct ifnet *ifp, int dir)
@@ -237,7 +239,7 @@
ipforwarding = 1;
SPL_X(s);
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
fr_slowtimer_ch = timeout(fr_slowtimer, NULL,
(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);
#else
@@ -261,7 +263,7 @@
SPL_NET(s);
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
if (fr_slowtimer_ch.callout != NULL)
untimeout(fr_slowtimer, NULL, fr_slowtimer_ch);
bzero(&fr_slowtimer_ch, sizeof(fr_slowtimer_ch));
@@ -300,11 +302,12 @@
* Filter ioctl interface.
*/
int iplioctl(dev, cmd, data, mode
-# if defined(_KERNEL) && ((BSD >= 199506) || (__FreeBSD_version >= 220000))
+# if defined(_KERNEL) && ((BSD >= 199506) ||
+ (__FreeBSD_version >= 220000) || defined(__MidnightBSD__))
, p)
-# if (__FreeBSD_version >= 500024)
+# if (__FreeBSD_version >= 500024) || defined(__MidnightBSD__)
struct thread *p;
-# if (__FreeBSD_version >= 500043)
+# if (__FreeBSD_version >= 500043) || defined(__MidnightBSD__)
# define p_uid td_ucred->cr_ruid
# else
# define p_uid t_proc->p_cred->p_ruid
@@ -316,7 +319,7 @@
# else
)
# endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 502116)
+#if defined(_KERNEL) && (defined(__MidnightBSD__) || (__FreeBSD_version >= 502116))
struct cdev *dev;
#else
dev_t dev;
@@ -406,10 +409,11 @@
* routines below for saving IP headers to buffer
*/
int iplopen(dev, flags
-#if ((BSD >= 199506) || (__FreeBSD_version >= 220000)) && defined(_KERNEL)
+#if ((BSD >= 199506) || (__FreeBSD_version >= 220000) || \
+ defined(__MidnightBSD__)) && defined(_KERNEL)
, devtype, p)
int devtype;
-# if (__FreeBSD_version >= 500024)
+# if (__FreeBSD_version >= 500024) || defined(__MidnightBSD__)
struct thread *p;
# else
struct proc *p;
@@ -417,7 +421,8 @@
#else
)
#endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 502116)
+#if defined(_KERNEL) && ((__FreeBSD_version >= 502116) || \
+ defined(__MidnightBSD__))
struct cdev *dev;
#else
dev_t dev;
@@ -435,10 +440,11 @@
int iplclose(dev, flags
-#if ((BSD >= 199506) || (__FreeBSD_version >= 220000)) && defined(_KERNEL)
+#if ((BSD >= 199506) || (__FreeBSD_version >= 220000) || \
+ defined(__MidnightBSD__)) && defined(_KERNEL)
, devtype, p)
int devtype;
-# if (__FreeBSD_version >= 500024)
+# if (__FreeBSD_version >= 500024) || defined(__MidnightBSD__)
struct thread *p;
# else
struct proc *p;
@@ -446,7 +452,7 @@
#else
)
#endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 502116)
+#if defined(_KERNEL) && ((__FreeBSD_version >= 502116) || defined(__MidnightBSD__))
struct cdev *dev;
#else
dev_t dev;
@@ -474,7 +480,7 @@
#else
int iplread(dev, uio)
#endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 502116)
+#if defined(_KERNEL) && ((__FreeBSD_version >= 502116) || defined(__MidnightBSD__))
struct cdev *dev;
#else
dev_t dev;
@@ -514,7 +520,7 @@
#else
int iplwrite(dev, uio)
#endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 502116)
+#if defined(_KERNEL) && ((__FreeBSD_version >= 502116) || defined(__MidnightBSD__))
struct cdev *dev;
#else
dev_t dev;
@@ -654,7 +660,7 @@
IP_HL_A(ip, sizeof(*oip) >> 2);
ip->ip_tos = oip->ip_tos;
ip->ip_id = fin->fin_ip->ip_id;
-#if (__FreeBSD_version > 460000)
+#if (__FreeBSD_version > 460000) || defined(__MidnightBSD__)
ip->ip_off = path_mtu_discovery ? IP_DF : 0;
#else
ip->ip_off = 0;
@@ -934,7 +940,7 @@
* currently "to <if>" and "to <if>:ip#" are not supported
* for IPv6
*/
-#if (__FreeBSD_version >= 490000)
+#if (__FreeBSD_version >= 490000) || defined(__MidnightBSD__)
return ip6_output(m0, NULL, NULL, 0, NULL, NULL, NULL);
#else
return ip6_output(m0, NULL, NULL, 0, NULL, NULL);
@@ -1192,7 +1198,7 @@
else if (v == 6)
bzero((char *)inp, sizeof(struct in6_addr));
#endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
ifa = TAILQ_FIRST(&ifp->if_addrhead);
#else
ifa = ifp->if_addrlist;
@@ -1211,7 +1217,7 @@
break;
}
#endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
ifa = TAILQ_NEXT(ifa, ifa_link);
#else
ifa = ifa->ifa_next;
@@ -1248,7 +1254,7 @@
fr_info_t *fin;
{
u_32_t newiss;
-#if (__FreeBSD_version >= 400000)
+#if (__FreeBSD_version >= 400000) || defined(__MidnightBSD__)
newiss = arc4random();
#else
static iss_seq_off = 0;
@@ -1492,7 +1498,7 @@
int error = 0;
if (fin->fin_out == 0) {
-#if (__FreeBSD_version >= 501000)
+#if (__FreeBSD_version >= 501000) || defined(__MidnightBSD__)
netisr_dispatch(NETISR_IP, m);
#else
struct ifqueue *ifq;
@@ -1519,7 +1525,7 @@
} else {
fin->fin_ip->ip_len = ntohs(fin->fin_ip->ip_len);
fin->fin_ip->ip_off = ntohs(fin->fin_ip->ip_off);
-#if (__FreeBSD_version >= 470102)
+#if (__FreeBSD_version >= 470102) || defined(__MidnightBSD__)
error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
#else
error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL);
@@ -1530,8 +1536,9 @@
}
int ipf_pfil_unhook(void) {
-#if defined(NETBSD_PF) && (__FreeBSD_version >= 500011)
-# if __FreeBSD_version >= 501108
+#if defined(NETBSD_PF) && (defined(__MidnightBSD__) || \
+ (__FreeBSD_version >= 500011))
+# if __FreeBSD_version >= 501108 || defined(__MidnightBSD__)
struct pfil_head *ph_inet;
# ifdef USE_INET6
struct pfil_head *ph_inet6;
@@ -1540,8 +1547,8 @@
#endif
#ifdef NETBSD_PF
-# if (__FreeBSD_version >= 500011)
-# if (__FreeBSD_version >= 501108)
+# if (__FreeBSD_version >= 500011) || defined(__MidnightBSD__)
+# if (__FreeBSD_version >= 501108) || defined(__MidnightBSD__)
ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
if (ph_inet != NULL)
pfil_remove_hook((void *)fr_check_wrapper, NULL,
@@ -1554,7 +1561,7 @@
pfil_remove_hook((void *)fr_check, PFIL_IN|PFIL_OUT|PFIL_WAITOK);
# endif
# ifdef USE_INET6
-# if (__FreeBSD_version >= 501108)
+# if (__FreeBSD_version >= 501108) || defined(__MidnightBSD__)
ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
if (ph_inet6 != NULL)
pfil_remove_hook((void *)fr_check_wrapper6, NULL,
@@ -1570,8 +1577,9 @@
}
int ipf_pfil_hook(void) {
-#if defined(NETBSD_PF) && (__FreeBSD_version >= 500011)
-# if __FreeBSD_version >= 501108
+#if defined(NETBSD_PF) && (defined(__MidnightBSD__) || \
+ (__FreeBSD_version >= 500011))
+# if __FreeBSD_version >= 501108 || defined(__MidnightBSD__)
struct pfil_head *ph_inet;
# ifdef USE_INET6
struct pfil_head *ph_inet6;
@@ -1580,8 +1588,8 @@
#endif
# ifdef NETBSD_PF
-# if __FreeBSD_version >= 500011
-# if __FreeBSD_version >= 501108
+# if __FreeBSD_version >= 500011 || defined(__MidnightBSD__)
+# if __FreeBSD_version >= 501108 || defined(__MidnightBSD__)
ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
# ifdef USE_INET6
ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
@@ -1604,7 +1612,7 @@
pfil_add_hook((void *)fr_check, PFIL_IN|PFIL_OUT|PFIL_WAITOK);
# endif
# ifdef USE_INET6
-# if __FreeBSD_version >= 501108
+# if __FreeBSD_version >= 501108 || defined(__MidnightBSD__)
if (ph_inet6 != NULL)
pfil_add_hook((void *)fr_check_wrapper6, NULL,
PFIL_IN|PFIL_OUT|PFIL_WAITOK, ph_inet6);
@@ -1620,7 +1628,7 @@
void
ipf_event_reg(void)
{
-#if (__FreeBSD_version >= 502103)
+#if (__FreeBSD_version >= 502103) || defined(__MidnightBSD__)
ipf_arrivetag = EVENTHANDLER_REGISTER(ifnet_arrival_event, \
ipf_ifevent, NULL, \
EVENTHANDLER_PRI_ANY);
@@ -1635,7 +1643,7 @@
void
ipf_event_dereg(void)
{
-#if (__FreeBSD_version >= 502103)
+#if (__FreeBSD_version >= 502103) || defined(__MidnightBSD__)
if (ipf_arrivetag != NULL) {
EVENTHANDLER_DEREGISTER(ifnet_arrival_event, ipf_arrivetag);
}
Index: ip_fil.h
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_fil.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_fil.h -L sys/contrib/ipfilter/netinet/ip_fil.h -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_fil.h
+++ sys/contrib/ipfilter/netinet/ip_fil.h
@@ -1234,8 +1234,8 @@
# define IPF_SMAJ 0 /* temp assignment XXX, not critical */
#endif
-#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) && \
- (__FreeBSD_version >= 220000)
+#if !defined(CDEV_MAJOR) && (defined(__MidnightBSD__) || defined (__FreeBSD_version) && \
+ (__FreeBSD_version >= 220000))
# define CDEV_MAJOR 79
#endif
@@ -1245,7 +1245,7 @@
* with this!
*/
#if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \
- (defined(NetBSD1_2) && NetBSD1_2 > 1) || \
+ (defined(NetBSD1_2) && NetBSD1_2 > 1) || defined(__MidnightBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 500043))
# if defined(NetBSD) && (NetBSD >= 199905)
# define PFIL_HOOKS
@@ -1272,7 +1272,7 @@
extern int ipf_log __P((void));
extern struct ifnet *get_unit __P((char *, int));
extern char *get_ifname __P((struct ifnet *));
-# if defined(__NetBSD__) || defined(__OpenBSD__) || \
+# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__) || \
(_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000)
extern int iplioctl __P((int, ioctlcmd_t, caddr_t, int));
# else
@@ -1285,7 +1285,7 @@
#else /* #ifndef _KERNEL */
# ifdef BSD
# if (defined(__NetBSD__) && (__NetBSD_Version__ < 399000000)) || \
- defined(__osf__) || \
+ defined(__osf__) || defined(__MidnightBSD__) || \
(defined(__FreeBSD_version) && (__FreeBSD_version < 500043))
# include <sys/select.h>
# else
@@ -1341,13 +1341,14 @@
extern int iplidentify __P((char *));
# endif
# if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199510) || \
- (__FreeBSD_version >= 220000) || \
+ (__FreeBSD_version >= 220000) || defined(__MidnightBSD__) || \
(NetBSD >= 199511) || defined(__OpenBSD__)
# if defined(__NetBSD__) || \
(defined(_BSDI_VERSION) && _BSDI_VERSION >= 199701) || \
- defined(__OpenBSD__) || (__FreeBSD_version >= 300000)
-# if (__FreeBSD_version >= 500024)
-# if (__FreeBSD_version >= 502116)
+ defined(__OpenBSD__) || defined(__MidnightBSD__) || \
+ (__FreeBSD_version >= 300000)
+# if (__FreeBSD_version >= 500024) || defined(__MidnightBSD__)
+# if (__FreeBSD_version >= 502116) || defined(__MidnightBSD__)
extern int iplioctl __P((struct cdev*, u_long, caddr_t, int, struct thread *));
# else
extern int iplioctl __P((dev_t, u_long, caddr_t, int, struct thread *));
@@ -1366,8 +1367,8 @@
# else
extern int iplioctl __P((dev_t, int, caddr_t, int, struct thread *));
# endif
-# if (__FreeBSD_version >= 500024)
-# if (__FreeBSD_version >= 502116)
+# if (__FreeBSD_version >= 500024) || defined(__MidnightBSD__)
+# if (__FreeBSD_version >= 502116) || defined(__MidnightBSD__)
extern int iplopen __P((struct cdev*, int, int, struct thread *));
extern int iplclose __P((struct cdev*, int, int, struct thread *));
# else
@@ -1393,7 +1394,7 @@
# endif
# endif /* (_BSDI_VERSION >= 199510) */
# if BSD >= 199306
-# if (__FreeBSD_version >= 502116)
+# if (__FreeBSD_version >= 502116) || defined(__MidnightBSD__)
extern int iplread __P((struct cdev*, struct uio *, int));
extern int iplwrite __P((struct cdev*, struct uio *, int));
# else
@@ -1409,7 +1410,7 @@
# endif /* __ sgi */
# endif /* MENTAT */
-# if defined(__FreeBSD_version)
+# if defined(__FreeBSD_version) || defined(__MidnightBSD__)
extern int ipf_pfil_hook __P((void));
extern int ipf_pfil_unhook __P((void));
extern void ipf_event_reg __P((void));
@@ -1447,7 +1448,7 @@
extern void *fr_resolvenic __P((char *, int));
extern int fr_send_icmp_err __P((int, fr_info_t *, int));
extern int fr_send_reset __P((fr_info_t *));
-#if (__FreeBSD_version < 501000) || !defined(_KERNEL)
+#if (__FreeBSD_version < 501000) || !defined(_KERNEL) || !defined(__MidnightBSD__)
extern int ppsratecheck __P((struct timeval *, int *, int));
#endif
extern ipftq_t *fr_addtimeoutqueue __P((ipftq_t **, u_int));
Index: ip_auth.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_auth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_auth.c -L sys/contrib/ipfilter/netinet/ip_auth.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_auth.c
+++ sys/contrib/ipfilter/netinet/ip_auth.c
@@ -27,7 +27,7 @@
# include <sys/uio.h>
# undef _KERNEL
#endif
-#if defined(_KERNEL) && (__FreeBSD_version >= 220000)
+#if defined(_KERNEL) && (defined(__MidnightBSD__) || (__FreeBSD_version >= 220000))
# include <sys/filio.h>
# include <sys/fcntl.h>
#else
@@ -53,7 +53,7 @@
# include <sys/kmem.h>
#endif
#if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \
- (__FreeBSD_version >= 400000)
+ (__FreeBSD_version >= 400000) || defined(__MidnightBSD__)
# include <sys/queue.h>
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)
@@ -87,9 +87,9 @@
extern struct ifqueue ipintrq; /* ip packet input queue */
#else
# if !defined(__hpux) && !defined(linux)
-# if __FreeBSD_version >= 300000
+# if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
-# if __FreeBSD_version >= 500042
+# if __FreeBSD_version >= 500042 || defined(__MidnightBSD__)
# define IF_QFULL _IF_QFULL
# define IF_DROP _IF_DROP
# endif /* __FreeBSD_version >= 500042 */
@@ -106,11 +106,11 @@
#include "netinet/ip_auth.h"
#if !defined(MENTAT) && !defined(linux)
# include <net/netisr.h>
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include <machine/cpufunc.h>
# endif
#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>
@@ -835,7 +835,8 @@
mb_t *m;
char *t;
#if defined(_KERNEL) && !defined(MENTAT) && !defined(linux) && \
- (!defined(__FreeBSD_version) || (__FreeBSD_version < 501000))
+ (!defined(__FreeBSD_version) || (__FreeBSD_version < 501000)) && \
+ !defined(__MidnightBSD__)
SPL_INT(s);
#endif
Index: ip_frag.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_frag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_frag.c -L sys/contrib/ipfilter/netinet/ip_frag.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_frag.c
+++ sys/contrib/ipfilter/netinet/ip_frag.c
@@ -30,7 +30,7 @@
# 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>
#else
@@ -80,7 +80,7 @@
#include "netinet/ip_state.h"
#include "netinet/ip_auth.h"
#include "netinet/ip_proxy.h"
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/malloc.h>
# if defined(_KERNEL)
# ifndef IPFILTER_LKM
@@ -869,7 +869,7 @@
# if defined(__OpenBSD__)
timeout_add(&fr_slowtimer_ch, hz/2);
# else
-# if (__FreeBSD_version >= 300000)
+# if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
fr_slowtimer_ch = timeout(fr_slowtimer, NULL, hz/2);
# else
# ifdef linux
Index: ip_compat.h
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_compat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_compat.h -L sys/contrib/ipfilter/netinet/ip_compat.h -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_compat.h
+++ sys/contrib/ipfilter/netinet/ip_compat.h
@@ -40,7 +40,7 @@
# define USE_INET6
# endif
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
+#if (defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) && \
!defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
# define USE_INET6
#endif
@@ -819,14 +819,14 @@
/* ----------------------------------------------------------------------- */
/* F R E E B S D */
/* ----------------------------------------------------------------------- */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# if defined(_KERNEL)
-# if (__FreeBSD_version >= 500000)
+# if (__FreeBSD_version >= 500000) || defined(__MidnightBSD__)
# include "opt_bpf.h"
# else
# include "bpf.h"
# endif
-# if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)
+# if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)
# include "opt_inet6.h"
# endif
# if defined(INET6) && !defined(USE_INET6)
@@ -835,27 +835,28 @@
# endif
# if defined(_KERNEL)
-# if (__FreeBSD_version >= 400000)
+# if defined(__MidnightBSD__) || (__FreeBSD_version >= 400000)
/*
* When #define'd, the 5.2.1 kernel panics when used with the ftp proxy.
* There may be other, safe, kernels but this is not extensively tested yet.
*/
# define HAVE_M_PULLDOWN
# endif
-# if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000)
+# if !defined(IPFILTER_LKM) && \
+ (defined(__MidnightBSD__) || (__FreeBSD_version >= 300000))
# include "opt_ipfilter.h"
# endif
# define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c))
# define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c))
-# if (__FreeBSD_version >= 500043)
+# if (__FreeBSD_version >= 500043) || defined(__MidnightBSD__)
# define NETBSD_PF
# endif
# endif /* _KERNEL */
-# if (__FreeBSD_version >= 500043)
+# if (__FreeBSD_version >= 500043) || defined(__MidnightBSD__)
# include <sys/mutex.h>
-# if (__FreeBSD_version > 700014)
+# if (__FreeBSD_version > 700014) || defined(__MidnightBSD__)
# include <sys/rwlock.h>
# define KRWLOCK_T struct rwlock
# ifdef _KERNEL
@@ -911,7 +912,7 @@
# define KMUTEX_T struct mtx
# endif
-# if (__FreeBSD_version >= 501113)
+# if (__FreeBSD_version >= 501113) || defined(__MidnightBSD__)
# include <net/if_var.h>
# define IFNAME(x) ((struct ifnet *)x)->if_xname
# define COPYIFNAME(v, x, b) \
@@ -919,7 +920,7 @@
((struct ifnet *)x)->if_xname, \
LIFNAMSIZ)
# endif
-# if (__FreeBSD_version >= 500043)
+# if (__FreeBSD_version >= 500043) || defined(__MidnightBSD__)
# define CACHE_HASH(x) ((((struct ifnet *)fin->fin_ifp)->if_index) & 7)
# else
# define IFNAME(x) ((struct ifnet *)x)->if_name
@@ -930,13 +931,13 @@
# ifdef _KERNEL
# define GETKTIME(x) microtime((struct timeval *)x)
-# if (__FreeBSD_version >= 500002)
+# if (__FreeBSD_version >= 500002) || defined(__MidnightBSD__)
# include <netinet/in_systm.h>
# include <netinet/ip.h>
# include <machine/in_cksum.h>
# endif
-# if (__FreeBSD_version >= 500043)
+# if (__FreeBSD_version >= 500043) || defined(__MidnightBSD__)
# define USE_MUTEXES
# define MUTEX_ENTER(x) mtx_lock(&(x)->ipf_lk)
# define MUTEX_EXIT(x) mtx_unlock(&(x)->ipf_lk)
@@ -982,7 +983,7 @@
# endif
# endif
-# if (__FreeBSD_version >= 300000)
+# if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
typedef u_long ioctlcmd_t;
# else
typedef int ioctlcmd_t;
@@ -1467,7 +1468,8 @@
#define ipf_magic ipf_lkun_s.ipf_magic
#if !defined(__GNUC__) || \
- (defined(__FreeBSD_version) && (__FreeBSD_version >= 503000))
+ (defined(__FreeBSD_version) && (__FreeBSD_version >= 503000)) || \
+ defined(__MidnightBSD__)
# ifndef INLINE
# define INLINE
# endif
@@ -1589,7 +1591,7 @@
#ifdef USE_INET6
# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
- defined(__osf__) || defined(linux)
+ defined(__osf__) || defined(linux) || defined(__MidnightBSD__)
# include <netinet/ip6.h>
# include <netinet/icmp6.h>
# if !defined(linux)
@@ -1613,14 +1615,14 @@
# define COPYDATA m_copydata
# define COPYBACK m_copyback
# endif
-# if (BSD >= 199306) || defined(__FreeBSD__)
+# if (BSD >= 199306) || defined(__FreeBSD__) || defined(__MidnightBSD__)
# if (defined(__NetBSD_Version__) && (__NetBSD_Version__ < 105180000)) || \
defined(__FreeBSD__) || (defined(OpenBSD) && (OpenBSD < 200206)) || \
- defined(_BSDI_VERSION)
+ defined(_BSDI_VERSION) || defined(__MidnightBSD__)
# include <vm/vm.h>
# endif
# if !defined(__FreeBSD__) || (defined (__FreeBSD_version) && \
- (__FreeBSD_version >= 300000))
+ (__FreeBSD_version >= 300000)) || defined(__MidnightBSD__)
# if (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105180000)) || \
(defined(OpenBSD) && (OpenBSD >= 200111))
# include <uvm/uvm_extern.h>
Index: fil.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/fil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/fil.c -L sys/contrib/ipfilter/netinet/fil.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/fil.c
+++ sys/contrib/ipfilter/netinet/fil.c
@@ -24,9 +24,9 @@
# endif
# endif
#endif
-#if defined(_KERNEL) && defined(__FreeBSD_version) && \
- (__FreeBSD_version >= 220000)
-# if (__FreeBSD_version >= 400000)
+#if defined(_KERNEL) && (defined(__MidnightBSD__) || defined(__FreeBSD_version) && \
+ (__FreeBSD_version >= 220000))
+# if (__FreeBSD_version >= 400000 ) || defined(__MidnightBSD__)
# if !defined(IPFILTER_LKM)
# include "opt_inet6.h"
# endif
@@ -82,8 +82,9 @@
#ifdef sun
# include <net/af.h>
#endif
-#if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(SOLARIS2))
-# if (__FreeBSD_version >= 504000)
+#if !defined(_KERNEL) && (defined(__FreeBSD__) || defined(SOLARIS2)) || \
+ defined(__MidnightBSD__)
+# if (__FreeBSD_version >= 504000) || defined(__MidnightBSD__)
# undef _RADIX_H_
# endif
# include "radix_ipf.h"
@@ -142,7 +143,8 @@
#if defined(IPFILTER_BPF) && defined(_KERNEL)
# include <net/bpf.h>
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || \
+ defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
# if defined(_KERNEL) && !defined(IPFILTER_LKM)
# include "opt_ipfilter.h"
@@ -4750,7 +4752,7 @@
}
-#if !defined(_KERNEL) || (!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) || \
+#if !defined(_KERNEL) || (!defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) && !defined(__MidnightBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version < 501000)) || \
(defined(__NetBSD__) && (__NetBSD_Version__ < 105000000)) || \
(defined(__OpenBSD__) && (OpenBSD < 200006))
@@ -5333,6 +5335,7 @@
static char namebuf[LIFNAMSIZ];
# if defined(MENTAT) || defined(__FreeBSD__) || defined(__osf__) || \
defined(__sgi) || defined(linux) || defined(_AIX51) || \
+ defined(__MidnightBSD__) || \
(defined(sun) && !defined(__SVR4) && !defined(__svr4__))
int unit, space;
char temp[20];
@@ -5344,7 +5347,7 @@
(void) strncpy(buffer, ifp->if_name, LIFNAMSIZ);
buffer[LIFNAMSIZ - 1] = '\0';
# if defined(MENTAT) || defined(__FreeBSD__) || defined(__osf__) || \
- defined(__sgi) || defined(_AIX51) || \
+ defined(__sgi) || defined(_AIX51) || defined(__MidnightBSD__) || \
(defined(sun) && !defined(__SVR4) && !defined(__svr4__))
for (s = buffer; *s; s++)
;
Index: ip_nat.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_nat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_nat.c -L sys/contrib/ipfilter/netinet/ip_nat.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_nat.c
+++ sys/contrib/ipfilter/netinet/ip_nat.c
@@ -39,7 +39,7 @@
# 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>
#else
@@ -67,11 +67,11 @@
# include <sys/stream.h>
# include <sys/kmem.h>
#endif
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <sys/queue.h>
#endif
#include <net/if.h>
-#if __FreeBSD_version >= 300000
+#if __FreeBSD_version >= 300000 || defined(__MidnightBSD__)
# include <net/if_var.h>
# if defined(_KERNEL) && !defined(IPFILTER_LKM)
# include "opt_ipfilter.h"
@@ -107,7 +107,7 @@
#ifdef IPFILTER_SYNC
#include "netinet/ip_sync.h"
#endif
-#if (__FreeBSD_version >= 300000)
+#if (__FreeBSD_version >= 300000) || defined(__MidnightBSD__)
# include <sys/malloc.h>
#endif
/* END OF INCLUDES */
Index: ip_htable.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_htable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_htable.c -L sys/contrib/ipfilter/netinet/ip_htable.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_htable.c
+++ sys/contrib/ipfilter/netinet/ip_htable.c
@@ -27,10 +27,10 @@
# undef _KERNEL
#endif
#include <sys/socket.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__MidnightBSD__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include <sys/cdefs.h>
# include <sys/proc.h>
#endif
Index: ip_lookup.c
===================================================================
RCS file: /home/cvs/src/sys/contrib/ipfilter/netinet/ip_lookup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/ipfilter/netinet/ip_lookup.c -L sys/contrib/ipfilter/netinet/ip_lookup.c -u -r1.2 -r1.3
--- sys/contrib/ipfilter/netinet/ip_lookup.c
+++ sys/contrib/ipfilter/netinet/ip_lookup.c
@@ -17,7 +17,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/file.h>
-#if __FreeBSD_version >= 220000 && defined(_KERNEL)
+#if (__FreeBSD_version >= 220000 || defined(__MidnightBSD__)) && defined(_KERNEL)
# include <sys/fcntl.h>
# include <sys/filio.h>
#else
@@ -38,7 +38,7 @@
# define _RADIX_H_
#endif
#include <net/if.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
# include <sys/cdefs.h>
# include <sys/proc.h>
#endif
More information about the Midnightbsd-cvs
mailing list