From b6ac063c363b076959f38d5c01461947a58e8677 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 16 Jan 2012 16:18:01 +0100 Subject: [PATCH] Don't invoke a child_updown hook when a quick mode to delete has been rekeyed --- src/libcharon/sa/ikev1/tasks/quick_delete.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libcharon/sa/ikev1/tasks/quick_delete.c b/src/libcharon/sa/ikev1/tasks/quick_delete.c index 9a502f5..6e4194e 100644 --- a/src/libcharon/sa/ikev1/tasks/quick_delete.c +++ b/src/libcharon/sa/ikev1/tasks/quick_delete.c @@ -69,6 +69,7 @@ static bool delete_child(private_quick_delete_t *this, { u_int64_t bytes_in, bytes_out; child_sa_t *child_sa; + bool rekeyed; child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, spi, TRUE); 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); } + rekeyed = child_sa->get_state(child_sa) == CHILD_REKEYING; child_sa->set_state(child_sa, CHILD_DELETING); if (this->expired) @@ -107,7 +109,10 @@ static bool delete_child(private_quick_delete_t *this, 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); -- 2.7.4