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

interfaces: hmm, this seems correct now...

Browse Source 
It's not equivalent because the _vip check wasn't correct and now
you can easily see the logic invert so that setup is either on '1'
or '2' and nothing can be missed.
This commit is contained in:
Franco Fichtner 2019-04-24 03:56:57 +02:00
parent 868f68ab16
commit 17489ebea5
1 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/etc/inc/interfaces.inc
View File

@ -333,26 +333,21 @@ function interfaces_bridge_configure($verbose = false, $checkmember = 0, $realif
continue;
}
if ($checkmember == 1) {
if (strstr($bridge['if'], '_vip')) {
continue;
}
foreach (explode(',', $bridge['members']) as $member) {
if (!empty($config['interfaces'][$member]['ipaddrv6']) && $config['interfaces'][$member]['ipaddrv6'] == 'track6') {
continue 2;
}
}
} elseif ($checkmember == 2) {
if (strstr($bridge['if'], '_vip')) {
continue;
}
foreach (explode(',', $bridge['members']) as $member) {
if (empty($config['interfaces'][$member]['ipaddrv6']) || $config['interfaces'][$member]['ipaddrv6'] != 'track6') {
continue 2;
}
$vip_or_track6 = strstr($gif['if'], '_vip');
foreach (explode(',', $bridge['members']) as $member) {
if (!empty($config['interfaces'][$member]['ipaddrv6']) && $config['interfaces'][$member]['ipaddrv6'] == 'track6') {
$vip_or_track6 = true;
break;
}
}
if ($checkmember == 1 && $vip_or_track6) {
continue;
} elseif ($checkmember == 2 && $vip_or_track6) {
continue;
}
interface_bridge_configure($bridge, $checkmember);
}
@ -688,20 +683,14 @@ function interfaces_gre_configure($verbose = false, $checkparent = 0, $realif =
continue;
}
if ($checkparent == 1) {
if (strstr($gre['if'], '_vip')) {
continue;
}
if (!empty($config['interfaces'][$gre['if']]['ipaddrv6']) && $config['interfaces'][$gre['if']]['ipaddrv6'] == 'track6') {
continue;
}
} elseif ($checkparent == 2) {
if (strstr($gre['if'], '_vip')) {
continue;
}
if (empty($config['interfaces'][$gre['if']]['ipaddrv6']) || $config['interfaces'][$gre['if']]['ipaddrv6'] != 'track6') {
continue;
}
$vip_or_track6 = strstr($gre['if'], '_vip') ||
(!empty($config['interfaces'][$gre['if']]['ipaddrv6']) &&
$config['interfaces'][$gre['if']]['ipaddrv6'] == 'track6');
if ($checkparent == 1 && $vip_or_track6) {
continue;
} elseif ($checkparent == 2 && !$vip_or_track6) {
continue;
}
interface_gre_configure($gre);
@ -805,20 +794,14 @@ function interfaces_gif_configure($verbose = false, $checkparent = 0, $realif =
continue;
}
if ($checkparent == 1) {
if (strstr($gif['if'], '_vip')) {
continue;
}
if (!empty($config['interfaces'][$gif['if']]['ipaddrv6']) && $config['interfaces'][$gif['if']]['ipaddrv6'] == 'track6') {
continue;
}
} elseif ($checkparent == 2) {
if (strstr($gif['if'], '_vip')) {
continue;
}
if (empty($config['interfaces'][$gif['if']]['ipaddrv6']) || $config['interfaces'][$gif['if']]['ipaddrv6'] != 'track6') {
continue;
}
$vip_or_track6 = strstr($gif['if'], '_vip') ||
(!empty($config['interfaces'][$gif['if']]['ipaddrv6']) &&
$config['interfaces'][$gif['if']]['ipaddrv6'] == 'track6');
if ($checkparent == 1 && $vip_or_track6) {
continue;
} elseif ($checkparent == 2 && !$vip_or_track6) {
continue;
}
interface_gif_configure($gif);