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

some task queueing improvements:

Browse Source 
- do not pass CHILD_SAs to task constructor, might not
	  be valid anymore during execution (late lookup)
	- use sub-tasks to delete CHILD/IKE_SA after rekeying,
	  as we want to execute the delete before additional
	  queued tasks
This commit is contained in:
Martin Willi
2008-12-01 18:38:28 +00:00
parent 9a96ccd485
commit 394eb35b0c
8 changed files with 186 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/task_manager.c
+12 -3
View File
@@ -417,7 +417,7 @@ static status_t build_request(private_task_manager_t *this)
message->set_exchange_type(message, exchange);
this->initiating.type = exchange;
this->initiating.retransmitted = 0;
iterator = this->active_tasks->create_iterator(this->active_tasks, TRUE);
while (iterator->iterate(iterator, (void*)&task))
{
@@ -442,6 +442,9 @@ static status_t build_request(private_task_manager_t *this)
}
iterator->destroy(iterator);
/* update exchange type if a task changed it */
this->initiating.type = message->get_exchange_type(message);
DESTROY_IF(this->initiating.packet);
status = this->ike_sa->generate_message(this->ike_sa, message,
&this->initiating.packet);
@@ -495,7 +498,9 @@ static status_t process_response(private_task_manager_t *this,
case FAILED:
default:
/* critical failure, destroy IKE_SA */
iterator->remove(iterator);
iterator->destroy(iterator);
task->destroy(task);
return DESTROY_ME;
}
if (this->reset)
@@ -716,7 +721,8 @@ static status_t process_request(private_task_manager_t *this,
{
if (notify_found)
{
task = (task_t*)child_rekey_create(this->ike_sa, NULL);
task = (task_t*)child_rekey_create(this->ike_sa,
PROTO_NONE, 0);
}
else
{
@@ -773,7 +779,8 @@ static status_t process_request(private_task_manager_t *this,
}
else
{
task = (task_t*)child_delete_create(this->ike_sa, NULL);
task = (task_t*)child_delete_create(this->ike_sa,
PROTO_NONE, 0);
}
break;
}
@@ -822,7 +829,9 @@ static status_t process_request(private_task_manager_t *this,
case FAILED:
default:
/* critical failure, destroy IKE_SA */
iterator->remove(iterator);
iterator->destroy(iterator);
task->destroy(task);
return DESTROY_ME;
}
}