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

child-rekey: Don't add a REKEY_SA notify if the child-create task is deleting the SA

Browse Source
This commit is contained in:
Tobias Brunner
2015-08-21 16:14:07 +02:00
parent f91bd4b92c
commit 105365eabe
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_rekey.c
+9 -6
View File
@@ -170,13 +170,8 @@ METHOD(task_t, build_i, status_t,
} }
config = this->child_sa->get_config(this->child_sa); config = this->child_sa->get_config(this->child_sa);
/* we just need the rekey notify ... */
notify = notify_payload_create_from_protocol_and_type(PLV2_NOTIFY,
this->protocol, REKEY_SA);
notify->set_spi(notify, this->spi);
message->add_payload(message, (payload_t*)notify);
/* ... our CHILD_CREATE task does the hard work for us. */ /* our CHILD_CREATE task does the hard work for us */
if (!this->child_create) if (!this->child_create)
{ {
this->child_create = child_create_create(this->ike_sa, this->child_create = child_create_create(this->ike_sa,
@@ -194,6 +189,14 @@ METHOD(task_t, build_i, status_t,
schedule_delayed_rekey(this); schedule_delayed_rekey(this);
return FAILED; return FAILED;
} }
if (message->get_exchange_type(message) == CREATE_CHILD_SA)
{
/* don't add the notify if the CHILD_CREATE task changed the exchange */
notify = notify_payload_create_from_protocol_and_type(PLV2_NOTIFY,
this->protocol, REKEY_SA);
notify->set_spi(notify, this->spi);
message->add_payload(message, (payload_t*)notify);
}
this->child_sa->set_state(this->child_sa, CHILD_REKEYING); this->child_sa->set_state(this->child_sa, CHILD_REKEYING);
return NEED_MORE; return NEED_MORE;