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

Removed IKEv1 specific code from child_delete task

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:22 +01:00
parent c459dae556
commit 91ca35a2d2
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/child_delete.c
Executable → Regular
+3 -17
View File
@@ -65,11 +65,6 @@ struct private_child_delete_t {
* CHILD_SAs which get deleted * CHILD_SAs which get deleted
*/ */
linked_list_t *child_sas; linked_list_t *child_sas;
/**
* CHILD_SAs which get deleted
*/
payload_type_t payload_type;
}; };
/** /**
@@ -92,7 +87,7 @@ static void build_payloads(private_child_delete_t *this, message_t *message)
case PROTO_ESP: case PROTO_ESP:
if (esp == NULL) if (esp == NULL)
{ {
esp = delete_payload_create(this->payload_type, PROTO_ESP); esp = delete_payload_create(DELETE, PROTO_ESP);
message->add_payload(message, (payload_t*)esp); message->add_payload(message, (payload_t*)esp);
} }
esp->add_spi(esp, spi); esp->add_spi(esp, spi);
@@ -102,7 +97,7 @@ static void build_payloads(private_child_delete_t *this, message_t *message)
case PROTO_AH: case PROTO_AH:
if (ah == NULL) if (ah == NULL)
{ {
ah = delete_payload_create(this->payload_type, PROTO_AH); ah = delete_payload_create(DELETE, PROTO_AH);
message->add_payload(message, (payload_t*)ah); message->add_payload(message, (payload_t*)ah);
} }
ah->add_spi(ah, spi); ah->add_spi(ah, spi);
@@ -132,7 +127,7 @@ static void process_payloads(private_child_delete_t *this, message_t *message)
payloads = message->create_payload_enumerator(message); payloads = message->create_payload_enumerator(message);
while (payloads->enumerate(payloads, &payload)) while (payloads->enumerate(payloads, &payload))
{ {
if (payload->get_type(payload) == this->payload_type) if (payload->get_type(payload) == DELETE)
{ {
delete_payload = (delete_payload_t*)payload; delete_payload = (delete_payload_t*)payload;
protocol = delete_payload->get_protocol_id(delete_payload); protocol = delete_payload->get_protocol_id(delete_payload);
@@ -392,14 +387,5 @@ child_delete_t *child_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol,
this->public.task.process = _process_r; this->public.task.process = _process_r;
this->initiator = FALSE; this->initiator = FALSE;
} }
if (ike_sa->get_version(ike_sa) == IKEV2)
{
this->payload_type = DELETE;
}
else
{
this->payload_type = DELETE_V1;
}
return &this->public; return &this->public;
} }