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

#1066 try all communities on highest snmp version before lowering version and trying communities again

Browse Source
This commit is contained in:
Oliver Gorwits
2023-07-13 13:33:24 +01:00
parent 0eb26159f9
commit 2f7e3f80a3
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/App/Netdisco/Transport/SNMP.pm
View File

@@ -210,22 +210,30 @@ sub _snmp_connect_generic {
} }
my $info = undef; my $info = undef;
COMMUNITY: foreach my $comm (@communities) { my $orig_retries = $snmp_args{Retries};
next unless $comm; my $orig_timeout = $snmp_args{Timeout};
CLASS: foreach my $class (@classes) {
next unless $class;
VERSION: foreach my $ver (@versions) { VERSION: foreach my $ver (@versions) {
next unless $ver; next unless $ver;
my %local_args = (%snmp_args, Version => $ver);
next if $ver eq 3 and exists $comm->{community}; COMMUNITY: foreach my $comm (@communities) {
next if $ver ne 3 and !exists $comm->{community}; next unless $comm;
CLASS: foreach my $class (@classes) { next if $ver eq 3 and exists $comm->{community};
next unless $class; next if $ver ne 3 and !exists $comm->{community};
# $local_args{Retries} = $comm->{_tried} ? $orig_retries : 0;
# $local_args{Timeout} = $comm->{_tried} ? $orig_timeout : 500000;
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,
($useclass ? 0 : 1) ); ($useclass ? 0 : 1) );
last COMMUNITY if $info; last CLASS if $info;
# ++$comm->{_tried};
} }
} }
} }
@@ -247,9 +255,10 @@ sub _try_connect {
try { try {
debug debug
sprintf '[%s:%s] try_connect with ver: %s, class: %s, comm: %s', sprintf '[%s:%s] try_connect with v: %s, t: %s, r: %s, class: %s, comm: %s',
$snmp_args->{DestHost}, $snmp_args->{RemotePort}, $snmp_args->{DestHost}, $snmp_args->{RemotePort},
$snmp_args->{Version}, $class, $debug_comm; $snmp_args->{Version}, ($snmp_args->{Timeout} / 1000000), $snmp_args->{Retries},
$class, $debug_comm;
Module::Load::load $class; Module::Load::load $class;
$info = $class->new(%$snmp_args, %comm_args) or return; $info = $class->new(%$snmp_args, %comm_args) or return;
@@ -260,7 +269,7 @@ sub _try_connect {
if ($reclass and $info and $info->device_type ne $class) { if ($reclass and $info and $info->device_type ne $class) {
$class = $info->device_type; $class = $info->device_type;
debug debug
sprintf '[%s:%s] try_connect with ver: %s, new class: %s, comm: %s', sprintf '[%s:%s] try_connect with v: %s, new class: %s, comm: %s',
$snmp_args->{DestHost}, $snmp_args->{RemotePort}, $snmp_args->{DestHost}, $snmp_args->{RemotePort},
$snmp_args->{Version}, $class, $debug_comm; $snmp_args->{Version}, $class, $debug_comm;