xnu-4903.241.1.tar.gz

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

diff --git a/bsd/netinet6/ipsec6.h b/bsd/netinet6/ipsec6.h
index 9fd4fc75a8b6c4e432cfac2c80cbab87f44524ed..018afa4d7c59e42d7ca1e3876072daa41e9eabae 100644 (file)
--- a/bsd/netinet6/ipsec6.h
+++ b/bsd/netinet6/ipsec6.h
@@ -41,8 +41,7 @@
 #include <net/pfkeyv2.h>
 #include <netkey/keydb.h>
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 extern struct ipsecstat ipsec6stat;
 extern struct secpolicy ip6_def_policy;
 extern int ip6_esp_trans_deflev;
@@ -52,35 +51,36 @@ extern int ip6_ah_net_deflev;
 extern int ip6_ipsec_ecn;
 extern int ip6_esp_randpad;
 
-extern struct secpolicy *ipsec6_getpolicybysock
-       __P((struct mbuf *, u_int, struct socket *, int *));
-extern struct secpolicy *ipsec6_getpolicybyaddr
-       __P((struct mbuf *, u_int, int, int *));
+struct ip6_out_args;
+
+extern struct secpolicy *ipsec6_getpolicybysock(struct mbuf *, u_int,
+       struct socket *, int *);
+extern struct secpolicy *ipsec6_getpolicybyaddr(struct mbuf *, u_int, int,
+       int *);
+extern int ipsec6_getpolicybyinterface(struct mbuf *,
+    u_int, int, struct ip6_out_args *, int *, struct secpolicy **);
 
 struct inpcb;
 
-extern int ipsec6_in_reject_so __P((struct mbuf *, struct socket *));
-extern int ipsec6_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec6_set_policy __P((struct inpcb *inp, int optname,
-       caddr_t request, size_t len, int priv));
-extern int ipsec6_get_policy
-       __P((struct inpcb *inp, caddr_t request, size_t len, struct mbuf **mp));
-extern int ipsec6_in_reject __P((struct mbuf *, struct inpcb *));
+extern int ipsec6_in_reject_so(struct mbuf *, struct socket *);
+extern int ipsec6_delete_pcbpolicy(struct inpcb *);
+extern int ipsec6_set_policy(struct inpcb *inp, int optname,
+       caddr_t request, size_t len, int priv);
+extern int ipsec6_in_reject(struct mbuf *, struct inpcb *);
 
 struct tcp6cb;
 
-extern size_t ipsec6_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
+extern size_t ipsec6_hdrsiz(struct mbuf *, u_int, struct inpcb *);
 
 struct ip6_hdr;
-extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, u_int32_t));
-
-extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *,
-       struct mbuf *, struct secpolicy *, int, int *));
-extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
-       struct secpolicy *, int));
-extern int ipsec6_tunnel_validate __P((struct mbuf *, int, u_int,
-       struct secasvar *));
-#endif /* __APPLE_API_PRIVATE */
-#endif /*KERNEL*/
+extern const char *ipsec6_logpacketstr(struct ip6_hdr *, u_int32_t);
 
-#endif /*_NETINET6_IPSEC6_H_*/
+extern int ipsec6_interface_output(struct ipsec_output_state *, ifnet_t, u_char *, struct mbuf *);
+extern int ipsec6_output_trans(struct ipsec_output_state *, u_char *,
+       struct mbuf *, struct secpolicy *, int, int *);
+extern int ipsec6_output_tunnel(struct ipsec_output_state *,
+                               struct secpolicy *, int);
+extern int ipsec6_tunnel_validate(struct mbuf *, int, u_int,
+       struct secasvar *, sa_family_t *);
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NETINET6_IPSEC6_H_ */