Do not use tags for vlan interface names since there might be same vlan tags on different parent interfaces and this will break configs and will hide the reason it does not work. Thanks-to: smos@

5 files changed, 29 insertions, 21 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 6dd751d..5d8661a 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -810,12 +810,12 @@ EOD;
 	if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
 
 		echo "\n\nVLAN interfaces:\n\n";
-		foreach ($config['vlans']['vlan'] as $vlan) {
+		foreach ($config['vlans']['vlan'] as $vlanid => $vlan) {
 
-			echo sprintf("% -8s%s\n", "vlan{$vlan['tag']}",
+			echo sprintf("% -8s%s\n", "vlan{$vlanid}",
 				"VLAN tag {$vlan['tag']}, interface {$vlan['if']}");
 
-			$iflist['vlan' . $vlan['tag']] = array();
+			$iflist['vlan' . $vlanid] = array();
 		}
 	}
 
@@ -1146,7 +1146,7 @@ EOD;
 
 		echo "Enter the VLAN tag (1-4094): ";
 		$vlan['tag'] = chop(fgets($fp));
-		$vlan['vlanif'] = "vlan{$vlan['tag']}";
+		$vlan['vlanif'] = "vlan{$vlanif}";
 		if (!is_numericint($vlan['tag']) || ($vlan['tag'] < 1) || ($vlan['tag'] > 4094)) {
 			echo "\nInvalid VLAN tag '{$vlan['tag']}'\n";
 			continue;
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 72fb3a1..603e7b3 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -88,9 +88,9 @@ function interfaces_loopback_configure() {
 function interfaces_vlan_configure() {
 	global $config;
 	if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
-		foreach ($config['vlans']['vlan'] as $vlan) {
+		foreach ($config['vlans']['vlan'] as $vlanid => $vlan) {
 			if(empty($vlan['vlanif']))
-				$vlan['vlanif'] = "vlan{$vlan['tag']}";
+				$vlan['vlanif'] = "vlan{$vlanid}";
 			/* XXX: Maybe we should report any errors?! */
 			interface_vlan_configure($vlan);
 		}
@@ -105,11 +105,10 @@ function interface_vlan_configure($vlan) {
 		return;
 	}
 	$if = $vlan['if'];
-	$vlanif  = empty($vlan['vlanif']) ? "vlan{$vlan['tag']}" : $vlan['vlanif'];
 	$tag = $vlan['tag'];
 
-	if(empty($if)) {
-		log_error("interface_vlan_confgure called with if undefined.");
+	if (empty($if)) {
+		log_error("interface_vlan_confgure called with parent if undefined.");
 		return;
 	}
 
@@ -148,14 +147,13 @@ function interface_vlan_configure($vlan) {
         /*   all vlans need to spoof their parent mac address, too.  see
          *   ticket #1514: http://cvstrac.pfsense.com/tktview?tn=1514,33
          */
-        foreach($config['interfaces'] as $interfaces) {
-                if($interfaces['if'] == $if && $interfaces['spoofmac']) {
+        foreach ($config['interfaces'] as $interfaces) {
+                if ($interfaces['if'] == $if && $interfaces['spoofmac']) {
                         mwexec("/sbin/ifconfig " . escapeshellarg($vlanif) .
                                 " link " . escapeshellarg($interfaces['spoofmac']));
                 }
         }
 
-        /* XXX: ermal -- for now leave it here at the moment it does not hurt. */
 	interfaces_bring_up($if);
 
         return $vlanif;
@@ -170,7 +168,7 @@ function interface_qinq_configure($vlan, $fd = NULL) {
         }
 
         $if = $vlan['if'];
-        $vlanif = empty($vlan['vlanif']) ? "vlan{$vlan['tag']}" : $vlan['vlanif'];
+	$vlanif = empty($vlan['vlanif']) ? "vlan" . count($config['qinqs']['qinq']) : $vlan['vlanif'];
         $tag = $vlan['tag'];
         if(empty($if)) {
                 log_error("interface_qinq_confgure called with if undefined.\n");
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 2e00622..48b94d5 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -772,7 +772,7 @@ function upgrade_044_to_045() {
 	global $config;
 	if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
 		foreach ($config['vlans']['vlan'] as $id => &$vlan)
-			$vlan['vlanif'] = "vlan{$vlan['tag']}";
+			$vlan['vlanif'] = "vlan{$id}";
 	}
 }
 
diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php
index bb13c62..17c9ccd 100755
--- a/usr/local/www/interfaces_qinq_edit.php
+++ b/usr/local/www/interfaces_qinq_edit.php
@@ -140,7 +140,12 @@ if ($_POST) {
 	if (!$input_errors) {
 		$qinqentry['members'] = $members;
 		$qinqentry['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
-		$qinqentry['vlanif'] = "vlan{$_POST['tag']}";
+		if (isset($id) && $a_qinqs[$id]) {
+			$qinqentry['vlanif'] = "vlan{$id}";
+		else {
+			$id = count($a_qinqs);
+			$qinqentry['vlanif'] = "vlan{$id}";
+		}
 		$nmembers = explode(" ", $members);
 
 		if (isset($id) && $a_qinqs[$id]) {
@@ -148,14 +153,14 @@ if ($_POST) {
 			$delmembers = array_diff($omembers, $nmembers);
 			if (count($delmembers) > 0) {
 				foreach ($delmembers as $tag) {
-					mwexec("/usr/sbin/ngctl shutdown vlan{$_POST['tag']}h{$tag}:");
-					mwexec("/usr/sbin/ngctl msg vlan{$_POST['tag']}qinq: delfilter \\\"vlan{$_POST['tag']}{$tag}\\\"");
+					mwexec("/usr/sbin/ngctl shutdown vlan{$id}h{$tag}:");
+					mwexec("/usr/sbin/ngctl msg vlan{$id}qinq: delfilter \\\"vlan{$id}{$tag}\\\"");
 				}
 			}
 			$addmembers = array_diff($nmembers, $omembers);
 			if (count($addmembers) > 0) {
 				foreach ($addmembers as $member) {
-					$if = "vlan{$_POST['tag']}";
+					$if = "vlan{$id}";
 					$vlanif = "{$if}_{$member}";
 					$macaddr = get_interface_mac($if);
 					mwexec("/usr/sbin/ngctl mkpeer {$if}qinq: eiface {$if}{$member} ether");
@@ -181,8 +186,8 @@ if ($_POST) {
 			}
 			$additions = "";
 			foreach($nmembers as $qtag)
-				$additions .= "vlan{$qinqentry['tag']}_{$qtag} ";
-			$additions .= "vlan{$qinqentry['tag']} ";
+				$additions .= "vlan{$id}_{$qtag} ";
+			$additions .= "vlan{$id} ";
 			if ($found == true)
 				$config['ifgroups']['ifgroupentry'][$gid]['members'] .= " {$additions}";
 			else {
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 04f7f4b..95cdd1f 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -98,7 +98,12 @@ if ($_POST) {
 		$vlan['if'] = $_POST['if'];
 		$vlan['tag'] = $_POST['tag'];
 		$vlan['descr'] = $_POST['descr'];
-		$vlan['vlanif'] = "vlan{$_POST['tag']}";
+		if (isset($id) && $a_vlans[$id])
+			$vlan['vlanif'] = "vlan{$id}";
+		else {
+			$id = count($a_vlans);
+			$vlan['vlanif'] = "vlan{$id}";
+		}
 
 		$vlan['vlanif'] = interface_vlan_configure($vlan);
                 if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))