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

[3564920] LLDP-MIB::lldpLocPortDesc isn't always unique, use LLDP-MIB::lldpLocPortId this cross references to ifName

Browse Source
This commit is contained in:
Eric A. Miller
2012-11-29 22:48:24 -05:00
parent 91d67ed0ae
commit 15cd354bae
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -32,6 +32,8 @@ version 3.00
[BUG FIXES] [BUG FIXES]
* [3564920] - lldp_if gives wrong data for Enterasys
version 2.09 (2012-11-28) version 2.09 (2012-11-28)

28
Info/Layer3/Enterasys.pm
View File

@@ -178,11 +178,33 @@ sub lldp_ip {
return $enterasys->SUPER::lldp_ip($partial); return $enterasys->SUPER::lldp_ip($partial);
} }
# [3564920] LLDP-MIB::lldpLocPortDesc isn't always unique,
# use LLDP-MIB::lldpLocPortId this cross references to ifName
sub lldp_if { sub lldp_if {
my $enterasys = shift; my $lldp = shift;
my $partial = shift || 0; my $partial = shift || 0;
return $enterasys->SUPER::lldp_if($partial); my $addr = $lldp->lldp_rem_pid($partial) || {};
my $i_descr = $lldp->i_name() || {};
my %r_i_descr = reverse %$i_descr;
my %lldp_if;
foreach my $key ( keys %$addr ) {
my @aOID = split( '\.', $key );
my $port = $aOID[1];
next unless $port;
# Local LLDP port may not equate to ifIndex
# Cross reference lldpLocPortId with ifName to get ifIndex
my $lldp_desc = $lldp->lldpLocPortId($port);
my $desc = $lldp_desc->{$port};
# If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum
if ( exists $r_i_descr{$desc} ) {
$port = $r_i_descr{$desc};
}
$lldp_if{$key} = $port;
}
return \%lldp_if;
} }
sub lldp_port { sub lldp_port {