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.

4 files changed, 12 insertions, 12 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index 78d8d00..631e2ad 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -1264,8 +1264,8 @@ $othersplist = array();
 
 		$altq->SetInterface('lan');
 		$altq->SetScheduler($config['ezshaper']['step2']["downloadscheduler"]);
-		//$altq->SetBandwidth($lanbw/1000);
-		//$altq->SetBwscale("Kb");
+		$altq->SetBandwidth($lanbw/1000);
+		$altq->SetBwscale("Kb");
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, 'lan');
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index 4b55503..30e7447 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -925,8 +925,8 @@ $othersplist = array();
 
 		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}uploadscheduler"]);
-		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
-		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
+		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
+		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);
@@ -1339,8 +1339,8 @@ $othersplist = array();
 
 		$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
-		//$altq->SetBandwidth($config['ezshaper']['step2']["conn{$i}download"]);
-		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}downloadspeed"]);
+		$altq->SetBandwidth($config['ezshaper']['step2']["conn{$i}download"]);
+		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}downloadspeed"]);
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, $config['ezshaper']['step2']["local{$i}interface"]);
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 3991834..9a189ea 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -970,8 +970,8 @@ $othersplist = array();
 
 		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}uploadscheduler"]);
-		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
-		//$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
+		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conn{$i}upload"]));
+		$altq->SetBwscale($config['ezshaper']['step2']["conn{$i}uploadspeed"]);
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);
@@ -1392,8 +1392,8 @@ $othersplist = array();
 
 		$altq->SetInterface($config['ezshaper']['step2']["local{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["local{$i}downloadscheduler"]);
-		//$altq->SetBandwidth($lanbw/1000);
-		//$altq->SetBwscale("Kb");
+		$altq->SetBandwidth($lanbw/1000);
+		$altq->SetBwscale("Kb");
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, $config['ezshaper']['step2']["local{$i}interface"]);
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 3f83142..e6360a3 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -752,8 +752,8 @@ $othersplist = array();
 
 		$altq->SetInterface($config['ezshaper']['step2']["conn{$i}interface"]);
 		$altq->SetScheduler($config['ezshaper']['step2']["conn{$i}downloadscheduler"]);
-		//$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conndownload"]));
-		//$altq->SetBwscale($config['ezshaper']['step2']["conndownloadspeed"]);
+		$altq->SetBandwidth(floatval($config['ezshaper']['step2']["conndownload"]));
+		$altq->SetBwscale($config['ezshaper']['step2']["conndownloadspeed"]);
 		$altq->SetEnabled("on");
 		$altq_list_queues[$altq->GetQname()] =& $altq;
 		array_push($tmppath, $config['ezshaper']['step2']["conn{$i}interface"]);