Module Name: src
Committed By: drochner
Date: Fri Jan 6 14:17:12 UTC 2012
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/netinet6: Makefile ipsec.h
src/sys/netipsec: Makefile ipsec.h
src/sys/netkey: Makefile keysock.h
src/usr.bin/netstat: fast_ipsec.c
Log Message:
more IPSEC header cleanup: don't install unneeded headers to userland,
and remove some differences berween KAME and FAST_IPSEC
To generate a diff of this commit:
cvs rdiff -u -r1.1722 -r1.1723 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet6/Makefile
cvs rdiff -u -r1.52 -r1.53 src/sys/netinet6/ipsec.h
cvs rdiff -u -r1.4 -r1.5 src/sys/netipsec/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.4 -r1.5 src/sys/netkey/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/netkey/keysock.h
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/netstat/fast_ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1722 src/distrib/sets/lists/comp/mi:1.1723
--- src/distrib/sets/lists/comp/mi:1.1722 Wed Jan 4 16:25:14 2012
+++ src/distrib/sets/lists/comp/mi Fri Jan 6 14:17:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1722 2012/01/04 16:25:14 yamt Exp $
+# $NetBSD: mi,v 1.1723 2012/01/06 14:17:10 drochner Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1938,8 +1938,8 @@
./usr/include/netinet/tcpip.h comp-c-include
./usr/include/netinet/udp.h comp-c-include
./usr/include/netinet/udp_var.h comp-c-include
-./usr/include/netinet6/ah.h comp-c-include
-./usr/include/netinet6/esp.h comp-c-include
+./usr/include/netinet6/ah.h comp-obsolete obsolete
+./usr/include/netinet6/esp.h comp-obsolete obsolete
./usr/include/netinet6/icmp6.h comp-obsolete obsolete
./usr/include/netinet6/in6.h comp-c-include
./usr/include/netinet6/in6_gif.h comp-c-include
@@ -1950,7 +1950,7 @@
./usr/include/netinet6/ip6_mroute.h comp-c-include
./usr/include/netinet6/ip6_var.h comp-c-include
./usr/include/netinet6/ip6protosw.h comp-c-include
-./usr/include/netinet6/ipcomp.h comp-c-include
+./usr/include/netinet6/ipcomp.h comp-obsolete obsolete
./usr/include/netinet6/ipsec.h comp-c-include
./usr/include/netinet6/mld6_var.h comp-c-include
./usr/include/netinet6/nd6.h comp-c-include
@@ -1965,7 +1965,8 @@
./usr/include/netipsec/ipip_var.h comp-c-include
./usr/include/netipsec/ipsec.h comp-c-include
./usr/include/netipsec/ipsec_var.h comp-c-include
-./usr/include/netipsec/keydb.h comp-c-include
+./usr/include/netipsec/keydb.h comp-obsolete obsolete
+./usr/include/netipsec/keysock.h comp-c-include
./usr/include/netisdn/i4b_cause.h comp-c-include
./usr/include/netisdn/i4b_debug.h comp-c-include
./usr/include/netisdn/i4b_ioctl.h comp-c-include
@@ -2002,10 +2003,10 @@
./usr/include/netiso/tp_user.h comp-c-include
./usr/include/netiso/tp_var.h comp-c-include
./usr/include/netiso/tuba_table.h comp-obsolete obsolete
-./usr/include/netkey/key.h comp-c-include
-./usr/include/netkey/key_debug.h comp-c-include
-./usr/include/netkey/key_var.h comp-c-include
-./usr/include/netkey/keydb.h comp-c-include
+./usr/include/netkey/key.h comp-obsolete obsolete
+./usr/include/netkey/key_debug.h comp-obsolete obsolete
+./usr/include/netkey/key_var.h comp-obsolete obsolete
+./usr/include/netkey/keydb.h comp-obsolete obsolete
./usr/include/netkey/keysock.h comp-c-include
./usr/include/netkey/keyv2.h comp-obsolete obsolete
./usr/include/netmpls/mpls.h comp-c-include
Index: src/sys/netinet6/Makefile
diff -u src/sys/netinet6/Makefile:1.7 src/sys/netinet6/Makefile:1.8
--- src/sys/netinet6/Makefile:1.7 Wed Jan 4 15:55:36 2012
+++ src/sys/netinet6/Makefile Fri Jan 6 14:17:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/01/04 15:55:36 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netinet6
@@ -7,7 +7,5 @@ INCS= in6.h in6_gif.h in6_ifattach.h in6
mld6_var.h nd6.h pim6.h pim6_var.h \
raw_ip6.h udp6.h udp6_var.h
INCS+= ipsec.h
-# XXX ah.h is used by ping6, rest unneeded
-INCS+= ah.h esp.h ipcomp.h
.include <bsd.kinc.mk>
Index: src/sys/netinet6/ipsec.h
diff -u src/sys/netinet6/ipsec.h:1.52 src/sys/netinet6/ipsec.h:1.53
--- src/sys/netinet6/ipsec.h:1.52 Wed Jan 4 15:55:36 2012
+++ src/sys/netinet6/ipsec.h Fri Jan 6 14:17:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.52 2012/01/04 15:55:36 drochner Exp $ */
+/* $NetBSD: ipsec.h,v 1.53 2012/01/06 14:17:11 drochner Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@@ -42,10 +42,11 @@
#endif
#include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
#ifdef _KERNEL
+#include <netkey/keydb.h>
+
/*
* Security Policy Index
* NOTE: Ensure to be same address family and upper layer protocol.
Index: src/sys/netipsec/Makefile
diff -u src/sys/netipsec/Makefile:1.4 src/sys/netipsec/Makefile:1.5
--- src/sys/netipsec/Makefile:1.4 Wed Jan 4 16:09:43 2012
+++ src/sys/netipsec/Makefile Fri Jan 6 14:17:11 2012
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/01/04 16:09:43 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netipsec
INCS= ah_var.h esp_var.h ipcomp_var.h ipip_var.h ipsec_var.h \
- keydb.h
+ keysock.h
INCS+= ipsec.h
.include <bsd.kinc.mk>
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.30 src/sys/netipsec/ipsec.h:1.31
--- src/sys/netipsec/ipsec.h:1.30 Wed Jan 4 15:55:36 2012
+++ src/sys/netipsec/ipsec.h Fri Jan 6 14:17:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.30 2012/01/04 15:55:36 drochner Exp $ */
+/* $NetBSD: ipsec.h,v 1.31 2012/01/06 14:17:11 drochner 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 $ */
@@ -44,10 +44,10 @@
#endif
#include <net/pfkeyv2.h>
-#include <netipsec/keydb.h>
#ifdef _KERNEL
+#include <netipsec/keydb.h>
#include <netipsec/ipsec_osdep.h>
/*
Index: src/sys/netkey/Makefile
diff -u src/sys/netkey/Makefile:1.4 src/sys/netkey/Makefile:1.5
--- src/sys/netkey/Makefile:1.4 Tue Nov 26 23:30:33 2002
+++ src/sys/netkey/Makefile Fri Jan 6 14:17:11 2012
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/11/26 23:30:33 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2012/01/06 14:17:11 drochner Exp $
INCSDIR= /usr/include/netkey
-INCS= key.h key_debug.h key_var.h keydb.h keysock.h
+INCS= keysock.h
.include <bsd.kinc.mk>
Index: src/sys/netkey/keysock.h
diff -u src/sys/netkey/keysock.h:1.15 src/sys/netkey/keysock.h:1.16
--- src/sys/netkey/keysock.h:1.15 Sat Mar 14 14:46:11 2009
+++ src/sys/netkey/keysock.h Fri Jan 6 14:17:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.h,v 1.15 2009/03/14 14:46:11 dsl Exp $ */
+/* $NetBSD: keysock.h,v 1.16 2012/01/06 14:17:11 drochner Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*
@@ -61,9 +61,11 @@
#define KEY_SENDUP_ONE 0
#define KEY_SENDUP_ALL 1
#define KEY_SENDUP_REGISTERED 2
-#define KEY_SENDUP_CANWAIT 4
#ifdef _KERNEL
+
+#define KEY_SENDUP_CANWAIT 4
+
struct keycb {
struct rawcb kp_raw; /* rawcb */
int kp_promisc; /* promiscuous mode */
Index: src/usr.bin/netstat/fast_ipsec.c
diff -u src/usr.bin/netstat/fast_ipsec.c:1.17 src/usr.bin/netstat/fast_ipsec.c:1.18
--- src/usr.bin/netstat/fast_ipsec.c:1.17 Thu May 26 21:50:03 2011
+++ src/usr.bin/netstat/fast_ipsec.c Fri Jan 6 14:17:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fast_ipsec.c,v 1.17 2011/05/26 21:50:03 drochner Exp $ */
+/* $NetBSD: fast_ipsec.c,v 1.18 2012/01/06 14:17:11 drochner Exp $ */
/* $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.1.4.1 2003/06/03 00:13:13 sam Exp $ */
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
#ifdef __NetBSD__
-__RCSID("$NetBSD: fast_ipsec.c,v 1.17 2011/05/26 21:50:03 drochner Exp $");
+__RCSID("$NetBSD: fast_ipsec.c,v 1.18 2012/01/06 14:17:11 drochner Exp $");
#endif
#endif /* not lint*/
@@ -52,7 +52,6 @@ __RCSID("$NetBSD: fast_ipsec.c,v 1.17 20
#include <netipsec/ipip_var.h>
#include <netipsec/ipcomp_var.h>
#include <netipsec/ipsec_var.h>
-#include <netipsec/keydb.h>
#include <machine/int_fmtio.h>
