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

Safely continue macsuck if neighbor cannot be resolved

Browse Source
This commit is contained in:
Oliver Gorwits
2016-02-02 08:15:25 +00:00
parent a67057e288
commit 783382378f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -9,6 +9,7 @@
* [#255] undefined host error in netdisco-do psql * [#255] undefined host error in netdisco-do psql
* [#250] Linux SSHColletor cannot handle uppercase MACs * [#250] Linux SSHColletor cannot handle uppercase MACs
* Return from device discover if device is unknown * Return from device discover if device is unknown
* Safely continue macsuck if neighbor cannot be resolved
2.033004 - 2015-11-16 2.033004 - 2015-11-16

5
Netdisco/lib/App/Netdisco/Core/Macsuck.pm
View File

@@ -374,7 +374,10 @@ sub _walk_fwtable {
if ($neigh_cannot_macsuck) { if ($neigh_cannot_macsuck) {
debug sprintf debug sprintf
' [%s] macsuck %s - port %s neighbor %s without macsuck support', ' [%s] macsuck %s - port %s neighbor %s without macsuck support',
$device->ip, $mac, $port, $device_port->neighbor->ip; $device->ip, $mac, $port,
(eval { $device_port->neighbor->ip }
|| ($device_port->remote_ip
|| $device_port->remote_id || '?'));
# continue!! # continue!!
} }
elsif (my $neighbor = $device_port->neighbor) { elsif (my $neighbor = $device_port->neighbor) {