From 310459c6c33c70e0647057e5ec663649297e2d1d Mon Sep 17 00:00:00 2001 From: koichirok Date: Thu, 8 May 2014 10:39:01 +0000 Subject: [PATCH] 2014-05-08 Koichiro KIKUCHI * godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: (Re)added ifXTable support to the SNMP interface wizard. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9893 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ .../agentes/agent_wizard.snmp_interfaces_explorer.php | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 90c5ca7926..521409aea9 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2014-05-08 Koichiro KIKUCHI + + * godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: + (Re)added ifXTable support to the SNMP interface wizard. + 2014-05-08 Vanessa Gil * godmode/agentes/agent_wizard.snmp_explorer.php: diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php index b22d59cb7b..19a6cbf886 100644 --- a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php +++ b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php @@ -52,10 +52,12 @@ if ($snmpwalk) { $snmpis = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user, $snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass, $snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.2", $tcp_port); - - if ($snmpis === false) { - $snmpis = array(); - } + // ifXTable is also used + $ifxitems = get_snmpwalk($ip_target, $snmp_version, $snmp_community, $snmp3_auth_user, + $snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass, + $snmp3_privacy_method, $snmp3_privacy_pass, 0, ".1.3.6.1.2.1.31.1.1", $tcp_port); + + $snmpis = array_merge(($snmpis === false ? array() : $snmpis), ($ifxitems === false ? array() : $ifxitems)); $interfaces = array();