xnu-3248.20.55.tar.gz

[apple/xnu.git] / bsd / netinet / ip_fw.h

diff --git a/bsd/netinet/ip_fw.h b/bsd/netinet/ip_fw.h
index e1cafd4cfcb98eb5ca52b2e9fbbd93222c8db6d6..1eb861d3b62c832e44b6800ae95b55fde752a44d 100644 (file)
--- a/bsd/netinet/ip_fw.h
+++ b/bsd/netinet/ip_fw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2008-2013 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -42,6 +42,8 @@
 
 #ifndef _IP_FW_H
 #define _IP_FW_H
+#ifdef __APPLE_API_OBSOLETE
+
 #include <sys/appleapiopts.h>
 
 #ifdef IPFW2
@@ -49,7 +51,7 @@
 #else /* !IPFW2, good old ipfw */
 
 #include <sys/queue.h>
-
+#include <sys/types.h>         /* u_ types */
 
 #define IP_FW_CURRENT_API_VERSION 20   /* Version of this API */
 
@@ -297,7 +299,7 @@ struct ipfw_dyn_rule {
 /*
  * Main firewall chains definitions and global var's definitions.
  */
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 
 #define IP_FW_PORT_DYNT_FLAG   0x10000
 #define        IP_FW_PORT_TEE_FLAG     0x20000
@@ -318,8 +320,10 @@ extern     ip_fw_chk_t *ip_fw_chk_ptr;
 extern ip_fw_ctl_t *ip_fw_ctl_ptr;
 extern int fw_one_pass;
 extern int fw_enable;
+#define IPFW_LOADED     (ip_fw_chk_ptr != NULL)
 extern struct ipfw_flow_id last_pkt ;
-#endif KERNEL_PRIVATE
+#endif /* BSD_KERNEL_PRIVATE */
 
-#endif !IPFW2
-#endif _IP_FW_H
+#endif /* !IPFW2 */
+#endif /* __APPLE_API_OBSOLETE */
+#endif /* _IP_FW_H */