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

If the port ID claims to be interfaceName, use it for lldp_port

Browse Source 
The LLDP spec says that if lldpRemPortIdSubtype is
"interface name", then lldpRemPortId should contain
ifName.  It doesn't say much about lldpRemPortDesc;
some vendors seem to always leave it empty, some use
the interface description / ifAlias.  Our algorithm
for lldp_port is now basically: If we find that
lldpRemPortIdSubtype is "interface name", then use
the lldpRemPortId, else use lldpRemPortDesc if set,
else use lldpRemPortId.
This commit is contained in:
Bill Fenner
2013-10-07 09:32:18 -07:00
parent cfce6296fb
commit 4e2b642ed1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Info/LLDP.pm
View File

@@ -168,10 +168,15 @@ sub lldp_port {
my %lldp_port; my %lldp_port;
foreach my $key ( sort keys %$pid ) { foreach my $key ( sort keys %$pid ) {
my $port = $pdesc->{$key}; my $port = $pdesc->{$key};
my $type = $ptype->{$key};
if ( $type and $type eq 'interfaceName' ) {
# If the pid claims to be an interface name,
# believe it.
$port = $pid->{$key};
}
unless ($port) { unless ($port) {
$port = $pid->{$key}; $port = $pid->{$key};
next unless $port; next unless $port;
my $type = $ptype->{$key};
next unless $type; next unless $type;
# May need to format other types in the future, i.e. Network address # May need to format other types in the future, i.e. Network address