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

Don't invoke a child_updown hook when a quick mode to delete has been rekeyed

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:36 +01:00
parent 669d8bded2
commit b6ac063c36
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_delete.c
+6 -1
View File
@@ -69,6 +69,7 @@ static bool delete_child(private_quick_delete_t *this,
{ {
u_int64_t bytes_in, bytes_out; u_int64_t bytes_in, bytes_out;
child_sa_t *child_sa; child_sa_t *child_sa;
bool rekeyed;
child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, spi, TRUE); child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, spi, TRUE);
if (!child_sa) if (!child_sa)
@@ -81,6 +82,7 @@ static bool delete_child(private_quick_delete_t *this,
this->spi = spi = child_sa->get_spi(child_sa, TRUE); this->spi = spi = child_sa->get_spi(child_sa, TRUE);
} }
rekeyed = child_sa->get_state(child_sa) == CHILD_REKEYING;
child_sa->set_state(child_sa, CHILD_DELETING); child_sa->set_state(child_sa, CHILD_DELETING);
if (this->expired) if (this->expired)
@@ -107,7 +109,10 @@ static bool delete_child(private_quick_delete_t *this,
child_sa->get_traffic_selectors(child_sa, FALSE)); child_sa->get_traffic_selectors(child_sa, FALSE));
} }
charon->bus->child_updown(charon->bus, child_sa, FALSE); if (!rekeyed)
{
charon->bus->child_updown(charon->bus, child_sa, FALSE);
}
this->ike_sa->destroy_child_sa(this->ike_sa, protocol, spi); this->ike_sa->destroy_child_sa(this->ike_sa, protocol, spi);