From 4a2e6a4375717e7b2a31757d6cb2aae13ce199bb Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 25 Mar 2015 16:33:05 +0000
Subject: [PATCH 1/5] Added basic Ubiquiti support

---
 html/images/os/ubiquiti.png              | Bin 0 -> 794 bytes
 includes/definitions.inc.php             |   5 +++++
 includes/discovery/os/ubiquitiap.inc.php |   9 +++++++++
 includes/polling/os/ubiquitiap.inc.php   |  10 ++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 html/images/os/ubiquiti.png
 create mode 100644 includes/discovery/os/ubiquitiap.inc.php
 create mode 100644 includes/polling/os/ubiquitiap.inc.php

diff --git a/html/images/os/ubiquiti.png b/html/images/os/ubiquiti.png
new file mode 100644
index 0000000000000000000000000000000000000000..f079540830bca9de308b51e803c31e63ce2b53d4
GIT binary patch
literal 794
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2c#`plA5Z7tbrX6|p!`IiBVeW%BKmK0-@QY!^<CQB{GHiIt
zu>R@mAAdjm{Hw38fBN)Up`9;GO-&hAz3ja9DI+7}<;#~-Zhc}{`?UMor<=EKGpu<s
zdGe%lyS5xUeDw60a~mFi%Rl}$F){Jz(c??&3-5paeg6FUi4!L>EPPOM;r+i~Kfizf
z@$K8U+S;0`OYi>u`wz5;VbilOzyEf2_itUZ>e{vI8?Qaxx_x(jef{Y-KbI|D;(z4L
z@)aw7{{46H{jZs~KR^EZ=kw>!3>!b!U-@|B<1e6NoSd8(*1X#C<XhGG_Y7;E?tAc-
zVd<lTFTO_}fBWRgGlq3ffByXGariaErl<Gr-=8&S!N*UZ`}+D4F8rD@WlH_!kA8lB
zkG}k#I(2Hy$+xe+|DAvD%lRj7&YrtaUQzAo>ACp+*VAXtifwuJ=*yoe(`Es~1ZbeE
zt7~uHM4<D44%qhe+tw%F9zA;8eD!16>30m<UI1g^|NsByjpd7gtkRMozhEGj?to$T
zhI_Ao4!Gdy;uunKE2%^GqQ5R9vwCn{rM-HaP;9=wLHy<&J7z3j($YB9)JUCQ<p7_E
z2MgDSsT*!YG_p7~FbO&^vQJx5vSFIW0tVrL1qaO3qQz7WFo+8HTo>hT=d@tf{4Wyj
zCOE@EZNjO9?rkSpIX5t`WUwvYmNUb_Zi3dS2Lh=qoGqf_+^nys7>HCAc|<g`sB~|w
zsBO@iGQ%>~=1L>eDJ?fODThWO(=^6h&ElCUtS=WhObAp}&0F>DSQjT-WacAPfyPNP
lJ1<x`pRTapz|X+M!?0E@)V{=FuQ<?e44$rjF6*2UngCCo)vy2n

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index bb202a28e..6f2549178 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -580,6 +580,11 @@ $config['os'][$os]['text']              = "D-Link Access Point";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['icon']              = "dlink";
 
+$os = "ubiquitiap";
+$config['os'][$os]['text']              = "Ubiquiti Networks Wireless";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "ubiquiti";
+
 $os = "axiscam";
 $config['os'][$os]['text']              = "AXIS Network Camera";
 $config['os'][$os]['icon']              = "axis";
diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
new file mode 100644
index 000000000..243fec975
--- /dev/null
+++ b/includes/discovery/os/ubiquitiap.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") ) {
+        $os = "ubiquitiap";
+    }
+}
+
+?>
diff --git a/includes/polling/os/ubiquitiap.inc.php b/includes/polling/os/ubiquitiap.inc.php
new file mode 100644
index 000000000..63884caeb
--- /dev/null
+++ b/includes/polling/os/ubiquitiap.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-Oqv", "IEEE802dot11-MIB");
+$hardware = $data[0];
+
+if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $data[1],$matches)) {
+    $version = $matches[0];
+}
+
+?>

From ae9c4a370a05136091644224cd119acaeee3fa8c Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 25 Mar 2015 16:47:41 +0000
Subject: [PATCH 2/5] Updated logo

---
 html/images/os/ubiquiti.png | Bin 794 -> 1076 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/html/images/os/ubiquiti.png b/html/images/os/ubiquiti.png
index f079540830bca9de308b51e803c31e63ce2b53d4..41e24ea418360d078d584daac01240a7999b4e21 100644
GIT binary patch
delta 933
zcmV;W16ur=2DAtviBL{Q4GJ0x0000DNk~Le0000W0000W2m=5B07RsU#*rZ?e}GU-
zR7GLR?f|ss==c2;6cnngulDx#@cI3koS**w{@U^S0ITHt{r<?v%9)y-jE|9;+w-KR
zsLky8so?dKl$VExhjP#F0HNXJ<mB`E{e{!<dwY8sx#-{X`=X<!@$vBhuH^uz<DH(M
zM8oTrmzw+g``gyk_x%3(`uc5ce{BGx;Q+1WG&D5z_4SXCl77?h@9*z+(C`4F;fjop
z*Vx(srQ+A|`gVDIVP9dw>G;*w*8rN{`1$$u_4eoI=%}fy;o#w+-t+*n=CHA{k&=}F
zvE^6D?QPEP;NahRdw;X-{{XJ)RL1O5Qc~gJ;sB`QwdD5r@$YJGbH=i)e*moISkCyq
zr=Mih``Fprfq{Yi{QQH1gk{L>%Ix_~z3ScG-{Rur0JZMV&d$ES!NbMH*1)-Wd3i_8
z_f*I2`T6<c@%Bx@>!OB#_5J_T($d)2*u3ZWfZF;1oZyn#@?XsH0IlV8(C+}Q<p8AN
zl-l$C{r=nA+u7RP-rn8-6tLw000960{~pf=-2eapfOJw$Q<K2~Y?IId6Mq0W1xsfD
z00F*9L_t(|+I-XJSAtL!0B|w`L(NrLInJShaSBVLU0Q0pUVE7By{FQI`>zKNQ`G2v
zc$~-m@h<lb;<*+6Xx>=MVpl!P+#eJB@5<O;TN1A6l+`u}q4)!V-_V>@7f)B?xZJ4@
zRM799c+^k8XmR-*gC;9vMt`i}ST2IDJZQlHg@N<~M8rZoR9ylZ7nI)AZz2nzyA%l1
zN{<A64S#^4iGM&C_L@sqp$s%bxRHd6!w}@u2P^mtK`&TYV8tmTz`cMQkzfq6tuDd<
zXnRpbBT-pJ@v;)sYe14j$>kS`O7Q&)Bq^JvbCtkS1d>EIRDd1OK!3^ze2!w^6Ai%b
z)i4GGG5|GSeHb`6oFiKfydh=`gIb|{hISRqq|FJf3aG+4&};ET$ub`tGgEz96)^Oy
z=AbWv9hSUE#DfP;XDpou;NvEh)jYbsjoOyRdwRy>-r*QyrVim3umVy<WNu|}b~hU3
zJ#BW%8MB{40f32nlU`Ed{N33q&nG>0iU|bTPAobAWF~@AZyO(*14-q3hVt0A3%{J-
zMAr?CMz+#x19d#lQ?_m>2g(I^=hmOtjzGc|ztW%a9{~mcR&$MqE(&bK00000NkvXX
Hu0mjf9IyDI

delta 668
zcmV;N0%QHO2$}{ViBL{Q4GJ0x0000DNk~Le0000G0000G2m=5B04OaFQ;{Jke_v2c
zR7IASmc;7#O-)Szo#5>F{nzmN0I1`ssi^?4<p8hc>-hcf`TZ|1FU!l#61nI#H8lXL
z>510zXlQ8Z>FJc(@&K*ni`Mel+S>rE<dc(<&bqY1!^O+Y&amV5Z^!LnVPVC^$EAO9
z-}C#=&(D#OkpQ9KbkOhq`uX?wfB5$H_I-VPdeZLx{{QRv{Q$D&^!xpZi;uOes@B%m
zvDW3ax4VCTf6MIorlX`!#O$Z2sQLZ=(eL`1+w<e~{PXkk0I~Cb)bZHy`swNELPA0S
ztm?Gn_Il6n0IcP{;OzjV;=$<mS;y_<<mLdb<@x#fNW<#@vgO|2-<q7DfARA3j*gCC
z(E5~=lz-FlPEJnZ^!t^Sm0Zc~>-YVi-t^Dp?9I;5cX)eANlByM^~=o77PRK#^!${T
zn(+Dk0IualMMaH{k<0A)*zx+d<@UAY_Tu8>gVph7%kBWS=l}o!|Ns9tfp?++004D#
zQchF<|NsC0|NsC0|NsC0lkNd$e*l}X-s%7V0MJQ9K~#9!Vu&r#Pb~ohCsTfTKPQF~
zU2iWiU$eNln5U$Kft58fCl4gR4ircP3h<S%*jRxCLVyAhKmiAqq;#;BD4+lnP@upz
zCR-LHzyK8xOxG0)hY2_XDgP8#MiH1mCXmWti?+yx39tjH06llMY?wekZjdU<;1Fd5
z34|3F3kB<xFcf-nNLYgeB#X6peSj*Im^ocM)PVxZDn=$6K!Fl9W&v#}bD3lX>7YQ6
zQ6(jAs`kc;2?kkd;w2D)k{r3vI77>LJFpJ`0t^7HCRIOlK)n|L0000<MNUMnLSTZ)
CDQPJH


From a6802ec217888989652c6b51e21f9d8a497f20d6 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 25 Mar 2015 17:06:20 +0000
Subject: [PATCH 3/5] Updating to include Pro versions

---
 includes/discovery/os/ubiquitiap.inc.php | 2 +-
 includes/polling/os/ubiquitiap.inc.php   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
index 243fec975..3bc75d29b 100644
--- a/includes/discovery/os/ubiquitiap.inc.php
+++ b/includes/discovery/os/ubiquitiap.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (!$os) {
-    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") ) {
+    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") || stristr(snmp_get($device, "dot11manufacturerName.6", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks")) {
         $os = "ubiquitiap";
     }
 }
diff --git a/includes/polling/os/ubiquitiap.inc.php b/includes/polling/os/ubiquitiap.inc.php
index 63884caeb..545862f72 100644
--- a/includes/polling/os/ubiquitiap.inc.php
+++ b/includes/polling/os/ubiquitiap.inc.php
@@ -1,6 +1,9 @@
 <?php
 
 $data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-Oqv", "IEEE802dot11-MIB");
+if (empty($data)) {
+    $data = snmp_get_multi($device, "dot11manufacturerProductName.6 dot11manufacturerProductVersion.6", "-Oqv", "IEEE802dot11-MIB");
+}
 $hardware = $data[0];
 
 if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $data[1],$matches)) {

From f1c1adbc718a9918dc8b619b6c055a1aae427eff Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 25 Mar 2015 17:07:37 +0000
Subject: [PATCH 4/5] Added check if $os = linux

---
 includes/discovery/os/ubiquitiap.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
index 3bc75d29b..1160345d9 100644
--- a/includes/discovery/os/ubiquitiap.inc.php
+++ b/includes/discovery/os/ubiquitiap.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!$os) {
+if (!$os || $os == 'linux') {
     if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") || stristr(snmp_get($device, "dot11manufacturerName.6", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks")) {
         $os = "ubiquitiap";
     }

From 37262972bb1f60d0de13d7503720754011867547 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 25 Mar 2015 17:10:19 +0000
Subject: [PATCH 5/5] Added device_bits over graph

---
 includes/definitions.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 6f2549178..825b4c3b3 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -584,6 +584,8 @@ $os = "ubiquitiap";
 $config['os'][$os]['text']              = "Ubiquiti Networks Wireless";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['icon']              = "ubiquiti";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
 
 $os = "axiscam";
 $config['os'][$os]['text']              = "AXIS Network Camera";