fixed deferred CHILD_SA rekeying while IKE_SA rekeying in progress

This commit is contained in:
Martin Willi
2007-03-27 13:32:12 +00:00
parent b34f86f545
commit e23a59f635
4 changed files with 16 additions and 5 deletions
+2 -2
View File
@@ -282,9 +282,9 @@ static void destroy(private_ike_rekey_t *this)
{
if (this->new_sa)
{
if (this->new_sa->get_state(this->new_sa) == IKE_ESTABLISHED)
if (this->new_sa->get_state(this->new_sa) == IKE_ESTABLISHED &&
this->new_sa->inherit(this->new_sa, this->ike_sa) != DESTROY_ME)
{
this->new_sa->inherit(this->new_sa, this->ike_sa);
charon->ike_sa_manager->checkin(charon->ike_sa_manager, this->new_sa);
}
else