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

use ipAdEntAddr to get IP's rather than relying on index

Browse Source
This commit is contained in:
Eric A. Miller
2013-09-26 22:12:16 -04:00
parent 8d903c9fe1
commit c9a0ac0a8d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -45,6 +45,7 @@ sub store_device {
my ($device, $snmp) = @_; my ($device, $snmp) = @_;
my $ip_index = $snmp->ip_index; my $ip_index = $snmp->ip_index;
my $ip_table = $snmp->ip_table;
my $interfaces = $snmp->interfaces; my $interfaces = $snmp->interfaces;
my $ip_netmask = $snmp->ip_netmask; my $ip_netmask = $snmp->ip_netmask;
@@ -58,16 +59,16 @@ sub store_device {
# build device aliases suitable for DBIC # build device aliases suitable for DBIC
my @aliases; my @aliases;
foreach my $entry (keys %$ip_index) { foreach my $entry (keys %$ip_index) {
my $ip = NetAddr::IP::Lite->new($entry); my $ip = NetAddr::IP::Lite->new($ip_table->{$entry});
my $addr = $ip->addr; my $addr = $ip->addr;
next if $addr eq '0.0.0.0'; next if $addr eq '0.0.0.0';
next if $ip->within($localnet); next if $ip->within($localnet);
next if setting('ignore_private_nets') and $ip->is_rfc1918; next if setting('ignore_private_nets') and $ip->is_rfc1918;
my $iid = $ip_index->{$addr}; my $iid = $ip_index->{$entry};
my $port = $interfaces->{$iid}; my $port = $interfaces->{$iid};
my $subnet = $ip_netmask->{$addr} my $subnet = $ip_netmask->{$entry}
? NetAddr::IP::Lite->new($addr, $ip_netmask->{$addr})->network->cidr ? NetAddr::IP::Lite->new($addr, $ip_netmask->{$addr})->network->cidr
: undef; : undef;