xnu-792.22.5.tar.gz

[apple/xnu.git] / bsd / netkey / key.h

diff --git a/bsd/netkey/key.h b/bsd/netkey/key.h
index 99cf8bee4a75a62f25d0602be265cbf6b8731aa3..ce509fa9f88ba81e69fecb272cb1609a8571d613 100644 (file)
--- a/bsd/netkey/key.h
+++ b/bsd/netkey/key.h
@@ -33,8 +33,7 @@
 #define _NETKEY_KEY_H_
 #include <sys/appleapiopts.h>
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
 
 extern struct key_cb key_cb;
 
@@ -47,34 +46,30 @@ struct socket;
 struct sadb_msg;
 struct sadb_x_policy;
 
-extern struct secpolicy *key_allocsp __P((struct secpolicyindex *, u_int));
-extern struct secpolicy *key_gettunnel __P((struct sockaddr *,
-       struct sockaddr *, struct sockaddr *, struct sockaddr *));
-extern int key_checkrequest
-       __P((struct ipsecrequest *isr, struct secasindex *));
-extern struct secasvar *key_allocsa __P((u_int, caddr_t, caddr_t,
-                                       u_int, u_int32_t));
-extern void key_freesp __P((struct secpolicy *));
-extern void key_freeso __P((struct socket *));
-extern void key_freesav __P((struct secasvar *));
-extern struct secpolicy *key_newsp __P((void));
-extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *,
-       size_t, int *));
-extern struct mbuf *key_sp2msg __P((struct secpolicy *));
-extern int key_ismyaddr __P((struct sockaddr *));
-extern int key_spdacquire __P((struct secpolicy *));
-extern void key_timehandler __P((void));
-extern u_long key_random __P((void));
-extern void key_randomfill __P((void *, size_t));
-extern void key_freereg __P((struct socket *));
-extern int key_parse __P((struct mbuf *, struct socket *));
-extern void key_init __P((void));
-extern int key_checktunnelsanity __P((struct secasvar *, u_int,
-                                       caddr_t, caddr_t));
-extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
-extern void key_sa_routechange __P((struct sockaddr *));
-extern void key_sa_stir_iv __P((struct secasvar *));
+extern struct secpolicy *key_allocsp(struct secpolicyindex *, u_int);
+extern struct secpolicy *key_gettunnel(struct sockaddr *,
+       struct sockaddr *, struct sockaddr *, struct sockaddr *);
+extern int key_checkrequest(struct ipsecrequest *isr, struct secasindex *);
+extern struct secasvar *key_allocsa(u_int, caddr_t, caddr_t,
+                                       u_int, u_int32_t);
+extern void key_freesp(struct secpolicy *);
+extern void key_freeso(struct socket *);
+extern void key_freesav(struct secasvar *);
+extern struct secpolicy *key_newsp(void);
+extern struct secpolicy *key_msg2sp(struct sadb_x_policy *, size_t, int *);
+extern struct mbuf *key_sp2msg(struct secpolicy *);
+extern int key_ismyaddr(struct sockaddr *);
+extern int key_spdacquire(struct secpolicy *);
+extern void key_timehandler(void);
+extern u_long key_random(void);
+extern void key_randomfill(void *, size_t);
+extern void key_freereg(struct socket *);
+extern int key_parse(struct mbuf *, struct socket *);
+extern void key_domain_init(void);
+extern int key_checktunnelsanity(struct secasvar *, u_int, caddr_t, caddr_t);
+extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
+extern void key_sa_routechange(struct sockaddr *);
+extern void key_sa_stir_iv(struct secasvar *);
 
-#endif /* __APPLE_API_PRIVATE */
-#endif /* defined(_KERNEL) */
+#endif /* KERNEL_PRIVATE */
 #endif /* _NETKEY_KEY_H_ */