sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-05 00:00:45 -04:00
Code Issues Projects Releases Wiki Activity

peer-cfg: Replace equal child configs with newly added ones

Browse Source 
Otherwise, renamed child configs would still be known to the daemon
under their old name.

Fixes #2746.
This commit is contained in:
Tobias Brunner 2018-09-06 15:13:37 +02:00
parent 375dfb9076
commit 40ed812442
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libcharon/config/peer_cfg.c
View File

@ -258,48 +258,44 @@ METHOD(peer_cfg_t, replace_child_cfgs, enumerator_t*,
private_peer_cfg_t *this, peer_cfg_t *other_pub)
{
private_peer_cfg_t *other = (private_peer_cfg_t*)other_pub;
linked_list_t *removed, *added;
linked_list_t *new_cfgs, *removed, *added;
enumerator_t *mine, *others;
child_cfg_t *my_cfg, *other_cfg;
child_cfgs_replace_enumerator_t *enumerator;
bool found;
removed = linked_list_create();
added = linked_list_create();
other->lock->read_lock(other->lock);
added = linked_list_create_from_enumerator(
new_cfgs = linked_list_create_from_enumerator(
other->child_cfgs->create_enumerator(other->child_cfgs));
added->invoke_offset(added, offsetof(child_cfg_t, get_ref));
new_cfgs->invoke_offset(new_cfgs, offsetof(child_cfg_t, get_ref));
other->lock->unlock(other->lock);
this->lock->write_lock(this->lock);
others = added->create_enumerator(added);
mine = this->child_cfgs->create_enumerator(this->child_cfgs);
while (mine->enumerate(mine, &my_cfg))
removed = this->child_cfgs;
this->child_cfgs = new_cfgs;
others = new_cfgs->create_enumerator(new_cfgs);
mine = removed->create_enumerator(removed);
while (others->enumerate(others, &other_cfg))
{
found = FALSE;
while (others->enumerate(others, &other_cfg))
while (mine->enumerate(mine, &my_cfg))
{
if (my_cfg->equals(my_cfg, other_cfg))
{
added->remove_at(added, others);
other_cfg->destroy(other_cfg);
removed->remove_at(removed, mine);
my_cfg->destroy(my_cfg);
found = TRUE;
break;
}
}
added->reset_enumerator(added, others);
removed->reset_enumerator(removed, mine);
if (!found)
{
this->child_cfgs->remove_at(this->child_cfgs, mine);
removed->insert_last(removed, my_cfg);
added->insert_last(added, other_cfg->get_ref(other_cfg));
}
}
while (others->enumerate(others, &other_cfg))
{
this->child_cfgs->insert_last(this->child_cfgs,
other_cfg->get_ref(other_cfg));
}
others->destroy(others);
mine->destroy(mine);
this->lock->unlock(this->lock);

4
src/libcharon/config/peer_cfg.h
View File

@ -157,11 +157,9 @@ struct peer_cfg_t {
/**
* Replace the CHILD configs with those in the given PEER config.
*
* Configs that are equal are not replaced.
*
* The enumerator enumerates the removed and added CHILD configs
* (child_cfg_t*, bool), where the flag is FALSE for removed configs and
* TRUE for added configs.
* TRUE for added configs. Configs that are equal are not enumerated.
*
* @param other other config to get CHILD configs from
* @return an enumerator over removed/added CHILD configs