xnu-3789.1.32.tar.gz

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

diff --git a/bsd/netinet/ip_encap.h b/bsd/netinet/ip_encap.h
index 0a3aba1527d46121fda8eeecda7af0073abf0e0e..34f39d29dc246747b7dabe2c219fefc0bdaff9ed 100644 (file)
--- a/bsd/netinet/ip_encap.h
+++ b/bsd/netinet/ip_encap.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple 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,
- * 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@
  */
 /*     $KAME: ip_encap.h,v 1.6 2000/03/06 04:34:21 itojun Exp $        */
 
@@ -52,9 +58,7 @@
 
 #ifndef _NETINET_IP_ENCAP_H_
 #define _NETINET_IP_ENCAP_H_
-#include <sys/appleapiopts.h>
-
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 
 struct encaptab {
        LIST_ENTRY(encaptab) chain;
@@ -69,9 +73,15 @@ struct encaptab {
        void *arg;                      /* passed via m->m_pkthdr.aux */
 };
 
-void   encap_init(void);
+struct protosw;
+struct ip6protosw;
+struct domain;
+
+__BEGIN_DECLS
+void   encap4_init(struct protosw *, struct domain *);
+void   encap6_init(struct ip6protosw *, struct domain *);
 void   encap4_input(struct mbuf *, int);
-int    encap6_input(struct mbuf **, int *);
+int    encap6_input(struct mbuf **, int *, int);
 const struct encaptab *encap_attach(int, int, const struct sockaddr *,
        const struct sockaddr *, const struct sockaddr *,
        const struct sockaddr *, const struct protosw *, void *);
@@ -80,6 +90,7 @@ const struct encaptab *encap_attach_func(int, int,
        const struct protosw *, void *);
 int    encap_detach(const struct encaptab *);
 void   *encap_getarg(struct mbuf *);
-#endif KERNEL_PRIVATE
+__END_DECLS
 
+#endif /* BSD_KERNEL_PRIVATE */
 #endif /*_NETINET_IP_ENCAP_H_*/