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

better handling of malformed IPs in c_ip results

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-17 14:44:34 +00:00
parent fb42c871c1
commit 1ba1ea2e27
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/App/Netdisco/Worker/Plugin/Discover/Neighbors.pm
View File

@@ -172,13 +172,12 @@ sub store_neighbors {
my $remote_id = Encode::decode('UTF-8', $c_id->{$entry}); my $remote_id = Encode::decode('UTF-8', $c_id->{$entry});
next unless $remote_ip; next unless $remote_ip;
my $r_ip = NetAddr::IP::Lite->new($remote_ip) or next; my $r_netaddr = NetAddr::IP::Lite->new($remote_ip);
$remote_ip = $r_ip->addr;
# a bunch of heuristics to search known devices if we don't have a # a bunch of heuristics to search known devices if we don't have a
# useable remote IP... # useable remote IP...
if ($remote_ip eq '0.0.0.0' or if ((! $r_netaddr) or ($remote_ip eq '0.0.0.0') or
check_acl_no($remote_ip, 'group:__LOCAL_ADDRESSES__')) { check_acl_no($remote_ip, 'group:__LOCAL_ADDRESSES__')) {
if ($remote_id) { if ($remote_id) {
@@ -232,6 +231,14 @@ sub store_neighbors {
} }
} }
if ($r_netaddr->addr ne $remote_ip) {
info sprintf ' [%s] neigh - discrepancy in IP on %s: using %s instead of %s',
$device->ip, $port, $r_netaddr->addr, $remote_ip;
}
# OK, remote IP seems sane
$remote_ip = $r_netaddr->addr;
# what we came here to do.... discover the neighbor # what we came here to do.... discover the neighbor
debug sprintf ' [%s] neigh - %s with ID [%s] on %s', debug sprintf ' [%s] neigh - %s with ID [%s] on %s',
$device->ip, $remote_ip, ($remote_id || ''), $port; $device->ip, $remote_ip, ($remote_id || ''), $port;