xnu-2782.20.48.tar.gz

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

diff --git a/bsd/netinet6/ipcomp.h b/bsd/netinet6/ipcomp.h
index 25ca896f0d37a240c02d3f2df560e3463f688ad8..b976f138a971aa845264f2320e5718b7912b168e 100644 (file)
--- a/bsd/netinet6/ipcomp.h
+++ b/bsd/netinet6/ipcomp.h
@@ -1,3 +1,6 @@
+/*     $FreeBSD: src/sys/netinet6/ipcomp.h,v 1.1.2.2 2001/07/03 11:01:54 ume Exp $     */
+/*     $KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $  */
+

 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.


@@ -33,6 +36,8 @@
 
 #ifndef _NETINET6_IPCOMP_H_
 #define _NETINET6_IPCOMP_H_
 
 #ifndef _NETINET6_IPCOMP_H_
 #define _NETINET6_IPCOMP_H_

+#include <sys/appleapiopts.h>
+#include <netinet6/ipsec.h>

 
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */
 
 struct ipcomp {
        u_int8_t comp_nxt;      /* Next Header */


@@ -48,22 +53,17 @@ struct ipcomp {
 
 #define IPCOMP_CPI_NEGOTIATE_MIN       256
 
 
 #define IPCOMP_CPI_NEGOTIATE_MIN       256
 

-#if defined(KERNEL) || defined(_KERNEL)
+#ifdef BSD_KERNEL_PRIVATE

 struct ipcomp_algorithm {
 struct ipcomp_algorithm {

-       int (*compress) __P((struct mbuf *, struct mbuf *, size_t *));
-       int (*decompress) __P((struct mbuf *, struct mbuf *, size_t *));
+       int (*compress)(struct mbuf *, struct mbuf *, size_t *);
+       int (*decompress)(struct mbuf *, struct mbuf *, size_t *);

        size_t minplen;         /* minimum required length for compression */
 };
 
 struct ipsecrequest;
        size_t minplen;         /* minimum required length for compression */
 };
 
 struct ipsecrequest;

-extern struct ipcomp_algorithm ipcomp_algorithms[];
-extern void ipcomp4_input __P((struct mbuf *, int));
-extern int ipcomp4_output __P((struct mbuf *, struct ipsecrequest *));
-#if INET6
-extern int ipcomp6_input __P((struct mbuf **, int *));
-extern int ipcomp6_output __P((struct mbuf *, u_char *, struct mbuf *,
-       struct ipsecrequest *));
-#endif
-#endif /*KERNEL*/
+extern const struct ipcomp_algorithm *ipcomp_algorithm_lookup(int);
+extern void ipcomp4_input(struct mbuf *, int);
+extern int ipcomp4_output(struct mbuf *, struct secasvar *);
+#endif /* BSD_KERNEL_PRIVATE */

 
 

-#endif /*_NETINET6_IPCOMP_H_*/
+#endif /* _NETINET6_IPCOMP_H_ */