diff options
| author | gnn <gnn@FreeBSD.org> | 2007-07-01 12:08:08 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2007-07-01 12:08:08 +0000 |
| commit | f5875f045c1546f7504a2a0c4bc6744948772a54 (patch) | |
| tree | fb2b82ad120abb3da385b8bf5e6b39f05a558a48 /sbin/setkey | |
| parent | 1fd78b377e2d3d151697051bcbc05106c7d35c47 (diff) | |
| download | FreeBSD-src-f5875f045c1546f7504a2a0c4bc6744948772a54.zip FreeBSD-src-f5875f045c1546f7504a2a0c4bc6744948772a54.tar.gz | |
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
Diffstat (limited to 'sbin/setkey')
| -rw-r--r-- | sbin/setkey/Makefile | 4 | ||||
| -rw-r--r-- | sbin/setkey/parse.y | 4 | ||||
| -rw-r--r-- | sbin/setkey/setkey.c | 6 | ||||
| -rw-r--r-- | sbin/setkey/test-pfkey.c | 6 | ||||
| -rw-r--r-- | sbin/setkey/test-policy.c | 3 | ||||
| -rw-r--r-- | sbin/setkey/token.l | 6 |
6 files changed, 14 insertions, 15 deletions
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> |
