From 6b4444d97a0ce4c39f608ae39da3954f2426e758 Mon Sep 17 00:00:00 2001 From: Max Baker <> Date: Fri, 13 Feb 2004 06:30:31 +0000 Subject: [PATCH] version and copyright change for 0.8 prep --- COPYRIGHT | 2 +- ChangeLog | 1 + DeviceMatrix.txt | 43 ++++++++++++++++++++++------------------- Info.pm | 6 +++--- Info/Bridge.pm | 4 ++++ Info/CDP.pm | 5 ++++- Info/CiscoStack.pm | 8 ++++---- Info/CiscoStats.pm | 5 ++++- Info/CiscoVTP.pm | 2 +- Info/Entity.pm | 4 +++- Info/EtherLike.pm | 4 +++- Info/Layer1.pm | 4 +++- Info/Layer1/Allied.pm | 4 +++- Info/Layer1/Asante.pm | 4 +++- Info/Layer2/Aironet.pm | 4 +++- Info/Layer2/Bay.pm | 4 +++- Info/Layer2/C1900.pm | 4 +++- Info/Layer2/C2900.pm | 4 +++- Info/Layer2/Catalyst.pm | 4 ++-- Info/Layer2/HP.pm | 2 ++ Info/Layer3/Aironet.pm | 4 +++- Info/Layer3/C3550.pm | 4 ++-- Info/Layer3/C6500.pm | 4 ++-- Info/Layer3/Foundry.pm | 4 +++- Info/MAU.pm | 4 +++- README | 20 ++++++++++++------- 26 files changed, 102 insertions(+), 56 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 0ce8e7ae..ac82a539 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ All code from version 0.7 on -Copyright (c) 2003 Max Baker +Copyright (c) 2003,2004 Max Baker All rights reserved. Original Code diff --git a/ChangeLog b/ChangeLog index b5221f2f..6ca33c00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ version 0.8 () + Added Cisco Catalyst 4000 to Layer3::C6500 class + Added Cisco Catalyst 2970 to Layer3::C6500 Class * Fixed warning about uninitialized value in CiscoStats line 92 + * Added for more serial# checking for L2 and L3 * Fixed warning in Layer2::Bay about non numeric port line 199 Contributions from Dmitry Sergienko: + Added Cisco Aironet BR500 and AP1200 to L2::Aironet Class diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt index 1aeb83a1..cfd94565 100644 --- a/DeviceMatrix.txt +++ b/DeviceMatrix.txt @@ -1,5 +1,5 @@ # SNMP Device Compatibility Matrix -# SNMP::Info - Max Baker +# SNMP::Info - (C) 2004 Max Baker # This file is meant to detail the cababilities # of network devices to supply data via SNMP. @@ -10,7 +10,7 @@ device-vendor: Allied Telesyn cdp:no -device-family: Hubs +device-family: Allied Hubs class: Layer1::Allied ver: 1 arpnip: no @@ -19,7 +19,7 @@ duplex: no device: AT-3624T -device-family: AT-80nn Switches +device-family: AT-8000 Switches class: Layer2::Allied ver: 2 macsuck: yes @@ -27,7 +27,7 @@ macsuck: yes # Asante device-vendor: Asante -device-family: Hubs +device-family: Asante Hubs class: Layer1::Asante ver: 1 arpnip: no @@ -68,7 +68,7 @@ class: Layer2::Aironet device: BR500 note: Aironet based device -device: AP350, AP340, AP4800-E +device: AP350, AP340, CAP350, CAP340, 1200, AP4800 note: Aironet based device device-family: 1000 @@ -109,20 +109,14 @@ arpnip: yes macsuck: yes class: Layer3 -device:2610 - -device:2611 - -device:2620 - -device:2620XM - -device:2621 +device:2610,2610XM,2611,2620,2620XM,2621 device:2621XM device:2651XM +device:2691 + device-family: 3600 class: Layer3 @@ -178,9 +172,17 @@ device: 2924CXL device: 2924CXLv +device-family: Catlayst 2940 + +device: 2940-8TT + +device-family: Catalyst 2950 + +device: 2950-t24 + device-family: Catalyst 2970 macsuck:vlan -note: Acts just like IOS Catalyst 6000 series +note: Acts just like IOS Catalyst 6500 series class: Layer3::C6500 device: 2970G-24T-E @@ -189,6 +191,7 @@ device-family: Catalyst 3500 XL portmac: yes macsuck: vlan note: L2 only IOS devices - Just like Catalyst 2900 series from SNMP +note: IOS Version 12.0(5)XP is buggy and doesn't do VLAN Community indexing correctly. class: Layer2::C2900 device: 3508GXL @@ -311,7 +314,7 @@ device-vendor: HP class: Layer2::HP ver: 2 -device-family: ProCurve +device-family: HP ProCurve duplex: both macsuck: yes arpnip: no @@ -325,18 +328,18 @@ device: 2524 ver: 1 device: 4000 +note: duplex issues? device: 4104GL duplex: link -device: 4108GL - -device: 8000 +device: 4108GL,8000,2626,2650,8000 +note: VLAN info in Q-BRIDGE-MIB device-vendor: Zyxel class: Layer2::ZyXEL_DSLAM note: Doesn't report sysServices (layers) -device-family: DSLAM +device-family: Zyxel DSLAM device:AAM10008-61, AAM1008-63 diff --git a/Info.pm b/Info.pm index 1ee1a759..fa8ad14c 100644 --- a/Info.pm +++ b/Info.pm @@ -2197,10 +2197,10 @@ sub AUTOLOAD { =head1 COPYRIGHT AND LICENCE -Portions -Copyright (c) 2003 Max Baker - All rights reserved. +Changes from SNMP::Info Version 0.7 and on are: +Copyright (c)2003, 2004 Max Baker - All rights reserved. -Original Code +Original Code is: Copyright (c) 2002-3, Regents of the University of California All rights reserved. diff --git a/Info/Bridge.pm b/Info/Bridge.pm index ad5ab462..2b344f5e 100644 --- a/Info/Bridge.pm +++ b/Info/Bridge.pm @@ -1,8 +1,12 @@ # SNMP::Info::Bridge # Max Baker # +# Changes since Version 0.7 Copyright (c) 2004 Max Baker +# All rights reserved. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. +# # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/Info/CDP.pm b/Info/CDP.pm index 420d30fe..a45272e8 100644 --- a/Info/CDP.pm +++ b/Info/CDP.pm @@ -1,6 +1,9 @@ # SNMP::Info::CDP # Max Baker # +# Changes since Version 0.7 Copyright (c) 2004 Max Baker +# All rights reserved. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +31,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CDP; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/CiscoStack.pm b/Info/CiscoStack.pm index 7ae2b3d4..3bbb2cee 100644 --- a/Info/CiscoStack.pm +++ b/Info/CiscoStack.pm @@ -1,9 +1,9 @@ # SNMP::Info::CiscoStack # Max Baker # -# Copyright (c) 2003 Max Baker -# All rights reserved. -# +# Copyright (c)2003,2004 Max Baker +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CiscoStack; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm index 0caf0c4b..95a37c5d 100644 --- a/Info/CiscoStats.pm +++ b/Info/CiscoStats.pm @@ -1,6 +1,9 @@ # SNMP::Info::CiscoStats # Max Baker # +# Changes since Version 0.7 Copyright (c) 2004 Max Baker +# All rights reserved. +# # Copyright (c) 2003 Regents of the University of California # All rights reserved. # @@ -28,7 +31,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CiscoStats; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm index d459bb6a..f4d7930c 100644 --- a/Info/CiscoVTP.pm +++ b/Info/CiscoVTP.pm @@ -30,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CiscoVTP; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Entity.pm b/Info/Entity.pm index 8b2f2527..2d4e5d08 100644 --- a/Info/Entity.pm +++ b/Info/Entity.pm @@ -1,6 +1,8 @@ # SNMP::Info::Entity # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Entity; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm index 3aff1879..66b73595 100644 --- a/Info/EtherLike.pm +++ b/Info/EtherLike.pm @@ -1,6 +1,8 @@ # SNMP::Info::EtherLike # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::EtherLike; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer1.pm b/Info/Layer1.pm index 4c4ab658..7224084d 100644 --- a/Info/Layer1.pm +++ b/Info/Layer1.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer1 - SNMP Interface to Layer1 Devices # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm index cbdf6bf1..5742923c 100644 --- a/Info/Layer1/Allied.pm +++ b/Info/Layer1/Allied.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer1::Allied # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1::Allied; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm index f0a901b7..f8be4735 100644 --- a/Info/Layer1/Asante.pm +++ b/Info/Layer1/Asante.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer1::Asante # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1::Asante; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm index f0eb20d2..92149fa7 100644 --- a/Info/Layer2/Aironet.pm +++ b/Info/Layer2/Aironet.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer2::Aironet # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::Aironet; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/Bay.pm b/Info/Layer2/Bay.pm index 66fb2310..19706936 100644 --- a/Info/Layer2/Bay.pm +++ b/Info/Layer2/Bay.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer2::Bay # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::Bay; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm index 72c7da29..43bce809 100644 --- a/Info/Layer2/C1900.pm +++ b/Info/Layer2/C1900.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer2::C1900 # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::C1900; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/C2900.pm b/Info/Layer2/C2900.pm index 60881388..e1d41c78 100644 --- a/Info/Layer2/C2900.pm +++ b/Info/Layer2/C2900.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer2::C2900 # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::C2900; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/Catalyst.pm b/Info/Layer2/Catalyst.pm index e51fa166..cc1bcdf2 100644 --- a/Info/Layer2/Catalyst.pm +++ b/Info/Layer2/Catalyst.pm @@ -2,7 +2,7 @@ # Max Baker # # Copyright (c) 2002,2003 Regents of the University of California -# Copyright (c) 2003 Max Baker +# Copyright (c) 2003,2004 Max Baker changes from version 0.8 and beyond # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::Catalyst; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm index 621c2c9a..a3050da9 100644 --- a/Info/Layer2/HP.pm +++ b/Info/Layer2/HP.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer2::HP - SNMP Interface to HP ProCurve Switches # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm index d7cfbd43..6bc399ef 100644 --- a/Info/Layer3/Aironet.pm +++ b/Info/Layer3/Aironet.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer3::Aironet # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::Aironet; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm index 5b2152d5..c547e97b 100644 --- a/Info/Layer3/C3550.pm +++ b/Info/Layer3/C3550.pm @@ -1,8 +1,8 @@ # SNMP::Info::Layer3::C3550 # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. # Copyright (c) 2003, Regents of the University of California -# Copyright (c) 2003 Max Baker # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::C3550; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm index f6261bbd..8de5a8c9 100644 --- a/Info/Layer3/C6500.pm +++ b/Info/Layer3/C6500.pm @@ -1,7 +1,7 @@ # SNMP::Info::Layer3::C6500 # Max Baker # -# Copyright (c) 2003 Max Baker +# Copyright (c) 2003,2004 Max Baker # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::C6500; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm index e9e8f1f6..34811e10 100644 --- a/Info/Layer3/Foundry.pm +++ b/Info/Layer3/Foundry.pm @@ -1,6 +1,8 @@ # SNMP::Info::Layer3::Foundry - SNMP Interface to Foundry devices # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::Foundry; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/Info/MAU.pm b/Info/MAU.pm index 1a87e185..571550d7 100644 --- a/Info/MAU.pm +++ b/Info/MAU.pm @@ -1,6 +1,8 @@ # SNMP::Info::MAU - Media Access Unit - RFC2668 # Max Baker # +# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond. +# # Copyright (c) 2002,2003 Regents of the University of California # All rights reserved. # @@ -28,7 +30,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::MAU; -$VERSION = 0.7; +$VERSION = 0.8; # $Id$ use strict; diff --git a/README b/README index c6d16c39..5ffffb2c 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ NAME VERSION - SNMP::Info - Version 0.7 + SNMP::Info - Version 0.8 AUTHOR @@ -68,7 +68,7 @@ SUPPORT Please direct all support, help, and bug requests to the snmp-info-users Mailing List at - http://lists.sourceforge.net/lists/listinfo/snmp-info-users + DESCRIPTION @@ -154,6 +154,7 @@ DESCRIPTION BRIDGE-MIB SNMP-REPEATER-MIB STAND-ALONE-ETHERNET-SWITCH-MIB (ESSWITCH-MIB) + by running mkdir -p /usr/local/share/snmp/mibs @@ -190,13 +191,14 @@ DESCRIPTION Design Goals 1. Use of textual MIB leaf identifier and enumerated values + * All values are retrieved via MIB Leaf node names For example SNMP::Info has an entry in its %GLOBALS hash for ``sysName'' instead of 1.3.6.1.2.1.1.5. * Data returned is in the enumerated value form. For Example instead of looking up 1.3.6.1.2.1.2.2.1.3 and - getting back "23" + getting back 23 SNMP::Info will ask for "RFC1213-MIB::ifType" and will get back "ppp". @@ -287,7 +289,7 @@ DESCRIPTION CatOS. SNMP::Info::Layer2::C2900 - Subclass for Cisco Catalyst 2900 devices running IOS. + Subclass for Cisco Catalyst 2900 and 3500XL devices running IOS. SNMP::Info::Layer2::Catalyst Subclass for Cisco Catalyst switches running CatOS. These @@ -426,6 +428,7 @@ USAGE Bay Networks -> SNMP::Info::Layer2::Bay Catalyst 1900 -> SNMP::Info::Layer2::C1900 Catalyst 2900XL/2950(IOS) -> SNMP::Info::Layer2::C2900 + Catalyst 3500XL (3548) IOS -> SNMP::Info::Layer2::C2900 Catalyst 3550/3548 -> SNMP::Info::Layer3::C3550 Catalyst WS-C 2926,5xxx -> SNMP::Info::Layer2::Catalyst HP Procurve -> SNMP::Info::Layer2::HP @@ -528,7 +531,7 @@ USAGE $local_routes = $info->ipr_route('192.168.0'); - This will only fetch entries in the table that start with "192.168.0", + This will only fetch entries in the table that start with 192.168.0, which in this case are routes on the local network. Remember that you must supply the partial IID (a numeric OID). @@ -1030,6 +1033,7 @@ SNMP::INFO INTERNALS '11000000' => '11 Mbps', '20000000' => '20 Mbps', '16000000' => '16 Mbps', + '44210000' => 'T3', '44736000' => 'T3', '45000000' => '45 Mbps', '45045000' => 'DS3', @@ -1169,6 +1173,7 @@ SNMP::INFO INTERNALS 3. Method is in %FUNCS 4. Run $info->_load_attr(method) if not cached 5. Return $info->_show_attr(method). + Override any dynamic method listed in one of these hashes by creating a subroutine with the same name. @@ -1177,9 +1182,10 @@ SNMP::INFO INTERNALS COPYRIGHT AND LICENCE - Portions Copyright (c) 2003 Max Baker - All rights reserved. + Changes from SNMP::Info Version 0.7 and on are: Copyright (c)2003, 2004 + Max Baker - All rights reserved. - Original Code Copyright (c) 2002-3, Regents of the University of + Original Code is: Copyright (c) 2002-3, Regents of the University of California All rights reserved. Redistribution and use in source and binary forms, with or without