From 48315e65964500cb9f61c1cebef6f9b608b09d4d Mon Sep 17 00:00:00 2001
From: Ermal Luci <eri@pfsense.org>
Date: Tue, 16 Jun 2009 23:27:11 +0000
Subject: s/./_/ for vlans since netgraph does not like .(dots) in the path
 names.

---
 etc/inc/config.inc                     | 4 ++--
 etc/inc/interfaces.inc                 | 4 ++--
 etc/inc/upgrade_config.inc             | 2 +-
 usr/local/www/interfaces_vlan_edit.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 9b69ece..40b19e6 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -815,7 +815,7 @@ EOD;
 			echo sprintf("% -8s%s\n", "vlan{$vlan['tag']}",
 				"VLAN tag {$vlan['tag']}, interface {$vlan['if']}");
 
-			$iflist[$vlan['if'] . '.vlan' . $vlan['tag']] = array();
+			$iflist[$vlan['if'] . '_vlan' . $vlan['tag']] = array();
 		}
 	}
 
@@ -1146,7 +1146,7 @@ EOD;
 
 		echo "Enter the VLAN tag (1-4094): ";
 		$vlan['tag'] = chop(fgets($fp));
-		$vlan['vlanif'] = "{$vlan['if']}.vlan{$vlan['tag']}";
+		$vlan['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}";
 		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 25afae1..55f352b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -90,7 +90,7 @@ function interfaces_vlan_configure() {
 	if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
 		foreach ($config['vlans']['vlan'] as $vlan) {
 			if(empty($vlan['vlanif']))
-				$vlan['vlanif'] = "{$vlan['if']}.vlan{$vlan['tag']}";
+				$vlan['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}";
 			/* XXX: Maybe we should report any errors?! */
 			interface_vlan_configure($vlan);
 		}
@@ -105,7 +105,7 @@ function interface_vlan_configure($vlan) {
 		return;
 	}
 	$if = $vlan['if'];
-	$vlanif  = empty($vlan['vlanif']) ? "{$if}.vlan{$vlan['tag']}" : $vlan['vlanif'];
+	$vlanif  = empty($vlan['vlanif']) ? "{$if}_vlan{$vlan['tag']}" : $vlan['vlanif'];
 	$tag = $vlan['tag'];
 
 	if(empty($if)) {
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index c70c804..22f1191 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['if']}.vlan{$vlan['tag']}";
+			$vlan['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}";
 	}
 }
 
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 2b68596..b656293 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -98,7 +98,7 @@ if ($_POST) {
 		$vlan['if'] = $_POST['if'];
 		$vlan['tag'] = $_POST['tag'];
 		$vlan['descr'] = $_POST['descr'];
-		$vlan['vlanif'] = "{$_POST['if']}.vlan{$_POST['tag']}";
+		$vlan['vlanif'] = "{$_POST['if']}_vlan{$_POST['tag']}";
 
 		$vlan['vlanif'] = interface_vlan_configure($vlan);
                 if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))
-- 
cgit v1.1