diff options
author | Martin Willi <martin@strongswan.org> | 2006-06-08 14:20:05 +0000 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2006-06-08 14:20:05 +0000 |
commit | 5238c9afefb7783b639e154ae882cec1f8651c70 (patch) | |
tree | fa47ce291a4dcbb696b39311de7542db17a4ddfe /src/charon/queues/jobs | |
parent | c0d63ac9db44ae1b0161b7398bb61385a6f4ac88 (diff) | |
download | strongswan-5238c9afefb7783b639e154ae882cec1f8651c70.tar.bz2 strongswan-5238c9afefb7783b639e154ae882cec1f8651c70.tar.xz |
fixed compile warnings when using -Wall
further CHILD_SA rekeying work done:
creation of a new CHILD_SA on a expire from a kernel works
delete of old CHILD_SA still missing
some issues when both initiate rekeing
Diffstat (limited to 'src/charon/queues/jobs')
4 files changed, 3 insertions, 2 deletions
diff --git a/src/charon/queues/jobs/delete_established_ike_sa_job.c b/src/charon/queues/jobs/delete_established_ike_sa_job.c index 78f5c9ed1..515340da9 100644 --- a/src/charon/queues/jobs/delete_established_ike_sa_job.c +++ b/src/charon/queues/jobs/delete_established_ike_sa_job.c @@ -61,7 +61,6 @@ static job_type_t get_type(private_delete_established_ike_sa_job_t *this) */ static status_t execute(private_delete_established_ike_sa_job_t *this) { - ike_sa_t *ike_sa; status_t status; status = charon->ike_sa_manager->delete(charon->ike_sa_manager, this->ike_sa_id); diff --git a/src/charon/queues/jobs/delete_half_open_ike_sa_job.c b/src/charon/queues/jobs/delete_half_open_ike_sa_job.c index 5de3cb222..c81783446 100644 --- a/src/charon/queues/jobs/delete_half_open_ike_sa_job.c +++ b/src/charon/queues/jobs/delete_half_open_ike_sa_job.c @@ -76,7 +76,7 @@ static status_t execute(private_delete_half_open_ike_sa_job_t *this) case IKE_SA_INIT_REQUESTED: case IKE_SA_INIT_RESPONDED: case IKE_AUTH_REQUESTED: - case DELETE_REQUESTED: + case DELETE_IKE_SA_REQUESTED: { /* IKE_SA is half open and gets deleted! */ status = charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, ike_sa); diff --git a/src/charon/queues/jobs/incoming_packet_job.c b/src/charon/queues/jobs/incoming_packet_job.c index 834b14bb2..6043b03ca 100644 --- a/src/charon/queues/jobs/incoming_packet_job.c +++ b/src/charon/queues/jobs/incoming_packet_job.c @@ -24,6 +24,7 @@ #include "incoming_packet_job.h" #include <daemon.h> +#include <queues/jobs/delete_half_open_ike_sa_job.h> typedef struct private_incoming_packet_job_t private_incoming_packet_job_t; diff --git a/src/charon/queues/jobs/initiate_ike_sa_job.c b/src/charon/queues/jobs/initiate_ike_sa_job.c index fa8513659..16e440768 100644 --- a/src/charon/queues/jobs/initiate_ike_sa_job.c +++ b/src/charon/queues/jobs/initiate_ike_sa_job.c @@ -26,6 +26,7 @@ #include "initiate_ike_sa_job.h" #include <daemon.h> +#include <queues/jobs/delete_half_open_ike_sa_job.h> typedef struct private_initiate_ike_sa_job_t private_initiate_ike_sa_job_t; |