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

vici: Replace child configs atomically

Browse Source 
This also leaves unmodified configs as they are.
This commit is contained in:
Tobias Brunner
2016-03-08 10:21:58 +01:00
parent 622c2b2c33
commit 101abed566
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+11 -14
View File
@@ -1847,22 +1847,19 @@ static void replace_children(private_vici_config_t *this,
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
child_cfg_t *child; child_cfg_t *child;
bool added;
enumerator = to->create_child_cfg_enumerator(to); enumerator = to->replace_child_cfgs(to, from);
while (enumerator->enumerate(enumerator, &child)) while (enumerator->enumerate(enumerator, &child, &added))
{ {
to->remove_child_cfg(to, enumerator); if (added)
clear_start_action(this, to->get_name(to), child); {
child->destroy(child); run_start_action(this, to, child);
} }
enumerator->destroy(enumerator); else
{
enumerator = from->create_child_cfg_enumerator(from); clear_start_action(this, to->get_name(to), child);
while (enumerator->enumerate(enumerator, &child)) }
{
from->remove_child_cfg(from, enumerator);
to->add_child_cfg(to, child);
run_start_action(this, to, child);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
} }