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

vici: Close empty IKE_SAs after undoing CHILD_SA start actions

Browse Source
This commit is contained in:
Martin Willi
2015-12-07 10:05:07 +01:00
parent 2facf18833
commit 23b1f71372
1 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+44 -6
View File
@@ -1619,8 +1619,8 @@ static void clear_start_action(private_vici_config_t *this,
enumerator_t *enumerator, *children; enumerator_t *enumerator, *children;
child_sa_t *child_sa; child_sa_t *child_sa;
ike_sa_t *ike_sa; ike_sa_t *ike_sa;
u_int32_t id = 0; u_int32_t id = 0, others;
array_t *ids = NULL; array_t *ids = NULL, *ikeids = NULL;
char *name; char *name;
name = child_cfg->get_name(child_cfg); name = child_cfg->get_name(child_cfg);
@@ -1631,17 +1631,45 @@ static void clear_start_action(private_vici_config_t *this,
charon->controller, TRUE); charon->controller, TRUE);
while (enumerator->enumerate(enumerator, &ike_sa)) while (enumerator->enumerate(enumerator, &ike_sa))
{ {
others = id = 0;
children = ike_sa->create_child_sa_enumerator(ike_sa); children = ike_sa->create_child_sa_enumerator(ike_sa);
while (children->enumerate(children, &child_sa)) while (children->enumerate(children, &child_sa))
{ {
if (streq(name, child_sa->get_name(child_sa))) if (child_sa->get_state(child_sa) != CHILD_DELETING)
{ {
id = child_sa->get_unique_id(child_sa); if (streq(name, child_sa->get_name(child_sa)))
array_insert_create_value(&ids, sizeof(id), {
ARRAY_TAIL, &id); id = child_sa->get_unique_id(child_sa);
}
else
{
others++;
}
} }
} }
children->destroy(children); children->destroy(children);
if (id && !others)
{
/* found matching children only, delete full IKE_SA */
id = ike_sa->get_unique_id(ike_sa);
array_insert_create_value(&ikeids, sizeof(id),
ARRAY_TAIL, &id);
}
else
{
children = ike_sa->create_child_sa_enumerator(ike_sa);
while (children->enumerate(children, &child_sa))
{
if (streq(name, child_sa->get_name(child_sa)))
{
id = child_sa->get_unique_id(child_sa);
array_insert_create_value(&ids, sizeof(id),
ARRAY_TAIL, &id);
}
}
children->destroy(children);
}
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
@@ -1655,6 +1683,16 @@ static void clear_start_action(private_vici_config_t *this,
} }
array_destroy(ids); array_destroy(ids);
} }
if (array_count(ikeids))
{
while (array_remove(ikeids, ARRAY_HEAD, &id))
{
DBG1(DBG_CFG, "closing IKE_SA #%u", id);
charon->controller->terminate_ike(charon->controller,
id, NULL, NULL, 0);
}
array_destroy(ikeids);
}
break; break;
case ACTION_ROUTE: case ACTION_ROUTE:
DBG1(DBG_CFG, "uninstalling '%s'", name); DBG1(DBG_CFG, "uninstalling '%s'", name);