diff options
| author | jim-p <jimp@pfsense.org> | 2017-08-01 11:40:41 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-08-01 11:40:41 -0400 |
| commit | d08c13875483a81b6393f0127abe719e5734dea4 (patch) | |
| tree | 787e02626b2d8891f734fe0ce80e586b427a8ed4 | |
| parent | c71df82d1f7d249660cf09c66f91d6aac48a8e21 (diff) | |
| download | pfsense-d08c13875483a81b6393f0127abe719e5734dea4.zip pfsense-d08c13875483a81b6393f0127abe719e5734dea4.tar.gz | |
Fix VLAN Priority set pf syntax. Fixes #7744
| -rw-r--r-- | src/etc/inc/filter.inc | 18 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 11 |
2 files changed, 25 insertions, 4 deletions
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 472bbb7..3470642 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -90,6 +90,18 @@ $icmptypes = array( 'wrureq' => array('descrip' => gettext('Who are you request'), 'valid4' => false, 'valid6' => true) ); +global $vlanprio_values; +$vlanprio_values = array( + "bk" => 0, + "be" => 1, + "ee" => 2, + "ca" => 3, + "vi" => 4, + "vo" => 5, + "ic" => 6, + "nc" => 7 +); + /* * Fixed tracker values (used to group and track usage in GUI): * @@ -2628,7 +2640,7 @@ function filter_generate_address(& $rule, $target = "source", $isnat = false) { function filter_generate_user_rule($rule) { global $config, $g, $FilterIflist, $GatewaysList; - global $dummynet_name_list; + global $dummynet_name_list, $vlanprio_values; if (isset($config['system']['developerspew'])) { $mt = microtime(); @@ -2874,10 +2886,10 @@ function filter_generate_user_rule($rule) { } } if (!empty($rule['vlanprio']) && ($rule['vlanprio'] != "none")) { - $aline['vlanprio'] = " ieee8021q-pcp " . $rule['vlanprio'] . " "; + $aline['vlanprio'] = " prio " . $vlanprio_values[$rule['vlanprio']] . " "; } if (!empty($rule['vlanprioset']) && ($rule['vlanprioset'] != "none")) { - $aline['vlanprioset'] = " ieee8021q-setpcp " . $rule['vlanprioset'] . " "; + $aline['vlanprioset'] = " set prio " . $vlanprio_values[$rule['vlanprioset']] . " "; } if ($type == "pass") { if (isset($rule['allowopts'])) { diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index e880537..3a462c3 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1626,7 +1626,16 @@ $section->addInput(new Form_Checkbox( $pconfig['nosync'] ))->setHelp('This does NOT prevent the rule from being overwritten on Slave.'); -$vlanprio = array("" => "none", "be" => "BE", "bk" => "BK", "ee" => "EE", "ca" => "CA", "vi" => "VI", "vo" => "VO", "ic" => "IC", "nc" => "NC"); +$vlanprio = array( + "" => "none", + "bk" => "Background (BK, 0)", + "be" => "Best Effort (BE, 1)", + "ee" => "Excellent Effort (EE, 2)", + "ca" => "Critical Applications (CA, 3)", + "vi" => "Video (VI, 4)", + "vo" => "Voice (VO, 5)", + "ic" => "Internetwork Control (IC, 6)", + "nc" => "Network Control (NC, 7)"); $section->addInput(new Form_Select( 'vlanprio', |
