diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-21 12:05:34 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:30 +0100 |
| commit | 3d54ae94d935fa60b3f3228e7a0ad1ba92092e84 (patch) | |
| tree | fcd01352169a5a53b5ef41183694dc62eeac90f0 /src/libcharon/control/controller.c | |
| parent | daee47ba466c96eca5accbb0cac737465915b4f8 (diff) | |
| download | strongswan-3d54ae94d935fa60b3f3228e7a0ad1ba92092e84.tar.bz2 strongswan-3d54ae94d935fa60b3f3228e7a0ad1ba92092e84.tar.xz | |
Handle initiation of not supported IKE versions properly
Diffstat (limited to 'src/libcharon/control/controller.c')
| -rw-r--r-- | src/libcharon/control/controller.c | 11 |
1 files changed, 11 insertions, 0 deletions
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) |