diff options
| author | Ermal <eri@pfsense.org> | 2011-07-15 19:17:59 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-07-15 19:17:59 +0000 |
| commit | 058a4f1c03f548575941010f1e0c0048f1e3e313 (patch) | |
| tree | e3dc95f062e3003cd117b57f175e8e21c8f573cf /usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | |
| parent | 8f864d33eac460cc34189b7eb399144a2975f880 (diff) | |
| download | pfsense-058a4f1c03f548575941010f1e0c0048f1e3e313.zip pfsense-058a4f1c03f548575941010f1e0c0048f1e3e313.tar.gz | |
Respect the p2p catchall setting.
Diffstat (limited to 'usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc')
| -rwxr-xr-x | usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 8b73e4a..23fd493 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1107,32 +1107,34 @@ function apply_all_choosen_items() { $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'] = "qLink"; - $tmpcf['priority'] = 3; - $tmpcf['enabled'] = "on"; - $tmpcf['default'] = "on"; - $tmpcf['ecn'] = "on"; - if ($sched == "CBQ") { - $tmpcf['borrow'] = "on"; - $tmpcf['bandwidth'] = 20; /* 20% bandwidth */ - $tmpcf['bandwidthtype'] = "%"; - } else if ($sched == "HFSC") { - $tmpcf['bandwidth'] = 20; /* 20% bandwidth */ - $tmpcf['bandwidthtype'] = "%"; + if (!$p2pcatchall) { + 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'] = "qLink"; + $tmpcf['priority'] = 3; + $tmpcf['enabled'] = "on"; + $tmpcf['default'] = "on"; + $tmpcf['ecn'] = "on"; + if ($sched == "CBQ") { + $tmpcf['borrow'] = "on"; + $tmpcf['bandwidth'] = 20; /* 20% bandwidth */ + $tmpcf['bandwidthtype'] = "%"; + } else if ($sched == "HFSC") { + $tmpcf['bandwidth'] = 20; /* 20% bandwidth */ + $tmpcf['bandwidthtype'] = "%"; + } + array_push($tmppath, $tmpcf['name']); + $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); + array_pop($tmppath); + //echo "qDefault <br />"; + //var_dump($input_errors); + $qtmp->wconfig(); } - array_push($tmppath, $tmpcf['name']); - $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); - array_pop($tmppath); - //echo "qDefault <br />"; - //var_dump($input_errors); - $qtmp->wconfig(); if ($sched != "PRIQ") { if ($sched == "CBQ") @@ -1219,7 +1221,7 @@ function apply_all_choosen_items() { $tmpcf['bandwidth'] = $p2pcatchbw; $tmpcf['bandwidthtype'] = $p2pcatchbwunit; } - //$tmpcf['default'] = "on"; + $tmpcf['default'] = "on"; } else { if ($sched == "CBQ") { $tmpcf['borrow'] = "on"; |
