Project

General

Profile

« Previous | Next » 

Revision 21d8d785

Added by Ermal Luçi about 17 years ago

Reactivate setting the root queue bandwidth so rules created by wizards do not fail
with interfaces that cannot report their bandwidth.
This involves people to do some manual setup on multi-lan setups but it is better than failing
and telling them to fix everything by hand.

View differences:

usr/local/www/wizards/traffic_shaper_wizard.inc
1264 1264

  
1265 1265
		$altq->SetInterface('lan');
1266 1266
		$altq->SetScheduler($config['ezshaper']['step2']["downloadscheduler"]);
1267
		//$altq->SetBandwidth($lanbw/1000);
1268
		//$altq->SetBwscale("Kb");
1267
		$altq->SetBandwidth($lanbw/1000);
1268
		$altq->SetBwscale("Kb");
1269 1269
		$altq->SetEnabled("on");
1270 1270
		$altq_list_queues[$altq->GetQname()] =& $altq;
1271 1271
		array_push($tmppath, 'lan');
usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
925 925

  
926 926
		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
927 927
		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}uploadscheduler"]);
928
		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
929
		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
928
		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
929
		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
930 930
		$altq->SetEnabled("on");
931 931
		$altq_list_queues[$altq->GetQname()] =& $altq;
932 932
		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);
......
1339 1339

  
1340 1340
		$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
1341 1341
		$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
1342
		//$altq->SetBandwidth($config['ezshaper']['step2']["conn{$i}download"]);
1343
		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}downloadspeed"]);
1342
		$altq->SetBandwidth($config['ezshaper']['step2']["conn{$i}download"]);
1343
		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}downloadspeed"]);
1344 1344
		$altq->SetEnabled("on");
1345 1345
		$altq_list_queues[$altq->GetQname()] =& $altq;
1346 1346
		array_push($tmppath, $config['ezshaper']['step2']["local{$i}interface"]);
usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
970 970

  
971 971
		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
972 972
		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}uploadscheduler"]);
973
		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
974
		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
973
		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
974
		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
975 975
		$altq->SetEnabled("on");
976 976
		$altq_list_queues[$altq->GetQname()] =& $altq;
977 977
		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);
......
1392 1392

  
1393 1393
		$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
1394 1394
		$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
1395
		//$altq->SetBandwidth($lanbw/1000);
1396
		//$altq->SetBwscale("Kb");
1395
		$altq->SetBandwidth($lanbw/1000);
1396
		$altq->SetBwscale("Kb");
1397 1397
		$altq->SetEnabled("on");
1398 1398
		$altq_list_queues[$altq->GetQname()] =& $altq;
1399 1399
		array_push($tmppath, $config['ezshaper']['step2']["local{$i}interface"]);
usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
752 752

  
753 753
		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
754 754
		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}downloadscheduler"]);
755
		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conndownload"]));
756
		//$altq->SetBwscale($config['ezshaper']['step2']["conndownloadspeed"]);
755
		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conndownload"]));
756
		$altq->SetBwscale($config['ezshaper']['step2']["conndownloadspeed"]);
757 757
		$altq->SetEnabled("on");
758 758
		$altq_list_queues[$altq->GetQname()] =& $altq;
759 759
		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);

Also available in: Unified diff