tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5818-snmpbrowser-no-usa-mibs-personalizadas-por-defecto' into 'develop'

Browse Source 
Fixed snmp_read_mib call

See merge request artica/pandorafms!3239
This commit is contained in:
Alejandro Fraguas 2020-06-10 14:02:25 +02:00
commit ee20b5ca94
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pandora_console/include/functions_snmp_browser.php
View File

@ -238,8 +238,17 @@ function snmp_browser_print_tree(
/** /**
* Build the SNMP tree for the given SNMP agent. * Build the SNMP tree for the given SNMP agent.
* *
* @param target_ip string IP of the SNMP agent. * @param string $target_ip Target_ip.
* @param community string SNMP community to use. * @param string $community Community.
* @param string $starting_oid Starting_oid.
* @param string $version Version.
* @param string $snmp3_auth_user Snmp3_auth_user.
* @param string $snmp3_security_level Snmp3_security_level.
* @param string $snmp3_auth_method Snmp3_auth_method.
* @param string $snmp3_auth_pass Snmp3_auth_pass.
* @param string $snmp3_privacy_method Snmp3_privacy_method.
* @param string $snmp3_privacy_pass Snmp3_privacy_pass.
* @param string|null $snmp3_context_engine_id Snmp3_context_engine_id.
* *
* @return array The SNMP tree. * @return array The SNMP tree.
*/ */
@ -253,7 +262,8 @@ function snmp_browser_get_tree(
$snmp3_auth_method='', $snmp3_auth_method='',
$snmp3_auth_pass='', $snmp3_auth_pass='',
$snmp3_privacy_method='', $snmp3_privacy_method='',
$snmp3_privacy_pass='' $snmp3_privacy_pass='',
$snmp3_context_engine_id=null
) { ) {
global $config; global $config;
@ -277,6 +287,7 @@ function snmp_browser_get_tree(
default: default:
$snmp_version = SNMP::VERSION_2c; $snmp_version = SNMP::VERSION_2c;
break;
} }
$snmp_session = new SNMP($snmp_version, $target_ip, $community); $snmp_session = new SNMP($snmp_version, $target_ip, $community);
@ -284,10 +295,34 @@ function snmp_browser_get_tree(
// Set security if SNMP Version is 3. // Set security if SNMP Version is 3.
if ($snmp_version == SNMP::VERSION_3) { if ($snmp_version == SNMP::VERSION_3) {
$snmp_session->setSecurity($snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass); $snmp_session->setSecurity(
$snmp3_security_level,
$snmp3_auth_method,
$snmp3_auth_pass,
$snmp3_privacy_method,
$snmp3_privacy_pass,
$community,
$snmp3_context_engine_id
);
} }
snmp_read_mib($config['homedir'].'/attachment/mibs'); $mibs_dir = $config['homedir'].'/attachment/mibs';
$_dir = opendir($mibs_dir);
// Future. Recomemended: Use a global config limit of MIBs loaded.
while (($mib_file = readdir($_dir)) !== false) {
if ($mib_file == '..' || $mib_file == '.') {
continue;
}
$rs = snmp_read_mib($mibs_dir.'/'.$mib_file);
if ($rs !== true) {
error_log('Failed while reading MIB file: '.$mib_file);
}
}
closedir($_dir);
$output = $snmp_session->walk($starting_oid); $output = $snmp_session->walk($starting_oid);
if ($output == false) { if ($output == false) {
$output = $snmp_session->getError(); $output = $snmp_session->getError();