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

vici: Use value based array to store CHILD_SA ids during restart

Browse Source 
The previous approach stored a pointer to a volatile stack variable, which
works for a single ID, but not for multiple.
This commit is contained in:
Martin Willi
2015-12-07 10:05:07 +01:00
parent 01caed533b
commit 2facf18833
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+6 -5
View File
@@ -1619,7 +1619,7 @@ 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, *del; u_int32_t id = 0;
array_t *ids = NULL; array_t *ids = NULL;
char *name; char *name;
@@ -1637,7 +1637,8 @@ static void clear_start_action(private_vici_config_t *this,
if (streq(name, child_sa->get_name(child_sa))) if (streq(name, child_sa->get_name(child_sa)))
{ {
id = child_sa->get_unique_id(child_sa); id = child_sa->get_unique_id(child_sa);
array_insert_create(&ids, ARRAY_TAIL, &id); array_insert_create_value(&ids, sizeof(id),
ARRAY_TAIL, &id);
} }
} }
children->destroy(children); children->destroy(children);
@@ -1646,11 +1647,11 @@ static void clear_start_action(private_vici_config_t *this,
if (array_count(ids)) if (array_count(ids))
{ {
while (array_remove(ids, ARRAY_HEAD, &del)) while (array_remove(ids, ARRAY_HEAD, &id))
{ {
DBG1(DBG_CFG, "closing '%s' #%u", name, *del); DBG1(DBG_CFG, "closing '%s' #%u", name, id);
charon->controller->terminate_child(charon->controller, charon->controller->terminate_child(charon->controller,
*del, NULL, NULL, 0); id, NULL, NULL, 0);
} }
array_destroy(ids); array_destroy(ids);
} }