From 9c19c70029e0a2a2c0033dca015446ccadbdcfe8 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 1 Nov 2012 19:10:17 +0000 Subject: [PATCH] revert cac2224fa181ff7219049870a9c313beb413212c LLDP bug fixes --- Info/Layer3/Enterasys.pm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm index c2af7155..737cf2ce 100644 --- a/Info/Layer3/Enterasys.pm +++ b/Info/Layer3/Enterasys.pm @@ -166,6 +166,12 @@ 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; @@ -178,7 +184,7 @@ sub c_ip { my $partial = shift; my $cdp = $enterasys->SUPER::c_ip($partial) || {}; - my $lldp = $enterasys->lldp_ip($partial) || {}; + my $lldp = $enterasys->lldp_ip(0) || {}; my %c_ip; foreach my $iid ( keys %$cdp ) { @@ -201,7 +207,7 @@ sub c_if { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_if($partial) || {}; + my $lldp = $enterasys->lldp_if(0) || {}; my $cdp = $enterasys->SUPER::c_if($partial) || {}; my %c_if; @@ -225,7 +231,7 @@ sub c_port { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_port($partial) || {}; + my $lldp = $enterasys->lldp_port(0) || {}; my $cdp = $enterasys->SUPER::c_port($partial) || {}; my %c_port; @@ -249,7 +255,7 @@ sub c_id { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_id($partial) || {}; + my $lldp = $enterasys->lldp_id(0) || {}; my $cdp = $enterasys->SUPER::c_id($partial) || {}; my %c_id; @@ -273,7 +279,7 @@ sub c_platform { my $enterasys = shift; my $partial = shift; - my $lldp = $enterasys->lldp_rem_sysdesc($partial) || {}; + my $lldp = $enterasys->lldp_rem_sysdesc(0) || {}; my $cdp = $enterasys->SUPER::c_platform($partial) || {}; my %c_platform;