diff options
| -rw-r--r-- | src/etc/inc/interfaces.inc | 3 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_virtual_ip_edit.php | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 800ff42..53fa9ba 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2160,7 +2160,8 @@ function interfaces_sync_setup() { mwexec("/sbin/ifconfig pfsync0 -syncdev -syncpeer down", false); } - if ($config['virtualip']['vip']) { + $carplist = get_configured_vip_list('all', VIP_CARP); + if (isset($carplist) && is_array($carplist) && count($carplist) > 0) { set_single_sysctl("net.inet.carp.allow", "1"); } else { set_single_sysctl("net.inet.carp.allow", "0"); diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index f75bd33..a666c31 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -324,19 +324,15 @@ function build_if_list() { $list = array(); $interfaces = get_configured_interface_with_descr(false, true); - $carplist = get_configured_vip_list(); + $carplist = get_configured_vip_list('all', VIP_CARP); foreach ($carplist as $vipname => $address) { - $vip = get_configured_vip($vipname); - if ($vip['mode'] != 'carp') { - continue; - } - $interfaces[$vipname] = $address; $interfaces[$vipname] .= " ("; if (get_vip_descr($address)) { $interfaces[$vipname] .= get_vip_descr($address); } else { + $vip = get_configured_vip($vipname); $interfaces[$vipname] .= "vhid: {$vip['vhid']}"; } $interfaces[$vipname] .= ")"; |
