first batch

This commit is contained in:
crcro
2016-09-22 23:03:44 +03:00
parent fee15f5e53
commit b3a178f98e
12 changed files with 51 additions and 85 deletions

View File

@@ -1,5 +1,9 @@
<?php
if (str_contains($sysDescr, array('ProCurve', 'HP 1820'))) {
$os = 'procurve';
}
if (!$os) {
if (stristr($sysDescr, 'ProCurve') || stristr($sysDescr, 'HP 1820')) {
$os = 'procurve';

View File

@@ -1,7 +1,5 @@
<?php
if (!$os) {
if (strstr($sysObjectId, '.1.3.6.1.4.1.11898.2.4.9')) {
$os = 'proxim';
}
if (starts_with($sysObjectId, '.1.3.6.1.4.1.11898.2.4.9')) {
$os = 'proxim';
}

View File

@@ -9,8 +9,7 @@
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
if (!$os) {
if (strstr($sysDescr, 'Pulse Connect Secure')) {
$os = 'pulse';
}
if (str_contains($sysDescr, 'Pulse Connect Secure')) {
$os = 'pulse';
}

View File

@@ -1,6 +1,9 @@
<?php
if (!$os) {
if (strstr($sysObjectId, '.1.3.6.1.4.1.4413') || strstr($sysObjectId, '.1.3.6.1.4.1.7244') && (stristr($sysDescr, 'vxworks') || stristr($sysDescr, 'Quanta'))) {
$os = 'quanta';
}
if (starts_with($sysObjectId, array('.1.3.6.1.4.1.4413', '.1.3.6.1.4.1.7244'))) {
$os = 'quanta';
}
if (str_contains($sysDescr, array('vxworks', 'Quanta'))) {
$os = 'quanta';
}

View File

@@ -1,7 +1,5 @@
<?php
if (!$os) {
if (strstr($sysDescr, 'AT-8000')) {
$os = 'radlan';
} //end if
if (str_contains($sysDescr, 'AT-8000')) {
$os = 'radlan';
}

View File

@@ -1,7 +1,5 @@
<?php
if (!$os) {
if (strstr($sysObjectId, '.1.3.6.1.4.1.8886')) {
$os = 'raisecom';
}
if (starts_with($sysObjectId, '.1.3.6.1.4.1.8886')) {
$os = 'raisecom';
}

View File

@@ -1,19 +1,5 @@
<?php
if (!$os) {
if (strstr($sysDescr, 'Raritan')) {
$os = 'raritan';
}
}
if (!$os) {
if (strstr($sysDescr, 'PX2')) {
$os = 'raritan';
}
}
if (!$os) {
if (strstr($sysDescr, 'Raritan')) {
$os = 'raritan';
}
if (str_contains($sysDescr, array('Raritan', 'PX2'))) {
$os = 'raritan';
}

View File

@@ -1,7 +1,5 @@
<?php
if (!$os) {
if (preg_match('/Redback/', $sysDescr)) {
$os = 'redback';
}
if (str_contains($sysDescr, 'Redback')) {
$os = 'redback';
}

View File

@@ -1,11 +1,5 @@
<?php
if (!$os) {
if (strstr($sysDescr, 'RICOH Aficio')) {
$os = 'ricoh';
}
if (stristr($sysDescr, 'RICOH Network Printer')) {
$os = 'ricoh';
}
if (str_contains($sysDescr, array('RICOH Aficio', 'RICOH Network Printer'))) {
$os = 'ricoh';
}

View File

@@ -9,8 +9,7 @@
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
*/
if (!$os) {
if (strpos($sysObjectId, '1.3.6.1.4.1.17163.1.1') !== false) {
$os = 'riverbed';
}
if (starts_with($sysObjectId, '1.3.6.1.4.1.17163.1.1')) {
$os = 'riverbed';
}

View File

@@ -1,25 +1,16 @@
<?php
if (!$os) {
// RouterOS <= 4
// sysDescr.0 = STRING: router
if ($sysDescr == 'router') {
if (is_numeric(snmp_get($device, 'SNMPv2-SMI::enterprises.14988.1.1.4.3.0', '-Oqv', ''))) {
$os = 'routeros';
}
}
// Routeros >= 5
// sysDescr.0 = STRING: RouterOS RB493AH
if (preg_match('/^RouterOS/', $sysDescr)) {
$os = 'routeros';
}
// poll Cisco AAA MIB
if (!empty($os)) {
$extra_mibs = array(
"ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
);
register_mibs($device, $extra_mibs, "includes/discovery/os/routeros.inc.php");
}
if (str_contains($sysDescr, 'router') && is_numeric(snmp_get($device, 'SNMPv2-SMI::enterprises.14988.1.1.4.3.0', '-Oqv', ''))) {
$os = 'routeros';
}
if (str_contains($sysDescr, 'RouterOS')) {
$os = 'routeros';
}
if (!empty($os)) {
$extra_mibs = array(
"ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
);
register_mibs($device, $extra_mibs, "includes/discovery/os/routeros.inc.php");
}

View File

@@ -12,16 +12,14 @@
* the source code distribution for details.
*/
if (!$os) {
if (strstr($sysObjectId, '.1.3.6.1.4.1.25053.3.1')) {
$os = 'ruckuswireless';
if (starts_with($sysObjectId, '.1.3.6.1.4.1.25053.3.1')) {
$os = 'ruckuswireless';
$ruckus_mibs = array(
"ruckusZDSystemStats" => "RUCKUS-ZD-SYSTEM-MIB",
"ruckusZDWLANTable" => "RUCKUS-ZD-WLAN-MIB",
"ruckusZDWLANAPTable" => "RUCKUS-ZD-WLAN-MIB",
"ruckusZDWLANAPRadioStatsTable" => "RUCKUS-ZD-WLAN-MIB",
);
register_mibs($device, $ruckus_mibs, "includes/discovery/os/ruckuswireless.inc.php");
}
$ruckus_mibs = array(
"ruckusZDSystemStats" => "RUCKUS-ZD-SYSTEM-MIB",
"ruckusZDWLANTable" => "RUCKUS-ZD-WLAN-MIB",
"ruckusZDWLANAPTable" => "RUCKUS-ZD-WLAN-MIB",
"ruckusZDWLANAPRadioStatsTable" => "RUCKUS-ZD-WLAN-MIB",
);
register_mibs($device, $ruckus_mibs, "includes/discovery/os/ruckuswireless.inc.php");
}