summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-05-01 21:07:46 +0200
committerErmal LUÇI <eri@pfsense.org>2015-05-01 21:07:46 +0200
commitbe8b480ed1ab787d35f2e8cfeb471b5b898b0fff (patch)
tree349944543893eed776dca1886631da2a7a571df3 /etc
parent120acbae8c2edd2e60685dd7ca16966cd988afc7 (diff)
downloadpfsense-be8b480ed1ab787d35f2e8cfeb471b5b898b0fff.zip
pfsense-be8b480ed1ab787d35f2e8cfeb471b5b898b0fff.tar.gz
Fixes #4651 Assign a proper tracker for NEGATE rules
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/filter.inc10
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 9c64795..3283b39 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -119,13 +119,21 @@ $icmp6types = array(
);
global $tracker;
+global $negate_tracker;
$tracker = 1000000000;
+$tracker = 10000000;
function filter_rule_tracker($tracker) {
global $tracker;
return (++$tracker);
+}
+
+function filter_negaterule_tracker() {
+ global $tracker;
+ ++$negate_tracker;
+ return "tracker {$negate_tracker} ";
}
function fix_rule_label($descr) {
@@ -2760,7 +2768,7 @@ function filter_generate_user_rule($rule) {
$line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] .
$aline['interface'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] .
$negate_networks . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] .
- $aline['vlanprio'] . $aline['vlanprioset'] . $aline['dscp'] . $aline['tracker'] . $aline['allowopts'] . $aline['flags'] .
+ $aline['vlanprio'] . $aline['vlanprioset'] . $aline['dscp'] . filter_negaterule_tracker() . $aline['allowopts'] . $aline['flags'] .
$aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'] .
" label \"NEGATE_ROUTE: Negate policy routing for destination\"\n";
OpenPOWER on IntegriCloud