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

ike: Fix reestablishing SAs if no child-creating tasks are queued

Browse Source
This commit is contained in:
Tobias Brunner
2013-07-18 10:40:08 +02:00
parent 2b0c8ee37d
commit 07a9d5c91a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+5 -2
View File
@@ -1617,8 +1617,11 @@ METHOD(ike_sa_t, reestablish, status_t,
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
/* check if we have tasks that recreate children */ /* check if we have tasks that recreate children */
restart = is_child_queued(this, TASK_QUEUE_ACTIVE) || if (!restart)
is_child_queued(this, TASK_QUEUE_QUEUED); {
restart = is_child_queued(this, TASK_QUEUE_ACTIVE) ||
is_child_queued(this, TASK_QUEUE_QUEUED);
}
#ifdef ME #ifdef ME
/* mediation connections have no children, keep them up anyway */ /* mediation connections have no children, keep them up anyway */
if (this->peer_cfg->is_mediation(this->peer_cfg)) if (this->peer_cfg->is_mediation(this->peer_cfg))