From a8d380f95fd277bd844424575823958db679d4e1 Mon Sep 17 00:00:00 2001
From: neg2led <neg2led@gmail.com>
Date: Wed, 3 Jan 2018 17:14:45 +1100
Subject: [PATCH] Fixed UniFi AP hardware type and firmware version retrieval,
 enabled snmpbulkwalk

---
 includes/definitions/unifi.yaml   |  1 -
 includes/polling/os/unifi.inc.php | 28 +++++-----------------------
 2 files changed, 5 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..d6e35a4ffa 100644
--- a/includes/polling/os/unifi.inc.php
+++ b/includes/polling/os/unifi.inc.php
@@ -1,27 +1,9 @@
 <?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 ($sysmodel = snmp_get($device, 'unifiApSystemModel.0', '-Osqnv', 'UBNT-UniFi-MIB')) {
+    $hardware = $sysmodel;
 }
 
-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)) {
-        $version = $matches[0];
-    }
+if ($sysver = snmp_get($device, 'unifiApSystemVersion.0', '-Osqnv', 'UBNT-UniFi-MIB')) {
+    $version = $sysver;
 }