xnu-1456.1.26.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 3f19ae79f4fe824262dd6f49a2d8e85c73e0b92f..6755fab566e739197ca7ac5c858434049ce705b7 100644 (file)
--- a/bsd/netinet/ip_fw.h
+++ b/bsd/netinet/ip_fw.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1993 Daniel Boulet
  */
 /*
  * Copyright (c) 1993 Daniel Boulet


@@ -36,6 +42,7 @@
 
 #ifndef _IP_FW_H
 #define _IP_FW_H
 
 #ifndef _IP_FW_H
 #define _IP_FW_H

+

 #include <sys/appleapiopts.h>
 
 #ifdef IPFW2
 #include <sys/appleapiopts.h>
 
 #ifdef IPFW2


@@ -43,7 +50,7 @@
 #else /* !IPFW2, good old ipfw */
 
 #include <sys/queue.h>
 #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 */
 
 
 #define IP_FW_CURRENT_API_VERSION 20   /* Version of this API */
 


@@ -312,8 +319,9 @@ 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;
 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 ;
 extern struct ipfw_flow_id last_pkt ;

-#endif KERNEL_PRIVATE
+#endif /* KERNEL_PRIVATE */

 
 

-#endif !IPFW2
-#endif _IP_FW_H
+#endif /* !IPFW2 */
+#endif /* _IP_FW_H */