diff options
author | Ermal <eri@pfsense.org> | 2010-08-18 22:22:31 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-08-18 22:22:31 +0000 |
commit | 6debb14077a5963aeab60fa9f8fcc87bdc806740 (patch) | |
tree | 1e91e49def7e0313fd2afa3a54559b788066e5b1 /usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | |
parent | 751dd5b3d38a4b00ebec7c592f5462d9992e6079 (diff) | |
download | pfsense-6debb14077a5963aeab60fa9f8fcc87bdc806740.zip pfsense-6debb14077a5963aeab60fa9f8fcc87bdc806740.tar.gz |
Resolves #713. Take in conisderation the suggestion of not setting m1 parameter to 0b.
Diffstat (limited to 'usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc')
-rwxr-xr-x | usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index c50bff5..4de731e 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -737,16 +737,11 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = - floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; - + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = - floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; - - + floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['linkshare2'] = 100; - //$tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"]; @@ -779,8 +774,6 @@ function apply_all_choosen_items() { else if ($sched == "HFSC") { $lkbw = 0.20 * $remainbw; $tmpcf['linkshare3'] = "{$lkbw}%"; - $tmpcf['linkshare2'] = 100; - $tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = $lkbw; $tmpcf['bandwidthtype'] = "%"; @@ -842,8 +835,6 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $p2pcatchbwunit; } else if ($sched == "HFSC") { $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; - $tmpcf['linkshare2'] = 300; $tmpcf['linkshare3'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; @@ -860,8 +851,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $tmpbw = $remainbw * 0.05; /* 5% bandwidth */ $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "{$tmpbw}%"; - $tmpcf['linkshare2'] = 300; $tmpcf['linkshare3'] = "{$tmpbw}%"; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = "{$tmpbw}%"; @@ -906,9 +895,7 @@ function apply_all_choosen_items() { $tmpcf['realtime3'] = "{$voipbw}%"; } $tmpcf['realtime'] = "on"; - $tmpcf['realtime2'] = "10"; $tmpcf['bandwidth'] = 32; - $tmpcf['realtime1'] = "0b"; $tmpcf['bandwidthtype'] = "Kb"; } array_push($tmppath, "qVoIP"); @@ -938,8 +925,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $gamesbw = $remainbw * 0.2; /* 20% bandwidth */ $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "0b"; - $tmpcf['linkshare2'] = "50"; $tmpcf['linkshare3'] = "{$gamesbw}%"; $tmpcf['bandwidth'] = "{$gamesbw}"; $tmpcf['bandwidthtype'] = "%"; @@ -971,8 +956,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $tmpcf['linkshare'] = "on"; $otherbw = $remainbw * 0.1; /* 10% bandwidth */ - $tmpcf['linkshare1'] = "0b"; - $tmpcf['linkshare2'] = 200; $tmpcf['linkshare3'] = "{$otherbw}%"; $tmpcf['bandwidth'] = $otherbw; $tmpcf['bandwidthtype'] = "%"; @@ -1008,18 +991,15 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { if ($penalty) { $tmpcf['linkshare3'] = "{$penaltybw}{$penaltybwunit}"; - $tmpcf['linkshare1'] = "{$penaltybw}{$penaltybwunit}"; $tmpcf['bandwidth'] = $penaltybw; $tmpcf['bandwidthtype'] = $penaltybwunit; } else { $lsbw = $remainbw * 0.05; - $tmpcf['linkshare1'] = "{$lsbw}%"; /* 5% bandwidth */ $tmpcf['linkshare3'] = "{$lsbw}%"; /* 5% bandwidth */ $tmpcf['bandwidth'] = $lsbw; $tmpcf['bandwidthtype'] = "%"; } $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare2'] = 500; } array_push($tmppath, "qOthersLow"); $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); @@ -1143,15 +1123,10 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}downloadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = - floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; - + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; $tmpcf['upperlimit'] = "on"; - $tmpcf['upperlimit3'] = - floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; - + $tmpcf['upperlimit3'] = floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; $tmpcf['linkshare2'] = 100; - //$tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conn{$i}download"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}downloadspeed"]; @@ -1184,8 +1159,6 @@ function apply_all_choosen_items() { else if ($sched == "HFSC") { $lkbw = 0.20 * $remainbw; $tmpcf['linkshare3'] = "{$lkbw}%"; - $tmpcf['linkshare2'] = 100; - $tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = $lkbw; $tmpcf['bandwidthtype'] = "%"; @@ -1247,8 +1220,6 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $p2pcatchbwunit; } else if ($sched == "HFSC") { $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; - $tmpcf['linkshare2'] = 300; $tmpcf['linkshare3'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = "{$p2pcatchbw}{$p2pcatchbwunit}"; @@ -1265,8 +1236,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $tmpbw = $remainbw * 0.05; /* 5% bandwidth */ $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "{$tmpbw}%"; - $tmpcf['linkshare2'] = 300; $tmpcf['linkshare3'] = "{$tmpbw}%"; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = "{$tmpbw}%"; @@ -1311,9 +1280,7 @@ function apply_all_choosen_items() { $tmpcf['realtime3'] = "{$voipbw}%"; } $tmpcf['realtime'] = "on"; - $tmpcf['realtime2'] = "10"; $tmpcf['bandwidth'] = 32; - $tmpcf['realtime1'] = "0b"; $tmpcf['bandwidthtype'] = "Kb"; } array_push($tmppath, "qVoIP"); @@ -1343,8 +1310,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $gamesbw = $remainbw * 0.2; /* 20% bandwidth */ $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare1'] = "0b"; - $tmpcf['linkshare2'] = "50"; $tmpcf['linkshare3'] = "{$gamesbw}%"; $tmpcf['bandwidth'] = "{$gamesbw}"; $tmpcf['bandwidthtype'] = "%"; @@ -1376,8 +1341,6 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { $tmpcf['linkshare'] = "on"; $otherbw = $remainbw * 0.1; /* 10% bandwidth */ - $tmpcf['linkshare1'] = "0b"; - $tmpcf['linkshare2'] = 200; $tmpcf['linkshare3'] = "{$otherbw}%"; $tmpcf['bandwidth'] = $otherbw; $tmpcf['bandwidthtype'] = "%"; @@ -1413,18 +1376,15 @@ function apply_all_choosen_items() { } else if ($sched == "HFSC") { if ($penalty) { $tmpcf['linkshare3'] = "{$penaltybw}{$penaltybwunit}"; - $tmpcf['linkshare1'] = "{$penaltybw}{$penaltybwunit}"; $tmpcf['bandwidth'] = $penaltybw; $tmpcf['bandwidthtype'] = $penaltybwunit; } else { $lsbw = $remainbw * 0.05; - $tmpcf['linkshare1'] = "{$lsbw}%"; /* 5% bandwidth */ $tmpcf['linkshare3'] = "{$lsbw}%"; /* 5% bandwidth */ $tmpcf['bandwidth'] = $lsbw; $tmpcf['bandwidthtype'] = "%"; } $tmpcf['linkshare'] = "on"; - $tmpcf['linkshare2'] = 500; } array_push($tmppath, "qOthersLow"); $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors); |