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

Do more thorough matching of IPalias VIPs

Browse Source
This commit is contained in:
Michael Steenbeek 2019-01-07 12:08:26 +01:00
parent 1bc9eb9afc
commit da366be8e5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,8 @@ function restore_config_section_xmlrpc($new_config)
foreach ($config['virtualip']['vip'] as $vipindex => $vip) {
if (!empty($vip['vhid'])) {
// rc.filter_synchronize only sends CARP VIPs and IP Aliases with a VHID. Keep the rest like it was.
$oldvips["{$vip['interface']}_vip{$vip['vhid']}"] = $vip ;
$vipKey = get_unique_vip_key($vip);
$oldvips[$vipKey] = $vip ;
} else {
$vipbackup[] = $vip;
}
@ -200,16 +201,17 @@ function restore_config_section_xmlrpc($new_config)
$anyproxyarp = false;
if (isset($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vip) {
if (!empty($vip['vhid']) && isset($oldvips["{$vip['interface']}_vip{$vip['vhid']}"])) {
$vipKey = get_unique_vip_key($vip);
if (!empty($vip['vhid']) && isset($oldvips[$vipKey])) {
$is_changed = false;
foreach (array('password', 'advskew', 'subnet', 'subnet_bits', 'advbase') as $chk_key) {
if ($oldvips["{$vip['interface']}_vip{$vip['vhid']}"][$chk_key] != $vip[$chk_key]) {
if ($oldvips[$vipKey][$chk_key] != $vip[$chk_key]) {
$is_changed = true;
break;
}
}
if (!$is_changed) {
unset($oldvips["{$vip['interface']}_vip{$vip['vhid']}"]);
unset($oldvips[$vipKey]);
if (does_vip_exist($vip)) {
continue; // Skip reconfiguring this vips since nothing has changed.
}
@ -254,3 +256,11 @@ function restore_config_section_xmlrpc($new_config)
return true;
}
function get_unique_vip_key($vip)
{
if($vip['mode'] === 'carp')
return "{$vip['mode']}_{$vip['interface']}_vip{$vip['vhid']}";
else
return "{$vip['mode']}_{$vip['interface']}_vip{$vip['vhid']}_{$vip['subnet']}_{$vip['subnet_bits']}_{$vip['gateway']}";
}