Module Name: src
Committed By: maxv
Date: Sat Apr 28 14:25:56 UTC 2018
Modified Files:
src/sys/netipsec: ipsec.h ipsec6.h
Log Message:
Move the ipsec6_input prototype into ipsec6.h, and style.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.27 -r1.28 src/sys/netipsec/ipsec6.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.76 src/sys/netipsec/ipsec.h:1.77
--- src/sys/netipsec/ipsec.h:1.76 Sat Apr 28 14:21:03 2018
+++ src/sys/netipsec/ipsec.h Sat Apr 28 14:25:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.76 2018/04/28 14:21:03 maxv Exp $ */
+/* $NetBSD: ipsec.h,v 1.77 2018/04/28 14:25:56 maxv Exp $ */
/* $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -264,9 +264,6 @@ struct inpcb;
int ipsec4_output(struct mbuf *, struct inpcb *, int, u_long *, bool *, bool *);
int ipsec4_input(struct mbuf *, int);
int ipsec4_forward(struct mbuf *, int *);
-#ifdef INET6
-int ipsec6_input(struct mbuf *);
-#endif
struct inpcb;
int ipsec_init_pcbpolicy(struct socket *so, struct inpcbpolicy **);
Index: src/sys/netipsec/ipsec6.h
diff -u src/sys/netipsec/ipsec6.h:1.27 src/sys/netipsec/ipsec6.h:1.28
--- src/sys/netipsec/ipsec6.h:1.27 Thu Apr 19 08:27:38 2018
+++ src/sys/netipsec/ipsec6.h Sat Apr 28 14:25:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec6.h,v 1.27 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: ipsec6.h,v 1.28 2018/04/28 14:25:56 maxv Exp $ */
/* $FreeBSD: ipsec6.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */
@@ -31,10 +31,6 @@
* SUCH DAMAGE.
*/
-/*
- * IPsec controller part.
- */
-
#ifndef _NETIPSEC_IPSEC6_H_
#define _NETIPSEC_IPSEC6_H_
@@ -50,24 +46,21 @@ extern int ip6_ah_net_deflev;
extern int ip6_ipsec_ecn;
extern struct secpolicy ip6_def_policy;
-struct inpcb;
struct in6pcb;
-
-struct secpolicy *ipsec6_check_policy(struct mbuf *,
- struct in6pcb *, int, int*,int*);
-
struct tcp6cb;
-size_t ipsec6_hdrsiz_tcp(struct tcpcb*);
+struct secpolicy *ipsec6_check_policy(struct mbuf *, struct in6pcb *,
+ int, int *, int *);
+size_t ipsec6_hdrsiz_tcp(struct tcpcb *);
-/* NetBSD protosw ctlin entrypoint */
void *esp6_ctlinput(int, const struct sockaddr *, void *);
void *ah6_ctlinput(int, const struct sockaddr *, void *);
struct m_tag;
int ipsec6_common_input(struct mbuf **, int *, int);
int ipsec6_common_input_cb(struct mbuf *, struct secasvar *, int, int);
-int ipsec6_process_packet(struct mbuf*, const struct ipsecrequest *);
+int ipsec6_process_packet(struct mbuf *, const struct ipsecrequest *);
+int ipsec6_input(struct mbuf *);
#endif /*_KERNEL*/
#endif /* !_NETIPSEC_IPSEC6_H_ */
