From 5f1e1d2617c211ac680a6f56a202d504cdcb6991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Sat, 28 Mar 2009 09:06:31 +0000 Subject: Bring in support for QinQ. At this time it is limited to only 2 levels. --- usr/local/www/interfaces_assign.php | 11 ++++++----- usr/local/www/interfaces_bridge.php | 11 ++++++----- usr/local/www/interfaces_gif.php | 11 ++++++----- usr/local/www/interfaces_gre.php | 11 ++++++----- usr/local/www/interfaces_groups.php | 11 ++++++----- usr/local/www/interfaces_lagg.php | 11 ++++++----- usr/local/www/interfaces_ppp.php | 11 ++++++----- usr/local/www/interfaces_vlan.php | 11 ++++++----- usr/local/www/interfaces_vlan_edit.php | 4 ++-- 9 files changed, 50 insertions(+), 42 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 00f58aa..ceb6069 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -318,11 +318,12 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed")) $tab_array[0] = array("Interface assignments", true, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 934dbd3..c7e4753 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -78,11 +78,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", true, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", true, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_gif.php b/usr/local/www/interfaces_gif.php index 9e01b33..1407a6c 100644 --- a/usr/local/www/interfaces_gif.php +++ b/usr/local/www/interfaces_gif.php @@ -86,11 +86,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", true, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", true, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index 85540e5..79a43e2 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -86,11 +86,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", true, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", true, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php index a14b3a6..2cec361 100755 --- a/usr/local/www/interfaces_groups.php +++ b/usr/local/www/interfaces_groups.php @@ -71,11 +71,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", true, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index fd46c9c..840f1c6 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -78,11 +78,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", true, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", true, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_ppp.php b/usr/local/www/interfaces_ppp.php index b258762..c698cb6 100644 --- a/usr/local/www/interfaces_ppp.php +++ b/usr/local/www/interfaces_ppp.php @@ -100,11 +100,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", false, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", true, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", true, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index f8bf3f3..7b9569d 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -87,11 +87,12 @@ include("head.inc"); $tab_array[0] = array("Interface assignments", false, "interfaces_assign.php"); $tab_array[1] = array("Interface Groups", false, "interfaces_groups.php"); $tab_array[2] = array("VLANs", true, "interfaces_vlan.php"); - $tab_array[3] = array("PPP", false, "interfaces_ppp.php"); - $tab_array[4] = array("GRE", false, "interfaces_gre.php"); - $tab_array[5] = array("GIF", false, "interfaces_gif.php"); - $tab_array[6] = array("Bridges", false, "interfaces_bridge.php"); - $tab_array[7] = array("LAGG", false, "interfaces_lagg.php"); + $tab_array[3] = array("QinQs", false, "interfaces_qinq.php"); + $tab_array[4] = array("PPP", false, "interfaces_ppp.php"); + $tab_array[5] = array("GRE", false, "interfaces_gre.php"); + $tab_array[6] = array("GIF", false, "interfaces_gif.php"); + $tab_array[7] = array("Bridges", false, "interfaces_bridge.php"); + $tab_array[8] = array("LAGG", false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index 72224c5..85ed1f9 100755 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -93,9 +93,9 @@ if ($_POST) { $vlan['if'] = $_POST['if']; $vlan['tag'] = $_POST['tag']; $vlan['descr'] = $_POST['descr']; - $vlan['vlanif'] = $_POST['vlanif']; + $vlan['vlanif'] = "vlan{$_POST['tag']}"; - $vlan['vlanif'] = interface_vlan_configure($vlan['if'], $vlan['tag'], "vlan" . $vlan['tag']); + $vlan['vlanif'] = interface_vlan_configure($vlan); if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) $input_errors[] = "Error occured creating interface, please retry."; else { -- cgit v1.1