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

Initiate and respond to quick mode task (stub)

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:45 +01:00
parent 3bd5fcc832
commit 744c080153
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+4 -3
View File
@@ -45,6 +45,7 @@
#include <sa/tasks/child_delete.h> #include <sa/tasks/child_delete.h>
#include <sa/tasks/child_rekey.h> #include <sa/tasks/child_rekey.h>
#include <sa/tasks/main_mode.h> #include <sa/tasks/main_mode.h>
#include <sa/tasks/quick_mode.h>
#include <processing/jobs/retransmit_job.h> #include <processing/jobs/retransmit_job.h>
#include <processing/jobs/delete_ike_sa_job.h> #include <processing/jobs/delete_ike_sa_job.h>
#include <processing/jobs/send_dpd_job.h> #include <processing/jobs/send_dpd_job.h>
@@ -1190,13 +1191,13 @@ METHOD(ike_sa_t, initiate, status_t,
child_create_t *child_create = (child_create_t*)task; child_create_t *child_create = (child_create_t*)task;
child_create->use_reqid(child_create, reqid); child_create->use_reqid(child_create, reqid);
} }
this->task_manager->queue_task(this->task_manager, task);
} }
else else
{ {
/* TODO-IKEv1: create quick mode task */ task = (task_t*)quick_mode_create(&this->public, child_cfg,
tsi, tsr);
} }
child_cfg->destroy(child_cfg); this->task_manager->queue_task(this->task_manager, task);
#ifdef ME #ifdef ME
if (this->peer_cfg->get_mediated_by(this->peer_cfg)) if (this->peer_cfg->get_mediated_by(this->peer_cfg))
src/libcharon/sa/task_manager_v1.c
+14 -2
View File
@@ -18,6 +18,7 @@
#include <daemon.h> #include <daemon.h>
#include <sa/tasks/main_mode.h> #include <sa/tasks/main_mode.h>
#include <sa/tasks/quick_mode.h>
typedef struct exchange_t exchange_t; typedef struct exchange_t exchange_t;
@@ -214,6 +215,12 @@ METHOD(task_manager_t, initiate, status_t,
exchange = ID_PROT; exchange = ID_PROT;
} }
break; break;
case IKE_ESTABLISHED:
if (activate_task(this, TASK_QUICK_MODE))
{
exchange = QUICK_MODE;
}
break;
default: default:
break; break;
} }
@@ -230,6 +237,9 @@ METHOD(task_manager_t, initiate, status_t,
case MAIN_MODE: case MAIN_MODE:
exchange = ID_PROT; exchange = ID_PROT;
break; break;
case TASK_QUICK_MODE:
exchange = QUICK_MODE;
break;
default: default:
continue; continue;
} }
@@ -423,8 +433,10 @@ static status_t process_request(private_task_manager_t *this,
/* TODO-IKEv1: agressive mode */ /* TODO-IKEv1: agressive mode */
return FAILED; return FAILED;
case QUICK_MODE: case QUICK_MODE:
/* TODO-IKEv1: quick mode */ task = (task_t *)quick_mode_create(this->ike_sa, NULL,
return FAILED; NULL, NULL);
this->passive_tasks->insert_last(this->passive_tasks, task);
break;
case INFORMATIONAL_V1: case INFORMATIONAL_V1:
/* TODO-IKEv1: informational */ /* TODO-IKEv1: informational */
return FAILED; return FAILED;