summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-01-21 20:56:53 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-01-21 20:56:53 +0000
commit222b529936c015c50274f46b5f0a83f75046cd59 (patch)
treeb8293f462c366d84f12537239140d1aa3880698a
parent1b8f6d97f8961569db5a97ba0805cda8123d5802 (diff)
downloadpfsense-222b529936c015c50274f46b5f0a83f75046cd59.zip
pfsense-222b529936c015c50274f46b5f0a83f75046cd59.tar.gz
Move scheduler type to advanced menu. We'll default to PRIQ as a simple starting point for new users. NOTE: The scheduler type goes into affect for all interfaces.
-rwxr-xr-xusr/local/www/interfaces.php20
-rwxr-xr-xusr/local/www/interfaces_lan.php23
-rwxr-xr-xusr/local/www/interfaces_opt.php25
-rwxr-xr-xusr/local/www/interfaces_wan.php20
-rwxr-xr-xusr/local/www/system_advanced.php39
5 files changed, 39 insertions, 88 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 7e8e174..4601dfc 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -229,7 +229,6 @@ if ($_POST) {
$config['bigpond']['minheartbeatinterval'] = $_POST['bigpond_minheartbeatinterval'];
}
- $wancfg['schedulertype'] = $_POST['schedulertype'];
$wancfg['bandwidth'] = $_POST['bandwidth'];
$wancfg['bandwidthtype'] = $_POST['bandwidthtype'];
@@ -502,25 +501,6 @@ function type_change(enable_change,enable_change_pptp) {
<tr>
<td colspan="2" valign="top" class="listtopic">Bandwidth Management (Traffic Shaping)</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><b>Scheduler</b> </td>
- <td width="78%" class="vtable">
- <select id="schedulertype" name="schedulertype">
- <?php
- if($schedulertype == 'priq')
- echo "<option value=\"priq\">Priority based queueing</option>";
- if($schedulertype == 'cbq')
- echo "<option value=\"cbq\">Class based queueing</option>";
- if($schedulertype == 'hfsc')
- echo "<option value=\"hfsc\">Hierarchical Fair Service Curve queueing</option>";
- ?>
- <option value="priq">Priority based queueing</option>
- <option value="cbq">Class based queueing</option>
- <option value="hfsc">Hierarchical Fair Service Curve queueing</option>
- </select>
- <br> <span class="vexpl">Select which type of queueing you would like to use
- </span></td>
- </tr>
<tr>
<td valign="top" class="vncell">Interface Bandwidth Speed</td>
<td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index cb38e46..c169cc5 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -38,7 +38,6 @@ $pconfig['subnet'] = $config['interfaces']['lan']['subnet'];
$pconfig['bandwidth'] = $config['interfaces']['lan']['bandwidth'];
$pconfig['bandwidthtype'] = $config['interfaces']['lan']['bandwidthtype'];
-$pconfig['schedulertype'] = $config['interfaces']['lan']['schedulertype'];
/* Wireless interface? */
if (isset($optcfg['wireless'])) {
@@ -77,7 +76,6 @@ if ($_POST) {
$config['interfaces']['lan']['subnet'] = $_POST['subnet'];
$config['interfaces']['lan']['bandwidth'] = $_POST['bandwidth'];
$config['interfaces']['lan']['bandwidthtype'] = $_POST['bandwidthtype'];
- $config['interfaces']['lan']['schedulertype'] = $_POST['schedulertype'];
$dhcpd_was_enabled = 0;
if (isset($config['dhcpd']['enable'])) {
@@ -95,7 +93,7 @@ if ($_POST) {
"and enable it again prior to rebooting.";
}
}
-$schedulertype = $config['interfaces']['lan']['schedulertype'];
+
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -166,25 +164,6 @@ function ipaddr_change() {
<tr>
<td colspan="2" valign="top" class="vnsepcell">Bandwidth Management (Traffic Shaping)</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><b>Scheduler</b> </td>
- <td width="78%" class="vtable">
- <select id="schedulertype" name="schedulertype">
- <?php
- if($schedulertype == 'priq')
- echo "<option value=\"priq\">Priority based queueing</option>";
- if($schedulertype == 'cbq')
- echo "<option value=\"cbq\">Class based queueing</option>";
- if($schedulertype == 'hfsc')
- echo "<option value=\"hfsc\">Hierarchical Fair Service Curve queueing</option>";
- ?>
- <option value="priq">Priority based queueing</option>
- <option value="cbq">Class based queueing</option>
- <option value="hfsc">Hierarchical Fair Service Curve queueing</option>
- </select>
- <br> <span class="vexpl">Select which type of queueing you would like to use
- </span></td>
- </tr>
<tr>
<td valign="top" class="vncell">Interface Bandwidth Speed</td>
<td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index 4b80cc4..64189d0 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -48,8 +48,6 @@ $pconfig['subnet'] = $optcfg['subnet'];
$pconfig['bandwidth'] = $optcfg['bandwidth'];
$pconfig['bandwidthtype'] = $optcfg['bandwidthtype'];
-$pconfig['schedulertype'] = $optcfg['schedulertype'];
-
$pconfig['enable'] = isset($optcfg['enable']);
@@ -130,7 +128,6 @@ if ($_POST) {
$optcfg['enable'] = $_POST['enable'] ? true : false;
$optcfg['bandwidth'] = $_POST['bandwidth'];
$optcfg['bandwidthtype'] = $_POST['bandwidthtype'];
- $optcfg['schedulertype'] = $_POST['schedulertype'];
write_config();
@@ -191,9 +188,6 @@ function ipaddr_change() {
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<?php
- $schedulertype = $pconfig['schedulertype'];
-?>
<p class="pgtitle">Interfaces: Optional <?=$index;?> (<?=htmlspecialchars($optcfg['descr']);?>)</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
@@ -264,25 +258,6 @@ function ipaddr_change() {
<tr>
<td colspan="2" valign="top" class="vnsepcell">Bandwidth Management (Traffic Shaping)</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><b>Scheduler</b> </td>
- <td width="78%" class="vtable">
- <select id="schedulertype" name="schedulertype">
- <?php
- if($schedulertype == 'priq')
- echo "<option value=\"priq\">Priority based queueing</option>";
- if($schedulertype == 'cbq')
- echo "<option value=\"cbq\">Class based queueing</option>";
- if($schedulertype == 'hfsc')
- echo "<option value=\"hfsc\">Hierarchical Fair Service Curve queueing</option>";
- ?>
- <option value="priq">Priority based queueing</option>
- <option value="cbq">Class based queueing</option>
- <option value="hfsc">Hierarchical Fair Service Curve queueing</option>
- </select>
- <br> <span class="vexpl">Select which type of queueing you would like to use
- </span></td>
- </tr>
<tr>
<td valign="top" class="vncell">Interface Bandwidth Speed</td>
<td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 7e8e174..4601dfc 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -229,7 +229,6 @@ if ($_POST) {
$config['bigpond']['minheartbeatinterval'] = $_POST['bigpond_minheartbeatinterval'];
}
- $wancfg['schedulertype'] = $_POST['schedulertype'];
$wancfg['bandwidth'] = $_POST['bandwidth'];
$wancfg['bandwidthtype'] = $_POST['bandwidthtype'];
@@ -502,25 +501,6 @@ function type_change(enable_change,enable_change_pptp) {
<tr>
<td colspan="2" valign="top" class="listtopic">Bandwidth Management (Traffic Shaping)</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell"><b>Scheduler</b> </td>
- <td width="78%" class="vtable">
- <select id="schedulertype" name="schedulertype">
- <?php
- if($schedulertype == 'priq')
- echo "<option value=\"priq\">Priority based queueing</option>";
- if($schedulertype == 'cbq')
- echo "<option value=\"cbq\">Class based queueing</option>";
- if($schedulertype == 'hfsc')
- echo "<option value=\"hfsc\">Hierarchical Fair Service Curve queueing</option>";
- ?>
- <option value="priq">Priority based queueing</option>
- <option value="cbq">Class based queueing</option>
- <option value="hfsc">Hierarchical Fair Service Curve queueing</option>
- </select>
- <br> <span class="vexpl">Select which type of queueing you would like to use
- </span></td>
- </tr>
<tr>
<td valign="top" class="vncell">Interface Bandwidth Speed</td>
<td class="vtable"> <input name="bandwidth" type="text" class="formfld" id="bandwidth" size="30" value="<?=htmlspecialchars($pconfig['bandwidth']);?>">
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index cbd177b..ea1baf3 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -46,6 +46,8 @@ if ($g['platform'] == "generic-pc")
$pconfig['noantilockout'] = isset($config['system']['webgui']['noantilockout']);
$pconfig['tcpidletimeout'] = $config['filter']['tcpidletimeout'];
+$pconfig['schedulertype'] = $config['system']['schedulertype'];
+
if ($_POST) {
unset($input_errors);
@@ -88,6 +90,7 @@ if ($_POST) {
$config['system']['disableconsolemenu'] = $_POST['disableconsolemenu'] ? true : false;
$config['system']['disablefirmwarecheck'] = $_POST['disablefirmwarecheck'] ? true : false;
$config['system']['webgui']['expanddiags'] = $_POST['expanddiags'] ? true : false;
+ $config['system']['schedulertype'] = $_POST['schedulertype'];
if ($g['platform'] == "generic-pc") {
$oldharddiskstandby = $config['system']['harddiskstandby'];
$config['system']['harddiskstandby'] = $_POST['harddiskstandby'];
@@ -169,7 +172,41 @@ function enable_change(enable_over) {
</tr>
<tr>
<td colspan="2" class="list" height="12"></td>
- </tr> <tr>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Traffic Shaper Scheduler Type</td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncell"><b>Scheduler</b> </td>
+ <td width="78%" class="vtable">
+ <select id="schedulertype" name="schedulertype">
+ <?php
+ if($pconfig['schedulertype'] == 'priq')
+ echo "<option value=\"priq\">Priority based queueing</option>";
+ if($pconfig['schedulertype'] == 'cbq')
+ echo "<option value=\"cbq\">Class based queueing</option>";
+ if($pconfig['schedulertype'] == 'hfsc')
+ echo "<option value=\"hfsc\">Hierarchical Fair Service Curve queueing</option>";
+ ?>
+ <option value="priq">Priority based queueing</option>
+ <option value="cbq">Class based queueing</option>
+ <option value="hfsc">Hierarchical Fair Service Curve queueing</option>
+ </select>
+ <br> <span class="vexpl">Select which type of queueing you would like to use
+ </span></td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input name="Submit" type="submit" class="formbtn" value="Save" onclick="enable_change(true)">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+
+ <tr>
<td colspan="2" valign="top" class="listtopic">Disable Firewalling</td>
</tr>
<tr>
OpenPOWER on IntegriCloud