xnu-517.7.7.tar.gz

[apple/xnu.git] / bsd / netinet6 / ip6_fw.h

diff --git a/bsd/netinet6/ip6_fw.h b/bsd/netinet6/ip6_fw.h
index ea7b3fe75167a611948e4914aea08aaf706f3ef4..ed1a10c8982ced78409236d46a22575b9c0dccbf 100644 (file)
--- a/bsd/netinet6/ip6_fw.h
+++ b/bsd/netinet6/ip6_fw.h
@@ -39,9 +39,8 @@
 #include <sys/appleapiopts.h>
 
 #include <net/if.h>
-#ifdef __APPLE_API_PRIVATE
 
-#define IP6_FW_CURRENT_API_VERSION 20  /* Version of this API */
+#define IPV6_FW_CURRENT_API_VERSION 20 /* Version of this API */
 
 
 /*
@@ -209,6 +208,7 @@ struct ip6_fw_chain {
  * Main firewall chains definitions and global var's definitions.
  */
 #ifdef KERNEL
+#ifdef __APPLE_API_PRIVATE
 
 #define M_IP6FW M_IPFW
 
@@ -220,14 +220,15 @@ void ip6_fw_init(void);
 
 /* Firewall hooks */
 struct ip6_hdr;
+struct sockopt;
 typedef        int ip6_fw_chk_t __P((struct ip6_hdr**, struct ifnet*,
                                u_short *, struct mbuf**));
-typedef        int ip6_fw_ctl_t __P((int, struct mbuf**));
+typedef        int ip6_fw_ctl_t __P((struct sockopt *));
 extern ip6_fw_chk_t *ip6_fw_chk_ptr;
 extern ip6_fw_ctl_t *ip6_fw_ctl_ptr;
 extern int ip6_fw_enable;
 
-#endif /* KERNEL */
 #endif /* __APPLE_API_PRIVATE */
+#endif /* KERNEL */
 
 #endif /* _IP6_FW_H */