MFC 11285

Other Applications will now be in OtherH, OtherL, or default depending on setting. This is important if you don't want all your apps to hit the P2PCatchall rule if selected.

2 files changed, 46 insertions, 27 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index 856488a..aa8d83c 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -929,8 +929,18 @@ function step6_stepsubmitphpaction() {
 			    $config['shaper']['itemsshaped']++;
 			    if ($srcdest == 'source') {
 				    $destsrc = 'destination';
-				    $rule['inqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */
-				    $rule['outqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */
+				    switch ($otherclient[5]) {
+					case "H":
+					case "L":
+				    		$rule['inqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */
+				    		$rule['outqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */
+						break;
+					case "D":
+				    		$rule['inqueue'] = "q${downint}def"; /* posted value H or L */
+				    		$rule['outqueue'] = "q${upint}def"; /* posted value H or L */
+						break;
+				    }
+						
 				    $rule['in-interface'] = $downint;
 				    $rule['out-interface'] = $upint;
 				    $rule['source']['network'] = $downint;
@@ -938,8 +948,17 @@ function step6_stepsubmitphpaction() {
 				    $rule['descr'] = "m_Other {$otherclient[0]} outbound";
 			    } else {
 				    $destsrc = 'source';
-				    $rule['inqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */
-				    $rule['outqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */
+				    switch ($otherclient[5]) {
+					case "H":
+					case "L":
+				    		$rule['inqueue'] = 'qOthersUp' . $otherclient[5]; /* posted value H or L */
+				    		$rule['outqueue'] = 'qOthersDown' . $otherclient[5]; /* posted value H or L */
+						break;
+					case "D":
+				    		$rule['inqueue'] = "q${upint}def"; /* posted value H or L */
+				    		$rule['outqueue'] = "q${downint}def"; /* posted value H or L */
+						break;
+				    }
 				    $rule['in-interface'] = $upint;
 				    $rule['out-interface'] = $downint;
 				    $rule['source']['any'] = TRUE;
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 555bba6..b198966 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -644,7 +644,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -664,7 +664,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -684,7 +684,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -708,7 +708,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -728,7 +728,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -748,7 +748,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -768,7 +768,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -788,7 +788,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -812,7 +812,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -832,7 +832,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -856,7 +856,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -876,7 +876,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -900,7 +900,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -924,7 +924,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -944,7 +944,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -964,7 +964,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -984,7 +984,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -1008,7 +1008,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -1028,7 +1028,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -1048,7 +1048,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -1068,7 +1068,7 @@
 				</option>
 				<option>
 					<name>Default priority</name>
-					<value></value>
+					<value>D</value>
 				</option>
 				<option>
 					<name>Lower priority</name>
@@ -1108,7 +1108,7 @@
 							</option>
 							<option>
 								<name>Default priority</name>
-								<value></value>
+								<value>D</value>
 							</option>
 							<option>
 								<name>Lower priority</name>
@@ -1128,7 +1128,7 @@
 							</option>
 							<option>
 								<name>Default priority</name>
-								<value></value>
+								<value>D</value>
 							</option>
 							<option>
 								<name>Lower priority</name>