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

Moved responder informational handling to task

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:18 +01:00
parent 1477ab157c
commit 97933967a0
2 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/task_manager_v1.c
+3 -53
View File
@@ -24,7 +24,7 @@
#include <sa/tasks/quick_mode.h>
#include <sa/tasks/xauth.h>
#include <sa/tasks/mode_config.h>
#include <sa/tasks/ike_delete.h>
#include <sa/tasks/informational.h>
#include <sa/tasks/ike_natd_v1.h>
#include <sa/tasks/ike_vendor_v1.h>
#include <sa/tasks/ike_cert_pre_v1.h>
@@ -582,8 +582,6 @@ static status_t process_request(private_task_manager_t *this,
enumerator_t *enumerator;
task_t *task = NULL;
bool send_response = FALSE;
payload_t *payload;
notify_payload_t *notify;
if (this->passive_tasks->get_count(this->passive_tasks) == 0)
{ /* create tasks depending on request type, if not already some queued */
@@ -616,56 +614,8 @@ static status_t process_request(private_task_manager_t *this,
this->passive_tasks->insert_last(this->passive_tasks, task);
break;
case INFORMATIONAL_V1:
enumerator = message->create_payload_enumerator(message);
while (enumerator->enumerate(enumerator, &payload))
{
switch (payload->get_type(payload))
{
case NOTIFY_V1:
{
notify = (notify_payload_t*)payload;
switch (notify->get_notify_type(notify))
{
/* TODO-IKEv1: Add notification types here as needed */
case INITIAL_CONTACT_IKEV1:
break;
default:
if(notify->get_notify_type(notify) < 16384)
{
DBG1(DBG_IKE, "Received %N error notification.", notify_type_names, notify->get_notify_type(notify));
enumerator->destroy(enumerator);
return FAILED;
}
break;
}
break;
}
case DELETE_V1:
{
delete_payload_t *delete;
delete = (delete_payload_t*)payload;
if (delete->get_protocol_id(delete) == PROTO_IKE)
{
task = (task_t*)ike_delete_create(this->ike_sa,
FALSE);
}
else
{
task = (task_t*)child_delete_create(this->ike_sa,
PROTO_NONE, 0);
}
break;
}
default:
break;
}
if (task)
{
this->passive_tasks->insert_last(this->passive_tasks, task);
}
}
enumerator->destroy(enumerator);
task = (task_t *)informational_create(this->ike_sa, NULL);
this->passive_tasks->insert_last(this->passive_tasks, task);
break;
case TRANSACTION:
if (this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED)
src/libcharon/sa/tasks/informational.c
+43 -1
View File
@@ -51,7 +51,49 @@ METHOD(task_t, build_i, status_t,
METHOD(task_t, process_r, status_t,
private_informational_t *this, message_t *message)
{
return FAILED;
enumerator_t *enumerator;
notify_payload_t *notify;
notify_type_t type;
payload_t *payload;
status_t status = SUCCESS;
enumerator = message->create_payload_enumerator(message);
while (enumerator->enumerate(enumerator, &payload))
{
switch (payload->get_type(payload))
{
case NOTIFY_V1:
notify = (notify_payload_t*)payload;
type = notify->get_notify_type(notify);
if (type == INITIAL_CONTACT_IKEV1)
{
this->ike_sa->set_condition(this->ike_sa,
COND_INIT_CONTACT_SEEN, TRUE);
}
else if (type < 16384)
{
DBG1(DBG_IKE, "received %N error notify",
notify_type_names, notify->get_notify_type(notify));
status = FAILED;
break;
}
else
{
DBG1(DBG_IKE, "received %N notify",
notify_type_names, notify->get_notify_type(notify));
}
continue;
case DELETE_V1:
/* TODO-IKEv1: handle delete */
default:
continue;
}
break;
}
enumerator->destroy(enumerator);
return status;
}
METHOD(task_t, build_r, status_t,