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

Handle aggressive mode task in IKEv1 task manager

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:34 +01:00
parent 91c212fd6a
commit 830ab2ae7f
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+36 -6
View File
@@ -20,6 +20,7 @@
#include <daemon.h> #include <daemon.h>
#include <sa/ikev1/tasks/main_mode.h> #include <sa/ikev1/tasks/main_mode.h>
#include <sa/ikev1/tasks/aggressive_mode.h>
#include <sa/ikev1/tasks/quick_mode.h> #include <sa/ikev1/tasks/quick_mode.h>
#include <sa/ikev1/tasks/quick_delete.h> #include <sa/ikev1/tasks/quick_delete.h>
#include <sa/ikev1/tasks/xauth.h> #include <sa/ikev1/tasks/xauth.h>
@@ -346,9 +347,13 @@ METHOD(task_manager_t, initiate, status_t,
if (activate_task(this, TASK_MAIN_MODE)) if (activate_task(this, TASK_MAIN_MODE))
{ {
exchange = ID_PROT; exchange = ID_PROT;
activate_task(this, TASK_ISAKMP_CERT_POST);
activate_task(this, TASK_ISAKMP_NATD);
} }
else if (activate_task(this, TASK_AGGRESSIVE_MODE))
{
exchange = AGGRESSIVE;
}
activate_task(this, TASK_ISAKMP_CERT_POST);
activate_task(this, TASK_ISAKMP_NATD);
break; break;
case IKE_CONNECTING: case IKE_CONNECTING:
if (activate_task(this, TASK_ISAKMP_DELETE)) if (activate_task(this, TASK_ISAKMP_DELETE))
@@ -418,6 +423,9 @@ METHOD(task_manager_t, initiate, status_t,
case TASK_MAIN_MODE: case TASK_MAIN_MODE:
exchange = ID_PROT; exchange = ID_PROT;
break; break;
case TASK_AGGRESSIVE_MODE:
exchange = AGGRESSIVE;
break;
case TASK_QUICK_MODE: case TASK_QUICK_MODE:
exchange = QUICK_MODE; exchange = QUICK_MODE;
break; break;
@@ -719,8 +727,17 @@ static status_t process_request(private_task_manager_t *this,
this->passive_tasks->insert_last(this->passive_tasks, task); this->passive_tasks->insert_last(this->passive_tasks, task);
break; break;
case AGGRESSIVE: case AGGRESSIVE:
/* TODO-IKEv1: agressive mode */ task = (task_t *)isakmp_vendor_create(this->ike_sa, FALSE);
return FAILED; this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t*)isakmp_cert_pre_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t *)aggressive_mode_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t*)isakmp_cert_post_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
task = (task_t *)isakmp_natd_create(this->ike_sa, FALSE);
this->passive_tasks->insert_last(this->passive_tasks, task);
break;
case QUICK_MODE: case QUICK_MODE:
if (this->ike_sa->get_state(this->ike_sa) != IKE_ESTABLISHED) if (this->ike_sa->get_state(this->ike_sa) != IKE_ESTABLISHED)
{ {
@@ -1096,6 +1113,8 @@ static bool has_queued(private_task_manager_t *this, task_type_t type)
METHOD(task_manager_t, queue_ike, void, METHOD(task_manager_t, queue_ike, void,
private_task_manager_t *this) private_task_manager_t *this)
{ {
peer_cfg_t *peer_cfg;
if (!has_queued(this, TASK_ISAKMP_VENDOR)) if (!has_queued(this, TASK_ISAKMP_VENDOR))
{ {
queue_task(this, (task_t*)isakmp_vendor_create(this->ike_sa, TRUE)); queue_task(this, (task_t*)isakmp_vendor_create(this->ike_sa, TRUE));
@@ -1104,9 +1123,20 @@ METHOD(task_manager_t, queue_ike, void,
{ {
queue_task(this, (task_t*)isakmp_cert_pre_create(this->ike_sa, TRUE)); queue_task(this, (task_t*)isakmp_cert_pre_create(this->ike_sa, TRUE));
} }
if (!has_queued(this, TASK_MAIN_MODE)) peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
if (peer_cfg->use_aggressive(peer_cfg))
{ {
queue_task(this, (task_t*)main_mode_create(this->ike_sa, TRUE)); if (!has_queued(this, TASK_AGGRESSIVE_MODE))
{
queue_task(this, (task_t*)aggressive_mode_create(this->ike_sa, TRUE));
}
}
else
{
if (!has_queued(this, TASK_MAIN_MODE))
{
queue_task(this, (task_t*)main_mode_create(this->ike_sa, TRUE));
}
} }
if (!has_queued(this, TASK_ISAKMP_CERT_POST)) if (!has_queued(this, TASK_ISAKMP_CERT_POST))
{ {