From cac2224fa181ff7219049870a9c313beb413212c Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Wed, 27 Jun 2012 00:19:05 -0400 Subject: [PATCH] LLDP bug fixes --- ChangeLog | 3 ++- Info/Layer3/Enterasys.pm | 16 +++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e5fdfda..bb95fbef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,8 +20,9 @@ version 2.07 () [BUG FIXES] + * [2929883] [3413999] LLDP interface mapping issue + * [3297786] LLDP TimeMark component defaults to zero (David Baldwin) * [2988163] Detect Juniper SSG firewalls as Layer3::Netscreen (R. Kerr) - * [3297786] LLDP INDEX munged to ignore TimeMark component (David Baldwin) * [3317739] Fix for Baystack without POE on stack member 1 (David Baldwin) * [2037444] os_ver fails on some Extreme versions (Robert Kerr) * [2980789] Fix root_ip to try OSPF RouterID first (Brian De Wolf) diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm index 44ee09eb..8ecad765 100644 --- a/Info/Layer3/Enterasys.pm +++ b/Info/Layer3/Enterasys.pm @@ -166,12 +166,6 @@ sub fw_port { } # Use CDP and/or LLDP -# -# LLDP table timefilter implementation continuously increments when walked -# and we may never reach the end of the table. This behavior can be -# modified with the "set snmp timefilter break disable" command, -# unfortunately it is not the default. Query with a partial value of zero -# which means no time filter. sub hasCDP { my $enterasys = shift; @@ -184,7 +178,7 @@ sub c_ip { my $partial = shift; my $cdp = $enterasys->SUPER::c_ip($partial) || {}; - my $lldp = $enterasys->lldp_ip(0) || {}; + my $lldp = $enterasys->lldp_ip($partial) || {}; my %c_ip; foreach my $iid ( keys %$cdp ) { @@ -207,7 +201,7 @@ sub c_if { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_if(0) || {}; + my $lldp = $enterasys->lldp_if($partial) || {}; my $cdp = $enterasys->SUPER::c_if($partial) || {}; my %c_if; @@ -231,7 +225,7 @@ sub c_port { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_port(0) || {}; + my $lldp = $enterasys->lldp_port($partial) || {}; my $cdp = $enterasys->SUPER::c_port($partial) || {}; my %c_port; @@ -255,7 +249,7 @@ sub c_id { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_id(0) || {}; + my $lldp = $enterasys->lldp_id($partial) || {}; my $cdp = $enterasys->SUPER::c_id($partial) || {}; my %c_id; @@ -279,7 +273,7 @@ sub c_platform { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_rem_sysdesc(0) || {}; + my $lldp = $enterasys->lldp_rem_sysdesc($partial) || {}; my $cdp = $enterasys->SUPER::c_platform($partial) || {}; my %c_platform;