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

Reset task manager state when build() completes an exchange (quick mode)

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:19 +01:00
parent 92aa6e0255
commit 41fbde4544
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/task_manager_v1.c
+5 -3
View File
@@ -415,8 +415,10 @@ METHOD(task_manager_t, initiate, status_t,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* update exchange type if a task changed it */ if (this->active_tasks->get_count(this->active_tasks) == 0)
this->initiating.type = message->get_exchange_type(message); { /* tasks completed, no exchange active anymore */
this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
}
this->initiating.seqnr++; this->initiating.seqnr++;
status = this->ike_sa->generate_message(this->ike_sa, message, status = this->ike_sa->generate_message(this->ike_sa, message,
@@ -442,7 +444,7 @@ METHOD(task_manager_t, initiate, status_t,
this->initiating.packet = NULL; this->initiating.packet = NULL;
/* close after sending an INFORMATIONAL error but not yet established */ /* close after sending an INFORMATIONAL error but not yet established */
if (this->initiating.type == INFORMATIONAL_V1 && if (exchange == INFORMATIONAL_V1 &&
this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING) this->ike_sa->get_state(this->ike_sa) == IKE_CONNECTING)
{ {
return FAILED; return FAILED;