sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-06 00:00:47 -04:00
Code Issues Projects Releases Wiki Activity

ikev2: Only schedule half-open-timeout delete job after successfully handling IKE_SA_INIT

Browse Source 
We want to avoid this allocation if the initial message is invalid (e.g.
if the message ID is != 0).
This commit is contained in:
Tobias Brunner 2013-07-25 13:38:35 +02:00
parent 68957d1811
commit 4dc8978000
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libcharon/sa/ikev2/task_manager_v2.c
View File

@ -1092,6 +1092,7 @@ METHOD(task_manager_t, process_message, status_t,
host_t *me, *other; host_t *me, *other;
status_t status; status_t status;
u_int32_t mid; u_int32_t mid;
bool schedule_delete_job = FALSE;
charon->bus->message(charon->bus, msg, TRUE, FALSE); charon->bus->message(charon->bus, msg, TRUE, FALSE);
status = parse_message(this, msg); status = parse_message(this, msg);
@ -1106,9 +1107,8 @@ METHOD(task_manager_t, process_message, status_t,
/* if this IKE_SA is virgin, we check for a config */ /* if this IKE_SA is virgin, we check for a config */
if (this->ike_sa->get_ike_cfg(this->ike_sa) == NULL) if (this->ike_sa->get_ike_cfg(this->ike_sa) == NULL)
{ {
ike_sa_id_t *ike_sa_id;
ike_cfg_t *ike_cfg; ike_cfg_t *ike_cfg;
job_t *job;
ike_cfg = charon->backends->get_ike_cfg(charon->backends, ike_cfg = charon->backends->get_ike_cfg(charon->backends,
me, other, IKEV2); me, other, IKEV2);
if (ike_cfg == NULL) if (ike_cfg == NULL)
@ -1123,12 +1123,7 @@ METHOD(task_manager_t, process_message, status_t,
this->ike_sa->set_ike_cfg(this->ike_sa, ike_cfg); this->ike_sa->set_ike_cfg(this->ike_sa, ike_cfg);
ike_cfg->destroy(ike_cfg); ike_cfg->destroy(ike_cfg);
/* add a timeout if peer does not establish it completely */ /* add a timeout if peer does not establish it completely */
ike_sa_id = this->ike_sa->get_id(this->ike_sa); schedule_delete_job = TRUE;
job = (job_t*)delete_ike_sa_job_create(ike_sa_id, FALSE);
lib->scheduler->schedule_job(lib->scheduler, job,
lib->settings->get_int(lib->settings,
"%s.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT,
charon->name));
} }
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND, this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL)); time_monotonic(NULL));
@ -1227,6 +1222,19 @@ METHOD(task_manager_t, process_message, status_t,
return SUCCESS; return SUCCESS;
} }
} }
if (schedule_delete_job)
{
ike_sa_id_t *ike_sa_id;
job_t *job;
ike_sa_id = this->ike_sa->get_id(this->ike_sa);
job = (job_t*)delete_ike_sa_job_create(ike_sa_id, FALSE);
lib->scheduler->schedule_job(lib->scheduler, job,
lib->settings->get_int(lib->settings,
"%s.half_open_timeout", HALF_OPEN_IKE_SA_TIMEOUT,
charon->name));
}
return SUCCESS; return SUCCESS;
} }