mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup check for existing easyrule block rule to account for the ipproto and when the ipproto is blank.

Browse Source
This commit is contained in:
jim-p 2013-08-21 15:19:37 -04:00
parent b4dcdbcff5
commit 4475997eb6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/inc/easyrule.inc
View File

@ -71,7 +71,7 @@ function easyrule_find_rule_interface($int) {
return false;
}
function easyrule_block_rule_exists($int = 'wan') {
function easyrule_block_rule_exists($int = 'wan', $ipproto = "inet") {
global $blockaliasname, $config;
/* No rules, we we know it doesn't exist */
if (!is_array($config['filter']['rule'])) {
@ -82,7 +82,8 @@ function easyrule_block_rule_exists($int = 'wan') {
foreach ($config['filter']['rule'] as $rule) {
if (!is_array($rule) || !is_array($rule['source']))
continue;
if ($rule['source']['address'] == $blockaliasname . strtoupper($int) && ($rule['interface'] == $int) && ($rule['ipprotocol'] == $ipproto))
$checkproto = isset($rule['ipprotocol']) ? $rule['ipprotocol'] : "inet";
if ($rule['source']['address'] == $blockaliasname . strtoupper($int) && ($rule['interface'] == $int) && ($checkproto == $ipproto))
return true;
}
return false;