xnu-4570.51.1.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 9e1c39167ae506140bf6570ebb272f107ffb4fc2..34f39d29dc246747b7dabe2c219fefc0bdaff9ed 100644 (file)
--- a/bsd/netinet/ip_encap.h
+++ b/bsd/netinet/ip_encap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2012 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -58,9 +58,7 @@
 
 #ifndef _NETINET_IP_ENCAP_H_
 #define _NETINET_IP_ENCAP_H_
 
 #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;
 
 struct encaptab {
        LIST_ENTRY(encaptab) chain;


@@ -75,9 +73,15 @@ struct encaptab {
        void *arg;                      /* passed via m->m_pkthdr.aux */
 };
 
        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);
 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 *);
 const struct encaptab *encap_attach(int, int, const struct sockaddr *,
        const struct sockaddr *, const struct sockaddr *,
        const struct sockaddr *, const struct protosw *, void *);


@@ -86,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 *);
        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_*/
 #endif /*_NETINET_IP_ENCAP_H_*/