From 1346306cf7bdc82d4f33b607e46452fe6efa691f Mon Sep 17 00:00:00 2001 From: Ermal Date: Fri, 18 May 2012 19:49:41 +0000 Subject: Allow 802.1p tags to be controlled from firewall rules edit screen --- etc/inc/filter.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'etc/inc') diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 3cbfe61..3dccbab 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2171,6 +2171,10 @@ function filter_generate_user_rule($rule) { $aline['tagged'] = " tagged " .$rule['tagged'] . " "; if(!empty($rule['dscp'])) $aline['dscp'] = " dscp " . $rule['dscp'] . " "; + if(!empty($rule['vlanprio'])) + $aline['vlanprio'] = " ieee8021q-pcp " . $rule['vlanprio'] . " "; + if(!empty($rule['vlanprioset'])) + $aline['vlanprioset'] = " ieee8021q-setpcp " . $rule['vlanprioset'] . " "; if($type == "pass") { if(isset($rule['allowopts'])) $aline['allowopts'] = " allow-opts "; @@ -2323,7 +2327,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['dscp'] . $aline['allowopts'] . $aline['flags'] . + $aline['vlanprio'] . $aline['vlanprioset'] . $aline['dscp'] . $aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['dnpipe'] . $aline['schedlabel'] . " label \"NEGATE_ROUTE: Negate policy routing for destination\"\n"; @@ -2332,7 +2336,7 @@ function filter_generate_user_rule($rule) { $line .= $aline['type'] . $aline['direction'] . $aline['log'] . $aline['quick'] . $aline['interface'] . $aline['reply'] . $aline['route'] . $aline['ipprotocol'] . $aline['prot'] . $aline['src'] . $aline['os'] . $aline['dst'] . $aline['divert'] . $aline['icmp-type'] . $aline['icmp6-type'] . $aline['tag'] . $aline['tagged'] . $aline['dscp'] . - $aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['dnpipe'] . $aline['schedlabel']; + $aline['vlanprio'] . $aline['vlanprioset'] . $aline['allowopts'] . $aline['flags'] . $aline['queue'] . $aline['dnpipe'] . $aline['schedlabel']; return $line; -- cgit v1.1