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 /lib/libipsec | |
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 'lib/libipsec')
-rw-r--r-- | lib/libipsec/Makefile | 2 | ||||
-rw-r--r-- | lib/libipsec/ipsec_dump_policy.c | 4 | ||||
-rw-r--r-- | lib/libipsec/ipsec_get_policylen.c | 2 | ||||
-rw-r--r-- | lib/libipsec/ipsec_set_policy.3 | 2 | ||||
-rw-r--r-- | lib/libipsec/ipsec_strerror.3 | 4 | ||||
-rw-r--r-- | lib/libipsec/ipsec_strerror.c | 2 | ||||
-rw-r--r-- | lib/libipsec/pfkey.c | 4 | ||||
-rw-r--r-- | lib/libipsec/pfkey_dump.c | 7 | ||||
-rw-r--r-- | lib/libipsec/policy_parse.y | 2 | ||||
-rw-r--r-- | lib/libipsec/policy_token.l | 4 | ||||
-rw-r--r-- | lib/libipsec/test-policy.c | 4 |
11 files changed, 18 insertions, 19 deletions
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile index 933174d..a415e26 100644 --- a/lib/libipsec/Makefile +++ b/lib/libipsec/Makefile @@ -39,7 +39,7 @@ CFLAGS+=-DIPSEC_DEBUG -DIPSEC CFLAGS+=-DINET6 .endif -#.PATH: ${.CURDIR}/../../sys/netkey +#.PATH: ${.CURDIR}/../../sys/netipsec #SRCS= pfkey.c pfkey_dump.c SRCS+= ipsec_strerror.c policy_parse.y policy_token.l SRCS+= ipsec_dump_policy.c ipsec_get_policylen.c diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c index 3ce525b..638d788 100644 --- a/lib/libipsec/ipsec_dump_policy.c +++ b/lib/libipsec/ipsec_dump_policy.c @@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> -#include <netkey/key_var.h> +#include <netipsec/key_var.h> #include <netinet/in.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <arpa/inet.h> diff --git a/lib/libipsec/ipsec_get_policylen.c b/lib/libipsec/ipsec_get_policylen.c index 911b2ce..232cb45 100644 --- a/lib/libipsec/ipsec_get_policylen.c +++ b/lib/libipsec/ipsec_get_policylen.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <net/pfkeyv2.h> diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3 index 0b7d756..1e24b63 100644 --- a/lib/libipsec/ipsec_set_policy.3 +++ b/lib/libipsec/ipsec_set_policy.3 @@ -41,7 +41,7 @@ .Sh LIBRARY .Lb libipsec .Sh SYNOPSIS -.In netinet6/ipsec.h +.In netipsec/ipsec.h .Ft "char *" .Fn ipsec_set_policy "char *policy" "int len" .Ft int diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3 index d162fa6..73fe68d 100644 --- a/lib/libipsec/ipsec_strerror.3 +++ b/lib/libipsec/ipsec_strerror.3 @@ -38,12 +38,12 @@ .Nd error messages for the IPsec policy manipulation library .\" .Sh SYNOPSIS -.In netinet6/ipsec.h +.In netipsec/ipsec.h .Ft "const char *" .Fn ipsec_strerror .\" .Sh DESCRIPTION -.In netinet6/ipsec.h +.In netipsec/ipsec.h declares .Pp .Dl extern int ipsec_errcode; diff --git a/lib/libipsec/ipsec_strerror.c b/lib/libipsec/ipsec_strerror.c index 203b651..f9b2dc9 100644 --- a/lib/libipsec/ipsec_strerror.c +++ b/lib/libipsec/ipsec_strerror.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <string.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include "ipsec_strerror.h" diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c index ca75df4..2dd9d71 100644 --- a/lib/libipsec/pfkey.c +++ b/lib/libipsec/pfkey.c @@ -36,9 +36,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> #include <net/pfkeyv2.h> -#include <netkey/key_var.h> +#include <netipsec/key_var.h> #include <netinet/in.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <stdlib.h> #include <unistd.h> diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c index af8e384..068ad0e 100644 --- a/lib/libipsec/pfkey_dump.c +++ b/lib/libipsec/pfkey_dump.c @@ -35,13 +35,12 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <net/pfkeyv2.h> -#include <netkey/key_var.h> -#include <netkey/key_debug.h> +#include <netipsec/key_var.h> +#include <netipsec/key_debug.h> #include <netinet/in.h> -#include <netinet6/ipsec.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y index ae25958..9e2f979 100644 --- a/lib/libipsec/policy_parse.y +++ b/lib/libipsec/policy_parse.y @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <netinet/in.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <stdlib.h> #include <stdio.h> diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l index f957569..d648702 100644 --- a/lib/libipsec/policy_token.l +++ b/lib/libipsec/policy_token.l @@ -36,9 +36,9 @@ #include <sys/socket.h> #include <net/route.h> #include <net/pfkeyv2.h> -#include <netkey/keydb.h> +#include <netipsec/keydb.h> #include <netinet/in.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #include <stdlib.h> #include <limits.h> diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c index 65c111d..c1dfc79 100644 --- a/lib/libipsec/test-policy.c +++ b/lib/libipsec/test-policy.c @@ -38,8 +38,8 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <net/pfkeyv2.h> -#include <netkey/key_debug.h> -#include <netinet6/ipsec.h> +#include <netipsec/key_debug.h> +#include <netipsec/ipsec.h> #include <stdio.h> #include <stdlib.h> |