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

Fix IKEv1 DELETE subtask creation and processing

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:19 +01:00
parent 10e18713f1
commit 5dec456b69
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/informational.c
+13 -9
View File
@@ -94,15 +94,19 @@ METHOD(task_t, process_r, status_t,
} }
continue; continue;
case DELETE_V1: case DELETE_V1:
delete = (delete_payload_t*)payload; if (!this->del)
if (delete->get_protocol_id(delete) == PROTO_IKE)
{ {
this->del = (task_t*)ike_delete_create(this->ike_sa, FALSE); delete = (delete_payload_t*)payload;
} if (delete->get_protocol_id(delete) == PROTO_IKE)
else {
{ this->del = (task_t*)ike_delete_create(this->ike_sa,
this->del = (task_t*)child_delete_create(this->ike_sa, FALSE);
PROTO_NONE, 0); }
else
{
this->del = (task_t*)child_delete_create(this->ike_sa,
PROTO_NONE, 0);
}
} }
break; break;
default: default:
@@ -112,7 +116,7 @@ METHOD(task_t, process_r, status_t,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (status == SUCCESS) if (this->del && status == SUCCESS)
{ {
return this->del->process(this->del, message); return this->del->process(this->del, message);
} }