mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #160 from laf/issue-159"

Browse Source 
This reverts commit 59dfe4eee2, reversing
changes made to e6fa7d433d.

This commit does not constitute agreement with the claim of copyright violation made by Adam Armstrong at
59dfe4eee2
This commit is contained in:
Paul Gear
2014-04-28 20:10:36 +10:00
parent 707e512f5c
commit 45d8325e97
2 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
includes/discovery/vlans.inc.php
View File

@ -31,22 +31,9 @@ foreach ($device['vlans'] as $domain_id => $vlans)
if ($device['os_group'] == "cisco" || $device['os'] == "ios") // This shit only seems to work on IOS if ($device['os_group'] == "cisco" || $device['os'] == "ios") // This shit only seems to work on IOS
{ {
# Probably does not work with snmpv3. I have no real idea about what this code is really doing # Probably does not work with snmpv3. I have no real idea about what this code is really doing
$device_details = $device;
$device_details['snmpcontext'] = $vlan_id;
$vlan_device = array_merge($device, array('community' => $device['community']."@".$vlan_id)); $vlan_device = array_merge($device, array('community' => $device['community']."@".$vlan_id));
$vlan_data = snmpwalk_cache_oid($device_details, "dot1dStpPortEntry", array(), "BRIDGE-MIB:Q-BRIDGE-MIB"); $vlan_data = snmpwalk_cache_oid($vlan_device, "dot1dStpPortEntry", array(), "BRIDGE-MIB:Q-BRIDGE-MIB");
if ($exec_response['status'] != 0) $vlan_data = snmpwalk_cache_oid($vlan_device, "dot1dBasePortEntry", $vlan_data, "BRIDGE-MIB:Q-BRIDGE-MIB");
{
unset($device_details);
if( $device['snmpver'] == 'v3')
{
print_error("ERROR: For 'vlan-' context to work correctly on cisco device with SNMPv3, please add 'match prefix' into snmp config.");
} else {
print_error("ERROR: No support for per-VLAN community");
}
break;
}
$vlan_data = snmpwalk_cache_oid($device_details, "dot1dBasePortEntry", $vlan_data, "BRIDGE-MIB:Q-BRIDGE-MIB");
} }
echo("VLAN $vlan_id \n"); echo("VLAN $vlan_id \n");

18
includes/snmp.inc.php
View File

@ -765,28 +765,12 @@ function snmp_cache_portName($device, $array)
function snmp_gen_auth (&$device) function snmp_gen_auth (&$device)
{ {
global $debug; global $debug;
$vlan = FALSE;
if (isset($device['snmpcontext']))
{
if (is_numeric($device['snmpcontext']) && $device['snmpcontext'] > 0 && $device['snmpcontext'] < 4096 )
{
$vlan = $device['snmpcontext'];
}
}
$cmd = ""; $cmd = "";
if ($device['snmpver'] === "v3") if ($device['snmpver'] === "v3")
{ {
$cmd = " -v3 -l " . $device['authlevel']; $cmd = " -v3 -n \"\" -l " . $device['authlevel'];
if(is_numeric($vlan))
{
$cmd .= ' -n "vlan-' . $vlan . '"';
} else {
$cmd .= ' -n ""';
}
if ($device['authlevel'] === "noAuthNoPriv") if ($device['authlevel'] === "noAuthNoPriv")
{ {