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

Process feedback

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

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

@ -169,7 +169,7 @@ function restore_config_section_xmlrpc($new_config)
$oldvips = array();
if (isset($new_config['virtualip']['vip']) && isset($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vipindex => $vip) {
if (vip_is_eligible_for_sync($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 ;
} else {
@ -200,7 +200,7 @@ function restore_config_section_xmlrpc($new_config)
$anyproxyarp = false;
if (isset($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vip) {
if (vip_is_eligible_for_sync($vip) && isset($oldvips["{$vip['interface']}_vip{$vip['vhid']}"])) {
if (!empty($vip['vhid']) && isset($oldvips["{$vip['interface']}_vip{$vip['vhid']}"])) {
$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]) {
@ -254,9 +254,3 @@ function restore_config_section_xmlrpc($new_config)
return true;
}
function vip_is_eligible_for_sync(array $vip)
{
return $vip['mode'] === 'carp' ||
($vip['mode'] === 'ipalias' && isset($vip['vhid']) && $vip['vhid'] > 0);
}

6
src/etc/rc.filter_synchronize
View File

@ -52,10 +52,8 @@ function get_vip_config_section(): array
$temp = [];
$temp['vip'] = [];
foreach($config['virtualip']['vip'] as $section) {
if ($section['mode'] === 'carp' ||
($section['mode'] === 'ipalias' && isset($section['vhid']) && $section['vhid'] > 0)
) {
if (!empty($section['advskew'])) {
if (!empty($section['vhid'])) {
if (isset($section['advskew']) && $section['advskew'] !== '') {
$section['advskew'] = min(intval($section['advskew']) + 100, 254);
}
$temp['vip'][] = $section;