denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flush auth configs, create new keymat during SA reset

Browse Source
This commit is contained in:
Martin Willi
2010-06-07 14:59:39 +02:00
parent dbdb69f908
commit 550d9085fa
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+8 -4
View File
@@ -399,8 +399,6 @@ static void flush_auth_cfgs(private_ike_sa_t *this)
{ {
auth_cfg_t *cfg; auth_cfg_t *cfg;
if (lib->settings->get_bool(lib->settings, "charon.flush_auth_cfg", FALSE))
{
while (this->my_auths->remove_last(this->my_auths, while (this->my_auths->remove_last(this->my_auths,
(void**)&cfg) == SUCCESS) (void**)&cfg) == SUCCESS)
{ {
@@ -412,7 +410,6 @@ static void flush_auth_cfgs(private_ike_sa_t *this)
cfg->destroy(cfg); cfg->destroy(cfg);
} }
} }
}
METHOD(ike_sa_t, get_proposal, proposal_t*, METHOD(ike_sa_t, get_proposal, proposal_t*,
private_ike_sa_t *this) private_ike_sa_t *this)
@@ -713,6 +710,11 @@ METHOD(ike_sa_t, reset, void,
set_state(this, IKE_CREATED); set_state(this, IKE_CREATED);
flush_auth_cfgs(this);
this->keymat->destroy(this->keymat);
this->keymat = keymat_create(this->ike_sa_id->is_initiator(this->ike_sa_id));
this->task_manager->reset(this->task_manager, 0, 0); this->task_manager->reset(this->task_manager, 0, 0);
} }
@@ -1263,7 +1265,9 @@ METHOD(ike_sa_t, process_message, status_t,
} }
status = this->task_manager->process_message(this->task_manager, message); status = this->task_manager->process_message(this->task_manager, message);
if (message->get_exchange_type(message) == IKE_AUTH && if (message->get_exchange_type(message) == IKE_AUTH &&
this->state == IKE_ESTABLISHED) this->state == IKE_ESTABLISHED &&
lib->settings->get_bool(lib->settings,
"charon.flush_auth_cfg", FALSE))
{ /* authentication completed */ { /* authentication completed */
flush_auth_cfgs(this); flush_auth_cfgs(this);
} }