From 40d17b4c4a27b505cf0b38dcce3a976595c3e024 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Sun, 24 Jan 2016 20:35:29 +0100
Subject: [PATCH 1/2] resolve problem with absent VLAN's on devices with
 reported version 2 ieee8021QBridgeVlanVersionNumber
 ieee8021QBridgeVlanVersionNumber OBJECT-TYPE     SYNTAX      INTEGER {       
              version1(1),                     version2(2)                 }  
   MAX-ACCESS  read-only     STATUS      current     DESCRIPTION         "The
 version number of IEEE 802.1Q that this device         supports.  Reported as
 1 by VLAN Bridges that support         only SST operation, and reported as 2
 by VLAN Bridges         that support MST operation."     REFERENCE  
 "12.10.1.1"     ::= { ieee8021QBridgeEntry 2 }

---
 includes/discovery/vlans/q-bridge-mib.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/vlans/q-bridge-mib.inc.php b/includes/discovery/vlans/q-bridge-mib.inc.php
index 83908fbd9..c994887c0 100644
--- a/includes/discovery/vlans/q-bridge-mib.inc.php
+++ b/includes/discovery/vlans/q-bridge-mib.inc.php
@@ -4,7 +4,7 @@ echo 'Q-BRIDGE-MIB VLANs : ';
 
 $vlanversion = snmp_get($device, 'dot1qVlanVersionNumber.0', '-Oqv', 'Q-BRIDGE-MIB');
 
-if ($vlanversion == 'version1') {
+if ($vlanversion == 'version1' || $vlanversion == '2' ) {
     echo "VLAN $vlanversion ";
 
     $vtpdomain_id = '1';

From 995897b75ca1d89a7233e9de9789ea82c68e4793 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Sun, 24 Jan 2016 20:50:42 +0100
Subject: [PATCH 2/2] switch to newer IEEE8021-Q-BRIDGE-MIB

---
 includes/discovery/vlans/q-bridge-mib.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/vlans/q-bridge-mib.inc.php b/includes/discovery/vlans/q-bridge-mib.inc.php
index c994887c0..6de0c9423 100644
--- a/includes/discovery/vlans/q-bridge-mib.inc.php
+++ b/includes/discovery/vlans/q-bridge-mib.inc.php
@@ -1,14 +1,14 @@
 <?php
 
-echo 'Q-BRIDGE-MIB VLANs : ';
+echo 'IEEE8021-Q-BRIDGE-MIB VLANs : ';
 
-$vlanversion = snmp_get($device, 'dot1qVlanVersionNumber.0', '-Oqv', 'Q-BRIDGE-MIB');
+$vlanversion = snmp_get($device, 'dot1qVlanVersionNumber.0', '-Oqv', 'IEEE8021-Q-BRIDGE-MIB');
 
 if ($vlanversion == 'version1' || $vlanversion == '2' ) {
     echo "VLAN $vlanversion ";
 
     $vtpdomain_id = '1';
-    $vlans        = snmpwalk_cache_oid($device, 'dot1qVlanStaticName', array(), 'Q-BRIDGE-MIB');
+    $vlans        = snmpwalk_cache_oid($device, 'dot1qVlanStaticName', array(), 'IEEE8021-Q-BRIDGE-MIB');
 
     foreach ($vlans as $vlan_id => $vlan) {
         echo " $vlan_id";