[src/trunk]: src/sys/netipsec Minimal cleanup of sys/netipsec/ipsec{, _osdep}....

[jonathan <jonathan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/32141db95f2d
branches:  trunk
changeset: 566187:32141db95f2d
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Fri Apr 30 04:12:29 2004 +0000

description:
Minimal cleanup of sys/netipsec/ipsec{,_osdep}.h, to allow compiling
FAST_IPSEC headers (with declarations of stats structures) in
userspace code. I haven't checked for strict POSIX conformance, but
Sam Leffler's FreeBS `ipsecstats' tool will now compile, if you
manually make and populate usr/include/sys/netipsec.

Committed as-is for Andrew Brown to check more of the sys/netipsec sysctls.

diffstat:

 sys/netipsec/ipsec.h       |  5 +++--
 sys/netipsec/ipsec_osdep.h |  4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r d62c792f9e83 -r 32141db95f2d sys/netipsec/ipsec.h
--- a/sys/netipsec/ipsec.h      Fri Apr 30 02:47:16 2004 +0000
+++ b/sys/netipsec/ipsec.h      Fri Apr 30 04:12:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.h,v 1.8 2004/04/25 22:25:03 jonathan Exp $       */
+/*     $NetBSD: ipsec.h,v 1.9 2004/04/30 04:12:29 jonathan Exp $       */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/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 $  */
 
@@ -475,6 +475,7 @@
 extern const char *ipsec_strerror __P((void));
 #endif /* !_KERNEL */
 
+#ifdef _KERNEL
 /* External declarations of per-file init functions */
 INITFN void ah_attach(void);
 INITFN void esp_attach(void);
@@ -484,5 +485,5 @@
 INITFN void tcpsignature_attach(void);
 
 INITFN void ipsec_attach(void);
-
+#endif /* _KERNEL */
 #endif /* _NETIPSEC_IPSEC_H_ */
diff -r d62c792f9e83 -r 32141db95f2d sys/netipsec/ipsec_osdep.h
--- a/sys/netipsec/ipsec_osdep.h        Fri Apr 30 02:47:16 2004 +0000
+++ b/sys/netipsec/ipsec_osdep.h        Fri Apr 30 04:12:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_osdep.h,v 1.9 2004/03/16 22:37:46 jonathan Exp $ */
+/*     $NetBSD: ipsec_osdep.h,v 1.10 2004/04/30 04:12:29 jonathan Exp $        */
 /*     $FreeBSD: /repoman/r/ncvs/src/sys/netipsec/ipsec_osdep.h,v 1.1 2003/09/29 22:47:45 sam Exp $    */
 
 /*
@@ -29,6 +29,7 @@
 #ifndef NETIPSEC_OSDEP_H
 #define NETIPSEC_OSDEP_H
 
+#ifdef _KERNEL
 /* 
  *  Hide porting differences across different 4.4BSD-derived platforms.
  * 
@@ -371,4 +372,5 @@
  * FreeBSD splnet() equates directly to NetBSD's splsoftnet();
  * FreeBSD uses splimp() where (for networking) NetBSD would use splnet().
  */
+#endif /* _KERNEL */
 #endif /* NETIPSEC_OSDEP_H */