aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Egerer <thomas.egerer@secunet.com>2015-04-24 13:43:14 +0200
committerTobias Brunner <tobias@strongswan.org>2015-08-04 11:16:13 +0200
commite095d87bb69b9192350489a9f57b4047880f422f (patch)
treea688a439ffa61cc7fd442e7db6eb092331933c1c
parentedaba56ec7f9daf00052c9cfe4c824fb27ec25c4 (diff)
downloadstrongswan-e095d87bb69b9192350489a9f57b4047880f422f.tar.bz2
strongswan-e095d87bb69b9192350489a9f57b4047880f422f.tar.xz
jobs: Don't execute rekey CHILD_SA job on passive IKE_SAs
Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
-rw-r--r--src/libcharon/processing/jobs/rekey_child_sa_job.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libcharon/processing/jobs/rekey_child_sa_job.c b/src/libcharon/processing/jobs/rekey_child_sa_job.c
index 8f17d39ab..057876b33 100644
--- a/src/libcharon/processing/jobs/rekey_child_sa_job.c
+++ b/src/libcharon/processing/jobs/rekey_child_sa_job.c
@@ -67,7 +67,10 @@ METHOD(job_t, execute, job_requeue_t,
}
else
{
- ike_sa->rekey_child_sa(ike_sa, this->protocol, this->spi);
+ if (ike_sa->get_state(ike_sa) != IKE_PASSIVE)
+ {
+ ike_sa->rekey_child_sa(ike_sa, this->protocol, this->spi);
+ }
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
}
return JOB_REQUEUE_NONE;