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 | |
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')
4 files changed, 8 insertions, 148 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index 62c32cd..178d184 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -714,8 +714,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'] = "%"; @@ -777,8 +775,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}"; @@ -795,8 +791,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}%"; @@ -841,9 +835,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"); @@ -873,8 +865,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'] = "%"; @@ -906,8 +896,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'] = "%"; @@ -941,18 +929,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); @@ -1077,13 +1062,9 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = "Kb"; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 ."Kb"; + $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"; @@ -1117,8 +1098,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'] = "%"; @@ -1180,8 +1159,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}"; @@ -1198,8 +1175,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}%"; @@ -1244,9 +1219,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"); @@ -1276,8 +1249,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'] = "%"; @@ -1309,8 +1280,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'] = "%"; @@ -1344,18 +1313,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); 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); 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 38b53e4..99a68ea 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -769,15 +769,13 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['upperlimit3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['upperlimit'] = "on"; - $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"]; @@ -810,8 +808,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'] = "%"; @@ -873,8 +869,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}"; @@ -891,8 +885,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}%"; @@ -937,9 +929,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"); @@ -969,8 +959,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'] = "%"; @@ -1002,8 +990,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'] = "%"; @@ -1039,18 +1025,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); @@ -1184,11 +1167,9 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = "Kb"; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 . "Kb"; + $tmpcf['linkshare3'] = $lanbw/1000 . "Kb"; $tmpcf['upperlimit3'] = $lanbw/1000 . "Kb"; $tmpcf['upperlimit'] = "on"; - $tmpcf['linkshare2'] = 100; - //$tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = $lanbw/1000; $tmpcf['bandwidthtype'] = "Kb"; @@ -1221,8 +1202,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'] = "%"; @@ -1284,8 +1263,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}"; @@ -1302,8 +1279,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}%"; @@ -1348,9 +1323,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"); @@ -1380,8 +1353,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'] = "%"; @@ -1413,8 +1384,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'] = "%"; @@ -1450,18 +1419,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); 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 2c7a284..759ae61 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -545,14 +545,12 @@ function apply_all_choosen_items() { $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conndownload"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conndownloadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conndownload"]) . $config['ezshaper']['step2']["conndownloadspeed"]; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = floatval($config['ezshaper']['step2']["conndownload"]) . $config['ezshaper']['step2']["conndownloadspeed"]; - $tmpcf['linkshare2'] = 100; - //$tmpcf['linkshare1'] = "0b"; $tmpcf['linkshare'] = "on"; $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conndownload"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conndownloadspeed"]; @@ -587,8 +585,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'] = "%"; @@ -650,8 +646,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}"; @@ -668,8 +662,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}%"; @@ -714,9 +706,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"); @@ -746,8 +736,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'] = "%"; @@ -779,8 +767,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'] = "%"; @@ -814,18 +800,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); @@ -958,8 +941,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'] = "%"; @@ -1022,8 +1003,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}"; @@ -1040,8 +1019,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}%"; @@ -1086,9 +1063,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"); @@ -1118,8 +1093,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'] = "%"; @@ -1151,8 +1124,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'] = "%"; @@ -1186,18 +1157,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); |