Convert the shapers to the match action so the generated rules do not impact the filtering policy implemented.

1 files changed, 7 insertions, 0 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 c6347da..f33283a 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -1039,6 +1039,7 @@ function apply_all_choosen_items() {
 			if ($penalty) {
 				if( is_ipaddr($config['ezshaper']['step4']['address']) || is_alias($config['ezshaper']['step4']['address'])) {
 				    $rule = array();
+				    $rule['type'] = "match";
 				    $rule['descr'] = gettext("Penalty Box");
 				    $rule['direction'] = "out";
 				    $rule['source']['any'] = TRUE;
@@ -1058,6 +1059,7 @@ function apply_all_choosen_items() {
 				if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = gettext("VOIP Adapter");
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1072,6 +1074,7 @@ function apply_all_choosen_items() {
 				} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
 					/* create VOIP rules */
 					$rule = array();
+					$rule['type'] = "match";
 					$rule['descr'] = "DiffServ/Lowdelay/Upload";
 					$rule['direction'] = "out";
 					$rule['protocol'] = "udp";
@@ -1088,6 +1091,7 @@ function apply_all_choosen_items() {
 					/* loop through voiplist[] */
 					foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qVoIP';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;
@@ -1111,6 +1115,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($p2plist[$key] as $p2pclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qP2P';
 						$rule['direction'] = "out";
 						$rule['source']['any'] = TRUE;		
@@ -1133,6 +1138,7 @@ function apply_all_choosen_items() {
 										continue;
 					foreach ($gamesplist[$key] as $Gameclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						$rule['defaultqueue'] = 'qGames';
 						if ($Gameclient[1] == "tcp")
 							$rule['ackqueue'] = 'qACK';
@@ -1158,6 +1164,7 @@ function apply_all_choosen_items() {
 						continue;
 					foreach ($othersplist[$key] as $otherclient) {
 						$rule = array();
+						$rule['type'] = "match";
 						switch ($val) {
 						case "H":
 							$rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */