Use ECN for the queues created by the wizard which is a more recent technology and i am tired of explaining to users how to handle errors on it. Strange is this is an ALPHA(!!) release!

The actual problem is in the dummynet merge with pf which has a red keyword with diferent parameters.

1 files changed, 18 insertions, 18 deletions

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 e8287ab..f39ccfe 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -303,7 +303,7 @@ function step2_stepsubmitphpaction() {
 	}
 
 
-	/* This is necessary since the wizard expects predefined fields. */
+	/* This is necessary since the wizard expects pecnefined fields. */
 	unset($config['ezshaper']['step2']);
 	$config['ezshaper']['step2'] = array();
 
@@ -950,7 +950,7 @@ $othersplist = array();
 	 */
 	if(isset($config['shaper']['queue']))
 		unset($config['shaper']['queue']);
-	/* XXX: This is redundant, because this should be handled by converter at startup. */
+	/* XXX: This is ecnundant, because this should be handled by converter at startup. */
 	if(isset($config['shaper']['rule']))
 		unset($config['shaper']['rule']);
 	foreach ($config['filter']['rule'] as $key => $rule)
@@ -1077,7 +1077,7 @@ $othersplist = array();
                         $tmpcf = array();
                         $tmpcf['name'] = "qInternet";
                         //$tmpcf['priority'] = 6;
-                        $tmpcf['red'] = "on";
+                        $tmpcf['ecn'] = "on";
                         $tmpcf['enabled'] = "on";
                         If ($sched == "CBQ") {
                                 $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]);
@@ -1114,7 +1114,7 @@ $othersplist = array();
 			$tmpcf = array();
 			$tmpcf['name'] = "qACK";
 			$tmpcf['priority'] = 6;
-			$tmpcf['red'] = "on";
+			$tmpcf['ecn'] = "on";
 			$tmpcf['enabled'] = "on";
 			If ($sched == "CBQ") {
 				$tmpcf['borrow'] = "on";
@@ -1152,7 +1152,7 @@ $othersplist = array();
 			$tmpcf['enabled'] = "on";
 			if (!$p2pcatchall)
 				$tmpcf['default'] = "on";
-			$tmpcf['red'] = "on";
+			$tmpcf['ecn'] = "on";
 			if ($sched == "CBQ") {
 				$tmpcf['borrow'] = "on";
 				$tmpcf['bandwidth'] = $remainbw * 0.1; /* 10% bandwidth */
@@ -1178,7 +1178,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qP2P";
 				$tmpcf['priority'] = 1;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($p2pcatchall) {
 					if ($sched == "CBQ") {
@@ -1232,7 +1232,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qVoIP";
 				$tmpcf['priority'] = 7;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
@@ -1275,7 +1275,7 @@ $othersplist = array();
 				$tmpcf['name'] = "qGames";
 				$tmpcf['priority'] = 5;
 				$tmpcf['enabled'] = "on";
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
 					$tmpcf['bandwidth'] = $remainbw * 0.2; /* 20% bandwidth */
@@ -1307,7 +1307,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersHigh";
 				$tmpcf['priority'] = 4;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
@@ -1339,7 +1339,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersLow";
 				$tmpcf['priority'] = 2;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
@@ -1493,7 +1493,7 @@ $othersplist = array();
                         $tmpcf = array();
                         $tmpcf['name'] = "qInternet";
                         //$tmpcf['priority'] = 6;
-                        $tmpcf['red'] = "on";
+                        $tmpcf['ecn'] = "on";
                         $tmpcf['enabled'] = "on";
                         If ($sched == "CBQ") {
                                 $tmpcf['bandwidth'] = $lanbw/1000;
@@ -1526,7 +1526,7 @@ $othersplist = array();
 			$tmpcf = array();
 			$tmpcf['name'] = "qACK";
 			$tmpcf['priority'] = 6;
-			$tmpcf['red'] = "on";
+			$tmpcf['ecn'] = "on";
 			$tmpcf['enabled'] = "on";
 			If ($sched == "CBQ") {
 				$tmpcf['borrow'] = "on";
@@ -1564,7 +1564,7 @@ $othersplist = array();
 			$tmpcf['enabled'] = "on";
 			if (!$p2pcatchall)
 				$tmpcf['default'] = "on";
-			$tmpcf['red'] = "on";
+			$tmpcf['ecn'] = "on";
 			if ($sched == "CBQ") {
 				$tmpcf['borrow'] = "on";
 				$tmpcf['bandwidth'] = $remainbw * 0.1; /* 10% bandwidth */
@@ -1590,7 +1590,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qP2P";
 				$tmpcf['priority'] = 1;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($p2pcatchall) {
 					if ($sched == "CBQ") {
@@ -1644,7 +1644,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qVoIP";
 				$tmpcf['priority'] = 7;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
@@ -1687,7 +1687,7 @@ $othersplist = array();
 				$tmpcf['name'] = "qGames";
 				$tmpcf['priority'] = 5;
 				$tmpcf['enabled'] = "on";
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
 					$tmpcf['bandwidth'] = $remainbw * 0.2; /* 20% bandwidth */
@@ -1719,7 +1719,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersHigh";
 				$tmpcf['priority'] = 4;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";
@@ -1751,7 +1751,7 @@ $othersplist = array();
 				$tmpcf = array();
 				$tmpcf['name'] = "qOthersLow";
 				$tmpcf['priority'] = 2;
-				$tmpcf['red'] = "on";
+				$tmpcf['ecn'] = "on";
 				$tmpcf['enabled'] = "on";
 				if ($sched == "CBQ") {
 					$tmpcf['borrow'] = "on";