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 81c8b7ce0624e2e9243e504844c36a5ce2ce1201..34f39d29dc246747b7dabe2c219fefc0bdaff9ed 100644 (file)
--- a/bsd/netinet/ip_encap.h
+++ b/bsd/netinet/ip_encap.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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 $        */
 
@@ -55,10 +58,7 @@
 
 #ifndef _NETINET_IP_ENCAP_H_
 #define _NETINET_IP_ENCAP_H_
-#include <sys/appleapiopts.h>
-
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 
 struct encaptab {
        LIST_ENTRY(encaptab) chain;
@@ -68,23 +68,29 @@ struct encaptab {
        struct sockaddr_storage srcmask;
        struct sockaddr_storage dst;    /* remote addr */
        struct sockaddr_storage dstmask;
-       int (*func) __P((const struct mbuf *, int, int, void *));
+       int (*func)(const struct mbuf *, int, int, void *);
        const struct protosw *psw;      /* only pr_input will be used */
        void *arg;                      /* passed via m->m_pkthdr.aux */
 };
 
-void   encap_init __P((void));
-void   encap4_input __P((struct mbuf *, int));
-int    encap6_input __P((struct mbuf **, int *));
-const struct encaptab *encap_attach __P((int, int, const struct sockaddr *,
+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);
+const struct encaptab *encap_attach(int, int, const struct sockaddr *,
        const struct sockaddr *, const struct sockaddr *,
-       const struct sockaddr *, const struct protosw *, void *));
-const struct encaptab *encap_attach_func __P((int, int,
-       int (*) __P((const struct mbuf *, int, int, void *)),
-       const struct protosw *, void *));
-int    encap_detach __P((const struct encaptab *));
-void   *encap_getarg __P((struct mbuf *));
-#endif /* __APPLE_API_PRIVATE */
-#endif
+       const struct sockaddr *, const struct protosw *, void *);
+const struct encaptab *encap_attach_func(int, int,
+       int (*)(const struct mbuf *, int, int, void *),
+       const struct protosw *, void *);
+int    encap_detach(const struct encaptab *);
+void   *encap_getarg(struct mbuf *);
+__END_DECLS
 
+#endif /* BSD_KERNEL_PRIVATE */
 #endif /*_NETINET_IP_ENCAP_H_*/