Commit IPv6 support for FAST_IPSEC to the tree.

This commit includes all remaining changes for the time being including
user space updates.

Submitted by:    bz
Approved by:    re

9 files changed, 18 insertions, 19 deletions

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index be5f66e..9280bef 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <arpa/inet.h>
 
 #ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
 #endif /*IPSEC*/
 
 #include <ctype.h>
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 89e7fbe..e7a1e1d 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -3,7 +3,7 @@
 PROG=	ping6
 MAN=	ping6.8
 
-CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
+CFLAGS+=-DIPSEC -DFAST_IPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
 	-DHAVE_POLL_H -DHAVE_ARC4RANDOM
 WARNS?=	2
 
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index bcf86b3..a7ab9a1 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -134,8 +134,8 @@ static const char rcsid[] =
 #endif
 
 #ifdef IPSEC
-#include <netinet6/ah.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ah.h>
+#include <netipsec/ipsec.h>
 #endif
 
 #include <md5.h>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 9dd7cf5..03c2ea2 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -44,9 +44,9 @@ CLEANFILES=	y.tab.c y.tab.h key_test.o keytest
 
 # libpfkey
 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey
+.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netipsec
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
+CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netipsec
 
 SRCS+=	y.tab.h
 y.tab.h: parse.y
diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y
index e90c3a1..85f4fab 100644
--- a/sbin/setkey/parse.y
+++ b/sbin/setkey/parse.y
@@ -38,8 +38,8 @@
 #include <net/route.h>
 #include <netinet/in.h>
 #include <net/pfkeyv2.h>
-#include <netkey/key_var.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/key_var.h>
+#include <netipsec/ipsec.h>
 #include <arpa/inet.h>
 
 #include <string.h>
diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c
index 5bdd6df..9bb9a88 100644
--- a/sbin/setkey/setkey.c
+++ b/sbin/setkey/setkey.c
@@ -38,9 +38,9 @@
 #include <net/route.h>
 #include <netinet/in.h>
 #include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-#include <netkey/key_debug.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/keydb.h>
+#include <netipsec/key_debug.h>
+#include <netipsec/ipsec.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/setkey/test-pfkey.c b/sbin/setkey/test-pfkey.c
index b1fb238..672f03c 100644
--- a/sbin/setkey/test-pfkey.c
+++ b/sbin/setkey/test-pfkey.c
@@ -36,9 +36,9 @@
 #include <net/route.h>
 #include <net/pfkeyv2.h>
 #include <netinet/in.h>
-#include <netkey/keydb.h>
-#include <netkey/key_var.h>
-#include <netkey/key_debug.h>
+#include <netipsec/keydb.h>
+#include <netipsec/key_var.h>
+#include <netipsec/key_debug.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sbin/setkey/test-policy.c b/sbin/setkey/test-policy.c
index 27cd478..9e9b723 100644
--- a/sbin/setkey/test-policy.c
+++ b/sbin/setkey/test-policy.c
@@ -34,11 +34,10 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet6/in6.h>
-#include <netkey/keyv2.h>
+#include <netipsec/ipsec.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <netinet6/ipsec.h>
 
 char *requests[] = {
 "must_error",		/* must be error */
diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l
index 13db9be..fe45770 100644
--- a/sbin/setkey/token.l
+++ b/sbin/setkey/token.l
@@ -36,10 +36,10 @@
 #include <sys/socket.h>
 #include <net/route.h>
 #include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-#include <netkey/key_debug.h>
+#include <netipsec/keydb.h>
+#include <netipsec/key_debug.h>
 #include <netinet/in.h>
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
 
 #include <stdlib.h>
 #include <limits.h>