lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 18:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove outdated VHID-VIPs during sync

Browse Source
This commit is contained in:
Michael Steenbeek 2019-01-16 10:05:04 +01:00
parent da366be8e5
commit 8b4a25dab0
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/etc/inc/xmlrpc/legacy.inc
View File

@ -165,6 +165,16 @@ function restore_config_section_xmlrpc($new_config)
}
}
///
$vhidVipsInNewConfig = [];
if (isset($new_config['virtualip']['vip']))
{
foreach ($new_config['virtualip']['vip'] as $vip) {
$vipKey = get_unique_vip_key($vip);
$vhidVipsInNewConfig[$vipKey] = $vip;
}
}
$vipbackup = array();
$oldvips = array();
if (isset($new_config['virtualip']['vip']) && isset($config['virtualip']['vip'])) {
@ -172,7 +182,11 @@ function restore_config_section_xmlrpc($new_config)
if (!empty($vip['vhid'])) {
// rc.filter_synchronize only sends CARP VIPs and IP Aliases with a VHID. Keep the rest like it was.
$vipKey = get_unique_vip_key($vip);
$oldvips[$vipKey] = $vip ;
$oldvips[$vipKey] = $vip;
// Remove entries that are present locally, but are not present in the new config.
if (!array_key_exists($vipKey, $vhidVipsInNewConfig)) {
unset($config['virtualip']['vip'][$vipindex]);
}
} else {
$vipbackup[] = $vip;
}