From 59e9fae1d53535a07c9d72214e71552e4c9ef9a6 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Tue, 1 Oct 2013 20:21:29 +0100 Subject: [PATCH] release 3.07 --- .gitignore | 1 + ChangeLog | 3 +- Info.pm | 127 ++++++++++++++++++++++------------- Info/AMAP.pm | 2 +- Info/AdslLine.pm | 2 +- Info/Airespace.pm | 2 +- Info/Bridge.pm | 2 +- Info/CDP.pm | 2 +- Info/CiscoConfig.pm | 2 +- Info/CiscoImage.pm | 2 +- Info/CiscoPortSecurity.pm | 2 +- Info/CiscoPower.pm | 2 +- Info/CiscoQOS.pm | 2 +- Info/CiscoRTT.pm | 2 +- Info/CiscoStack.pm | 2 +- Info/CiscoStats.pm | 2 +- Info/CiscoStpExtensions.pm | 2 +- Info/CiscoVTP.pm | 2 +- Info/EDP.pm | 2 +- Info/Entity.pm | 2 +- Info/EtherLike.pm | 2 +- Info/FDP.pm | 2 +- Info/IEEE802dot11.pm | 2 +- Info/IPv6.pm | 2 +- Info/LLDP.pm | 2 +- Info/Layer1.pm | 2 +- Info/Layer1/Allied.pm | 2 +- Info/Layer1/Asante.pm | 2 +- Info/Layer1/Bayhub.pm | 2 +- Info/Layer1/Cyclades.pm | 2 +- Info/Layer1/S3000.pm | 2 +- Info/Layer2.pm | 2 +- Info/Layer2/Airespace.pm | 2 +- Info/Layer2/Aironet.pm | 2 +- Info/Layer2/Allied.pm | 2 +- Info/Layer2/Baystack.pm | 2 +- Info/Layer2/C1900.pm | 2 +- Info/Layer2/C2900.pm | 2 +- Info/Layer2/Catalyst.pm | 2 +- Info/Layer2/Centillion.pm | 2 +- Info/Layer2/Cisco.pm | 2 +- Info/Layer2/CiscoSB.pm | 2 +- Info/Layer2/HP.pm | 2 +- Info/Layer2/HP4000.pm | 2 +- Info/Layer2/HPVC.pm | 2 +- Info/Layer2/Kentrox.pm | 2 +- Info/Layer2/N2270.pm | 2 +- Info/Layer2/NAP222x.pm | 2 +- Info/Layer2/NWSS2300.pm | 2 +- Info/Layer2/Netgear.pm | 2 +- Info/Layer2/Orinoco.pm | 2 +- Info/Layer2/Trapeze.pm | 2 +- Info/Layer2/ZyXEL_DSLAM.pm | 2 +- Info/Layer3.pm | 2 +- Info/Layer3/Aironet.pm | 2 +- Info/Layer3/AlcatelLucent.pm | 2 +- Info/Layer3/AlteonAD.pm | 2 +- Info/Layer3/Altiga.pm | 2 +- Info/Layer3/Arista.pm | 2 +- Info/Layer3/Aruba.pm | 2 +- Info/Layer3/BayRS.pm | 2 +- Info/Layer3/BlueCoatSG.pm | 2 +- Info/Layer3/C3550.pm | 2 +- Info/Layer3/C4000.pm | 2 +- Info/Layer3/C6500.pm | 2 +- Info/Layer3/Cisco.pm | 2 +- Info/Layer3/CiscoASA.pm | 2 +- Info/Layer3/CiscoFWSM.pm | 2 +- Info/Layer3/Contivity.pm | 2 +- Info/Layer3/Dell.pm | 2 +- Info/Layer3/Enterasys.pm | 2 +- Info/Layer3/Extreme.pm | 2 +- Info/Layer3/F5.pm | 2 +- Info/Layer3/Force10.pm | 2 +- Info/Layer3/Foundry.pm | 2 +- Info/Layer3/H3C.pm | 2 +- Info/Layer3/HP9300.pm | 2 +- Info/Layer3/Juniper.pm | 2 +- Info/Layer3/Lantronix.pm | 2 +- Info/Layer3/Microsoft.pm | 2 +- Info/Layer3/Mikrotik.pm | 2 +- Info/Layer3/N1600.pm | 2 +- Info/Layer3/NetSNMP.pm | 2 +- Info/Layer3/Netscreen.pm | 2 +- Info/Layer3/Nexus.pm | 2 +- Info/Layer3/PacketFront.pm | 2 +- Info/Layer3/Passport.pm | 2 +- Info/Layer3/Pf.pm | 2 +- Info/Layer3/Pica8.pm | 2 +- Info/Layer3/SonicWALL.pm | 2 +- Info/Layer3/Sun.pm | 2 +- Info/Layer3/Tasman.pm | 2 +- Info/Layer3/Timetra.pm | 2 +- Info/Layer7.pm | 2 +- Info/Layer7/APC.pm | 2 +- Info/Layer7/Neoteris.pm | 2 +- Info/Layer7/Netscaler.pm | 2 +- Info/MAU.pm | 2 +- Info/NortelStack.pm | 2 +- Info/PowerEthernet.pm | 2 +- Info/RapidCity.pm | 2 +- Info/SONMP.pm | 2 +- MANIFEST.SKIP | 2 + README | 30 +++++++-- 104 files changed, 208 insertions(+), 153 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..98e6ef67 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.db diff --git a/ChangeLog b/ChangeLog index 4ce479cc..ab168a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ SNMP::Info - Friendly OO-style interface to Network devices using SNMP. -version 3.06 () +version 3.07 () [ENHANCEMENTS] * Support for Pica8 switches in L3::Pica8 + * Factor out cache/munge code from global/attr methods [BUG FIXES] diff --git a/Info.pm b/Info.pm index e84b8e20..813d0e61 100644 --- a/Info.pm +++ b/Info.pm @@ -24,7 +24,7 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP $NOSUCH $BIGINT $REPEATERS/; -$VERSION = '3.05'; +$VERSION = '3.07'; =head1 NAME @@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP =head1 VERSION -SNMP::Info - Version 3.05 +SNMP::Info - Version 3.07 =head1 AUTHOR @@ -833,6 +833,12 @@ Subclass for FreeBSD-Based Firewalls using Pf /Pf Sense See documentation in L for details. +=item SNMP::Info::Layer3::Pica8 + +Subclass for Pica8 devices. + +See documentation in L for details. + =item SNMP::Info::Layer3::SonicWALL Subclass for generic SonicWALL devices. See documentation in @@ -3542,19 +3548,16 @@ sub _global { $attr =~ s/^(load|orig)_//; $attr =~ s/_raw$//; - # Get the callback hash for data munging - my $munge = $self->munge(); - # Return cached data unless loading # We now store in raw format so munge before returning # unless expecting raw data if ( defined $self->{"_$attr"} && !$load ) { - if ( defined $munge->{$attr} && !$raw ) { - my $val = $self->{"_$attr"}; - my $subref = $munge->{$attr}; - return &$subref($val); + my $val = $self->{"_$attr"}; + + if ( !$raw ) { + return $self->_munge($attr, $val); } else{ - return $self->{"_$attr"}; + return $val; } } @@ -3585,12 +3588,11 @@ sub _global { } # Save Cached Value - $self->{"_$attr"} = $val; + $self->_cache($attr, $val); # Data Munging - if ( defined $munge->{$attr} && !$raw ) { - my $subref = $munge->{$attr}; - $val = &$subref($val); + if ( !$raw ) { + $val = $self->_munge($attr, $val); } return $val; @@ -3867,7 +3869,6 @@ sub _load_attr { my $ver = $self->snmp_ver(); my $nosuch = $self->nosuch(); my $store = $self->store(); - my $munge = $self->munge(); my $load = $method =~ /^load/; my $raw = $method =~ /raw$/; @@ -4047,24 +4048,14 @@ sub _load_attr { # Cache data if we are not getting partial data: if ( !defined $partial ) { - $self->{"_${attr}"}++; - $store->{$attr} = $localstore; + $self->_cache($attr, $localstore); } # Data Munging - # Checks for an entry in %munge and munges values unless we expect - # raw data - if ( defined $munge->{$attr} && !$raw ) { - my $subref = $munge->{$attr}; - my %munged; - foreach my $key ( keys %$localstore ) { - my $value = $localstore->{$key}; - next unless $key; - my $munged_value = &$subref($value); - $munged{$key} = $munged_value; - } - return \%munged; + if ( !$raw ) { + $localstore = $self->_munge($attr, $localstore); } + return $localstore; } } @@ -4073,11 +4064,6 @@ sub _load_attr { Used internally by AUTOLOAD to return data called by methods listed in %FUNCS. -Called like $info->METHOD(). - -The first time ran, it will call $info->load_METHOD(). -Every time after it will return cached data. - =cut sub _show_attr { @@ -4087,20 +4073,9 @@ sub _show_attr { my $store = $self->store(); - # Get the callback hash for data munging - my $munge = $self->munge(); - - if ( defined $munge->{$attr} && !$raw ) { + if ( !$raw ) { my $localstore = $store->{$attr}; - my $subref = $munge->{$attr}; - my %munged; - foreach my $key ( keys %$localstore ) { - my $value = $localstore->{$key}; - next unless $key; - my $munged_value = &$subref($value); - $munged{$key} = $munged_value; - } - return \%munged; + return $self->_munge($attr, $localstore); } else { return $store->{$attr}; @@ -4174,6 +4149,64 @@ sub modify_port_list { return pack( "B*", join( '', @$portlist ) ); } +=item $info->_cache(attr, data) + +Cache retrieved data so that if it's asked for again, we use the cache instead +of going back to Net-SNMP. Data is cached inside the blessed hashref C<$self>. + +Accepts the leaf and value (scalar, or hashref for a table). Does not return +anything useful. + +=cut + +sub _cache { + my $self = shift; + my ($attr, $data) = @_; + my $store = $self->store(); + + if (ref {} eq ref $data) { + $self->{"_${attr}"}++; + $store->{$attr} = $data; + } + else { + $self->{"_$attr"} = $data; + } +} + +=item $info->_munge(attr, data) + +Raw data returned from Net-SNMP might not be formatted correctly or might have +platform-specific bugs or mistakes. The MUNGE feature of SNMP::Info allows for +fixups to take place. + +Accepts the leaf and value (scalar, or hashref for a table) and returns the raw +or the munged data, as appropriate. That is, you do not need to know whether +MUNGE is installed, and it's safe to call this method regardless. + +=cut + +sub _munge { + my $self = shift; + my ($attr, $data) = @_; + my $munge = $self->munge(); + + return $data unless defined $munge->{$attr}; + + if (ref {} eq ref $data) { + my $subref = $munge->{$attr}; + my %munged; + foreach my $key ( keys %$data ) { + my $value = $data->{$key}; + $munged{$key} = $subref->($value); + } + return \%munged; + } + else { + my $subref = $munge->{$attr}; + return $subref->($data); + } +} + =item _validate_autoload_method(method) Used internally by AUTOLOAD to validate that a dynamic method should be diff --git a/Info/AMAP.pm b/Info/AMAP.pm index bbefd82a..9b4c4f3e 100644 --- a/Info/AMAP.pm +++ b/Info/AMAP.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', ); diff --git a/Info/AdslLine.pm b/Info/AdslLine.pm index e23d5e03..623b6464 100644 --- a/Info/AdslLine.pm +++ b/Info/AdslLine.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' ); diff --git a/Info/Airespace.pm b/Info/Airespace.pm index f1d028f1..c2eec575 100644 --- a/Info/Airespace.pm +++ b/Info/Airespace.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Bridge.pm b/Info/Bridge.pm index b8b7b9ba..abc56680 100644 --- a/Info/Bridge.pm +++ b/Info/Bridge.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'BRIDGE-MIB' => 'dot1dBaseBridgeAddress', diff --git a/Info/CDP.pm b/Info/CDP.pm index eb24da4e..846e805d 100644 --- a/Info/CDP.pm +++ b/Info/CDP.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/; -$VERSION = '3.05'; +$VERSION = '3.07'; # Five data structures required by SNMP::Info %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' ); diff --git a/Info/CiscoConfig.pm b/Info/CiscoConfig.pm index 2cf128c3..3a2d0526 100644 --- a/Info/CiscoConfig.pm +++ b/Info/CiscoConfig.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable', diff --git a/Info/CiscoImage.pm b/Info/CiscoImage.pm index 207cf3b8..9cf5f11e 100644 --- a/Info/CiscoImage.pm +++ b/Info/CiscoImage.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', ); diff --git a/Info/CiscoPortSecurity.pm b/Info/CiscoPortSecurity.pm index 1fea4167..f479141d 100644 --- a/Info/CiscoPortSecurity.pm +++ b/Info/CiscoPortSecurity.pm @@ -38,7 +38,7 @@ use Exporter; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB', diff --git a/Info/CiscoPower.pm b/Info/CiscoPower.pm index 34e0ec82..520be735 100644 --- a/Info/CiscoPower.pm +++ b/Info/CiscoPower.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex', 'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' ); diff --git a/Info/CiscoQOS.pm b/Info/CiscoQOS.pm index 507a4e9c..ed5eeff4 100644 --- a/Info/CiscoQOS.pm +++ b/Info/CiscoQOS.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', ); diff --git a/Info/CiscoRTT.pm b/Info/CiscoRTT.pm index ff6534a4..324dd0de 100644 --- a/Info/CiscoRTT.pm +++ b/Info/CiscoRTT.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', ); diff --git a/Info/CiscoStack.pm b/Info/CiscoStack.pm index 1b3e0716..da1f3125 100644 --- a/Info/CiscoStack.pm +++ b/Info/CiscoStack.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', ); diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm index 92071f6c..8144e8c7 100644 --- a/Info/CiscoStats.pm +++ b/Info/CiscoStats.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'SNMPv2-MIB' => 'sysDescr', diff --git a/Info/CiscoStpExtensions.pm b/Info/CiscoStpExtensions.pm index 99ea826b..a417a83e 100644 --- a/Info/CiscoStpExtensions.pm +++ b/Info/CiscoStpExtensions.pm @@ -36,7 +36,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/; -$VERSION = '3.05'; +$VERSION = '3.07'; @SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/; @SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//; diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm index 97e85026..b370d6ad 100644 --- a/Info/CiscoVTP.pm +++ b/Info/CiscoVTP.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'CISCO-VTP-MIB' => 'vtpVlanName', diff --git a/Info/EDP.pm b/Info/EDP.pm index 5f2976af..b616ee8d 100644 --- a/Info/EDP.pm +++ b/Info/EDP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'EXTREME-EDP-MIB' => 'extremeEdpPortIfIndex', diff --git a/Info/Entity.pm b/Info/Entity.pm index c364805d..b210f1a2 100644 --- a/Info/Entity.pm +++ b/Info/Entity.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' ); diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm index d22030e3..ec392ff3 100644 --- a/Info/EtherLike.pm +++ b/Info/EtherLike.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'EtherLike-MIB' => 'etherMIB' ); diff --git a/Info/FDP.pm b/Info/FDP.pm index fbaa6ce2..4b1956ae 100644 --- a/Info/FDP.pm +++ b/Info/FDP.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' ); diff --git a/Info/IEEE802dot11.pm b/Info/IEEE802dot11.pm index eb2cfa16..d25388b7 100644 --- a/Info/IEEE802dot11.pm +++ b/Info/IEEE802dot11.pm @@ -38,7 +38,7 @@ use Exporter; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', ); diff --git a/Info/IPv6.pm b/Info/IPv6.pm index ce801b30..ae83911e 100644 --- a/Info/IPv6.pm +++ b/Info/IPv6.pm @@ -44,7 +44,7 @@ use constant { IPV6MIB => 3, }; -$VERSION = '3.05'; +$VERSION = '3.07'; diff --git a/Info/LLDP.pm b/Info/LLDP.pm index c5c3b014..8a69846f 100644 --- a/Info/LLDP.pm +++ b/Info/LLDP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'LLDP-MIB' => 'lldpLocSysCapEnabled', diff --git a/Info/Layer1.pm b/Info/Layer1.pm index 0345d00c..92037047 100644 --- a/Info/Layer1.pm +++ b/Info/Layer1.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' ); diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm index e1f4bdb1..1f1174a6 100644 --- a/Info/Layer1/Allied.pm +++ b/Info/Layer1/Allied.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', ); diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm index 0e9523f9..76c3dcc0 100644 --- a/Info/Layer1/Asante.pm +++ b/Info/Layer1/Asante.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, ); diff --git a/Info/Layer1/Bayhub.pm b/Info/Layer1/Bayhub.pm index 00bf1fae..6687fd60 100644 --- a/Info/Layer1/Bayhub.pm +++ b/Info/Layer1/Bayhub.pm @@ -42,7 +42,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer1/Cyclades.pm b/Info/Layer1/Cyclades.pm index ee068b44..8f1136be 100644 --- a/Info/Layer1/Cyclades.pm +++ b/Info/Layer1/Cyclades.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer1::MIBS, diff --git a/Info/Layer1/S3000.pm b/Info/Layer1/S3000.pm index 519f3dfa..219d038a 100644 --- a/Info/Layer1/S3000.pm +++ b/Info/Layer1/S3000.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2.pm b/Info/Layer2.pm index 445d26d1..a152c6bb 100644 --- a/Info/Layer2.pm +++ b/Info/Layer2.pm @@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/Airespace.pm b/Info/Layer2/Airespace.pm index 8f0744da..6bcd0449 100644 --- a/Info/Layer2/Airespace.pm +++ b/Info/Layer2/Airespace.pm @@ -40,7 +40,7 @@ use SNMP::Info::Airespace; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm index 8e714624..59a1d56f 100644 --- a/Info/Layer2/Aironet.pm +++ b/Info/Layer2/Aironet.pm @@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %GLOBALS = ( %SNMP::Info::IEEE802dot11::GLOBALS, diff --git a/Info/Layer2/Allied.pm b/Info/Layer2/Allied.pm index e0768f69..741558b8 100644 --- a/Info/Layer2/Allied.pm +++ b/Info/Layer2/Allied.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS ); diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm index e778fb62..907ff850 100644 --- a/Info/Layer2/Baystack.pm +++ b/Info/Layer2/Baystack.pm @@ -46,7 +46,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::LLDP::MIBS, diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm index 2c09f351..bde8f703 100644 --- a/Info/Layer2/C1900.pm +++ b/Info/Layer2/C1900.pm @@ -46,7 +46,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, diff --git a/Info/Layer2/C2900.pm b/Info/Layer2/C2900.pm index dcbbf1c8..12770468 100644 --- a/Info/Layer2/C2900.pm +++ b/Info/Layer2/C2900.pm @@ -47,7 +47,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::CiscoConfig::GLOBALS, diff --git a/Info/Layer2/Catalyst.pm b/Info/Layer2/Catalyst.pm index 72ae61da..33171473 100644 --- a/Info/Layer2/Catalyst.pm +++ b/Info/Layer2/Catalyst.pm @@ -49,7 +49,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::CiscoPortSecurity::MIBS, diff --git a/Info/Layer2/Centillion.pm b/Info/Layer2/Centillion.pm index 9782db38..697cdbd9 100644 --- a/Info/Layer2/Centillion.pm +++ b/Info/Layer2/Centillion.pm @@ -43,7 +43,7 @@ use SNMP::Info::SONMP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/Cisco.pm b/Info/Layer2/Cisco.pm index f9798503..781e439f 100644 --- a/Info/Layer2/Cisco.pm +++ b/Info/Layer2/Cisco.pm @@ -50,7 +50,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::CiscoConfig::MIBS, diff --git a/Info/Layer2/CiscoSB.pm b/Info/Layer2/CiscoSB.pm index 3f5a942e..d3580972 100644 --- a/Info/Layer2/CiscoSB.pm +++ b/Info/Layer2/CiscoSB.pm @@ -50,7 +50,7 @@ use SNMP::Info::CDP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # This will be filled in with the device's index into the EntPhysicalEntry # table by the serial() function. diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm index e733ab3b..eb847b43 100644 --- a/Info/Layer2/HP.pm +++ b/Info/Layer2/HP.pm @@ -46,7 +46,7 @@ use SNMP::Info::CDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer2/HP4000.pm b/Info/Layer2/HP4000.pm index 27514318..f9b896b7 100644 --- a/Info/Layer2/HP4000.pm +++ b/Info/Layer2/HP4000.pm @@ -44,7 +44,7 @@ use SNMP::Info::CDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer2/HPVC.pm b/Info/Layer2/HPVC.pm index 66e4c92c..204bc058 100644 --- a/Info/Layer2/HPVC.pm +++ b/Info/Layer2/HPVC.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2/Kentrox.pm b/Info/Layer2/Kentrox.pm index 0797f412..0bdc10a1 100644 --- a/Info/Layer2/Kentrox.pm +++ b/Info/Layer2/Kentrox.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2/N2270.pm b/Info/Layer2/N2270.pm index 34483c72..6d5dcb5f 100644 --- a/Info/Layer2/N2270.pm +++ b/Info/Layer2/N2270.pm @@ -43,7 +43,7 @@ use SNMP::Info::Airespace; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/NAP222x.pm b/Info/Layer2/NAP222x.pm index fd7c0b99..fc4757e6 100644 --- a/Info/Layer2/NAP222x.pm +++ b/Info/Layer2/NAP222x.pm @@ -42,7 +42,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS, diff --git a/Info/Layer2/NWSS2300.pm b/Info/Layer2/NWSS2300.pm index 7d9e5f5c..598b1c48 100644 --- a/Info/Layer2/NWSS2300.pm +++ b/Info/Layer2/NWSS2300.pm @@ -39,7 +39,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/Netgear.pm b/Info/Layer2/Netgear.pm index 94eff417..4bef5de2 100644 --- a/Info/Layer2/Netgear.pm +++ b/Info/Layer2/Netgear.pm @@ -41,7 +41,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # This will be filled in with the device's index into the EntPhysicalEntry # table by the serial() function. diff --git a/Info/Layer2/Orinoco.pm b/Info/Layer2/Orinoco.pm index bc9b75ce..cb945cd4 100644 --- a/Info/Layer2/Orinoco.pm +++ b/Info/Layer2/Orinoco.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2/Trapeze.pm b/Info/Layer2/Trapeze.pm index 53820e25..4b40292f 100644 --- a/Info/Layer2/Trapeze.pm +++ b/Info/Layer2/Trapeze.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/ZyXEL_DSLAM.pm b/Info/Layer2/ZyXEL_DSLAM.pm index 98763aba..5294941c 100644 --- a/Info/Layer2/ZyXEL_DSLAM.pm +++ b/Info/Layer2/ZyXEL_DSLAM.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS ); diff --git a/Info/Layer3.pm b/Info/Layer3.pm index c461fb46..dd858bd8 100644 --- a/Info/Layer3.pm +++ b/Info/Layer3.pm @@ -51,7 +51,7 @@ use SNMP::Info::AdslLine; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm index 3f1118a1..e0c641a1 100644 --- a/Info/Layer3/Aironet.pm +++ b/Info/Layer3/Aironet.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/AlcatelLucent.pm b/Info/Layer3/AlcatelLucent.pm index f62c2fd9..1dd18d3b 100644 --- a/Info/Layer3/AlcatelLucent.pm +++ b/Info/Layer3/AlcatelLucent.pm @@ -49,7 +49,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/AlteonAD.pm b/Info/Layer3/AlteonAD.pm index 852e4364..58655aab 100644 --- a/Info/Layer3/AlteonAD.pm +++ b/Info/Layer3/AlteonAD.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Altiga.pm b/Info/Layer3/Altiga.pm index eafeab77..53cd119c 100644 --- a/Info/Layer3/Altiga.pm +++ b/Info/Layer3/Altiga.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE $int_include_vpn $fake_idx $type_class/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Arista.pm b/Info/Layer3/Arista.pm index 4dcd3a45..80cb1107 100644 --- a/Info/Layer3/Arista.pm +++ b/Info/Layer3/Arista.pm @@ -43,7 +43,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Aruba.pm b/Info/Layer3/Aruba.pm index 73a35b7a..6f470d47 100644 --- a/Info/Layer3/Aruba.pm +++ b/Info/Layer3/Aruba.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/BayRS.pm b/Info/Layer3/BayRS.pm index 2aeddd76..a18e4f80 100644 --- a/Info/Layer3/BayRS.pm +++ b/Info/Layer3/BayRS.pm @@ -43,7 +43,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP %MODID_MAP %PROCID_MAP/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer3/BlueCoatSG.pm b/Info/Layer3/BlueCoatSG.pm index 9ad06750..54687632 100644 --- a/Info/Layer3/BlueCoatSG.pm +++ b/Info/Layer3/BlueCoatSG.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm index 1019d782..95fd142c 100644 --- a/Info/Layer3/C3550.pm +++ b/Info/Layer3/C3550.pm @@ -64,7 +64,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; @SNMP::Info::Layer3::C3550::EXPORT_OK = qw//; -$VERSION = '3.05'; +$VERSION = '3.07'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/C4000.pm b/Info/Layer3/C4000.pm index edcd1a0d..7efbc99e 100644 --- a/Info/Layer3/C4000.pm +++ b/Info/Layer3/C4000.pm @@ -50,7 +50,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm index 2dac1f52..b29206f8 100644 --- a/Info/Layer3/C6500.pm +++ b/Info/Layer3/C6500.pm @@ -66,7 +66,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm index a35a0df6..0a18bff2 100644 --- a/Info/Layer3/Cisco.pm +++ b/Info/Layer3/Cisco.pm @@ -52,7 +52,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/CiscoASA.pm b/Info/Layer3/CiscoASA.pm index f5fd8dd8..f6a27b58 100644 --- a/Info/Layer3/CiscoASA.pm +++ b/Info/Layer3/CiscoASA.pm @@ -55,7 +55,7 @@ use SNMP::Info::Layer3::Cisco; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::Cisco::MIBS, diff --git a/Info/Layer3/CiscoFWSM.pm b/Info/Layer3/CiscoFWSM.pm index f76ec452..f109fd63 100644 --- a/Info/Layer3/CiscoFWSM.pm +++ b/Info/Layer3/CiscoFWSM.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3::Cisco; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::Cisco::MIBS, diff --git a/Info/Layer3/Contivity.pm b/Info/Layer3/Contivity.pm index 751cd2fb..4551ed9f 100644 --- a/Info/Layer3/Contivity.pm +++ b/Info/Layer3/Contivity.pm @@ -42,7 +42,7 @@ use SNMP::Info::Entity; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS, diff --git a/Info/Layer3/Dell.pm b/Info/Layer3/Dell.pm index ac05d57c..f6318155 100644 --- a/Info/Layer3/Dell.pm +++ b/Info/Layer3/Dell.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm index f6467c63..2957b23f 100644 --- a/Info/Layer3/Enterasys.pm +++ b/Info/Layer3/Enterasys.pm @@ -44,7 +44,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS, diff --git a/Info/Layer3/Extreme.pm b/Info/Layer3/Extreme.pm index be5150b2..d26b6617 100644 --- a/Info/Layer3/Extreme.pm +++ b/Info/Layer3/Extreme.pm @@ -46,7 +46,7 @@ use SNMP::Info::EDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/F5.pm b/Info/Layer3/F5.pm index bb2a9296..7210b854 100644 --- a/Info/Layer3/F5.pm +++ b/Info/Layer3/F5.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Force10.pm b/Info/Layer3/Force10.pm index 6fb95e35..7c6f813b 100644 --- a/Info/Layer3/Force10.pm +++ b/Info/Layer3/Force10.pm @@ -43,7 +43,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm index 625ddd20..f438d3d7 100644 --- a/Info/Layer3/Foundry.pm +++ b/Info/Layer3/Foundry.pm @@ -44,7 +44,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm index cee0e1f3..b1fa6435 100644 --- a/Info/Layer3/H3C.pm +++ b/Info/Layer3/H3C.pm @@ -39,7 +39,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/HP9300.pm b/Info/Layer3/HP9300.pm index d5d7dee1..24cdc1ea 100644 --- a/Info/Layer3/HP9300.pm +++ b/Info/Layer3/HP9300.pm @@ -42,7 +42,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Juniper.pm b/Info/Layer3/Juniper.pm index 9a4a8a4a..a7872c24 100644 --- a/Info/Layer3/Juniper.pm +++ b/Info/Layer3/Juniper.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Lantronix.pm b/Info/Layer3/Lantronix.pm index 848f41fc..940b7347 100644 --- a/Info/Layer3/Lantronix.pm +++ b/Info/Layer3/Lantronix.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Microsoft.pm b/Info/Layer3/Microsoft.pm index 16a8bccd..7c0374b6 100644 --- a/Info/Layer3/Microsoft.pm +++ b/Info/Layer3/Microsoft.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, ); diff --git a/Info/Layer3/Mikrotik.pm b/Info/Layer3/Mikrotik.pm index 33fa690f..4b4cc54f 100644 --- a/Info/Layer3/Mikrotik.pm +++ b/Info/Layer3/Mikrotik.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/N1600.pm b/Info/Layer3/N1600.pm index a3d9dada..8c0d2485 100644 --- a/Info/Layer3/N1600.pm +++ b/Info/Layer3/N1600.pm @@ -41,7 +41,7 @@ use SNMP::Info::SONMP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/NetSNMP.pm b/Info/Layer3/NetSNMP.pm index 85b98e72..5df9c082 100644 --- a/Info/Layer3/NetSNMP.pm +++ b/Info/Layer3/NetSNMP.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Netscreen.pm b/Info/Layer3/Netscreen.pm index e447e3de..a79195b3 100644 --- a/Info/Layer3/Netscreen.pm +++ b/Info/Layer3/Netscreen.pm @@ -40,7 +40,7 @@ use SNMP::Info::IEEE802dot11; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm index 30b3bade..a0735fc8 100644 --- a/Info/Layer3/Nexus.pm +++ b/Info/Layer3/Nexus.pm @@ -61,7 +61,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/PacketFront.pm b/Info/Layer3/PacketFront.pm index e6b578c6..47688d76 100644 --- a/Info/Layer3/PacketFront.pm +++ b/Info/Layer3/PacketFront.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Passport.pm b/Info/Layer3/Passport.pm index de8c5439..4eebb9b9 100644 --- a/Info/Layer3/Passport.pm +++ b/Info/Layer3/Passport.pm @@ -43,7 +43,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS, diff --git a/Info/Layer3/Pf.pm b/Info/Layer3/Pf.pm index 9a30ecdc..ee1dbaa0 100644 --- a/Info/Layer3/Pf.pm +++ b/Info/Layer3/Pf.pm @@ -41,7 +41,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Pica8.pm b/Info/Layer3/Pica8.pm index 7212b329..6d493187 100644 --- a/Info/Layer3/Pica8.pm +++ b/Info/Layer3/Pica8.pm @@ -39,7 +39,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/SonicWALL.pm b/Info/Layer3/SonicWALL.pm index e1735ed5..6fb55f7e 100644 --- a/Info/Layer3/SonicWALL.pm +++ b/Info/Layer3/SonicWALL.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Sun.pm b/Info/Layer3/Sun.pm index b970dadc..4b99c275 100644 --- a/Info/Layer3/Sun.pm +++ b/Info/Layer3/Sun.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, ); diff --git a/Info/Layer3/Tasman.pm b/Info/Layer3/Tasman.pm index 8cad868a..b30d1a26 100644 --- a/Info/Layer3/Tasman.pm +++ b/Info/Layer3/Tasman.pm @@ -41,7 +41,7 @@ use SNMP::Info::MAU; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Timetra.pm b/Info/Layer3/Timetra.pm index 932c24a1..f7ba206b 100644 --- a/Info/Layer3/Timetra.pm +++ b/Info/Layer3/Timetra.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', ); diff --git a/Info/Layer7.pm b/Info/Layer7.pm index 2ed2252e..61f2553b 100644 --- a/Info/Layer7.pm +++ b/Info/Layer7.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer7/APC.pm b/Info/Layer7/APC.pm index 7e84aec3..b365cea7 100644 --- a/Info/Layer7/APC.pm +++ b/Info/Layer7/APC.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/Layer7/Neoteris.pm b/Info/Layer7/Neoteris.pm index b9d566bf..141132b9 100644 --- a/Info/Layer7/Neoteris.pm +++ b/Info/Layer7/Neoteris.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/Layer7/Netscaler.pm b/Info/Layer7/Netscaler.pm index b10874fd..3611ea15 100644 --- a/Info/Layer7/Netscaler.pm +++ b/Info/Layer7/Netscaler.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/MAU.pm b/Info/MAU.pm index 60abcd06..2a6ec1e4 100644 --- a/Info/MAU.pm +++ b/Info/MAU.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'MAU-MIB' => 'mauMod' ); diff --git a/Info/NortelStack.pm b/Info/NortelStack.pm index 94c55398..f8960798 100644 --- a/Info/NortelStack.pm +++ b/Info/NortelStack.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( diff --git a/Info/PowerEthernet.pm b/Info/PowerEthernet.pm index d49f9561..43e40c50 100644 --- a/Info/PowerEthernet.pm +++ b/Info/PowerEthernet.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' ); diff --git a/Info/RapidCity.pm b/Info/RapidCity.pm index 3e420693..c70e7b8c 100644 --- a/Info/RapidCity.pm +++ b/Info/RapidCity.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'RAPID-CITY' => 'rapidCity', ); diff --git a/Info/SONMP.pm b/Info/SONMP.pm index 4838ff93..ea7c2080 100644 --- a/Info/SONMP.pm +++ b/Info/SONMP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.05'; +$VERSION = '3.07'; %MIBS = ( 'SYNOPTICS-ROOT-MIB' => 'synoptics', diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 07bf5347..70f0c1d9 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -4,6 +4,7 @@ ,v$ \B\.svn\b \B\.git\b +.gitignore # Makemaker generated files and dirs. ^MANIFEST\. @@ -11,6 +12,7 @@ ^blib/ ^MakeMaker-\d pm_to_blib +MYMETA.* # Temp, old and emacs backup files. ~$ diff --git a/README b/README index 31743b44..00f006c9 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ NAME VERSION - SNMP::Info - Version 3.05 + SNMP::Info - Version 3.07 AUTHOR @@ -711,6 +711,11 @@ SUBCLASSES See documentation in SNMP::Info::Layer3::Pf for details. + SNMP::Info::Layer3::Pica8 + Subclass for Pica8 devices. + + See documentation in SNMP::Info::Layer3::Pica8 for details. + SNMP::Info::Layer3::SonicWALL Subclass for generic SonicWALL devices. See documentation in SNMP::Info::Layer3::SonicWALL for details. @@ -1938,11 +1943,6 @@ SNMP::INFO INTERNALS Used internally by AUTOLOAD to return data called by methods listed in %FUNCS. - Called like $info->METHOD(). - - The first time ran, it will call $info->load_METHOD(). Every time - after it will return cached data. - $info->snmp_connect_ip(ip) Returns true or false based upon snmp connectivity to an IP. @@ -1950,6 +1950,24 @@ SNMP::INFO INTERNALS Replaces the specified bit in a port_list array and returns the packed bitmask + $info->_cache(attr, data) + Cache retrieved data so that if it's asked for again, we use the + cache instead of going back to Net-SNMP. Data is cached inside the + blessed hashref $self. + + Accepts the leaf and value (scalar, or hashref for a table). Does + not return anything useful. + + $info->_munge(attr, data) + Raw data returned from Net-SNMP might not be formatted correctly or + might have platform-specific bugs or mistakes. The MUNGE feature of + SNMP::Info allows for fixups to take place. + + Accepts the leaf and value (scalar, or hashref for a table) and + returns the raw or the munged data, as appropriate. That is, you do + not need to know whether MUNGE is installed, and it's safe to call + this method regardless. + _validate_autoload_method(method) Used internally by AUTOLOAD to validate that a dynamic method should be created. Returns the OID of the MIB leaf node the method will get