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

ikev1: Defer Mode Config push after CHILD adoption when using XAuth

Browse Source
This commit is contained in:
Martin Willi
2014-08-25 09:55:44 +02:00
parent 891bbbd4bb
commit 4f243dfaa9
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/main_mode.c
+7 -2
View File
@@ -480,6 +480,7 @@ METHOD(task_t, build_r, status_t,
id_payload_t *id_payload;
identification_t *id;
adopt_children_job_t *job = NULL;
xauth_t *xauth = NULL;
id = this->ph1->get_id(this->ph1, this->peer_cfg, TRUE);
if (!id)
@@ -503,8 +504,8 @@ METHOD(task_t, build_r, status_t,
case AUTH_XAUTH_INIT_PSK:
case AUTH_XAUTH_INIT_RSA:
case AUTH_HYBRID_INIT_RSA:
this->ike_sa->queue_task(this->ike_sa,
(task_t*)xauth_create(this->ike_sa, TRUE));
xauth = xauth_create(this->ike_sa, TRUE);
this->ike_sa->queue_task(this->ike_sa, (task_t*)xauth);
break;
case AUTH_XAUTH_RESP_PSK:
case AUTH_XAUTH_RESP_RSA:
@@ -544,6 +545,10 @@ METHOD(task_t, build_r, status_t,
job->queue_task(job, (task_t*)
mode_config_create(this->ike_sa, TRUE, FALSE));
}
else if (xauth)
{
xauth->queue_mode_config_push(xauth);
}
else
{
this->ike_sa->queue_task(this->ike_sa, (task_t*)