lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove non-functional traffic shaper (dummynet) from legacy code

Browse Source 
related to recent kernel cleanup.

This will be replaced with more standard components (schedule 15.7)
This commit is contained in:
Ad Schellevis 2015-04-27 17:50:14 +00:00
parent 701d2346c4
commit cd1c36f7af
14 changed files with 6 additions and 1788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/etc/inc/filter.inc
View File

@ -160,7 +160,7 @@ function filter_delete_states_for_down_gateways() {
function filter_configure_sync($delete_states_if_needed = true)
{
global $config, $g, $after_filter_configure_run, $FilterIflist;
global $time_based_rules, $filterdns, $aliases, $dummynet_name_list;
global $time_based_rules, $filterdns, $aliases;
/* Use filter lock to not allow concurrent filter reloads during this run. */
$filterlck = lock('filter', LOCK_EX);
@ -186,8 +186,6 @@ function filter_configure_sync($delete_states_if_needed = true)
if(file_exists("/var/run/booting"))
echo ".";
update_filter_reload_status(gettext("Generating Limiter rules"));
$dummynet_rules = filter_generate_dummynet_rules();
$dummynet_name_list = get_unique_dnqueue_list();
update_filter_reload_status(gettext("Generating NAT rules"));
/* generate nat rules */
$natrules = filter_nat_rules_generate();
@ -2229,7 +2227,7 @@ function filter_generate_address(& $rule, $target = "source", $isnat = false) {
function filter_generate_user_rule($rule)
{
global $config, $g, $FilterIflist, $GatewaysList;
global $layer7_rules_list, $dummynet_name_list;
global $layer7_rules_list;
/* don't include disabled rules */
if(isset($rule['disabled'])) {
@ -2544,21 +2542,6 @@ function filter_generate_user_rule($rule)
$aline['queue'] .= ",".$rule['ackqueue'];
$aline['queue'] .= ") ";
}
if($rule['dnpipe'] <> "") {
if (!empty($dummynet_name_list[$rule['dnpipe']])) {
if($dummynet_name_list[$rule['dnpipe']][0] == "?") {
$aline['dnpipe'] = " dnqueue( ";
$aline['dnpipe'] .= substr($dummynet_name_list[$rule['dnpipe']],1);
if($rule['pdnpipe'] <> "")
$aline['dnpipe'] .= ",".substr($dummynet_name_list[$rule['pdnpipe']], 1);
} else {
$aline['dnpipe'] = " dnpipe ( " . $dummynet_name_list[$rule['dnpipe']];
if($rule['pdnpipe'] <> "")
$aline['dnpipe'] .= "," . $dummynet_name_list[$rule['pdnpipe']];
}
$aline['dnpipe'] .= ") ";
}
}
/* is a time based rule schedule attached? */
if(!empty($rule['sched']) && !empty($config['schedules'])) {
@ -2588,7 +2571,7 @@ function filter_generate_user_rule($rule)
$aline['interface'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] .
$negate_networks . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] .
$aline['vlanprio'] . $aline['vlanprioset'] . $aline['dscp'] . $aline['allowopts'] . $aline['flags'] .
$aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'] .
$aline['queue'] . $aline['schedlabel'] .
" label \"NEGATE_ROUTE: Negate policy routing for destination\"\n";
}
@ -2596,7 +2579,7 @@ function filter_generate_user_rule($rule)
$line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] .
$aline['reply'] . $aline['route'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] . $aline['dst'] .
$aline['divert'] . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] .
$aline['vlanprio'] . $aline['vlanprioset'] . $aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'];
$aline['vlanprio'] . $aline['vlanprioset'] . $aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['schedlabel'];
unset($aline);

6
src/etc/inc/priv.defs.inc
View File

@ -406,12 +406,6 @@ $priv_list['page-firewall-trafficshaper-queues']['descr'] = gettext("Allow acces
$priv_list['page-firewall-trafficshaper-queues']['match'] = array();
$priv_list['page-firewall-trafficshaper-queues']['match'][] = "firewall_shaper_queues.php*";
$priv_list['page-firewall-trafficshaper-limiter'] = array();
$priv_list['page-firewall-trafficshaper-limiter']['name'] = gettext("WebCfg - Firewall: Traffic Shaper: Limiter page");
$priv_list['page-firewall-trafficshaper-limiter']['descr'] = gettext("Allow access to the 'Firewall: Traffic Shaper: Limiter' page.");
$priv_list['page-firewall-trafficshaper-limiter']['match'] = array();
$priv_list['page-firewall-trafficshaper-limiter']['match'][] = "firewall_shaper_vinterface.php*";
$priv_list['page-firewall-trafficshaper-wizard'] = array();
$priv_list['page-firewall-trafficshaper-wizard']['name'] = gettext("WebCfg - Firewall: Traffic Shaper: Wizard page");
$priv_list['page-firewall-trafficshaper-wizard']['descr'] = gettext("Allow access to the 'Firewall: Traffic Shaper: Wizard' page.");

1196
src/etc/inc/shaper.inc
View File

File diff suppressed because it is too large Load Diff

26
src/etc/inc/upgrade_config.inc
View File

@ -2813,7 +2813,7 @@ function upgrade_085_to_086() {
}
function upgrade_086_to_087() {
global $config, $dummynet_pipe_list;
global $config;
if (!is_array($config['filter']) || !is_array($config['filter']['rule']))
return;
@ -2836,30 +2836,6 @@ function upgrade_086_to_087() {
unset($dnqueue_number, $dnpipe_number, $qidx, $idx, $dnpipe, $dnqueue);
require_once("shaper.inc");
read_dummynet_config();
$dn_list = array();
if (is_array($dummynet_pipe_list)) {
foreach ($dummynet_pipe_list as $dn) {
$tmplist =& $dn->get_queue_list();
foreach ($tmplist as $qname => $link) {
$dn_list[$link] = $qname;
}
}
unset($dummynet_pipe_list);
}
foreach ($config['filter']['rule'] as $idx => $rule) {
if (!empty($rule['dnpipe'])) {
if (!empty($dn_list[$rule['dnpipe']]))
$config['filter']['rule'][$idx]['dnpipe'] = $dn_list[$rule['dnpipe']];
}
if (!empty($rule['pdnpipe'])) {
if (!empty($dn_list[$rule['pdnpipe']]))
$config['filter']['rule'][$idx]['pdnpipe'] = $dn_list[$rule['pdnpipe']];
}
}
}
function upgrade_087_to_088() {

1
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View File

@ -64,7 +64,6 @@
<Schedules url="/firewall_schedule.php"/>
<TrafficShaper url="/firewall_shaper.php">
<ByQueue VisibleName="By Queue" url="/firewall_shaper_queues.php"/>
<Limiter url="/firewall_shaper_vinterface.php"/>
<Layer7 url="/firewall_shaper_layer7.php"/>
<Wizards url="/firewall_shaper_wizards.php"/>
</TrafficShaper>

1
src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.txt
View File

@ -65,7 +65,6 @@ page-firewall-schedules-edit=firewall_schedule_edit.php*
page-firewall-trafficshaper=firewall_shaper.php*
page-firewall-trafficshaper-layer7=firewall_shaper_layer7.php*
page-firewall-trafficshaper-queues=firewall_shaper_queues.php*
page-firewall-trafficshaper-limiter=firewall_shaper_vinterface.php*
page-firewall-trafficshaper-wizard=firewall_shaper_wizards.php*
page-firewall-virtualipaddresses=firewall_virtual_ip.php*
page-firewall-virtualipaddress-edit=firewall_virtual_ip_edit.php*

74
src/www/firewall_rules_edit.php
View File

@ -208,8 +208,6 @@ if (isset($id) && $a_filter[$id]) {
/* Shaper support */
$pconfig['defaultqueue'] = (($a_filter[$id]['ackqueue'] == "none") ? '' : $a_filter[$id]['defaultqueue']);
$pconfig['ackqueue'] = (($a_filter[$id]['ackqueue'] == "none") ? '' : $a_filter[$id]['ackqueue']);
$pconfig['dnpipe'] = (($a_filter[$id]['dnpipe'] == "none") ? '' : $a_filter[$id]['dnpipe']);
$pconfig['pdnpipe'] = (($a_filter[$id]['pdnpipe'] == "none") ? '' : $a_filter[$id]['pdnpipe']);
$pconfig['l7container'] = (($a_filter[$id]['l7container'] == "none") ? '' : $a_filter[$id]['l7container']);
//schedule support
@ -236,8 +234,6 @@ if (isset($_GET['dup']) && is_numericint($_GET['dup']))
read_altq_config(); /* XXX: */
$qlist =& get_unique_queue_list();
read_dummynet_config(); /* XXX: */
$dnqlist =& get_unique_dnqueue_list();
read_layer7_config();
$l7clist =& get_l7_unique_list();
$a_gatewaygroups = return_gateway_groups_array();
@ -484,22 +480,8 @@ if ($_POST) {
else if ($_POST['ackqueue'] == $_POST['defaultqueue'])
$input_errors[] = gettext("Acknowledge queue and Queue cannot be the same.");
}
if (isset($_POST['floating']) && $_POST['pdnpipe'] != "" && (empty($_POST['direction']) || $_POST['direction'] == "any"))
$input_errors[] = gettext("You can not use limiters in Floating rules without choosing a direction.");
if (isset($_POST['floating']) && $_POST['gateway'] != "" && (empty($_POST['direction']) || $_POST['direction'] == "any"))
$input_errors[] = gettext("You can not use gateways in Floating rules without choosing a direction.");
if ($_POST['pdnpipe'] && $_POST['pdnpipe'] != "") {
if ($_POST['dnpipe'] == "" )
$input_errors[] = gettext("You must select a queue for the In direction before selecting one for Out too.");
else if ($_POST['pdnpipe'] == $_POST['dnpipe'])
$input_errors[] = gettext("In and Out Queue cannot be the same.");
else if ($dnqlist[$_POST['pdnpipe']][0] == "?" && $dnqlist[$_POST['dnpipe']][0] <> "?")
$input_errors[] = gettext("You cannot select one queue and one virtual interface for IN and Out. both must be from the same type.");
else if ($dnqlist[$_POST['dnpipe']][0] == "?" && $dnqlist[$_POST['pdnpipe']][0] <> "?")
$input_errors[] = gettext("You cannot select one queue and one virtual interface for IN and Out. both must be from the same type.");
if ($_POST['direction'] == "out" && empty($_POST['gateway']))
$input_errors[] = gettext("Please select a gateway, normaly the interface selected gateway, so the limiters work correctly");
}
if( !empty($_POST['ruleid']) && !ctype_digit($_POST['ruleid']))
$input_errors[] = gettext('ID must be an integer');
if($_POST['l7container'] && $_POST['l7container'] != "") {
@ -705,12 +687,6 @@ if ($_POST) {
$filterent['ackqueue'] = $_POST['ackqueue'];
}
if ($_POST['dnpipe'] != "") {
$filterent['dnpipe'] = $_POST['dnpipe'];
if ($_POST['pdnpipe'] != "")
$filterent['pdnpipe'] = $_POST['pdnpipe'];
}
if ($_POST['l7container'] != "") {
$filterent['l7container'] = $_POST['l7container'];
}
@ -1541,56 +1517,6 @@ include("head.inc");
</div>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("In/Out");?></td>
<td width="78%" class="vtable">
<div id="showadvinoutbox" <?php if (!empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
<input type="button" onclick="show_advanced_inout()" class="btn btn-default" value="<?=gettext("Advanced"); ?>" /> - <?=gettext("Show advanced option");?>
</div>
<div id="showinoutadv" <?php if (empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
<select name="dnpipe">
<?php
if (!is_array($dnqlist))
$dnqlist = array();
echo "<option value=\"\"";
if (!$dnqselected) echo " selected=\"selected\"";
echo " >none</option>";
foreach ($dnqlist as $dnq => $dnqkey) {
if($dnq == "")
continue;
echo "<option value=\"$dnq\"";
if ($dnq == $pconfig['dnpipe']) {
$dnqselected = 1;
echo " selected=\"selected\"";
}
echo ">{$dnq}</option>";
}
?>
</select> /
<select name="pdnpipe">
<?php
$dnqselected = 0;
echo "<option value=\"\"";
if (!$dnqselected) echo " selected=\"selected\"";
echo " >none</option>";
foreach ($dnqlist as $dnq => $dnqkey) {
if($dnq == "")
continue;
echo "<option value=\"$dnq\"";
if ($dnq == $pconfig['pdnpipe']) {
$dnqselected = 1;
echo " selected=\"selected\"";
}
echo ">{$dnq}</option>";
}
?>
</select>
<br />
<span class="vexpl"><?=gettext("Choose the Out queue/Virtual interface only if you have also selected In.")."<br />".gettext("The Out selection is applied to traffic leaving the interface where the rule is created, In is applied to traffic coming into the chosen interface.")."<br />".gettext("If you are creating a floating rule, if the direction is In then the same rules apply, if the direction is out the selections are reverted Out is for incoming and In is for outgoing.");?></span>
</div>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Ackqueue/Queue");?></td>
<td width="78%" class="vtable">

1
src/www/firewall_shaper.php
View File

@ -408,7 +408,6 @@ include("fbegin.inc");
$tab_array = array();
$tab_array[0] = array(gettext("By Interface"), true, "firewall_shaper.php");
$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
display_top_tabs($tab_array);

1
src/www/firewall_shaper_layer7.php
View File

@ -407,7 +407,6 @@ include("fbegin.inc");
$tab_array = array();
$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
$tab_array[3] = array(gettext("Layer7"), true, "firewall_shaper_layer7.php");
$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
display_top_tabs($tab_array);

1
src/www/firewall_shaper_queues.php
View File

@ -190,7 +190,6 @@ include("head.inc");
$tab_array = array();
$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
$tab_array[1] = array(gettext("By Queue"), true, "firewall_shaper_queues.php");
$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
display_top_tabs($tab_array);

453
src/www/firewall_shaper_vinterface.php
View File

@ -1,453 +0,0 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2004, 2005 Scott Ullrich
Copyright (C) 2008 Ermal Luçi
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
if($_GET['reset'] <> "") {
mwexec("/usr/bin/killall -9 pfctl");
exit;
}
$pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"), gettext("Limiter"));
$shortcut_section = "trafficshaper-limiters";
read_dummynet_config();
/*
* The whole logic in these code maybe can be specified.
* If you find a better way contact me :).
*/
if ($_GET) {
if (isset($_GET['queue'])) {
$qname = htmlspecialchars(trim($_GET['queue']));
}
if (isset($_GET['pipe'])) {
$pipe = htmlspecialchars(trim($_GET['pipe']));
}
if (isset($_GET['action'])) {
$action = htmlspecialchars($_GET['action']);
}
}
if ($_POST) {
if (isset($_POST['name'])) {
$qname = htmlspecialchars(trim($_POST['name']));
} else if (isset($_POST['newname'])) {
$qname = htmlspecialchars(trim($_POST['newname']));
}
if (isset($_POST['pipe'])) {
$pipe = htmlspecialchars(trim($_POST['pipe']));
} else {
$pipe = htmlspecialchars(trim($qname));
}
if (isset($_POST['parentqueue'])) {
$parentqueue = htmlspecialchars(trim($_POST['parentqueue']));
}
}
if ($pipe) {
$dnpipe = $dummynet_pipe_list[$pipe];
if ($dnpipe) {
$queue =& $dnpipe->find_queue($pipe, $qname);
} else $addnewpipe = true;
}
$dontshow = false;
$newqueue = false;
$output_form = "";
if ($_GET) {
switch ($action) {
case "delete":
if ($queue) {
if (is_array($config['filter']['rule'])) {
foreach ($config['filter']['rule'] as $rule) {
if ($rule['dnpipe'] == $queue->GetQname() || $rule['pdnpipe'] == $queue->GetQname())
$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleting.");
}
}
if (!$input_errors) {
$queue->delete_queue();
if (write_config())
mark_subsystem_dirty('shaper');
header("Location: firewall_shaper_vinterface.php");
exit;
}
$output_form .= $queue->build_form();
} else {
$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
$output_form .= $dn_default_shaper_msg;
$dontshow = true;
}
break;
case "resetall":
foreach ($dummynet_pipe_list as $dn)
$dn->delete_queue();
unset($dummynet_pipe_list);
$dummynet_pipe_list = array();
unset($config['dnshaper']['queue']);
unset($queue);
unset($pipe);
$can_add = false;
$can_enable = false;
$dontshow = true;
foreach ($config['filter']['rule'] as $key => $rule) {
if (isset($rule['dnpipe']))
unset($config['filter']['rule'][$key]['dnpipe']);
if (isset($rule['pdnpipe']))
unset($config['filter']['rule'][$key]['pdnpipe']);
}
if (write_config()) {
$retval = 0;
$retval = filter_configure();
$savemsg = get_std_save_message($retval);
if (stristr($retval, "error") <> true)
$savemsg = get_std_save_message($retval);
else
$savemsg = $retval;
} else
$savemsg = gettext("Unable to write config.xml (Access Denied?)");
$output_form = $dn_default_shaper_message;
break;
case "add":
if ($dnpipe) {
$q = new dnqueue_class();
$q->SetPipe($pipe);
$output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\"";
$output_form .= " value=\"".$pipe."\" />";
} else if ($addnewpipe) {
$q = new dnpipe_class();
$q->SetQname($pipe);
} else
$input_errors[] = gettext("Could not create new queue/discipline!");
if ($q) {
$output_form .= $q->build_form();
$newjavascript = $q->build_javascript();
unset($q);
$newqueue = true;
}
break;
case "show":
if ($queue)
$output_form .= $queue->build_form();
else
$input_errors[] = gettext("Queue not found!");
break;
case "enable":
if ($queue) {
$queue->SetEnabled("on");
$output_form .= $queue->build_form();
$queue->wconfig();
if (write_config())
mark_subsystem_dirty('shaper');
} else
$input_errors[] = gettext("Queue not found!");
break;
case "disable":
if ($queue) {
$queue->SetEnabled("");
$output_form .= $queue->build_form();
$queue->wconfig();
if (write_config())
mark_subsystem_dirty('shaper');
} else
$input_errors[] = gettext("Queue not found!");
break;
default:
$output_form .= $dn_default_shaper_msg;
$dontshow = true;
break;
}
} else if ($_POST) {
unset($input_errors);
if ($addnewpipe) {
if (!empty($dummynet_pipe_list[$qname]))
$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
else {
$dnpipe =& new dnpipe_class();
$dnpipe->ReadConfig($_POST);
$dnpipe->validate_input($_POST, $input_errors);
if (!$input_errors) {
$number = dnpipe_find_nextnumber();
$dnpipe->SetNumber($number);
unset($tmppath);
$tmppath[] = $dnpipe->GetQname();
$dnpipe->SetLink($tmppath);
$dnpipe->wconfig();
if (write_config())
mark_subsystem_dirty('shaper');
$can_enable = true;
$can_add = true;
}
read_dummynet_config();
$output_form .= $dnpipe->build_form();
$newjavascript = $dnpipe->build_javascript();
}
} else if ($parentqueue) { /* Add a new queue */
if (!empty($dummynet_pipe_list[$qname]))
$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
else if ($dnpipe) {
$tmppath =& $dnpipe->GetLink();
array_push($tmppath, $qname);
$tmp =& $dnpipe->add_queue($pipe, $_POST, $tmppath, $input_errors);
if (!$input_errors) {
array_pop($tmppath);
$tmp->wconfig();
if (write_config()) {
$can_enable = true;
$can_add = false;
mark_subsystem_dirty('shaper');
}
}
read_dummynet_config();
$output_form .= $tmp->build_form();
} else
$input_errors[] = gettext("Could not add new queue.");
} else if ($_POST['apply']) {
write_config();
$retval = 0;
$retval = filter_configure();
$savemsg = get_std_save_message($retval);
if (stristr($retval, "error") <> true)
$savemsg = get_std_save_message($retval);
else
$savemsg = $retval;
/* XXX: TODO Make dummynet pretty graphs */
// enable_rrd_graphing();
clear_subsystem_dirty('shaper');
if ($queue) {
$output_form .= $queue->build_form();
$dontshow = false;
}
else {
$output_form .= $dn_default_shaper_message;
$dontshow = true;
}
} else if ($queue) {
$queue->validate_input($_POST, $input_errors);
if (!$input_errors) {
$queue->update_dn_data($_POST);
$queue->wconfig();
if (write_config())
mark_subsystem_dirty('shaper');
$dontshow = false;
}
read_dummynet_config();
$output_form .= $queue->build_form();
} else {
$output_form .= $dn_default_shaper_msg;
$dontshow = true;
}
} else {
$output_form .= $dn_default_shaper_msg;
$dontshow = true;
}
if ($queue) {
if ($queue->GetEnabled())
$can_enable = true;
else
$can_enable = false;
if ($queue->CanHaveChildren()) {
$can_add = true;
} else
$can_add = false;
}
$tree = "<ul class=\"tree\" >";
if (is_array($dummynet_pipe_list)) {
foreach ($dummynet_pipe_list as $tmpdn) {
$tree .= $tmpdn->build_tree();
}
}
$tree .= "</ul>";
if (!$dontshow || $newqueue) {
$output_form .= "<tr><td width=\"22%\" valign=\"top\" class=\"vncellreq\">";
$output_form .= gettext("Queue Actions");
$output_form .= "</td><td valign=\"top\" class=\"vncellreq\" width=\"78%\">";
$output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"btn btn-primary\" />";
if ($can_add || $addnewaltq) {
$output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe=";
$output_form .= $pipe;
if ($queue) {
$output_form .= "&amp;queue=" . $queue->GetQname();
}
$output_form .= "&amp;action=add\">";
$output_form .= "<input type=\"button\" class=\"btn btn-primary\" name=\"add\" value=\"" . gettext("Add new queue") ."\" />";
$output_form .= "</a>";
}
$output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe=";
$output_form .= $pipe;
if ($queue) {
$output_form .= "&amp;queue=" . $queue->GetQname();
}
$output_form .= "&amp;action=delete\">";
$output_form .= "<input type=\"button\" class=\"btn btn-default\" name=\"delete\"";
if ($queue)
$output_form .= " value=\"" . gettext("Delete this queue") ."\" />";
else
$output_form .= " value=\"" . gettext("Delete Limiter") ."\" />";
$output_form .= "</a>";
$output_form .= "</td></tr>";
$output_form .= "</table>";
}
else
$output_form .= "</table>";
$output = "<table summary=\"output form\">";
$output .= $output_form;
$closehead = false;
include("head.inc");
?>
<body>
<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
<script type="text/javascript" src="./tree/tree.js"></script>
<script type="text/javascript">
//<![CDATA[
function show_source_port_range() {
document.getElementById("sprtable").style.display = '';
document.getElementById("sprtable1").style.display = '';
document.getElementById("sprtable2").style.display = '';
document.getElementById("sprtable5").style.display = '';
document.getElementById("sprtable4").style.display = 'none';
document.getElementById("showadvancedboxspr").innerHTML='';
}
//]]>
</script>
<?php
if ($queue)
echo $queue->build_javascript();
else
echo $newjavascript;
$main_buttons = array(
array('label'=>gettext("Create new limiter"), 'href'=>'firewall_shaper_vinterface.php?pipe=new&amp;action=add'),
);
include("fbegin.inc");
?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div id="inputerrors"></div>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('shaper')): ?><p>
<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br />".gettext("You must apply the changes in order for them to take effect."));?><br /></p>
<?php endif; ?>
<section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
$tab_array[2] = array(gettext("Limiter"), true, "firewall_shaper_vinterface.php");
$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<form action="firewall_shaper_vinterface.php" method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<?php if (count($dummynet_pipe_list) > 0): ?>
<tr class="tabcont"><td width="25%" align="left">
</td><td width="75%"> </td></tr>
<?php endif; ?>
<tr>
<td width="25%" valign="top" align="left">
<?php
echo $tree;
?>
</td>
<td width="75%" valign="top" align="center">
<div id="shaperarea" style="position:relative">
<?php
echo $output;
?>
</div>
</td>
</tr>
</table>
</div>
</form>
</div>
</section>
</div>
</div>
</section>
<script type='text/javascript'>
//<![CDATA[
<?php
$totalrows = 0;
if (is_array($config['dnshaper']) && is_array($config['dnshaper']['queue']))
$totalrows = count($config['dnshaper']['queue']);
echo "totalrows = {$totalrows}";
?>
//]]>
</script>
<?php include("foot.inc"); ?>

1
src/www/firewall_shaper_wizards.php
View File

@ -93,7 +93,6 @@ include("head.inc");
$tab_array = array();
$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
$tab_array[4] = array(gettext("Wizards"), true, "firewall_shaper_wizards.php");
display_top_tabs($tab_array);

4
src/www/guiconfig.inc
View File

@ -459,10 +459,6 @@ function firewall_check_for_advanced_options(&$item) {
$item_set .= "vlanprioset {$item['vlanprioset']} ";
if($item['gateway'])
$item_set .= "gateway {$item['gateway']} ";
if($item['dnpipe'])
$item_set .= "limiter {$item['dnpipe']} ";
if($item['pdnpipe'])
$item_set .= "limiter {$item['pdnpipe']} ";
if($item['ackqueue'])
$item_set .= "ackqueue {$item['ackqueue']} ";
if($item['defaultqueue'])

4
src/www/shortcuts.inc
View File

@ -214,10 +214,6 @@ $shortcuts['trafficshaper'] = array();
$shortcuts['trafficshaper']['main'] = "firewall_shaper.php";
$shortcuts['trafficshaper']['status'] = "status_queues.php";
$shortcuts['trafficshaper-limiters'] = array();
$shortcuts['trafficshaper-limiters']['main'] = "firewall_shaper_vinterface.php";
$shortcuts['trafficshaper-limiters']['status'] = "diag_limiter_info.php";
$shortcuts['forwarder'] = array();
$shortcuts['forwarder']['main'] = "services_dnsmasq.php";
$shortcuts['forwarder']['log'] = "diag_logs_resolver.php";