From ff63913adc68f7c0360d50aedbebb75d2022196e Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sun, 31 May 2015 17:25:42 +1000 Subject: [PATCH 1/2] Reorganise Ruckus detection to allow for standalone APs --- includes/polling/os/ruckuswireless.inc.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/includes/polling/os/ruckuswireless.inc.php b/includes/polling/os/ruckuswireless.inc.php index 8e299f37d..8436a897b 100644 --- a/includes/polling/os/ruckuswireless.inc.php +++ b/includes/polling/os/ruckuswireless.inc.php @@ -11,13 +11,24 @@ * the source code distribution for details. */ +$productmib = trim(snmp_get($device, ".1.3.6.1.2.1.1.2.0", "-Oqv"), '" '); + $ruckusmodels = array( - ".1.3.6.1.2.1.1.1.0", + "$productmib.5.0", ".1.3.6.1.4.1.25053.1.2.1.1.1.1.9.0", ".1.3.6.1.4.1.25053.1.1.2.1.1.1.1.0", + ".1.3.6.1.2.1.1.1.0", ); +$ruckusversions = array( + "$productmib.8.0", + ".1.3.6.1.4.1.25053.1.1.3.1.1.1.1.1.3.1", +); +$ruckusserials = array( + "$productmib.7.0", + ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0" +); + $hardware = first_oid_match($device, $ruckusmodels); -$productmib = trim(snmp_get($device, ".1.3.6.1.2.1.1.2.0", "-Oqv"), '" '); -$version = first_oid_match($device, array("$productmib.8.0", ".1.3.6.1.4.1.25053.1.1.3.1.1.1.1.1.3.1")); -$serial = first_oid_match($device, array("$productmib.7.0", ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0")); +$version = first_oid_match($device, $ruckusversions); +$serial = first_oid_match($device, $ruckusserials); ?> From 53e61702f0bfeff0562e1a280ccf70707cb639c7 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Sun, 31 May 2015 19:01:49 +1000 Subject: [PATCH 2/2] Ruckus: Add country to end of version --- includes/polling/os/ruckuswireless.inc.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/includes/polling/os/ruckuswireless.inc.php b/includes/polling/os/ruckuswireless.inc.php index 8436a897b..1c9b1b0ec 100644 --- a/includes/polling/os/ruckuswireless.inc.php +++ b/includes/polling/os/ruckuswireless.inc.php @@ -27,8 +27,16 @@ $ruckusserials = array( "$productmib.7.0", ".1.3.6.1.4.1.25053.1.1.2.1.1.1.2.0" ); +$ruckuscountries = array( + "$productmib.9.0", + ".1.3.6.1.4.1.25053.1.2.1.1.1.1.20" +); $hardware = first_oid_match($device, $ruckusmodels); $version = first_oid_match($device, $ruckusversions); $serial = first_oid_match($device, $ruckusserials); +$ruckuscountry = first_oid_match($device, $ruckuscountries); +if (isset($ruckuscountry) && $ruckuscountry != "") { + $version .= " ($ruckuscountry)"; +} ?>