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

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;
+                                }
+                        }
+                }
 	}
 }