diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-11-17 00:30:10 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-11-17 00:30:10 +0000 |
| commit | 213e9de2f440cf46dec7240f1c7504fcdf267eb9 (patch) | |
| tree | e21ce2f735c2584adc1f3c1e5cee7462484fa828 /usr | |
| parent | 31e4928b990488da9ece13595e5bd13dc2cbfacb (diff) | |
| download | pfsense-213e9de2f440cf46dec7240f1c7504fcdf267eb9.zip pfsense-213e9de2f440cf46dec7240f1c7504fcdf267eb9.tar.gz | |
Fix ticket #1837.
Diffstat (limited to 'usr')
4 files changed, 49 insertions, 51 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index 26e08f3..bb4559b 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -1356,42 +1356,40 @@ $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'] = "qInternet"; - //$tmpcf['priority'] = 6; - $tmpcf['ecn'] = "on"; - $tmpcf['enabled'] = "on"; - If ($sched == "CBQ") { - $tmpcf['bandwidth'] = $lanbw/1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 ."Kb"; - - - $tmpcf['upperlimit'] = "on"; - $tmpcf['upperlimit3'] = $lanbw/1000 ."Kb"; - - - $tmpcf['linkshare2'] = 100; - //$tmpcf['linkshare1'] = "0b"; - $tmpcf['linkshare'] = "on"; - $tmpcf['bandwidth'] = $lanbw/1000; - $tmpcf['bandwidthtype'] = "Kb"; - } - array_push($tmppath, "qInternet"); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - //array_pop($tmppath); - //echo "qInternet <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); - $altq =& $qtmp; + if ($sched != "PRIQ") { + if ($sched == "CBQ") + $q =& new cbq_queue(); + else if ($sched == "HFSC") + $q =& new hfsc_queue(); + $tmpcf = array(); + $tmpcf['name'] = "qInternet"; + //$tmpcf['priority'] = 6; + $tmpcf['ecn'] = "on"; + $tmpcf['enabled'] = "on"; + If ($sched == "CBQ") { + $tmpcf['bandwidth'] = $lanbw/1000; + $tmpcf['bandwidthtype'] = "Kb"; + } + else if ($sched == "HFSC") { + $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 ."Kb"; + $tmpcf['upperlimit'] = "on"; + $tmpcf['upperlimit3'] = $lanbw/1000 ."Kb"; + + + $tmpcf['linkshare2'] = 100; + //$tmpcf['linkshare1'] = "0b"; + $tmpcf['linkshare'] = "on"; + $tmpcf['bandwidth'] = $lanbw/1000; + $tmpcf['bandwidthtype'] = "Kb"; + } + array_push($tmppath, "qInternet"); + $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); + //array_pop($tmppath); + //echo "qInternet <br />"; + //var_dump($input_errors); + $qtmp->wconfig(); + $altq =& $qtmp; + } if ($sched == "PRIQ") diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index d8afda3..3d05c7f 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1023,9 +1023,8 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") + if ($sched != "PRIQ") { + if ($sched == "CBQ") $q =& new cbq_queue(); else if ($sched == "HFSC") $q =& new hfsc_queue(); @@ -1060,6 +1059,7 @@ $othersplist = array(); //var_dump($input_errors); $qtmp->wconfig(); $altq =& $qtmp; + } if ($sched == "PRIQ") $q =& new priq_queue(); @@ -1431,9 +1431,8 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") + if ($sched != "PRIQ") { + if ($sched == "CBQ") $q =& new cbq_queue(); else if ($sched == "HFSC") $q =& new hfsc_queue(); @@ -1467,6 +1466,7 @@ $othersplist = array(); //var_dump($input_errors); $qtmp->wconfig(); $altq =& $qtmp; + } if ($sched == "PRIQ") $q =& new priq_queue(); 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 f39ccfe..1173a1e 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1068,9 +1068,8 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") + if ($sched != "PRIQ") { + if ($sched == "CBQ") $q =& new cbq_queue(); else if ($sched == "HFSC") $q =& new hfsc_queue(); @@ -1104,6 +1103,7 @@ $othersplist = array(); //var_dump($input_errors); $qtmp->wconfig(); $altq =& $qtmp; + } if ($sched == "PRIQ") $q =& new priq_queue(); @@ -1484,9 +1484,8 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") + if ($sched != "PRIQ") { + if ($sched == "CBQ") $q =& new cbq_queue(); else if ($sched == "HFSC") $q =& new hfsc_queue(); @@ -1516,6 +1515,7 @@ $othersplist = array(); //var_dump($input_errors); $qtmp->wconfig(); $altq =& $qtmp; + } if ($sched == "PRIQ") $q =& new priq_queue(); 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 4b88c38..1de1269 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -845,9 +845,8 @@ $othersplist = array(); $remainbw = 100 - $remainbw; //} - if ($sched == "PRIQ") - $q =& new priq_queue(); - else if ($sched == "CBQ") + if ($sched != "PRIQ") { + if ($sched == "CBQ") $q =& new cbq_queue(); else if ($sched == "HFSC") $q =& new hfsc_queue(); @@ -880,6 +879,7 @@ $othersplist = array(); //var_dump($input_errors); $qtmp->wconfig(); $altq =& $qtmp; + } if ($sched == "PRIQ") |
