From 3d54ae94d935fa60b3f3228e7a0ad1ba92092e84 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 21 Dec 2011 12:05:34 +0100 Subject: Handle initiation of not supported IKE versions properly --- src/libcharon/control/controller.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/libcharon/control/controller.c') diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c index 0f247962b..4aded8f9d 100644 --- a/src/libcharon/control/controller.c +++ b/src/libcharon/control/controller.c @@ -217,6 +217,17 @@ METHOD(job_t, initiate_execute, void, ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager, peer_cfg); + if (!ike_sa) + { + listener->child_cfg->destroy(listener->child_cfg); + peer_cfg->destroy(peer_cfg); + /* trigger down event to release listener */ + listener->ike_sa = charon->ike_sa_manager->checkout_new( + charon->ike_sa_manager, IKE_ANY, TRUE); + DESTROY_IF(listener->ike_sa); + listener->status = FAILED; + return; + } listener->ike_sa = ike_sa; if (ike_sa->get_peer_cfg(ike_sa) == NULL) -- cgit v1.2.3