Interfaces/Other Types/VLAN - outer vlan should be marked "ad", inner…

… is always "q". closes #5893 (cherry picked from commit d8f2094)
opnsense · Jan 21, 2023 · 021f656 · 021f656
1 parent 2e78add
commit 021f656
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
@@ -154,11 +154,14 @@ function interfaces_vlan_configure($verbose = false)
     $all_parents = [];
     foreach ($config['vlans']['vlan'] as $vlan) {
         if (!in_array($vlan['vlanif'], $all_parents)) {
-            $all_parents[] = $vlan['vlanif'];
+            if (!isset($all_parents[$vlan['if']])) {
+                $all_parents[$vlan['if']] = 0;
+            }
+            $all_parents[$vlan['if']]++ ;
         }
     }
     foreach ($config['vlans']['vlan'] as $vlan) {
-        $vlan['proto'] = !in_array($vlan['if'], $all_parents) ? '802.1q' : '802.1ad';
+        $vlan['proto'] = empty($all_parents[$vlan['vlanif']]) ? '802.1q' : '802.1ad';
         _interfaces_vlan_configure($vlan);
     }
 

diff --git a/src/opnsense/scripts/interfaces/reconfigure_vlans.php b/src/opnsense/scripts/interfaces/reconfigure_vlans.php
@@ -54,9 +54,10 @@
 if (!empty($config['vlans']['vlan'])) {
     foreach ($config['vlans']['vlan'] as $vlan) {
         $all_vlans[$vlan['vlanif']] = $vlan;
-        if (!in_array($vlan['vlanif'], $all_parents)) {
-            $all_parents[] = $vlan['vlanif'];
+        if (!isset($all_parents[$vlan['if']])) {
+            $all_parents[$vlan['if']] = 0;
         }
+        $all_parents[$vlan['if']]++ ;
     }
 }
 
@@ -67,7 +68,7 @@
     }
     if (isset($all_vlans[$ifname])) {
         $vlan = $all_vlans[$ifname];
-        $vlan['proto'] = !in_array($vlan['if'], $all_parents) ? '802.1q' : '802.1ad';
+        $vlan['proto'] = empty($all_parents[$vlan['vlanif']]) ? '802.1q' : '802.1ad';
         $cvlan = $ifdetails['vlan'];
         if (empty($vlan)) {
             // option 1: removed vlan