[Midnightbsd-cvs] src: pfvar.h: __MidnightBSD__

[laffer1 at midnightbsd.org]

Log Message:
-----------
__MidnightBSD__

Modified Files:
--------------
    src/sys/contrib/pf/net:
        pfvar.h (r1.2 -> r1.3)

-------------- next part --------------
Index: pfvar.h
===================================================================
RCS file: /home/cvs/src/sys/contrib/pf/net/pfvar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/contrib/pf/net/pfvar.h -L sys/contrib/pf/net/pfvar.h -u -r1.2 -r1.3
--- sys/contrib/pf/net/pfvar.h
+++ sys/contrib/pf/net/pfvar.h
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/tree.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 #include <sys/lock.h>
 #include <sys/sx.h>
 #else
@@ -47,7 +47,7 @@
 
 #include <net/radix.h>
 #include <net/route.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 #include <net/if_clone.h>
 #include <net/pf_mtag.h>
 #include <vm/uma.h>
@@ -55,7 +55,7 @@
 #include <netinet/ip_ipsp.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 #include <netinet/in.h>
 #endif
 
@@ -63,7 +63,7 @@
 
 struct ip;
 struct ip6_hdr;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 struct inpcb;
 #endif
 
@@ -211,7 +211,7 @@
  * Address manipulation macros
  */
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 #define splsoftnet()	splnet()
 
 #define	HTONL(x)	(x) = htonl((__uint32_t)(x))
@@ -793,7 +793,7 @@
 	sa_family_t	 af;
 	u_int8_t	 proto;
 	u_int8_t	 direction;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 	u_int8_t	 local_flags;
 #define	PFSTATE_EXPIRING 0x01
 #else
@@ -1010,8 +1010,10 @@
 	struct pf_state_tree_ext_gwy	 pfik_ext_gwy;
 	TAILQ_ENTRY(pfi_kif)		 pfik_w_states;
 #ifndef __FreeBSD__
+#ifndef __MidnightBSD__
 	void				*pfik_ah_cookie;
 #endif
+#endif
 	struct ifnet			*pfik_ifp;
 	struct ifg_group		*pfik_group;
 	int				 pfik_states;
@@ -1259,6 +1261,7 @@
 };
 
 #ifndef __FreeBSD__
+#ifndef __MidnightBSD__
 
 #define	PF_TAG_GENERATED		0x01
 #define	PF_TAG_FRAGCACHE		0x02
@@ -1274,6 +1277,7 @@
 	sa_family_t	 af;		/* for ECN */
 };
 #endif
+#endif
 
 struct pf_tag {
 	u_int16_t	tag;		/* tag id */
@@ -1535,7 +1539,7 @@
 #define DIOCSETIFFLAG	_IOWR('D', 89, struct pfioc_iface)
 #define DIOCCLRIFFLAG	_IOWR('D', 90, struct pfioc_iface)
 #define DIOCKILLSRCNODES	_IOWR('D', 91, struct pfioc_src_node_kill)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 struct pf_ifspeed {
 	char			ifname[IFNAMSIZ];
 	u_int32_t		baudrate;
@@ -1573,7 +1577,7 @@
 extern void			 pf_tbladdr_remove(struct pf_addr_wrap *);
 extern void			 pf_tbladdr_copyout(struct pf_addr_wrap *);
 extern void			 pf_calc_skip_steps(struct pf_rulequeue *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 extern uma_zone_t		 pf_src_tree_pl, pf_rule_pl;
 extern uma_zone_t		 pf_state_pl, pf_altq_pl, pf_pooladdr_pl;
 extern uma_zone_t		 pfr_ktable_pl, pfr_kentry_pl, pfr_kentry_pl2;
@@ -1612,7 +1616,7 @@
 				    struct pf_rule *);
 
 #ifdef INET
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 int	pf_test(int, struct ifnet *, struct mbuf **, struct ether_header *,
     struct inpcb *);
 #else
@@ -1621,7 +1625,7 @@
 #endif /* INET */
 
 #ifdef INET6
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 int	pf_test6(int, struct ifnet *, struct mbuf **, struct ether_header *,
     struct inpcb *);
 #else
@@ -1632,7 +1636,7 @@
 void	pf_addr_inc(struct pf_addr *, sa_family_t);
 #endif /* INET6 */
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 u_int32_t	pf_new_isn(struct pf_state *);
 #endif
 void   *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *,
@@ -1666,7 +1670,7 @@
 void	pf_purge_expired_fragments(void);
 int	pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *);
 int	pf_rtlabel_match(struct pf_addr *, sa_family_t, struct pf_addr_wrap *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 int	pf_socket_lookup(int, struct pf_pdesc *, struct inpcb *);
 #else
 int	pf_socket_lookup(int, struct pf_pdesc *);
@@ -1712,7 +1716,7 @@
 extern struct pfi_kif		*pfi_all;
 
 void		 pfi_initialize(void);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 void		 pfi_cleanup(void);
 #endif
 struct pfi_kif	*pfi_kif_get(const char *);
@@ -1744,13 +1748,15 @@
 void		 pf_qid2qname(u_int32_t, char *);
 void		 pf_qid_unref(u_int32_t);
 #ifndef __FreeBSD__
+#ifndef __MidnightBSD__
 struct pf_mtag	*pf_find_mtag(struct mbuf *);
 struct pf_mtag	*pf_get_mtag(struct mbuf *);
 #endif
+#endif
 
 extern struct pf_status	pf_status;
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 extern uma_zone_t	pf_frent_pl, pf_frag_pl;
 extern struct sx	pf_consistency_lock;
 #else
@@ -1764,7 +1770,7 @@
 };
 extern struct pf_pool_limit	pf_pool_limits[PF_LIMIT_MAX];
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 struct pf_frent {
 	LIST_ENTRY(pf_frent) fr_next;
 	struct ip *fr_ip;
@@ -1817,6 +1823,7 @@
 void			 pf_rs_initialize(void);
 
 #ifndef __FreeBSD__
+#ifndef __MidnightBSD__
 /* ?!? */
 #ifdef _KERNEL
 int			 pf_anchor_copyout(const struct pf_ruleset *,
@@ -1825,6 +1832,7 @@
 
 #endif /* _KERNEL */
 #endif
+#endif
 
 /* The fingerprint functions can be linked into userland programs (tcpdump) */
 int	pf_osfp_add(struct pf_osfp_ioctl *);
@@ -1838,7 +1846,7 @@
 	    const struct tcphdr *);
 void	pf_osfp_flush(void);
 int	pf_osfp_get(struct pf_osfp_ioctl *);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MidnightBSD__)
 int	pf_osfp_initialize(void);
 void	pf_osfp_cleanup(void);
 #else