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

#323 c_ip only ever returns one IP per value

Browse Source
This commit is contained in:
Oliver Gorwits
2017-07-05 05:54:45 +01:00
parent 8b33f4be0a
commit e8f73331bd
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@@ -1,3 +1,9 @@
2.036005 - TESTING
[ENHANCEMENTS]
* #323 c_ip only ever returns one IP per value
2.036004 - 2017-07-02 2.036004 - 2017-07-02
[BUG FIXES] [BUG FIXES]

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

@@ -748,6 +748,12 @@ sub store_neighbors {
next; next;
} }
if (ref $c_ip->{$entry}) {
error sprintf ' [%s] neigh - Error! port %s has multiple neighbors - skipping',
$device->ip, $port;
next;
}
my $remote_ip = $c_ip->{$entry}; my $remote_ip = $c_ip->{$entry};
my $remote_ipad = NetAddr::IP::Lite->new($remote_ip); my $remote_ipad = NetAddr::IP::Lite->new($remote_ip);
my $remote_port = undef; my $remote_port = undef;
@@ -838,24 +844,11 @@ sub store_neighbors {
} }
} }
# what we came here to do.... discover the neighbor(s) # what we came here to do.... discover the neighbor
foreach my $n ((ref $remote_ip) ? @$remote_ip : ($remote_ip)) {
debug sprintf debug sprintf
' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue', ' [%s] neigh - adding neighbor %s, type [%s], on %s to discovery queue',
$device->ip, $n, ($remote_type || ''), $port; $device->ip, $remote_ip, ($remote_type || ''), $port;
push @to_discover, [$n, $remote_type]; push @to_discover, [$remote_ip, $remote_type];
}
# devices seeing multiple neighbors on the port
# pick the highest IP for the neighbor, which results in preferring IPv6
if (ref [] eq ref $remote_ip) {
debug sprintf
' [%s] neigh - port %s has multiple neighbors, picking highest',
$device->ip, $port;
$remote_ip = [reverse sort {NetAddr::IP::Lite->new($a)
<=> NetAddr::IP::Lite->new($b)} @$remote_ip]->[0];
}
$remote_port = $c_port->{$entry}; $remote_port = $c_port->{$entry};
if (defined $remote_port) { if (defined $remote_port) {