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

Fix the interface_is_vlan() function.

Browse Source 
It now works when only QinQ VLANs exist in the system.
This commit is contained in:
Luiz Souza 2017-10-25 12:20:17 -05:00
parent 63a480cbf6
commit 77eda8d57e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ function vlan_inuse($vlan) {
function interface_is_vlan($if = NULL) {
global $config;
if ($if == NULL || empty($if) || !is_array($config['vlans']['vlan'])) {
if ($if == NULL || empty($if)) {
return (NULL);
}
@ -299,20 +299,20 @@ function interface_is_vlan($if = NULL) {
}
/* Find the VLAN interface. */
foreach ($config['vlans']['vlan'] as $vlanidx => $vlan) {
if ($if == $vlan['vlanif']) {
return ($vlan);
if (isset($config['vlans']['vlan']) && is_array($config['vlans']['vlan'])) {
foreach ($config['vlans']['vlan'] as $vlanidx => $vlan) {
if ($if == $vlan['vlanif']) {
return ($vlan);
}
}
}
/* Check for the first level tag in QinQ interfaces. */
if (!isset($config['qinqs']['qinqentry']) ||
!is_array($config['qinqs']['qinqentry'])) {
return (NULL);
}
foreach ($config['qinqs']['qinqentry'] as $qinqidx => $qinq) {
if ($if == $qinq['vlanif']) {
return ($qinq);
if (isset($config['qinqs']['qinqentry']) && is_array($config['qinqs']['qinqentry'])) {
foreach ($config['qinqs']['qinqentry'] as $qinqidx => $qinq) {
if ($if == $qinq['vlanif']) {
return ($qinq);
}
}
}