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

Merge pull request #686 from Klaws--/master

Browse Source 
Added previously missing class selectors cs1-cs7 plus VA (voice-admit), plus the TOS values which still work with DSCP
This commit is contained in:
Ermal Luçi 2013-07-02 03:49:06 -07:00
commit fcbef05a9c
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etc/inc/filter.inc
View File

@ -2252,8 +2252,19 @@ function filter_generate_user_rule($rule) {
$aline['tag'] = " tag " .$rule['tag']. " ";
if (!empty($rule['tagged']))
$aline['tagged'] = " tagged " .$rule['tagged'] . " ";
if (!empty($rule['dscp']))
$aline['dscp'] = " dscp " . $rule['dscp'] . " ";
if (!empty($rule['dscp'])) {
switch (strtolower($rule['dscp'])) {
case 'va': $aline['dscp'] = " dscp 44 "; break;
case 'cs1': $aline['dscp'] = " dscp 8 "; break;
case 'cs2': $aline['dscp'] = " dscp 16 "; break;
case 'cs3': $aline['dscp'] = " dscp 24 "; break;
case 'cs4': $aline['dscp'] = " dscp 32 "; break;
case 'cs5': $aline['dscp'] = " dscp 40 "; break;
case 'cs6': $aline['dscp'] = " dscp 48 "; break;
case 'cs7': $aline['dscp'] = " dscp 56 "; break;
default: $aline['dscp'] = " dscp " . $rule['dscp'] . " "; break;
}
}
if (!empty($rule['vlanprio']) && ($rule['vlanprio'] != "none"))
$aline['vlanprio'] = " ieee8021q-pcp " . $rule['vlanprio'] . " ";
if (!empty($rule['vlanprioset']) && ($rule['vlanprioset'] != "none"))

13
usr/local/www/guiconfig.inc
View File

@ -108,9 +108,16 @@ $firewall_rules_dscp_types = array("af11",
"af42",
"af43",
"EF",
"1-64",
"0x10",
"0x04-0xfc");
"cs1",
"cs2",
"cs3",
"cs4",
"cs5",
"cs6",
"cs7",
"0x01 (reliability, ToS 0x04)",
"0x02 (throughput, ToS 0x08)",
"0x04 (lowdelay, ToS 0x10)");
$auth_server_types = array(
'ldap' => "LDAP",