Remove direction from traffic shaper generated rules now that the match action is present to correctly put packets on proper queues. Before it was not possible since this would have also open firewall ports/holes.

4 files changed, 0 insertions, 28 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index 9de74a2..408d663 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -960,7 +960,6 @@ function apply_all_choosen_items() {
 				    $rule = array();
 				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
-				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
 				    $rule['defaultqueue'] = "qOthersLow";
 				    $rule['source']['address'] = $config['ezshaper']['step4']['address'];
@@ -980,7 +979,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 				        $rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['defaultqueue'] = "qVoIP";
 					$rule['source']['address'] = $config['ezshaper']['step3']['address'];
@@ -995,7 +993,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					    $rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['source']['any'] = TRUE;
 					$rule['defaultqueue'] = "qVoIP";
@@ -1012,7 +1009,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_voip {$voip[0]} outbound";
@@ -1036,7 +1032,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_P2P {$p2pclient[0]} outbound";
@@ -1061,7 +1056,6 @@ function apply_all_choosen_items() {
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['floating'] = "yes";
@@ -1110,7 +1104,6 @@ function apply_all_choosen_items() {
 							$loop = 1;
 						}
 						if (!$loop) {
-							$rule['direction'] = "out";
 							$rule['source']['any'] = TRUE;
 							$rule['destination']['any'] = TRUE;
 							$rule['floating'] = "yes";
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index d550497..9e1b03c 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -1024,7 +1024,6 @@ function apply_all_choosen_items() {
 				    $rule = array();
 				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
-				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
 				    $rule['defaultqueue'] = "qOthersLow";
 				    $rule['source']['address'] = $config['ezshaper']['step4']['address'];
@@ -1044,7 +1043,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['defaultqueue'] = "qVoIP";
 					$rule['source']['address'] = $config['ezshaper']['step3']['address'];
@@ -1059,7 +1057,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['source']['any'] = TRUE;
 					$rule['defaultqueue'] = "qVoIP";
@@ -1076,7 +1073,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_voip {$voip[0]} outbound";
@@ -1100,7 +1096,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_P2P {$p2pclient[0]} outbound";
@@ -1125,7 +1120,6 @@ function apply_all_choosen_items() {
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['floating'] = "yes";
@@ -1174,7 +1168,6 @@ function apply_all_choosen_items() {
 							$loop = 1;
 						}
 						if (!$loop) {
-							$rule['direction'] = "out";
 							$rule['source']['any'] = TRUE;
 							$rule['destination']['any'] = TRUE;
 							$rule['floating'] = "yes";
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 40f036d..aaeeccc 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -1057,7 +1057,6 @@ function apply_all_choosen_items() {
 				    $rule = array();
 				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
-				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
 				    $rule['defaultqueue'] = "qOthersLow";
 				    $rule['source']['address'] = $config['ezshaper']['step4']['address'];
@@ -1077,7 +1076,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['defaultqueue'] = "qVoIP";
 					$rule['source']['address'] = $config['ezshaper']['step3']['address'];
@@ -1092,7 +1090,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
-					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
 					$rule['source']['any'] = TRUE;
 					$rule['defaultqueue'] = "qVoIP";
@@ -1109,7 +1106,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_voip {$voip[0]} outbound";
@@ -1133,7 +1129,6 @@ function apply_all_choosen_items() {
 						$rule = array();
 						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
 						$rule['destination']['any'] = TRUE;
 						$rule['descr'] = "m_P2P {$p2pclient[0]} outbound";
@@ -1158,7 +1153,6 @@ function apply_all_choosen_items() {
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['floating'] = "yes";
@@ -1207,7 +1201,6 @@ function apply_all_choosen_items() {
 							$loop = 1;
 						}
 						if (!$loop) {
-							$rule['direction'] = "out";
 							$rule['source']['any'] = TRUE;
 							$rule['destination']['any'] = TRUE;
 							$rule['floating'] = "yes";
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 9453aae..0dedfea 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -1205,7 +1205,6 @@ function apply_all_choosen_items() {
 			    $rule = array();
 			    $rule['type'] = "match";
 			    $rule['descr'] = gettext("Penalty Box");
-			    $rule['direction'] = "out";
 			    $rule['source']['any'] = TRUE;
 			    $rule['defaultqueue'] = "qOthersLow";
 			    $rule['source']['address'] = $config['ezshaper']['step4']['address'];
@@ -1225,7 +1224,6 @@ function apply_all_choosen_items() {
 				$rule = array();
 				$rule['type'] = "match";
 				$rule['descr'] = gettext("VOIP Adapter");
-				$rule['direction'] = "out";
 				$rule['protocol'] = "udp";
 				$rule['defaultqueue'] = "qVoIP";
 				$rule['source']['address'] = $config['ezshaper']['step3']['address'];
@@ -1240,7 +1238,6 @@ function apply_all_choosen_items() {
 				$rule = array();
 				$rule['type'] = "match";
 				$rule['descr'] = "DiffServ/Lowdelay/Upload";
-				$rule['direction'] = "out";
 				$rule['protocol'] = "udp";
 				$rule['source']['any'] = TRUE;
 				$rule['defaultqueue'] = "qVoIP";
@@ -1257,7 +1254,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['defaultqueue'] = 'qVoIP';
-					$rule['direction'] = "out";
 					$rule['source']['any'] = TRUE;
 					$rule['destination']['any'] = TRUE;
 					$rule['descr'] = "m_voip {$voip[0]} outbound";
@@ -1281,7 +1277,6 @@ function apply_all_choosen_items() {
 					$rule = array();
 					$rule['type'] = "match";
 					$rule['defaultqueue'] = 'qP2P';
-					$rule['direction'] = "out";
 					$rule['source']['any'] = TRUE;		
 					$rule['destination']['any'] = TRUE;
 					$rule['descr'] = "m_P2P {$p2pclient[0]} outbound";
@@ -1306,7 +1301,6 @@ function apply_all_choosen_items() {
 					$rule['defaultqueue'] = 'qGames';
 					if ($Gameclient[1] == "tcp")
 						$rule['ackqueue'] = 'qACK';
-					$rule['direction'] = "out";
 					$rule['source']['any'] = TRUE;
 					$rule['destination']['any'] = TRUE;
 					$rule['floating'] = "yes";
@@ -1355,7 +1349,6 @@ function apply_all_choosen_items() {
 						$loop = 1;
 					}
 					if (!$loop) {
-						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
 						$rule['destination']['any'] = TRUE;
 						$rule['floating'] = "yes";