ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Never register IKE_SA during checkout_new, as rekeying keeps it checked out

This commit is contained in:
Martin Willi 2010-12-07 11:41:41 +01:00
parent e6f42b0721
commit 86993d6b90
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcharon/sa/ike_sa_manager.c
View File

@ -914,8 +914,6 @@ static ike_sa_t *checkout_new(private_ike_sa_manager_t* this, bool initiator)
{
ike_sa_id_t *ike_sa_id;
ike_sa_t *ike_sa;
entry_t *entry;
u_int segment;
if (initiator)
{
@ -926,23 +924,12 @@ static ike_sa_t *checkout_new(private_ike_sa_manager_t* this, bool initiator)
ike_sa_id = ike_sa_id_create(0, get_next_spi(this), FALSE);
}
ike_sa = ike_sa_create(ike_sa_id);
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 (!initiator)
{
ike_sa_id->destroy(ike_sa_id);
return ike_sa;
}
entry = entry_create();
entry->ike_sa_id = ike_sa_id;
entry->ike_sa = ike_sa;
segment = put_entry(this, entry);
entry->checked_out = TRUE;
unlock_single_segment(this, segment);
return entry->ike_sa;
return ike_sa;
}
/**

3
src/libcharon/sa/ike_sa_manager.h
View File

@ -52,9 +52,6 @@ struct ike_sa_manager_t {
/**
* Create and check out a new IKE_SA.
*
* @note If initiator equals FALSE, the returned IKE_SA is not registered
* in the manager.
*
* @param initiator TRUE for initiator, FALSE otherwise
* @returns created and checked out IKE_SA
*/