diff --git a/ChangeLog b/ChangeLog index bc3c133e..ac8334f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,8 @@ version 1.05 MIBs without definition in %FUNCS + Enable load_ methods for %GLOBALS and MIB Leaf node names. + Add loop detect option and code for getnext table column walks. + + Add Layer3::NetSNMP for Net-SNMP-based hosts, part of + SF patch 1557529 (Bradley Baetz). * Fix for bug where an SNMP error in any operation would cause subsequent table get operations to fail while using the same session, originally diff --git a/Info.pm b/Info.pm index 397fed15..93b78c79 100644 --- a/Info.pm +++ b/Info.pm @@ -507,6 +507,10 @@ Subclass for Juniper devices. Subclass for Nortel Ethernet Routing Switch 1600 series. +=item SNMP::Info::Layer3::NetSNMP + +Subclass for host systems running Net-SNMP. + =item SNMP::Info::Layer3::Netscreen Subclass for Juniper NetScreen. @@ -887,6 +891,7 @@ Algorithm for Subclass Detection: Extreme -> SNMP::Info::Layer3::Extreme Foundry -> SNMP::Info::Layer3::Foundry Juniper -> SNMP::Info::Layer3::Juniper + Net-SNMP -> SNMP::Info::Layer3::NetSNMP Nortel Passport/Accelar LAN -> SNMP::Info::Layer3::Passport Nortel/Bay Baystack -> SNMP::Info::Layer2::Baystack Alteon Ace Director -> SNMP::Info::Layer3::AlteonAD @@ -952,9 +957,11 @@ sub device_type { 674 => 'SNMP::Info::Layer3::Dell', 1916 => 'SNMP::Info::Layer3::Extreme', 1991 => 'SNMP::Info::Layer3::Foundry', + 2021 => 'SNMP::Info::Layer3::NetSNMP', 2272 => 'SNMP::Info::Layer3::Passport', 2636 => 'SNMP::Info::Layer3::Juniper', 2925 => 'SNMP::Info::Layer1::Cyclades', + 8072 => 'SNMP::Info::Layer3::NetSNMP', ); my %l2sysoidmap = ( diff --git a/Info/Layer3/NetSNMP.pm b/Info/Layer3/NetSNMP.pm new file mode 100644 index 00000000..be33f4c4 --- /dev/null +++ b/Info/Layer3/NetSNMP.pm @@ -0,0 +1,235 @@ +# SNMP::Info::Layer3::NetSNMP +# Bradley Baetz and Bill Fenner +# +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the University of California, Santa Cruz nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package SNMP::Info::Layer3::NetSNMP; +# $Id$ + +use Exporter; +use SNMP::Info::Layer3; + +use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ; +$VERSION = '1.04'; +@SNMP::Info::Layer3::NetSNMP::ISA = qw/SNMP::Info::Layer3 Exporter/; +@SNMP::Info::Layer3::NetSNMP::EXPORT_OK = qw//; + +%MIBS = ( + %SNMP::Info::Layer3::MIBS, + 'UCD-SNMP-MIB' => 'versionTag', + 'NET-SNMP-TC' => 'netSnmpAgentOIDs', + 'HOST-RESOURCES-MIB' => 'hrSystem', + ); + +%GLOBALS = ( + %SNMP::Info::Layer3::GLOBALS, + 'netsnmp_vers' => 'versionTag', + 'hrSystemUptime' => 'hrSystemUptime', + ); + +%FUNCS = ( + %SNMP::Info::Layer3::FUNCS, + ); + +%MUNGE = ( + %SNMP::Info::Layer3::MUNGE, + ); + +sub vendor { + return 'Net-SNMP'; +} + +sub os { + my $netsnmp = shift; + my $descr = $netsnmp->description(); + + return $1 if ($descr =~ /^(\S+)\s+/); + return undef; +} + +sub os_ver { + my $netsnmp = shift; + my $descr = $netsnmp->description(); + my $vers = $netsnmp->netsnmp_vers(); + my $os_ver = undef; + + $os_ver = $1 if ($descr =~ /^\S+\s+\S+\s+(\S+)\s+/); + if ($vers) { + $os_ver = "???" unless defined($os_ver); + $os_ver .= " / Net-SNMP " . $vers; + } + + return $os_ver; +} + +sub serial { + return ''; +} + +# sysUptime gives us the time since the SNMP daemon has restarted, +# so return the system uptime since that's probably what the user +# wants. (Caution: this could cause trouble if using +# sysUptime-based discontinuity timers or other TimeStamp +# objects. +sub uptime { + my $netsnmp = shift; + my $uptime; + + $uptime = $ucd->hrSystemUptime(); + return $uptime if defined $uptime; + + return $netsnmp->SUPER::uptime(); +} + +sub i_ignore { + my $l3 = shift; + my $partial = shift; + + my $interfaces = $l3->interfaces($partial) || {}; + + my %i_ignore; + foreach my $if (keys %$interfaces) { + # lo0 etc + if ($interfaces->{$if} =~ /\blo\d*\b/i){ + $i_ignore{$if}++; + } + } + return \%i_ignore; +} + +1; +__END__ + +=head1 NAME + +SNMP::Info::Layer3::NetSNMP - Perl5 Interface to L3 Net-SNMP Devices + +=head1 AUTHORS + +Bradley Baetz and Bill Fenner + +=head1 SYNOPSIS + + # Let SNMP::Info determine the correct subclass for you. + my $netsnmp = new SNMP::Info( + AutoSpecify => 1, + Debug => 1, + # These arguments are passed directly on to SNMP::Session + DestHost => 'myrouter', + Community => 'public', + Version => 2 + ) + or die "Can't connect to DestHost.\n"; + + my $class = $netsnmp->class(); + print "SNMP::Info determined this device to fall under subclass : $class\n"; + +=head1 DESCRIPTION + +Subclass for Generic Net-SNMP devices + +=head2 Inherited Classes + +=over + +=item SNMP::Info::Layer3 + +=back + +=head2 Required MIBs + +=over + +=item UCD-SNMP-MIB + +=item NET-SNMP-TC + +=item HOST-RESOURCES-MIB + +=item Inherited Classes' MIBs + +See L for its own MIB requirements. + +=back + +=head1 GLOBALS + +These are methods that return scalar value from SNMP + +=over + +=item $netsnmp->vendor() + + Returns 'Net-SNMP' and the Net-SNMP version. + +=item $netsnmp->os() + + Returns the OS extracted from sysDescr. + +=item $netsnmp->os_ver() + + Returns the software version extracted from sysDescr. + +=item $netsnmp->uptime() + + Returns the system uptime instead of the agent uptime. +NOTE: discontinuity timers and other TimeStamp-based objects +are based on agent uptime, so use orig_uptime(). + +=back + +=head2 Globals imported from SNMP::Info::Layer3 + +See documentation in L for details. + +=head1 TABLE ENTRIES + +These are methods that return tables of information in the form of a reference +to a hash. + +=head2 Table Methods imported from SNMP::Info::Layer3 + +See documentation in L for details. + +=head1 NOTES + +In order to cause SNMP::Info to classify your device into this class, it +may be necessary to put a configuration line into your F +similar to + + sysobjectid .1.3.6.1.4.1.8072.3.2.N + +where N is the object ID for your OS from the C MIB (or +255 if not listed). Some Net-SNMP installations default to an +incorrect return value for system.sysObjectId. + +In order to recognize a Net-SNMP device as Layer3, it may be necessary +to put a configuration line similar to + + sysservices 76 + +in your F. + +=cut