From c99458e94ebb98080153a17d4a47db2005634e65 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 23 Sep 2013 12:28:13 +0200 Subject: kernel: Use a time_t to report use time in query_sa() --- src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c') diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c index 40f253d5a..131b982f9 100644 --- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c +++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c @@ -268,7 +268,7 @@ METHOD(kernel_ipsec_t, update_sa, status_t, METHOD(kernel_ipsec_t, query_sa, status_t, private_kernel_libipsec_ipsec_t *this, host_t *src, host_t *dst, u_int32_t spi, u_int8_t protocol, mark_t mark, u_int64_t *bytes, - u_int64_t *packets, u_int32_t *time) + u_int64_t *packets, time_t *time) { return NOT_SUPPORTED; } -- cgit v1.2.3 From d7083b65419633a9f3569d71e4461efaa20a262e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 23 Sep 2013 12:35:33 +0200 Subject: kernel: Use a time_t to report use time in query_policy() --- src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c') diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c index 131b982f9..8e7cabcde 100644 --- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c +++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c @@ -555,7 +555,7 @@ METHOD(kernel_ipsec_t, add_policy, status_t, METHOD(kernel_ipsec_t, query_policy, status_t, private_kernel_libipsec_ipsec_t *this, traffic_selector_t *src_ts, traffic_selector_t *dst_ts, policy_dir_t direction, mark_t mark, - u_int32_t *use_time) + time_t *use_time) { return NOT_SUPPORTED; } -- cgit v1.2.3 From d53f9b9637cd35d1808e26d68b3df56c08650759 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 23 Sep 2013 12:46:43 +0200 Subject: kernel-libipsec: Support query_sa() to report usage statistics --- src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c') diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c index 8e7cabcde..0e9263838 100644 --- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c +++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c @@ -270,7 +270,8 @@ METHOD(kernel_ipsec_t, query_sa, status_t, u_int32_t spi, u_int8_t protocol, mark_t mark, u_int64_t *bytes, u_int64_t *packets, time_t *time) { - return NOT_SUPPORTED; + return ipsec->sas->query_sa(ipsec->sas, src, dst, spi, protocol, mark, + bytes, packets, time); } METHOD(kernel_ipsec_t, del_sa, status_t, -- cgit v1.2.3 From 12fdc2b16b43b8ea3098ff73a8b6cbdce542c74a Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 23 Sep 2013 16:26:11 +0200 Subject: kernel-libipsec: Support ESPv3 TFC padding --- src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c') diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c index 0e9263838..9d95aa7fd 100644 --- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c +++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c @@ -226,7 +226,7 @@ static void expire(u_int32_t reqid, u_int8_t protocol, u_int32_t spi, bool hard) METHOD(kernel_ipsec_t, get_features, kernel_feature_t, private_kernel_libipsec_ipsec_t *this) { - return KERNEL_REQUIRE_UDP_ENCAPSULATION; + return KERNEL_REQUIRE_UDP_ENCAPSULATION | KERNEL_ESP_V3_TFC; } METHOD(kernel_ipsec_t, get_spi, status_t, -- cgit v1.2.3