135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cdp_port when returned value is exactly 6 chars (#355)

Browse Source 
* revert fix 2 of commit 78119d6, breaks devices that report a port name
6 chars long
* and remove test case for the "packed mac" special case
* and mention cdp fix in changelog

ran this for over 2 months and did not have any regressions on my gear.
This commit is contained in:
nick n
2019-08-27 22:44:26 +02:00
committed by GitHub
parent 0f01c6c07c
commit 3abffc4d59
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SNMP/Info/CDP.pm
View File

@@ -82,7 +82,6 @@ $VERSION = '3.68';
'cdp_ver' => \&SNMP::Info::munge_null,
'cdp_ip' => \&SNMP::Info::munge_ip,
'cdp_power' => \&munge_power,
);
%CDP_CAPABILITIES = (
@@ -222,11 +221,17 @@ sub cdp_port {
my $ch = $cdp->cdp_dev_port($partial) || {};
# most devices return a string with the interface name here (Port-ID TLV)
# see https://www.cisco.com/c/en/us/td/docs/ios-xml/ios/cdp/command/cdp-cr-book/cdp-cr-a1.html
# it seems however that some devices report hex encoded mac addresses for this, see
# https://github.com/netdisco/snmp-info/issues/252
# once these bad devices get known we can figure out workarounds for them
my %cdp_port;
foreach my $key ( sort keys %$ch ) {
my $port = $ch->{$key};
next unless $port;
$port = SNMP::Info::munge_mac($port) || SNMP::Info::munge_null($port);
$port = SNMP::Info::munge_null($port);
$cdp_port{$key} = $port;
}
return \%cdp_port;
@@ -278,8 +283,8 @@ SNMP::Info::CDP is a subclass of SNMP::Info that provides an object oriented
interface to CDP information through SNMP.
CDP is a Layer 2 protocol that supplies topology information of devices that
also speak CDP, mostly switches and routers. CDP is implemented in Cisco and
some HP devices.
also speak CDP, mostly switches and routers. CDP is implemented by Cisco and
several other vendors.
Create or use a device subclass that inherits this class. Do not use
directly.
@@ -477,9 +482,10 @@ Returns remote platform id
=item $cdp->cdp_port()
Returns remote port ID
Returns remote Port-ID. Most of the time this is a string with the port name, but this
is not guaranteed to be so.
(C<cdpDevicePort>)
(C<cdpCacheDevicePort>)
=item $cdp->cdp_proto()