From e3720235f4bde071a2005e970c3cad35f668608e Mon Sep 17 00:00:00 2001
From: Andrew Holmes <4232981+neg2led@users.noreply.github.com>
Date: Tue, 9 Jan 2018 16:48:04 +1100
Subject: [PATCH] Fixed UniFi AP hardware type and firmware version retrieval
 (#8005)

* Fixed UniFi AP hardware type and firmware version retrieval, enabled snmpbulkwalk

* Modified to pull from appropriate OID depending on sysObjectID

* Revert "Modified to pull from appropriate OID depending on sysObjectID" - typos in snmp_get_multi() commands

This reverts commit 5c2b6039f4ea0434c842d25d0f12e22a74097992.

* Revert "Revert "Modified to pull from appropriate OID depending on sysObjectID" - typos in snmp_get_multi() commands"

This reverts commit bccf301a8b4f145d5d3cedd4f6376be86cfcc3a4, so I can submit everything in the one commit

* Revert "Modified to pull from appropriate OID depending on sysObjectID"

This reverts commit 5c2b6039f4ea0434c842d25d0f12e22a74097992 due to errors in code

* Revert to commit a8d380f and then apply changes to account for both old and new agent responses.

* Pull IEEE802dot11-MIB values via snmp_getnext() & sanity check returned results

* Fixed typo in previous commit - [0]s where they don't belong.

* Updated to take advantage of new snmp_getnext_multi() function

* Updated to account for changes to snmp_getnext_multi in pr#8052
---
 includes/definitions/unifi.yaml   |  1 -
 includes/polling/os/unifi.inc.php | 29 ++++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/includes/definitions/unifi.yaml b/includes/definitions/unifi.yaml
index ebe7527c72..777b445686 100644
--- a/includes/definitions/unifi.yaml
+++ b/includes/definitions/unifi.yaml
@@ -2,7 +2,6 @@ os: unifi
 text: 'Ubiquiti UniFi'
 type: wireless
 icon: ubiquiti
-nobulk: 1
 group: ubnt
 over:
     - { graph: device_bits, text: 'Device Traffic' }
diff --git a/includes/polling/os/unifi.inc.php b/includes/polling/os/unifi.inc.php
index 0a6e780328..953a3f1696 100644
--- a/includes/polling/os/unifi.inc.php
+++ b/includes/polling/os/unifi.inc.php
@@ -1,27 +1,10 @@
 <?php
-$data = snmp_get_multi($device, 'dot11manufacturerProductName.2 dot11manufacturerProductVersion.2', '-OQUs', 'IEEE802dot11-MIB');
-if (empty($data)) {
-    $data = snmp_get_multi($device, 'dot11manufacturerProductName.3 dot11manufacturerProductVersion.3', '-OQUs', 'IEEE802dot11-MIB');
-}
-
-if (empty($data)) {
-    $data = snmp_get_multi($device, 'dot11manufacturerProductName.4 dot11manufacturerProductVersion.4', '-OQUs', 'IEEE802dot11-MIB');
-}
-
-if (empty($data)) {
-    $data = snmp_get_multi($device, 'dot11manufacturerProductName.5 dot11manufacturerProductVersion.5', '-OQUs', 'IEEE802dot11-MIB');
-}
-
-if (empty($data)) {
-    $data = snmp_get_multi($device, 'dot11manufacturerProductName.6 dot11manufacturerProductVersion.6', '-OQUs', 'IEEE802dot11-MIB');
-}
-
-foreach ($data as $line) {
-    if (!empty($line['dot11manufacturerProductName'])) {
-        $hardware = $line['dot11manufacturerProductName'];
-    }
-
-    if (preg_match('/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/', $line['dot11manufacturerProductVersion'], $matches)) {
+if ($data = snmp_get_multi($device, 'unifiApSystemModel unifiApSystemVersion', '-OQUs', 'UBNT-UniFi-MIB')) {
+    $hardware = $data['unifiApSystemModel'];
+    $version = $data['unifiApSystemVersion'];
+} elseif ($data = snmp_getnext_multi($device, 'dot11manufacturerProductName dot11manufacturerProductVersion', '-OQUs', 'IEEE802dot11-MIB')) {
+    $hardware = $data['dot11manufacturerProductName'];
+    if (preg_match('/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/', $data['dot11manufacturerProductVersion'], $matches)) {
         $version = $matches[0];
     }
 }