diff options
| author | Martin Willi <martin@revosec.ch> | 2011-12-14 16:41:32 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:31:22 +0100 |
| commit | 91ca35a2d225957e05f102a84c9d4bb41417e111 (patch) | |
| tree | 19855559bd1824c4dd2ee127033a45dbe400ddf5 /src | |
| parent | c459dae556f3d858dbde30a3b96924f747c8e6a8 (diff) | |
| download | strongswan-91ca35a2d225957e05f102a84c9d4bb41417e111.tar.bz2 strongswan-91ca35a2d225957e05f102a84c9d4bb41417e111.tar.xz | |
Removed IKEv1 specific code from child_delete task
Diffstat (limited to 'src')
| -rw-r--r--[-rwxr-xr-x] | src/libcharon/sa/tasks/child_delete.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/libcharon/sa/tasks/child_delete.c b/src/libcharon/sa/tasks/child_delete.c index 455e06b7a..c5151abf1 100755..100644 --- a/src/libcharon/sa/tasks/child_delete.c +++ b/src/libcharon/sa/tasks/child_delete.c @@ -65,11 +65,6 @@ struct private_child_delete_t { * CHILD_SAs which get deleted */ 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: 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); } esp->add_spi(esp, spi); @@ -102,7 +97,7 @@ static void build_payloads(private_child_delete_t *this, message_t *message) case PROTO_AH: 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); } 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); 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; 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->initiator = FALSE; } - - if (ike_sa->get_version(ike_sa) == IKEV2) - { - this->payload_type = DELETE; - } - else - { - this->payload_type = DELETE_V1; - } return &this->public; } |