nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 16:26:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1266 from paulgear/mibdir-reduce-duplication

Browse Source 
Reduce duplication of mibdir code
This commit is contained in:
Daniel Preussker
2015-06-13 14:27:57 +02:00
parent 3575da30d2 217202f18a
commit f7b8936473
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/snmp.inc.php
+17 -12
View File
@@ -15,6 +15,12 @@ function string_to_oid($string)
return $oid; return $oid;
} }
function mibdir($mibdir)
{
global $config;
return " -M " . ($mibdir ? $mibdir : $config['mibdir']);
}
function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir = NULL) function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir = NULL)
{ {
global $debug,$config,$runtime_stats,$mibs_loaded; global $debug,$config,$runtime_stats,$mibs_loaded;
@@ -43,7 +49,7 @@ function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir
if ($options) { $cmd .= " " . $options; } if ($options) { $cmd .= " " . $options; }
if ($mib) { $cmd .= " -m " . $mib; } if ($mib) { $cmd .= " -m " . $mib; }
if ($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; } $cmd .= mibdir($mibdir);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -101,8 +107,7 @@ function snmp_get($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
if ($options) { $cmd .= " " . $options; } if ($options) { $cmd .= " " . $options; }
if ($mib) { $cmd .= " -m " . $mib; } if ($mib) { $cmd .= " -m " . $mib; }
if ($mibdir) { $cmd .= " -M " . $mibdir; } $cmd .= mibdir($mibdir);
else { $cmd .= " -M ".$config['mibdir']; }
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
$cmd .= " " . $device['transport'].":".$device['hostname'].":".$device['port']; $cmd .= " " . $device['transport'].":".$device['hostname'].":".$device['port'];
@@ -162,7 +167,7 @@ function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
if ($options) { $cmd .= " $options "; } if ($options) { $cmd .= " $options "; }
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
if ($mibdir) { $cmd .= " -M " . $mibdir; } else { $cmd .= " -M ".$config['mibdir']; } $cmd .= mibdir($mibdir);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -224,7 +229,7 @@ function snmpwalk_cache_cip($device, $oid, $array = array(), $mib = 0)
$cmd .= " -O snQ"; $cmd .= " -O snQ";
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -292,7 +297,7 @@ function snmp_cache_ifIndex($device)
$cmd .= snmp_gen_auth ($device); $cmd .= snmp_gen_auth ($device);
$cmd .= " -O Qs"; $cmd .= " -O Qs";
$cmd .= " -M " . $config['install_dir']."/mibs"; $cmd .= mibdir(null);
$cmd .= " -m IF-MIB ifIndex"; $cmd .= " -m IF-MIB ifIndex";
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
@@ -461,7 +466,7 @@ function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib = 0)
$cmd .= snmp_gen_auth ($device); $cmd .= snmp_gen_auth ($device);
$cmd .= " -O QUs"; $cmd .= " -O QUs";
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -521,7 +526,7 @@ function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib = 0)
$cmd .= snmp_gen_auth ($device); $cmd .= snmp_gen_auth ($device);
$cmd .= " -O QUs"; $cmd .= " -O QUs";
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
@@ -582,7 +587,7 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0)
$cmd .= " -O QUs"; $cmd .= " -O QUs";
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
$cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid; $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$oid;
@@ -645,7 +650,7 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0)
$cmd .= " -O vq"; $cmd .= " -O vq";
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if ($mib) { $cmd .= " -m $mib"; } if ($mib) { $cmd .= " -m $mib"; }
$cmd .= " -t " . $timeout . " -r " . $retries; $cmd .= " -t " . $timeout . " -r " . $retries;
$cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$string; $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." ".$string;
@@ -692,7 +697,7 @@ function snmp_cache_portIfIndex($device, $array)
$cmd .= snmp_gen_auth ($device); $cmd .= snmp_gen_auth ($device);
$cmd .= " -CI -m CISCO-STACK-MIB -O q"; $cmd .= " -CI -m CISCO-STACK-MIB -O q";
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
$cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portIfIndex"; $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portIfIndex";
@@ -739,7 +744,7 @@ function snmp_cache_portName($device, $array)
$cmd .= snmp_gen_auth ($device); $cmd .= snmp_gen_auth ($device);
$cmd .= " -CI -m CISCO-STACK-MIB -O Qs"; $cmd .= " -CI -m CISCO-STACK-MIB -O Qs";
$cmd .= " -M ".$config['install_dir']."/mibs"; $cmd .= mibdir(null);
if (isset($timeout)) { $cmd .= " -t " . $timeout; } if (isset($timeout)) { $cmd .= " -t " . $timeout; }
if (isset($retries)) { $cmd .= " -r " . $retries; } if (isset($retries)) { $cmd .= " -r " . $retries; }
$cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portName"; $cmd .= " ".$device['transport'].":".$device['hostname'].":".$device['port']." portName";