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/sa/ike_sa_manager.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/sa/ike_sa_manager.c')
| -rw-r--r-- | src/libcharon/sa/ike_sa_manager.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index 776b2b7ae..d992ce1dc 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c @@ -955,9 +955,11 @@ METHOD(ike_sa_manager_t, checkout_new, ike_sa_t*, ike_sa = ike_sa_create(ike_sa_id, initiator, version); ike_sa_id->destroy(ike_sa_id); - DBG2(DBG_MGR, "created IKE_SA %s[%u]", ike_sa->get_name(ike_sa), - ike_sa->get_unique_id(ike_sa)); - + if (ike_sa) + { + DBG2(DBG_MGR, "created IKE_SA %s[%u]", ike_sa->get_name(ike_sa), + ike_sa->get_unique_id(ike_sa)); + } return ike_sa; } @@ -1033,23 +1035,26 @@ METHOD(ike_sa_manager_t, checkout_by_message, ike_sa_t*, { /* no IKE_SA found, create a new one */ id->set_responder_spi(id, get_spi(this)); - entry = entry_create(); - /* a new SA checked out by message is a responder SA */ - entry->ike_sa = ike_sa_create(id, FALSE, ike_version); - entry->ike_sa_id = id->clone(id); + ike_sa = ike_sa_create(id, FALSE, ike_version); + if (ike_sa) + { + entry = entry_create(); + /* a new SA checked out by message is a responder SA */ + entry->ike_sa = ike_sa; + entry->ike_sa_id = id->clone(id); - segment = put_entry(this, entry); - entry->checked_out = TRUE; - unlock_single_segment(this, segment); + segment = put_entry(this, entry); + entry->checked_out = TRUE; + unlock_single_segment(this, segment); - entry->message_id = message->get_message_id(message); - entry->init_hash = hash; - ike_sa = entry->ike_sa; + entry->message_id = message->get_message_id(message); + entry->init_hash = hash; - DBG2(DBG_MGR, "created IKE_SA %s[%u]", - ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa)); + DBG2(DBG_MGR, "created IKE_SA %s[%u]", + ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa)); + } } - else + if (ike_sa == NULL) { chunk_free(&hash); DBG1(DBG_MGR, "ignoring message, no such IKE_SA"); |