From 5b74a42e08a28aedc08639db727e0de8fff55365 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Sun, 29 Sep 2013 22:28:54 -0400 Subject: [PATCH] revert last commit --- Netdisco/lib/App/Netdisco/Core/Discover.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm index b9c2f8c0..8241cde3 100644 --- a/Netdisco/lib/App/Netdisco/Core/Discover.pm +++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm @@ -45,7 +45,6 @@ sub store_device { my ($device, $snmp) = @_; my $ip_index = $snmp->ip_index; - my $ip_table = $snmp->ip_table; my $interfaces = $snmp->interfaces; my $ip_netmask = $snmp->ip_netmask; @@ -59,16 +58,16 @@ sub store_device { # build device aliases suitable for DBIC my @aliases; foreach my $entry (keys %$ip_index) { - my $ip = NetAddr::IP::Lite->new($ip_table->{$entry}); + my $ip = NetAddr::IP::Lite->new($entry); my $addr = $ip->addr; next if $addr eq '0.0.0.0'; next if $ip->within($localnet); next if setting('ignore_private_nets') and $ip->is_rfc1918; - my $iid = $ip_index->{$entry}; + my $iid = $ip_index->{$addr}; my $port = $interfaces->{$iid}; - my $subnet = $ip_netmask->{$entry} + my $subnet = $ip_netmask->{$addr} ? NetAddr::IP::Lite->new($addr, $ip_netmask->{$addr})->network->cidr : undef;