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

Use the new function to validate the VLAN tags.

Browse Source
This commit is contained in:
Luiz Souza 2017-10-17 17:45:46 -02:00
parent 0793de1aad
commit 2e155305e7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/inc/interfaces.inc
View File

@ -294,8 +294,7 @@ function interface_is_vlan($if = NULL) {
/* Check basic format. */
list($vlanif, $vlantag) = explode(".", $if);
if (empty($vlanif) || empty($vlantag) ||
intval($vlantag) < 0 || intval($vlantag) > 4094) {
if (empty($vlanif) || empty($vlantag) || !vlan_valid_tag($vlantag)) {
return (NULL);
}
@ -311,9 +310,8 @@ function interface_is_vlan($if = NULL) {
function vlan_interface($vlan = NULL) {
if ($vlan == NULL || !is_array($vlan) ||
!isset($vlan['if']) || !isset($vlan['tag']) ||
intval($vlan['tag']) < 0 || intval($vlan['tag']) > 4094) {
if ($vlan == NULL || !is_array($vlan) || !isset($vlan['if']) ||
!isset($vlan['tag']) || !vlan_valid_tag($vlan['tag'])) {
return (NULL);
}
return ("{$vlan['if']}.{$vlan['tag']}");

2
src/usr/local/www/interfaces_vlan_edit.php
View File

@ -70,7 +70,7 @@ if ($_POST['save']) {
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
if (isset($_POST['tag']) && (!is_numericint($_POST['tag']) || ($_POST['tag'] < '1') || ($_POST['tag'] > '4094'))) {
if (isset($_POST['tag']) && !vlan_valid_tag($_POST['tag'])) {
$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094.");
}
if (isset($_POST['pcp']) && !empty($_POST['pcp']) && (!is_numericint($_POST['pcp']) || ($_POST['pcp'] < '0') || ($_POST['pcp'] > '7'))) {