From 985118b8b15bef26c4eb1a11f25373b3a24d0a97 Mon Sep 17 00:00:00 2001 From: Luiz Otavio O Souza Date: Tue, 16 Feb 2016 10:51:42 -0600 Subject: Simplify the code with the use the newly introduced function to list CARP addresses. --- src/usr/local/www/firewall_virtual_ip_edit.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/usr/local/www/firewall_virtual_ip_edit.php') 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] .= ")"; -- cgit v1.1