diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-06-04 21:37:15 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-06-04 21:37:15 +0000 |
commit | a3f9082f46e573fab5b600a94ed8f721a9f6c74d (patch) | |
tree | aa8e1e3224b9890e969feacf1dd40db54d54cc7a /usr/local/www/interfaces_vlan.php | |
parent | 2075fadb5fce5e844d96c500cdc804a1bb7f1da9 (diff) | |
download | pfsense-a3f9082f46e573fab5b600a94ed8f721a9f6c74d.zip pfsense-a3f9082f46e573fab5b600a94ed8f721a9f6c74d.tar.gz |
Fix braindead vlan creation procedures.
Now we do not need to go through all vlans just to delete/create one of them.
Diffstat (limited to 'usr/local/www/interfaces_vlan.php')
-rwxr-xr-x | usr/local/www/interfaces_vlan.php | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index 0ed7ee6..276312b 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -52,34 +52,16 @@ function vlan_inuse($num) { return false; } -function renumber_vlan($if, $delvlan) { - if (!preg_match("/^vlan/", $if)) - return $if; - - $vlan = substr($if, 4); - if ($vlan > $delvlan) - return "vlan" . ($vlan - 1); - else - return $if; -} - if ($_GET['act'] == "del") { /* check if still in use */ if (vlan_inuse($_GET['id'])) { $input_errors[] = "This VLAN cannot be deleted because it is still being used as an interface."; } else { + mwexec("/sbin/ifconfig " . $a_vlans[$_GET['id']]['vlanif'] . " destroy"); unset($a_vlans[$_GET['id']]); - /* renumber all interfaces that use VLANs */ - $config['interfaces']['lan']['if'] = renumber_vlan($config['interfaces']['lan']['if'], $_GET['id']); - $config['interfaces']['wan']['if'] = renumber_vlan($config['interfaces']['wan']['if'], $_GET['id']); - for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $config['interfaces']['opt' . $i]['if'] = renumber_vlan($config['interfaces']['opt' . $i]['if'], $_GET['id']); - write_config(); - interfaces_vlan_configure(); - header("Location: interfaces_vlan.php"); exit; } |