135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow cached SNMP community hint to override SNMP version cycle

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-11 13:57:45 +00:00
parent c1295ad1c0
commit d264fb7d9d
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -18,6 +18,7 @@
* Correct is_discoverable check in Undiscovered Neighbors report * Correct is_discoverable check in Undiscovered Neighbors report
* Correct macsuck for Q-BRIDGE-MIB based devices * Correct macsuck for Q-BRIDGE-MIB based devices
* Allow cached SNMP community hint to override SNMP version cycle
2.021000 - 2014-01-08 2.021000 - 2014-01-08

38
Netdisco/lib/App/Netdisco/Util/SNMP.pm
View File

@@ -87,6 +87,16 @@ sub _snmp_connect_generic {
$snmp_args{BulkWalk} = 0; $snmp_args{BulkWalk} = 0;
} }
# get the community string(s)
my @communities = _build_communities($device, $mode);
# which SNMP versions to try and in what order
my @versions =
( check_no($device->ip, 'snmpforce_v3') ? (3)
: check_no($device->ip, 'snmpforce_v2') ? (2)
: check_no($device->ip, 'snmpforce_v1') ? (1)
: (reverse (1 .. (setting('snmpver') || 3))) );
# use existing or new device class # use existing or new device class
my @classes = ('SNMP::Info'); my @classes = ('SNMP::Info');
if ($device->snmp_class) { if ($device->snmp_class) {
@@ -96,30 +106,22 @@ sub _snmp_connect_generic {
$snmp_args{AutoSpecity} = 1; $snmp_args{AutoSpecity} = 1;
} }
# which SNMP versions to try and in what order
my @versions =
( check_no($device->ip, 'snmpforce_v3') ? (3)
: check_no($device->ip, 'snmpforce_v2') ? (2)
: check_no($device->ip, 'snmpforce_v1') ? (1)
: (reverse (1 .. (setting('snmpver') || 3))) );
# get the community string(s)
my @communities = _build_communities($device, $mode);
my $info = undef; my $info = undef;
VERSION: foreach my $ver (@versions) { COMMUNITY: foreach my $comm (@communities) {
next unless $ver; next unless $comm;
CLASS: foreach my $class (@classes) { VERSION: foreach my $ver (@versions) {
next unless $class; next unless $ver;
COMMUNITY: foreach my $comm (@communities) { next if $ver eq 3 and exists $comm->{community};
next if $ver eq 3 and exists $comm->{community}; next if $ver ne 3 and !exists $comm->{community};
next if $ver ne 3 and !exists $comm->{community};
CLASS: foreach my $class (@classes) {
next unless $class;
my %local_args = (%snmp_args, Version => $ver); my %local_args = (%snmp_args, Version => $ver);
$info = _try_connect($device, $class, $comm, $mode, \%local_args); $info = _try_connect($device, $class, $comm, $mode, \%local_args);
last VERSION if $info; last COMMUNITY if $info;
} }
} }
} }