diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-03-02 00:55:12 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-03-02 00:55:12 +0000 |
commit | e31eebbaf1dd1d5457a74c0775ffa6e8c4ea4818 (patch) | |
tree | 541fdb740b285e60b7918454f4f5c4c0be26e89a /etc | |
parent | 2e7efb95bfc986a43facbf58080e441a952e33c3 (diff) | |
download | pfsense-e31eebbaf1dd1d5457a74c0775ffa6e8c4ea4818.zip pfsense-e31eebbaf1dd1d5457a74c0775ffa6e8c4ea4818.tar.gz |
DSCP keyword comes first than flags and keep state
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/filter.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index a0adbe3..b20538d 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2179,7 +2179,7 @@ function generate_user_filter_rule($rule, $ngcounter) { $vpns = " to <vpns> "; $line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] . $aline['prot'] . $aline['src'] . $aline['srcport'] . $aline['os'] . $vpns . $aline['dstport']. - $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['flags'] . $aline['dscp']. + $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] . $aline['flags']. $aline['queue'] . " label \"NEGATE_ROUTE: Negate policy route for local network(s)\"\n"; /* if list */ if($config['interfaces']['lan']) @@ -2207,16 +2207,16 @@ function generate_user_filter_rule($rule, $ngcounter) { /* return the line */ $line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] . $aline['prot'] . $aline['src'] . $aline['srcport'] . $aline['os'] . $localnets . $aline['dstport']. - $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['flags'] . - $aline['dscp'] . $aline['queue'] . + $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] . + $aline['flags'] . $aline['queue'] . " label \"NEGATE_ROUTE: Negate policy route for local network(s)\"\n"; } /* piece together the actual user rule */ $line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] . $aline['reply'] . $aline['route'] . $aline['prot'] . $aline['src'] . $aline['srcport'] . $aline['os'] . $aline['dst'] . - $aline['dstport'] . $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['flags'] . - $aline['dscp'] . $aline['queue']; + $aline['dstport'] . $aline['icmp-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] . + $aline['flags'] . $aline['queue']; /* is a time based rule schedule attached? */ if($rule['sched']) { |