diff options
author | Ermal <eri@pfsense.org> | 2011-02-11 17:32:10 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2011-02-11 17:32:10 +0000 |
commit | b3205cc39e7b418eebbe5e97dc85261c1c2caf09 (patch) | |
tree | 8aabb544dc4b819d054b110e91a69c56bbc0b388 /usr/local | |
parent | a391d0ab1255b11f6f2d1778423fe54e8fc9258b (diff) | |
download | pfsense-b3205cc39e7b418eebbe5e97dc85261c1c2caf09.zip pfsense-b3205cc39e7b418eebbe5e97dc85261c1c2caf09.tar.gz |
Convert the shapers to the match action so the generated rules do not impact the filtering policy implemented.
Diffstat (limited to 'usr/local')
4 files changed, 28 insertions, 0 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index b684fb6..7869309 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -949,6 +949,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; @@ -968,6 +969,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"; @@ -982,6 +984,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"; @@ -998,6 +1001,7 @@ function apply_all_choosen_items() { /* loop through voiplist[] */ foreach ($voiplist[$config['ezshaper']['step3']['provider']] as $voip) { $rule = array(); + $rule = array(); $rule['defaultqueue'] = 'qVoIP'; $rule['direction'] = "out"; $rule['source']['any'] = TRUE; @@ -1021,6 +1025,7 @@ function apply_all_choosen_items() { continue; foreach ($p2plist[$key] as $p2pclient) { $rule = array(); + $rule = array(); $rule['defaultqueue'] = 'qP2P'; $rule['direction'] = "out"; $rule['source']['any'] = TRUE; @@ -1043,6 +1048,7 @@ function apply_all_choosen_items() { continue; foreach ($gamesplist[$key] as $Gameclient) { $rule = array(); + $rule = array(); $rule['defaultqueue'] = 'qGames'; if ($Gameclient[1] == "tcp") $rule['ackqueue'] = 'qACK'; @@ -1068,6 +1074,7 @@ function apply_all_choosen_items() { continue; foreach ($othersplist[$key] as $otherclient) { $rule = array(); + $rule = array(); switch ($val) { case "H": $rule['defaultqueue'] = 'qOthersHigh'; /* posted value H or L */ diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index b59c5a7..88a6296 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1006,6 +1006,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; @@ -1025,6 +1026,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"; @@ -1039,6 +1041,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"; @@ -1055,6 +1058,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; @@ -1078,6 +1082,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; @@ -1100,6 +1105,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'; @@ -1125,6 +1131,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 */ 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 */ 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 a5de47e..ab22b93 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -1178,6 +1178,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; @@ -1197,6 +1198,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"; @@ -1211,6 +1213,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"; @@ -1227,6 +1230,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; @@ -1250,6 +1254,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; @@ -1272,6 +1277,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'; @@ -1297,6 +1303,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 */ |