diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-04-14 17:21:00 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-04-14 17:21:00 +0000 |
commit | 16ab9f44ad2623d3f3c751af415aab78fc76ee58 (patch) | |
tree | 0039790a95ad652a0107cf16aeb3378d2ebba7b7 | |
parent | 85ff97a7ac35580eb10168d5da01fc622382dd84 (diff) | |
download | pfsense-16ab9f44ad2623d3f3c751af415aab78fc76ee58.zip pfsense-16ab9f44ad2623d3f3c751af415aab78fc76ee58.tar.gz |
Make the wizards up to date.
4 files changed, 1 insertions, 155 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index c303e0f..78d8d00 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -879,7 +879,6 @@ $othersplist = array(); /* restart the cached config */ unset($altq_list_queues); $altq_list_queues = array(); - $tmppath = array(); $steps = floatval($config['ezshaper']['step1']['numberofconnections']); $lanbw = 0; @@ -893,6 +892,7 @@ $othersplist = array(); $altq =& new altq_root_queue(); + $tmppath = array(); $altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]); $altq->SetScheduler($config['ezshaper']['step2']["conn{$i}uploadscheduler"]); $altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"])); @@ -1363,29 +1363,6 @@ $othersplist = array(); else if ($sched == "HFSC") $q =& new hfsc_queue(); $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $lanbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; $tmpcf['red'] = "on"; diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 8aedef9..4b55503 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1030,29 +1030,6 @@ $othersplist = array(); else if ($sched == "HFSC") $q =& new hfsc_queue(); $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $upbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; $tmpcf['red'] = "on"; @@ -1461,29 +1438,6 @@ $othersplist = array(); else if ($sched == "HFSC") $q =& new hfsc_queue(); $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $downbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; $tmpcf['red'] = "on"; diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index 921a205..3991834 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1068,29 +1068,6 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $upbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - if ($sched == "PRIQ") $q =& new priq_queue(); else if ($sched == "CBQ") @@ -1514,29 +1491,6 @@ $othersplist = array(); else if ($sched == "HFSC") $q =& new hfsc_queue(); $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $lanbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); $tmpcf['name'] = "qInternet"; //$tmpcf['priority'] = 6; $tmpcf['red'] = "on"; diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc index 7667b41..3f83142 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -845,29 +845,6 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") - $q =& new cbq_queue(); - else if ($sched == "HFSC") - $q =& new hfsc_queue(); - $tmpcf = array(); - $tmpcf['name'] = "qLocal"; - //$tmpcf['priority'] = 6; - $tmpcf['red'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ" || $sched == "HFSC") { - $ifbwguess = 10 * 1000 * 1000; // 10Mbit/s - $tmpcf['bandwidth'] = ($ifbwguess - $upbw) / 1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qLocal"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qLocal <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - if ($sched == "PRIQ") $q =& new priq_queue(); else if ($sched == "CBQ") @@ -1719,22 +1696,6 @@ $othersplist = array(); } } } - $rule = array(); - $rule['defaultqueue'] = 'qLocal'; - $rule['source']['any'] = TRUE; - $rule['destination']['any'] = TRUE; - $rule['floating'] = "yes"; - $rule['wizard'] = "yes"; - $rule['enabled'] = "on"; - $rule['descr'] = "Local traffic "; - for ($i = 0; $i < $steps; $i++) { - if ($config['ezshaper']['step2']["conn{$i}interface"] == "wan") - continue; - $rule['interface'] .= $config['ezshaper']['step2']["conn{$i}interface"]; - if ($i > 0 && $i < $steps - 1) - $rule['interface'] .= ","; - } - $config['filter']['rule'][] = $rule; write_config(); } |