Revert "Make vips vhid be unique per parent interface!" - per cmb, this should not have been on RELENG_2_0 see ticket #2415

This reverts commit 4d0c032c528b10221a2ef894b5eca34f6fda39a7.

Conflicts:

	etc/inc/openvpn.inc
	etc/inc/upgrade_config.inc
	etc/rc.filter_synchronize

6 files changed, 52 insertions, 64 deletions

diff --git a/etc/devd.conf b/etc/devd.conf
index 912bd7e..c83ff6d 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -16,14 +16,14 @@ options {
 notify 100 {
     match "system"          "IFNET";
     match "type"            "LINK_UP";
-    match "subsystem"		"_vip";
+    match "subsystem"		"vip";
     action "/etc/rc.carpmaster $subsystem";
 };
 
 notify 100 {
     match "system"          "IFNET";
     match "type"            "LINK_DOWN";
-    match "subsystem"		"_vip";
+    match "subsystem"		"vip";
     action "/etc/rc.carpbackup $subsystem";
 };
 
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 38bef4d..4de322d 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -98,7 +98,7 @@ function does_vip_exist($vip) {
 	switch ($vip['mode']) {
 	case "carp":
 	case "carpdev":
-		$realif = "{$vip['interface']}_vip{$vip['vhid']}";
+		$realif = "vip{$vip['vhid']}";
 		if (!does_interface_exist($realif)) {
 			return false;
 		}
@@ -743,9 +743,9 @@ function interfaces_gre_configure($checkparent = 0) {
                 foreach ($config['gres']['gre'] as $i => $gre) {
                         if(empty($gre['greif']))
                                 $gre['greif'] = "gre{$i}";
-			if ($checkparent == 1 && strstr($gre['if'], "_vip"))
+			if ($checkparent == 1 && strstr($gre['if'], "vip"))
 				continue;
-			if ($checkparent == 2 && !strstr($gre['if'], "_vip"))
+			if ($checkparent == 2 && !strstr($gre['if'], "vip"))
 				continue;
                         /* XXX: Maybe we should report any errors?! */
                         interface_gre_configure($gre);
@@ -802,9 +802,9 @@ function interfaces_gif_configure($checkparent = 0) {
 		foreach ($config['gifs']['gif'] as $i => $gif) {
 			if(empty($gif['gifif']))
 				$gre['gifif'] = "gif{$i}";
-			if ($checkparent == 1 && strstr($gif['if'], "_vip"))
+			if ($checkparent == 1 && strstr($gif['if'], "vip"))
 				continue;
-			if ($checkparent == 2 && !strstr($gif['if'], "_vip"))
+			if ($checkparent == 2 && !strstr($gif['if'], "vip"))
 				continue;
 			/* XXX: Maybe we should report any errors?! */
 			interface_gif_configure($gif);
@@ -996,9 +996,13 @@ function interface_vip_bring_down($vip) {
 			pfSense_interface_deladdress($vipif, $vip['subnet']);
 		break;
 	case "carp":
+		$vipif = "vip" . $vip['vhid'];
+		if(does_interface_exist($vipif)) 
+			pfSense_interface_destroy($vipif);
+		break;
 	case "carpdev-dhcp":
-		$vipif = "{$vip['interface']}_vip{$vip['vhid']}";
-		if (does_interface_exist($vipif)) 
+		$vipif = "vip" . $vip['vhid'];
+		if(does_interface_exist($vipif)) 
 			pfSense_interface_destroy($vipif);
 		break;
 	}
@@ -1877,6 +1881,14 @@ function interface_carp_configure(&$vip) {
 	if ($vip['mode'] != "carp")
 		return;
 
+	$vip_password = $vip['password'];
+	$vip_password = escapeshellarg(addslashes(str_replace(" ", "", $vip_password)));
+	if ($vip['password'] != "")
+		$password = " pass {$vip_password}";
+
+	// set the vip interface to the vhid
+	$vipif = "vip{$vip['vhid']}";
+
 	/*
 	 * ensure the interface containing the VIP really exists
  	 * prevents a panic if the interface is missing or invalid
@@ -1887,9 +1899,6 @@ function interface_carp_configure(&$vip) {
 		return;
 	}
 
-	// set the vip interface to the vhid
-	$vipif = "{$vip['interface']}_vip{$vip['vhid']}";
-
 	/* Ensure CARP IP really exists prior to loading up. */
 	$ww_subnet_ip = find_interface_ip($realif);
 	$ww_subnet_bits = find_interface_subnet($realif);
@@ -1910,20 +1919,14 @@ function interface_carp_configure(&$vip) {
 	/* invalidate interface cache */
 	get_interface_arr(true);
 
-	$vip_password = $vip['password'];
-	$vip_password = escapeshellarg(addslashes(str_replace(" ", "", $vip_password)));
-	if ($vip['password'] != "")
-		$password = " pass {$vip_password}";
-
 	$broadcast_address = gen_subnet_max($vip['subnet'], $vip['subnet_bits']);
 	$advbase = "";
 	if (!empty($vip['advbase']))
 		$advbase = "advbase {$vip['advbase']}";
-
 	mwexec("/sbin/ifconfig {$vipif} {$vip['subnet']}/{$vip['subnet_bits']} vhid {$vip['vhid']} advskew {$vip['advskew']} {$advbase} {$password}");
 
 	interfaces_bring_up($vipif);
-
+	
 	return $vipif;
 }
 
@@ -1933,12 +1936,17 @@ function interface_carpdev_configure(&$vip) {
 	if ($vip['mode'] != "carpdev-dhcp")
 		return;
 
+	$vip_password = $vip['password'];
+	$vip_password = str_replace(" ", "", $vip_password);
+	if($vip['password'] != "")
+		$password = " pass \"" . $vip_password . "\"";
+
 	if (empty($vip['interface']))
 		return;
 
+	$vipif = "vip" . $vip['vhid'];
 	$realif = get_real_interface($vip['interface']);
 	interfaces_bring_up($realif);
-
 	/*
 	 * ensure the interface containing the VIP really exists
 	 * prevents a panic if the interface is missing or invalid
@@ -1948,7 +1956,6 @@ function interface_carpdev_configure(&$vip) {
 		return;
 	}
 
-	$vipif = "{$vip['interface']}_vip{$vip['vhid']}";
 	if (does_interface_exist($vipif)) {
 		interface_bring_down($vipif);
 	} else {
@@ -1957,12 +1964,6 @@ function interface_carpdev_configure(&$vip) {
 		pfSense_ngctl_name("{$carpdevif}:", $vipif);
 	}
 
-	$vip_password = $vip['password'];
-	$vip_password = str_replace(" ", "", $vip_password);
-	if ($vip['password'] != "")
-		$password = " pass \"" . $vip_password . "\"";
-
-
 	mwexec("/sbin/ifconfig {$vipif} carpdev {$realif} vhid {$vip['vhid']} advskew {$vip['advskew']} advbase {$vip['advbase']} {$password}");
 	interfaces_bring_up($vipif);
 
@@ -2924,10 +2925,11 @@ function get_current_wan_address($interface = "wan") {
 function convert_real_interface_to_friendly_interface_name($interface = "wan") {
         global $config;
 
-	if (stristr($interface, "_vip")) {
+	if (stristr($interface, "vip")) {
+                $index = intval(substr($interface, 3));
                 foreach ($config['virtualip']['vip'] as $counter => $vip) {
                         if ($vip['mode'] == "carpdev-dhcp" || $vip['mode'] == "carp")  {
-                                if ($interface == "{$vip['interface']}_vip{$vip['vhid']}")
+                                if ($index == $vip['vhid'])
                                         return $vip['interface'];
                         }
                 }
@@ -2983,11 +2985,11 @@ function convert_friendly_interface_to_friendly_descr($interface) {
                         else
                                 $ifdesc = strtoupper($config['interfaces'][$interface]['descr']);
 			break;
-		} else if (stristr($interface, "_vip")) {
+		} else if (substr($interface, 0, 3) == "vip") {
 			if (is_array($config['virtualip']['vip'])) {
 				foreach ($config['virtualip']['vip'] as $counter => $vip) {
 					if ($vip['mode'] == "carpdev-dhcp" || $vip['mode'] == "carp")  {
-						if ($interface == "{$vip['interface']}_vip{$vip['vhid']}")
+						if ($interface == "vip{$vip['vhid']}")
 							return "{$vip['subnet']} - {$vip['descr']}";
 					}
 				}
@@ -2996,8 +2998,8 @@ function convert_friendly_interface_to_friendly_descr($interface) {
 			/* if list */
 			$ifdescrs = get_configured_interface_with_descr(false, true);
 			foreach ($ifdescrs as $if => $ifname) {
-				if ($if == $interface || $ifname == $interface)
-					return $ifname;
+					if ($if == $interface || $ifname == $interface)
+						return $ifname;
 			}
 		}
                 break;
@@ -3300,9 +3302,8 @@ function link_ip_to_carp_interface($ip) {
                                 $carp_ip = $vip['subnet'];
                                 $carp_sn = $vip['subnet_bits'];
                                 $carp_nw = gen_subnet($carp_ip, $carp_sn);
-                                if (ip_in_subnet($ip, "{$carp_nw}/{$carp_sn}")) {
-					$carp_int[] = "{$vip['interface']}_vip{$vip['vhid']}";
-				}
+                                if (ip_in_subnet($ip, "{$carp_nw}/{$carp_sn}"))
+					$carp_int[] = "vip{$vip['vhid']}";
                         }
                 }
 		if (!empty($carp_int))
@@ -3336,9 +3337,14 @@ function link_interface_to_vips($int, $action = "") {
         if (is_array($config['virtualip']['vip'])) {
 		foreach ($config['virtualip']['vip'] as $vip) {
 			if ($int == $vip['interface']) {
-				if ($action == "update")
-					interfaces_vips_configure($int);
-				else
+				if ($action == "update") {
+					if ($vip['mode'] == "carp" && !does_interface_exist("vip{$vip['vhid']}"))
+						interfaces_vips_configure($int);
+					else {
+						interface_vip_bring_down($vip);
+						interfaces_vips_configure($int);
+					}
+				} else
 					return $vip;
 			}
 		}
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index f4001ec..9e32853 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -626,7 +626,7 @@ function openvpn_restart($mode, $settings) {
 		return;
 
 	/* Do not start if we are a CARP backup on this vip! */
-	if (strstr($settings['interface'], "_vip") && (get_carp_interface_status($settings['interface']) == "BACKUP"))
+	if ((substr($settings['interface'], 0, 3) == "vip") && (get_carp_interface_status($settings['interface']) == "BACKUP"))
 		return;
 
 	/* start the new process */
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 0eee712..9959f10 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2638,22 +2638,4 @@ function upgrade_079_to_080() {
 		unset($config['system']['username']);
 	}
 }
-
-function upgrade_080_to_081() {
-	global $config, $g;
-
-	/* XXX: Gross hacks in sight */
-	write_config();
-	if (is_array($config['virtualips']['vip'])) {
-		$vipchg = array();
-		foreach ($config['virtualips']['vip'] as $vip) {
-			$realif = get_real_interface($vip['interface']);
-			file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$realif}_vip{$vip['vhid']}/g\n");
-		}
-		mwexec("/bin/sh -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
-		require_once("config.lib.inc");
-		$config = parse_config(true);
-	}
-}
-
 ?>
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 1646827..b7517db 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -542,11 +542,11 @@ function get_configured_carp_interface_list() {
 		$viparr = &$config['virtualip']['vip'];
 		foreach ($viparr as $vip) {
 			switch ($vip['mode']) {
-			case "carp":
-			case "carpdev-dhcp":
-				$vipif = "{$vip['interface']}_vip{$vip['vhid']}";
-				$iflist[$vipif] = $vip['subnet'];
-				break;
+				case "carp":
+				case "carpdev-dhcp":
+					$vipif = "vip" . $vip['vhid'];
+					$iflist[$vipif] = $vip['subnet'];
+					break;
 			}
 		}
 	}
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index 46e5c33..b98b683 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -55,7 +55,7 @@ function backup_vip_config_section() {
 	$temp = array();
 	$temp['vip'] = array();
 	foreach($config['virtualip']['vip'] as $section) {
-		if(($section['mode'] == "proxyarp" || $section['mode'] == "ipalias") && !strstr($section['interface'], "_vip"))
+		if(($section['mode'] == "proxyarp" || $section['mode'] == "ipalias") && substr($section['interface'],0,3) != "vip")
 			continue;
 		if($section['advskew'] <> "") {
 			$section_val = intval($section['advskew']);