diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-30 16:06:28 -0300 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-30 16:06:28 -0300 |
commit | 72423b73c7307e797c7365b74e1a1634dc89d99e (patch) | |
tree | ae7cfc535820423abd287c75e68620ad5c50d359 /usr/local/www/carp_status.php | |
parent | 65634b7eaf0b084121e4bcca529682da781b73d9 (diff) | |
parent | 83463e1e99cb92c0c567f5424883b5b79124ac95 (diff) | |
download | pfsense-72423b73c7307e797c7365b74e1a1634dc89d99e.zip pfsense-72423b73c7307e797c7365b74e1a1634dc89d99e.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/carp_status.php
usr/local/www/diag_nanobsd.php
usr/local/www/services_captiveportal_ip_edit.php
Diffstat (limited to 'usr/local/www/carp_status.php')
-rwxr-xr-x | usr/local/www/carp_status.php | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index b121fa7..69d1401 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -55,18 +55,41 @@ if($_POST['disablecarp'] <> "") { if($status == true) { $carp_ints = get_all_carp_interfaces(); mwexec("/sbin/sysctl net.inet.carp.allow=0"); - $carp_counter = find_number_of_created_carp_interfaces(); - if (is_array($carp_ints)) { - foreach($carp_ints as $int) { - mwexec("/sbin/ifconfig $int down"); - mwexec("/sbin/ifconfig $int destroy"); - } - } + if(is_array($config['virtualip']['vip'])) { + $viparr = &$config['virtualip']['vip']; + foreach ($viparr as $vip) { + switch ($vip['mode']) { + case "carp": + interface_vip_bring_down($vip); + sleep(1); + break; + case "carpdev-dhcp": + interface_vip_bring_down($vip); + sleep(1); + break; + } + } + } $savemsg = sprintf(gettext("%s IPs have been disabled."), $carp_counter); } else { $savemsg = gettext("CARP has been enabled."); mwexec("/sbin/sysctl net.inet.carp.allow=1"); interfaces_carp_setup(); + if(is_array($config['virtualip']['vip'])) { + $viparr = &$config['virtualip']['vip']; + foreach ($viparr as $vip) { + switch ($vip['mode']) { + case "carp": + interface_carp_configure($vip); + sleep(1); + break; + case "carpdev-dhcp": + interface_carpdev_configure($vip); + sleep(1); + break; + } + } + } } } |