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

Don't assume that lldpRemLocalPortNum is the same as ifIndex, try to cross reference lldpLocPortDesc with ifDescr to get ifIndex first. Revert commit eb5a492, patch request 3297786, and deal with timeMark by setting partial fetch to zero by default which should be a valid value according to RFC 2021.

Browse Source
This commit is contained in:
Eric A. Miller
2012-06-24 23:19:53 -04:00
parent 876fb9946b
commit 13478343cd
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Info/LLDP.pm
View File

@@ -95,22 +95,33 @@ sub hasLLDP {
sub lldp_if { sub lldp_if {
my $lldp = shift; my $lldp = shift;
my $partial = shift; my $partial = shift || 0;
my $addr = $lldp->lldp_rem_pid($partial) || {};
my $addr = $lldp->lldp_rem_pid($partial) || {};
my $i_descr = $lldp->i_description() || {};
my %r_i_descr = reverse %$i_descr;
my %lldp_if; my %lldp_if;
foreach my $key ( keys %$addr ) { foreach my $key ( keys %$addr ) {
my @aOID = split( '\.', $key ); my @aOID = split( '\.', $key );
my $port = $aOID[1]; my $port = $aOID[1];
$lldp_if{_lldp_rem_index($key)} = $port; # Local LLDP port may not equate to ifIndex
# Cross reference lldpLocPortDesc with ifDescr to get ifIndex
my $lldp_desc = $lldp->lldpLocPortDesc($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; return \%lldp_if;
} }
sub lldp_ip { sub lldp_ip {
my $lldp = shift; my $lldp = shift;
my $partial = shift; my $partial = shift || 0;
my $rman_addr = $lldp->lldp_rman_addr($partial) || {}; my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
@@ -126,7 +137,7 @@ sub lldp_ip {
sub lldp_addr { sub lldp_addr {
my $lldp = shift; my $lldp = shift;
my $partial = shift; my $partial = shift || 0;
my $rman_addr = $lldp->lldp_rman_addr($partial) || {}; my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
@@ -141,7 +152,7 @@ sub lldp_addr {
sub lldp_port { sub lldp_port {
my $lldp = shift; my $lldp = shift;
my $partial = shift; my $partial = shift || 0;
my $pdesc = $lldp->lldp_rem_desc($partial) || {}; my $pdesc = $lldp->lldp_rem_desc($partial) || {};
my $pid = $lldp->lldp_rem_pid($partial) || {}; my $pid = $lldp->lldp_rem_pid($partial) || {};
@@ -169,14 +180,14 @@ sub lldp_port {
$port = defined $1 ? "$2.$3" : "$3"; $port = defined $1 ? "$2.$3" : "$3";
} }
$lldp_port{_lldp_rem_index($key)} = $port; $lldp_port{$key} = $port;
} }
return \%lldp_port; return \%lldp_port;
} }
sub lldp_id { sub lldp_id {
my $lldp = shift; my $lldp = shift;
my $partial = shift; my $partial = shift || 0;
my $ch_type = $lldp->lldp_rem_id_type($partial) || {}; my $ch_type = $lldp->lldp_rem_id_type($partial) || {};
my $ch = $lldp->lldp_rem_id($partial) || {}; my $ch = $lldp->lldp_rem_id($partial) || {};
@@ -199,7 +210,7 @@ sub lldp_id {
$id = join '.', map { hex($_) } @octets; $id = join '.', map { hex($_) } @octets;
} }
} }
$lldp_id{_lldp_rem_index( $key )} = $id; $lldp_id{$key} = $id;
} }
return \%lldp_id; return \%lldp_id;
} }
@@ -222,16 +233,6 @@ sub lldp_id {
# return; # return;
#} #}
# Break up the lldpRemTable INDEX into time mark and common index returning
# index
sub _lldp_rem_index {
my $idx = shift;
my @oids = split( /\./, $idx );
# print "DBGoids: $idx\n";
my $timemark = shift @oids;
return join( '.', @oids );
}
# Break up the lldpRemManAddrTable INDEX into common index, protocol, # Break up the lldpRemManAddrTable INDEX into common index, protocol,
# and address. # and address.
sub _lldp_addr_index { sub _lldp_addr_index {
@@ -398,18 +399,24 @@ capability and nothing else."
These are methods that return tables of information in the form of a reference These are methods that return tables of information in the form of a reference
to a hash. to a hash.
Methods accessing the (C<lldpRemTable>) table use a partial value of zero if
not provided to set the (C<lldpRemTimeMark>) TimeMark instance to a known value
as per RFC 2021.
=over =over
=item $lldp->lldp_id() =item $lldp->lldp_id()
Returns the string value used to identify the chassis component associated Returns the string value used to identify the chassis component associated
with the remote system. with the remote system.
(C<lldpRemChassisId>) (C<lldpRemChassisId>)
=item $lldp->lldp_if() =item $lldp->lldp_if()
Returns the mapping to the SNMP Interface Table. Returns the mapping to the SNMP Interface Table. Trys to cross reference
(C<lldpLocPortDesc>) with (C<ifDescr>) to get (C<ifIndex>), if unable
defaults to (C<lldpRemLocalPortNum>).
=item $lldp->lldp_ip() =item $lldp->lldp_ip()