Commit 87011deb authored by Ad Schellevis's avatar Ad Schellevis

(vips) remove odd logic

parent ac8eba7d
...@@ -1916,24 +1916,15 @@ function interfaces_vips_configure($interface = '') ...@@ -1916,24 +1916,15 @@ function interfaces_vips_configure($interface = '')
$carp_setuped = false; $carp_setuped = false;
$anyproxyarp = false; $anyproxyarp = false;
foreach ($config['virtualip']['vip'] as $vip) { foreach ($config['virtualip']['vip'] as $vip) {
if ($interface == "" || $vip['interface'] == $interface) {
switch ($vip['mode']) { switch ($vip['mode']) {
case "proxyarp": case "proxyarp":
/* nothing it is handled on interface_proxyarp_configure() */
if ($interface <> "" && $vip['interface'] <> $interface) {
continue;
}
$anyproxyarp = true; $anyproxyarp = true;
break; break;
case "ipalias": case "ipalias":
if ($interface <> "" && $vip['interface'] <> $interface) {
continue;
}
interface_ipalias_configure($vip); interface_ipalias_configure($vip);
break; break;
case "carp": case "carp":
if ($interface <> "" && $vip['interface'] <> $interface) {
continue;
}
if ($carp_setuped == false) { if ($carp_setuped == false) {
$carp_setuped = true; $carp_setuped = true;
} }
...@@ -1941,6 +1932,7 @@ function interfaces_vips_configure($interface = '') ...@@ -1941,6 +1932,7 @@ function interfaces_vips_configure($interface = '')
break; break;
} }
} }
}
if ($carp_setuped == true) { if ($carp_setuped == true) {
interfaces_carp_setup(); interfaces_carp_setup();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment