update README

interface, dot11_cur_tx_pwr_mw(), in Airespace class
* Correct reporting of SSID broadcast status in Airespace class

COPYRIGHT

@@ -1,5 +1,5 @@
 All code from version 0.7 on
-Copyright (c) 2003,2004 Max Baker
+Copyright (c) 2003-2009 Max Baker and SNMP::Info Developers
 All rights reserved.
 
 Original Code

ChangeLog

@@ -1,5 +1,160 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
-ChangeLog $Id$
+
+version 2.11 (2012-12-09)
+
+    [BUG FIXES]
+
+    * Add fall-back for sysDescr on Force10
+
+version 2.10 (2012-12-08)
+
+    [NEW FEATURES]
+
+    * Support for Force10 devices (W. Bulley)
+
+version 2.09 (2012-11-28)
+
+    [NEW FEATURES]
+
+    * New method i_ssidmac() to get BSSID's from AP's with initial support
+      in L2::Aironet and Airespace classes
+    * Support for Avaya Secure Routers in new class L3::Tasman
+    * Add EDP and LLDP L2 Topology to L3::Extreme 
+    * [3185393] Support for Juniper SSL VPN in new class L7::Neoteris
+    * [3381027] Support for Cisco Nexus in new class L3::Nexus   
+    * [1424336] Support for Extreme Discovery Protocol (EDP)
+    
+    [ENHANCEMENTS]
+
+    * [3017571] Add LLDP support for NetSNMP device class (begemot) 
+    * [3418918] Extreme devices now report OS as either extremeware or xos
+    * [2809045] Strip preceding netscreen from model name in L3::Netscreen
+    * [] Classify Linksys 2024 as L3::Dell (Rogier Krieger)
+    
+    [BUG FIXES]
+    
+    * Fixed logic to return cached data for table methods when available and
+      not a partial fetch
+    * Fix typo in PoD for Bridge.pm and CiscoConfig.pm (William Bulley)
+    * Fix/improve IPv6 neighbor cache handling, especially for Cisco Nexus
+
+version 2.08 (2012-07-15)
+
+    [NEW FEATURES]
+
+    * Basic support for APC UPS devices
+    * [2993691] Support for SonicWALL devices in new class L3::SonicWALL (phishphreek)
+    * [2996795] Support for Kentrox devices in new class L2::Kentrox (phishphreek)
+    * [] Basic support for Blue Coat proxy devices in new class L3::BlueCoatSG (jeroenvi)
+    * [] Support Cisco 6500 / Sup2T in L3::C6500 class (jeroenvi)
+
+    [ENHANCEMENTS]
+
+    * Pseudo ENTITY-MIB methods added to L3::Juniper for hardware information
+    * Add method to report current transmit power of the radio interface,
+      dot11_cur_tx_pwr_mw(), in Airespace class 
+    * [3085411] Activate L3 properties for Netgear GSM7224v2 (phishphreek)
+    * [3085413] SNMP OIDs for Netgear Serial and OS Ver (phishphreek)
+    * [3286549] Dell LLDP Support (Nico Giefing)
+    * [3469527] Netgear LLDP Support (Nic Bernstein)
+    * [3472052] moduleSerialNumber support for Cisco Stack (Slava)
+    * [3523320] Better VLAN support in Juniper class (Web Bulley)
+    * [3532261] LLDP support in C6500 and related (Carlos Vicente)
+    * [3538949] Updated switch models in L2::HP (jeroenvi)
+
+    [BUG FIXES]
+
+    * Get OS version for Juniper devices not reporting in sysDescr
+    * Correct base MAC reporting for Juniper devices
+    * Correct reporting of SSID broadcast status in Airespace class
+    * [3541442] Change L2::Catalyst port names to what is reported in CDP
+    * [2132349] Add an additional check to get Foundry OS version
+    * [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)
+    * [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)
+    * [2986858] Fix the patch from this ticket (Oliver Gorwits)
+    * [3136084] Rename Allied Telesyn to Allied Telesis (Oliver Gorwits)
+    * [3268104] CiscoVTP.pm i_vlan_membership() array bounds (Michael Sanderson)
+    * [3497004] Clarify POD description of default values (a2w)
+    * [3502533] Layer2/Baystack interface indexes > 513 (Robert Nyqvist)
+
+version 2.06 (2011-09-28)
+
+    [NEW FEATURES]
+
+    * Support for PacketFront devices in new class L3::PacketFront
+    * Support for Mikrotik devices in new class L3::Mikrotik
+    * Support for HP VirtualConnect switches in new class L2::HPVC
+    * Support for ADSL-LINE-MIB in new class AdslLine
+
+    [ENHANCEMENTS]
+
+    * POD clarification on i_speed() munging by Info.pm
+    * Added i_stack_status method that can be used for finding the parent
+      interface for e.g. ADSL interface speed determination
+
+    [BUG FIXES]
+
+    * [3344843] Fix returning serial() and os_ver() for web-managable HP
+      switches, introduced by HP/HP4000 class split, reported by J R Binks
+    * [2809033] Put L2-only Cisco blade switches in L3::C6500
+    * [3408506] Fix uninitialized value in IPv6 when neighbor state is 
+      incomplete (Michael Borgelt)
+
+version 2.05 (2011-06-23)
+    + Fix broken function call in L2::Aironet
+    + Promote L2::Aruba to L3::Aruba, as Aruba devices can be L3 entities and
+      provide L3 information.
+
+version 2.04 (2011-03-31)
+    + Support for older HP switch models moved to new L2::HP4000 class
+    + Fix VLAN changing in L2::HP and L2::HP4000 classes
+    * Updated model lists in HP classes
+    + [2980782] Added L3::CiscoFWSM for Cisco Firewall Services Modules
+      (Brian De Wolf)
+    + Added L3::Pf for FreeBSD PFSense Firewalls (max)
+    * Added specific functions for neighbor mgmt addresses to CDP class
+    * Implemented os_bin() method in CiscoStats 
+    + [2980787] Fix for C1900 bp_index not containing interfaces.
+      (Brian De Wolf)
+    + [2599795] Added vendor_i_type() method to HP and HP4000 clases
+    + [2688801] Minor modification for obscure Proxim/Orinoco device
+      (jrbinks)
+    + [3051443] Add PoE measured power per port to Cisco, Extrme and HP 
+      classes (jeroenvi)
+    * Minor tweaks to support devices without sysServices
+    * Added Cisco CBS3xxx blade switches to L3::C6500
+    * Fix for FWSMs not being detected properly.  Special thanks goes to
+      Jukka Pirhonen for pointing it out. (Brian De Wolf)
+    + Added support for IPv6 to physical address mapping
+    * Added ME340x to L3::C3550
+    * Added new ProCurve models to HP class
+    * Fixed i_speed_raw not returning raw values (Alexander Hartmaier)
+
+version 2.01 (06/12/09)
+    + Added CiscoStpExtensions Class (Carlos Vicente)
+    + Added Layer3::Arista (fenner)
+    + [2020353] Added L3::Altiga for Cisco (Altiga) VPN3000 Concentrators
+                (Jeroen van Ingen)
+
+    * Fixed RFC1213-MIB vs IF-MIB collision in ifOperStatus
+    * Updated test_class.pl for better debug info and relative path
+    * Add cisco vendor detection by OID in Layer3.pm (Sam Stickland)
+    * Fix CaSe of EtherLike-MIB in EtherLike.pm (Alexander Hartmaier)
+    * Added Cisco FWSM to L3::Cisco
+    * Added s222_rp to L3::C6500
+    * Added CIGESM to L2::C2900
+    * Added Airespace WLC to L2::Airespace
+    * Updated POD and DeviceMatrix quite a bit
+    * Added ENTITY-MIB to CiscoStats for better model handling above
+    * Fix networkaddress handling in LLDP-MIB
+    * Added CiscoConfig to L2::Aironet, L3::C3550 classes
+    * Better SSID capabilities for L2::Aironet
+    * Fix CDP vs LLDP in c_id() for HP Class
+    * test_class.pl improvements
 
 version 2.00 (08/01/08)
     + Support for Alcatel-Lucent OmniSwitch via L3::AlcatelLucent

DEVELOP

@@ -0,0 +1,29 @@
+SNMP::Info Developer Guidelines
+
+Coding Guidelines:
+    - tab-width of 4, no tab characters
+    - keep POD documentation up-to-date
+    - always update ChangeLog before committing
+    - always update DeviceMatrix.txt before committing
+    - check-in required mibs to netdisco-mibs and release new package if needed
+
+Release and Testing Instructions: 
+    - Please see misc/RELEASE in Netdisco
+      ( http://netdisco.cvs.sourceforge.net/viewvc/netdisco/misc/RELEASE?view=markup )
+      and follow all testing and release guidelines
+
+FAQ:
+    - Do I have to update the version number and timestamp in modified files before committing? 
+    -> No.  These are RCS tags that are automatically updated by CVS when you commit
+
+    - Should I add changes at the top of the ChangeLog?
+    -> Yes. The changelog is created one commit at a time.  If there isn't a
+        section for the current version, then add one at the top and put your
+        changes after.  You can leave the date field for the release empty (). 
+
+    - What should I change the $VERSION to?
+    -> If you are the first person to get to a file after a release, update it
+       to either  release++ or "release++ dash cvs".   
+       Example: File is marked 2.01, change it to 2.02-cvs with your new changes.
+       Example: File is marked 2.02-cvs,  no change until packaging for release when the -cvs is removed.
+       TODO: Is there still an odd/even scheme as introduced by Eric?

DeviceMatrix.txt

@@ -6,7 +6,9 @@
 
 # $Id$
 
+#
 # Airespace (pre-Cisco)
+#
 device-vendor: Airespace
 cdp:no
 arpnip: no
@@ -16,15 +18,34 @@ duplex: both
 vlan: yes
 modules: yes
 class: Layer2::Airespace
+
+device-family: Airespace Wireless Controllers
 note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
 note: Device will only communicate with SNMP version configured in the controller.
 
-device-family: Airespace Wireless Controllers
-
 device: 3500, 4101, 4102
 
+#
+# Alcatel-Lucent
+#
+device-vendor: Alcatel-Lucent
+
+device-family: L3
+class: Layer3::AlcatelLucent
+device: All
+
+device-family: Timetra
+class: Layer3::Timetra
+device: All
+
+device-family: AOS
+class: Layer3::Aruba
+device: All
+
+#
 # Allied
-device-vendor: Allied Telesyn
+#
+device-vendor: Allied Telesis
 cdp:no
 class: Layer1::Allied
 ver: 1
@@ -40,21 +61,43 @@ device-family: AT-8000 Switches
 class: Layer2::Allied
 ver: 2
 macsuck: yes
+device: All
 
+#
+# Altiga
+#
+device-vendor: Altiga
+class: Layer3::Altiga
+note: See Cisco/Altiga
+
+#
+# Arista
+#
+device-vendor: Arista
+class: Layer3::Arista
+device-family: All
+device: All
+
+#
 # Aruba
+#
 device-vendor: Aruba
-arpnip: no
+arpnip: yes
 macsuck: yes
 portmac: yes
 duplex: no
-class: Layer2::Aruba
-note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
+class: Layer3::Aruba
 
 device-family: Aruba Wireless Controllers
+note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
 
 device: 5000
 
+device: 6000
+
+#
 # Asante
+#
 device-vendor: Asante
 class: Layer1::Asante
 ver: 1
@@ -66,16 +109,19 @@ device-family: Asante Hubs
 
 device: 1012
 
+#
 # Bay
+#
 device-vendor: Bay
 note: See Nortel
 
+#
 # CISCO
+#
 device-vendor: Cisco
 cdp: yes
 ver: 2
 modules: yes
-note: Error in CISCO-TC-MIB. See README for how to patch.
 
 device-family: Aironet
 note: IOS and Aironet OS versions
@@ -91,6 +137,12 @@ note: Aironet based device
 device: AP350, AP340, CAP350, CAP340, 1200, AP4800
 note: Aironet based device
 
+device-family: Altiga
+class: Layer3::Altiga
+
+device: VPN3000
+note: The Cisco 3000 device can return duplicate interface names, while Netdisco expects unique interface names.  To ensure unique device names I append numbers only when an interface name would not be unique without one. Interfaces with unique names keep their ifDescr name.
+
 device-family: 1000
 duplex: no
 ver: 1
@@ -121,11 +173,7 @@ arpnip: yes
 macsuck: yes
 class: Layer3::Cisco
 
-device:2610,2610XM,2611,2620,2620XM,2621,2621XM
-
-device:2651XM
-
-device:2691
+device:2610, 2610XM, 2611, 2620, 2620XM, 2621, 2621XM, 2651XM, 2691
 
 device-family: 2800
 duplex: link
@@ -145,14 +193,15 @@ duplex: no
 
 device-family:7200
 class: Layer3::Cisco
-note: !"When scanning my network with netdisco I would find that my 7200 series router running Cisco IOS Software Release 12.2(1) would reboot when scanning for CDP neighbours, to solve the issue I upgraded to Cisco IOS Software Release  Version 12.2(37)"
+device:all
+#note: Unconfirmed problem : "When scanning my network with netdisco I would find that my 7200 series router running Cisco IOS Software Release 12.2(1) would reboot when scanning for CDP neighbours, to solve the issue I upgraded to Cisco IOS Software Release  Version 12.2(37)"
 
 device-family: 7500
 class: Layer3::Cisco
 
 device: 7507
 duplex: no
-note: !Duplex settings are falsely reported in older IOS versions
+note: !Duplex settings are falsely reported in ancient IOS versions
 
 device-family: AS5000
 duplex: no
@@ -171,11 +220,7 @@ duplex: both
 vlan: write
 class: Layer2::C1900
 
-device: wsc1900c
-device-family: Catalyst 1900
-
-device: wsc1900
-device-family: Catalyst 1900
+device: wsc1900c,  wsc1900
 
 device-family: Catalyst 2900
 note: IOS
@@ -186,18 +231,14 @@ class: Layer2::C2900
 portmac: yes
 note: !Pre IOS 11.2 (8) SA3 - PortMAC shows up in CAM table.
 
+device: 2912MfXL, 2924CXL, 2924CXLv
+
 device: 2908xl
 note: !Pre IOS 11.2 (8.6) some features (duplex...) aren't present.
 
-device: 2912MfXL
-
 device: 2924MXL
 ver: 1
 
-device: 2924CXL
-
-device: 2924CXLv
-
 device-family: Catalyst 2940
 note: IOS
 macsuck: vlan
@@ -236,11 +277,7 @@ 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
-
-device: 3524XL
-
-device: 3548XL
+device: 3508GXL, 3524XL, 3548XL
 
 device-family: Catalyst 3550
 macsuck: vlan
@@ -256,11 +293,9 @@ device: 3550-12T
 
 device: 3400 w/ MetroBase Image
 
-device: 3550
+device: 3550, 3560, 3550-24, 3550-48
 note: L2/L3 Switch
 arpnip: yes
-
-device: 3550-24, 3550-48
 macsuck: vlan
 
 device-family: Catalyst 3750
@@ -268,19 +303,21 @@ class: Layer3::C6500
 
 device: 3750
 
+device-family: Catalyst Blade Switch 3xxx
+macsuck: vlan
+class: Layer3::C6500
+note: Cisco Blade switches for Dell, FSC, HP and IBM blade system chassis. Limited testing done.
+
 device-family: Catalyst 4000
 duplex: write
 macsuck: vlan
 vlan: write
 class: Layer2::Catalyst
 note: Comes in IOS and CatOS versions like the 6k series.
-note: CatOS versions like L2::Catalyst just fine.
-note: !Reported problems with SNMP taking up all the CPU.  Requests take significantly longer.
+note: !Reported problems with SNMP taking up all the CPU on older SW.  Requests take significantly longer.
 note: !IOS Version 12.1.8a reported not to respond to BRIDGE-MIB calls.
 
-device: wsc4003, wsc4006
-
-device: wsc4503, wsc4506
+device: wsc4003, wsc4006, wsc4503, wsc4506
 
 device: wsc4912g
 note: Dedicated 12 port gig-e switch
@@ -297,26 +334,19 @@ class: Layer3::C4000
 note: !Has serious slowdown/timeout problems with SNMP
 note: !IOS Software Release 12.2(20)EW or higher required for duplex support
 
-
 device-family: Catalyst 5000
 duplex: write
 vlan: write
 class: Layer2::Catalyst
-note: Port info in CISCO-STACK-MIB
 
 device: wsc2926
 note: !Can give false information over SNMP at times.
 
-device: wsc2948g
-
-device: wsc2980g
-note: !Macsuck not working?
+device: wsc2948g, wsc2980g, wsc5500, wsc5505, wsc5509
 
 device: wsc5000
 note: !Has nasty tendency to not give you all SNMP data ,flaky for some older Catalyst versions.
 
-device: wsc5500,wsc5505,wsc5509
-
 device: wsx5302
 arpnip: yes
 class: Layer3
@@ -333,17 +363,9 @@ note: Native Mode (IOS) versions seem to have SNMP problems with L2 data.
 note: !Problem with IOS 12.2.17d-SXB ... upgrade to -SXB1 or higher.
 note: !Sup720-3B and NativeIOS 12.2 (17d)SXB10 may report 127.0.0.51 as CDP neighbor address.
 
-device: 6503
-macsuck:no
-note: !Macsuck failing even under vlan mode
+device: 6503, 6509, sp72033, s3223, s32p3, s222
 note: Native mode (IOS) reports L2+L3
 
-device: 6509
-duplex: link
-macsuck:no
-note: Native mode (IOS) reports L2+L3
-note: !Macsuck failing even under vlan mode
-
 device: wsc6509
 duplex: write
 class: Layer2::Catalyst
@@ -379,7 +401,27 @@ note: Device will only communicate with SNMP version configured in the controlle
 
 device: 2006, 4112, 4124, 4136, 4402, 4404
 
+device-family: Firewall
+class: Layer3::Cisco
+device: PIX Security Appliance
+device: Adaptive Security Applicance
+
+device: Firewall Services Modules (FWSM)
+note: !Arpnip only available for 4.x software releases.
+class: Layer3::CiscoFWSM
+arpnip: yes
+
+#
+# Cyclades
+#
+device-vendor: Cyclades
+class: Layer1::Cyclades
+device-family: All
+device: All
+
+#
 # Dell
+#
 device-vendor: Dell
 arpnip: no
 macsuck: yes
@@ -399,7 +441,15 @@ device: 5324
 device-family: Dell PowerConnect 3000 Series
 device: 3348, 3448P, 3424, 3424P
 
+device-family: IBM BladeCenter Ethernet Switch
+device: All
+
+device-family: Linksys 2048
+device: All
+
+#
 # Enterasys
+#
 device-vendor: Enterasys Networks
 arpnip: yes
 macsuck: yes
@@ -411,14 +461,15 @@ class: Layer3::Enterasys
 
 device-family: SuperStack C-Series
 
-device: C3G124-24, C3G124-48
-device: C2G124-24, C2G124-48
+device: C3G124-24, C3G124-48, C2G124-24, C2G124-48
 
 device-family: Matrix
 
 device: Matrix N-Series DFE
 
+#
 # Extreme
+#
 device-vendor: Extreme Networks
 arpnip: yes
 macsuck: yes
@@ -433,9 +484,20 @@ device-family: Alpine and Summit
 device: Alpine 3808
 device: Summit 7i, 48si
 
+#
+# FreeBSD
+#
+device-vendor: FreeBSD
+device-famly: Pf
+class: Layer3::Pf
+arpnip: yes
+cdp: no
+note: LLDP support might be available. See note in Layer3::Pf
+
+#
 # Foundry
+#
 device-vendor: Foundry Networks
-note: CDP --> FDP.
 vlan: yes
 modules: no
 
@@ -467,52 +529,103 @@ device: FWSX424
 device: ServerIronGT
 device: FLS624, FLS648
 
+#
 # HP
+#
 device-vendor: HP
-class:  Layer2::HP
+note: HP Devices are very widely supported.
 ver: 2
 modules: yes
 
-device-family: HP ProCurve
+device-family: HP ProCurve (old)
+class:  Layer2::HP4000
 duplex: both
 macsuck: yes
 arpnip: no
 cdp: yes
 vlan: write
-note: CDP only available with newer ROM versions. 
+note: devices in this class only have CDP support
+note: VLAN info in HP-VLAN MIB
 
-device: 2512
-ver: 1
-
-device: 2524
-ver: 1
-
-device: 4000
+device: 1600M,2400,2424M,4000,8000
+duplex: link
 note: duplex issues?
 
-device: 4104GL
-duplex: link
-
-device: 4108GL,8000,2626,2650,8000
+device-family: HP ProCurve (recent)
+class:  Layer2::HP
+duplex: both
+macsuck: yes
+arpnip: no
+cdp: yes
+vlan: write
+note: old firmware versions only have CDP support, more recent have LLDP
 note: VLAN info in Q-BRIDGE-MIB
 
+device: 2312,2324,2512,2524
+ver: 1
+
+device: 2510,2600,2610,2800,2810,2900,2910al
+device: 3124,3324XL,3400cl,3500,3500yl
+device: 4100GL,4200vl,5300XL,5400yy,5400zl
+device: 6108,6200yl,6400cl,6410cl,6600,6600ml,8200zl
+
+
+#
 # Juniper
+#
 device-vendor: Juniper
 arpnip: yes
 
 device-family: M-series router
 class: Layer3::Juniper
-device: M-series router
+device: All
 
 device-family: NetScreen
 class: Layer3::Netscreen
-device:  Netscreen
+device: All
 
+#
+# Linksys
+#
+device-vendor: Linksys
+device-family: Generic L2 Device
+class: Layer2
+device: Some
+
+device-family: Generic L3 Device
+class: Layer3
+device: Some
+
+device-family: 2048
+class: Layer3::Dell
+device: All
+
+
+#
+# Microsoft
+#
+device-vendor: Microsoft
+device-family: Windows
+class: Layer3::Microsoft
+device: Windows Router
+
+#
+# Netgear
+#
+device-vendor: NetGear
+device-family: Switches
+class: Layer2::Netgear
+device: All
+
+#
 # NetScreen
+#
 device-vendor: NetScreen
 note: See Juniper
 
+#
 # Net-SNMP
+#
 device-vendor: Net-SNMP
 class: Layer3
 ver: 2
@@ -524,11 +637,21 @@ device:  Linux routers
 device-family: BSD
 device:  BSD routers
 
+#
+# Kentrox
+#
+device-vendor: Kentrox
+note: MIB not yet shipped
+
+device: Kentrox DataSMART DSU/CSU
+
+#
 # NORTEL
+#
 device-vendor: Nortel
 macsuck: yes
 cdp: proprietary
-note: CDP --> SONMP.
+note: SONMP Discovery Protocol Supported
 
 device-family: BayStack Hub
 duplex: both
@@ -549,23 +672,13 @@ vlan: write
 modules: yes
 class: Layer2::Baystack
 
-device: 303,304
-
-device: 350
-
-device: 380
-
-device: 410
-
-device: 420,425
+device: 303, 304, 350, 380, 410, 420, 425, 460, 470
 
 device: 450
 note: !Some versions > 4.X in stacked configuration have SNMP timeout issues. 
 note: Labels full duplex as 20Mbit connection.
 
-device: 460,470
-
-device: BPS
+device: Business Policy Switch (BPS)
 
 device-family: Ethernet Routing Switch/Baystack Switch
 arpnip: yes
@@ -597,13 +710,8 @@ vlan: yes
 class: Layer2::Centillion
 note: !Must be on version 4.x or 5.x (VLAN based) software.
 
-device: 5000BH
-
-device: 5005BH
-
-device: C100
-
-device: C50
+device: 5000BH, 5005BH
+device: C50,C100
 
 device-family: AP222x
 duplex: both
@@ -671,11 +779,7 @@ class: Layer3::Passport
 note: !8600 Code versions < 3.2 vlan based mac-suck and are unsupported.  Upgrade code.
 note: !8600 3.2 code versions < 3.2.2.2 have Bridge MIB loop.  Upgrade code.
 
-device: 8603,8606,8610
-
-device: 8610co
-
-device: 8106,8110
+device: 8603,8606,8610, 8610co, 8106, 8110
 
 device: 1050,1100,1150,1200
 
@@ -726,7 +830,9 @@ note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switc
 
 device: 2270
 
+#
 # Proxim
+#
 device-vendor: Proxim
 macsuck: yes
 duplex: no
@@ -739,7 +845,15 @@ device: AP-1000,AP-2000,AP-4000
 
 device: WavePOINT-II
 
+# 
+# SonicWALL
+# 
+device-vendor: SonicWALL
+class: Layer3::SonicWALL
+
+#
 # Sun
+#
 device-vendor: Sun
 class: Layer3::Sun
 
@@ -747,11 +861,15 @@ device-family: Sun routers
 
 device: Sun routers
 
+#
 # Synoptics
+#
 device-vendor: Synoptics
 note: See Nortel
 
+#
 # Zyxel
+#
 device-vendor: Zyxel
 class: Layer2::ZyXEL_DSLAM
 note: Doesn't report sysServices (layers)

Info.pm

@@ -1,8 +1,8 @@
-# SNMP::Info - Max Baker
-# $Id$
+# SNMP::Info
 #
-# Copyright (c) 2003-2008 Max Baker
+# Copyright (c) 2003-2012 Max Baker and SNMP::Info Developers
 # All rights reserved.
+#
 # Portions Copyright (c) 2002-2003, Regents of the University of California
 # All rights reserved.
 #
@@ -23,7 +23,7 @@ use vars
     qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 =head1 NAME
 
@@ -31,15 +31,22 @@ SNMP::Info - Object Oriented Perl5 Interface to Network devices and MIBs through
 
 =head1 VERSION
 
-SNMP::Info - Version 2.00
+SNMP::Info - Version 2.11
 
 =head1 AUTHOR
 
-SNMP::Info was created at UCSC for the netdisco project (www.netdisco.org)
-and was originally written by Max Baker.
+SNMP::Info is maintained by team of Open Source authors headed by Eric Miller,
+Bill Fenner, Max Baker, Jeroen van Ingen and Oliver Gorwits.
 
-Currently being maintained by team of Open Source authors headed by
-Eric Miller and Bill Fenner. 
+Please visit L<http://sourceforge.net/projects/snmp-info/> for most up-to-date
+list of developers.
+
+SNMP::Info was originally created at UCSC for the Netdisco project L<http://netdisco.org>
+by Max Baker.
+
+=head1 DEVICES SUPPORTED
+
+See L<http://netdisco.org/doc/DeviceMatrix.html> or L<DeviceMatrix.txt> for more details.
 
 =head1 SYNOPSIS
 
@@ -107,9 +114,6 @@ Mailing List at <http://lists.sourceforge.net/lists/listinfo/snmp-info-users>.
 SNMP::Info gives an object oriented interface to information obtained through
 SNMP.
 
-This module lives at http://snmp-info.sourceforge.net  Check for newest
-version and documentation.
-
 This module is geared towards network devices.  Subclasses exist for a number
 of network devices and common MIBs. 
 
@@ -150,12 +154,9 @@ distribution.
 
 Net-SNMP can be found at http://net-snmp.sourceforge.net
 
-Version 5.1.2 or greater is recommended.
+Version 5.3.2 or greater is recommended.
 
-Various version 4's and 5.0 and 5.1 series will work. 5.0.1 is kinda flaky
-on the Perl side.
-
-Versions 5.0301 and 5.0203 have issues with bulkwalk, turn off bulkwalk.
+Versions 5.0.1, 5.0301 and 5.0203 have issues with bulkwalk and are not supported.
 
 B<Redhat Users>: Some versions that come with certain versions of
 Redhat/Fedora don't have the Perl library installed.  Uninstall the RPM and
@@ -166,9 +167,7 @@ install by hand.
 SNMP::Info operates on textual descriptors found in MIBs.
 
 If you are using SNMP::Info separate from Netdisco, 
-download the Netdisco MIB package at
-
- http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517
+download the Netdisco MIB package at L<http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517>
 
 Make sure that your snmp.conf is updated to point to your MIB directory
 and that the MIBs are world-readable.
@@ -227,6 +226,14 @@ For more info run C<perldoc> on any of the following module names.
 
 =over
 
+=item SNMP::Info::AdslLine
+
+SNMP Interface to the ADSL-LINE-MIB for ADSL interfaces.
+
+Requires the F<ADSL-LINE-MIB>, downloadable from Cisco.
+
+See documentation in L<SNMP::Info::AdslLine> for details.
+
 =item SNMP::Info::Airespace
 
 F<AIRESPACE-WIRELESS-MIB> and F<AIRESPACE-SWITCHING-MIB>.  Inherited by
@@ -267,6 +274,12 @@ F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>.
 
 See documentation in L<SNMP::Info::CiscoPortSecurity> for details.
 
+=item SNMP::Info::CiscoPower
+
+F<CISCO-POWER-ETHERNET-EXT-MIB>.
+
+See documentation in L<SNMP::Info::CiscoPower> for details.
+
 =item SNMP::Info::CiscoQOS
 
 F<CISCO-CLASS-BASED-QOS-MIB>. A collection of OIDs providing information about
@@ -287,6 +300,12 @@ F<CISCO-STACK-MIB>.
 
 See documentation in L<SNMP::Info::CiscoStack> for details.
 
+=item SNMP::Info::CiscoStpExtensions
+
+F<CISCO-STP-EXTENSIONS-MIB>
+
+See documentation in L<SNMP::Info::CiscoStpExtensions> for details.
+
 =item SNMP::Info::CiscoStats
 
 F<OLD-CISCO-CPU-MIB>, F<CISCO-PROCESS-MIB>, and F<CISCO-MEMORY-POOL-MIB>.
@@ -302,6 +321,12 @@ F<CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB>
 
 See documentation in L<SNMP::Info::CiscoVTP> for details.
 
+=item SNMP::Info::EDP
+
+Extreme Discovery Protocol.  F<EXTREME-EDP-MIB>
+
+See documentation in L<SNMP::Info::EDP> for details.
+
 =item SNMP::Info::Entity
 
 F<ENTITY-MIB>.  Used for device info in Cisco and other vendors.
@@ -310,7 +335,7 @@ See documentation in L<SNMP::Info::Entity> for details.
 
 =item SNMP::Info::EtherLike
 
-F<ETHERLIKE-MIB> (RFC1398) - Some Layer3 devices implement this MIB, as well
+F<EtherLike-MIB> (RFC1398) - Some Layer3 devices implement this MIB, as well
 as some Aironet Layer 2 devices (non Cisco).
 
 See documentation in L<SNMP::Info::EtherLike> for details.
@@ -321,6 +346,14 @@ Foundry Discovery Protocol.  F<FOUNDRY-SN-SWITCH-GROUP-MIB>
 
 See documentation in L<SNMP::Info::FDP> for details.
 
+=item SNMP::Info::IPv6
+
+SNMP Interface for obtaining configured IPv6 addresses and mapping IPv6
+addresses to MACs and interfaces, using information from F<IP-MIB>,
+F<IPV6-MIB> and/or F<CISCO-IETF-IP-MIB>.
+
+See documentation in L<SNMP::Info::IPv6> for details.
+
 =item SNMP::Info::IEEE802dot11
 
 F<IEEE802dot11-MIB>.  A collection of OIDs providing information about
@@ -348,6 +381,12 @@ F<S5-AGENT-MIB>, F<S5-CHASSIS-MIB>.
 
 See documentation in L<SNMP::Info::NortelStack> for details.
 
+=item SNMP::Info::PowerEthernet
+
+F<POWER-ETHERNET-MIB>
+
+See documentation in L<SNMP::Info::PowerEthernet> for details.
+
 =item SNMP::Info::RapidCity
 
 F<RAPID-CITY>.  Inherited by Nortel switches for duplex and VLAN information.
@@ -384,7 +423,7 @@ See documentation in L<SNMP::Info::Layer1> for details.
 
 =item SNMP::Info::Layer1::Allied
 
-Subclass for Allied Telesys Repeaters / Hubs.  
+Subclass for Allied Telesis Repeaters / Hubs.  
 
 Requires F<ATI-MIB>
 
@@ -443,16 +482,10 @@ See documentation in L<SNMP::Info::Layer2::Aironet> for details.
 
 =item SNMP::Info::Layer2::Allied
 
-Allied Telesys switches.
+Allied Telesis switches.
 
 See documentation in L<SNMP::Info::Layer2::Allied> for details.
 
-=item SNMP::Info::Layer2::Aruba
-
-Subclass for Aruba wireless switches.
-
-See documentation in L<SNMP::Info::Layer2::Aruba> for details.
-
 =item SNMP::Info::Layer2::Bay
 
 Depreciated.  Use BayStack.
@@ -466,6 +499,10 @@ and probably others.
 
 See documentation in L<SNMP::Info::Layer2::Baystack> for details.
 
+=item SNMP::Info::Layer2::Kentrox
+
+Class for Kentrox DataSMART DSU/CSU. See L<SNMP::Info::Layer2::Kentrox> for details.
+
 =item SNMP::Info::Layer2::C1900
 
 Subclass for Cisco Catalyst 1900 and 1900c Devices running CatOS.
@@ -505,12 +542,26 @@ Depreciated.  Use SNMP::Info::Layer3::Foundry.
 
 =item SNMP::Info::Layer2::HP
 
-Subclass for HP Procurve Switches
+Subclass for more recent HP Procurve Switches
 
 Requires F<HP-ICF-OID> and F<ENTITY-MIB> downloaded from HP.  
 
 See documentation in L<SNMP::Info::Layer2::HP> for details.
 
+=item SNMP::Info::Layer2::HP4000
+
+Subclass for older HP Procurve Switches
+
+Requires F<HP-ICF-OID> and F<ENTITY-MIB> downloaded from HP.  
+
+See documentation in L<SNMP::Info::Layer2::HP4000> for details.
+
+=item SNMP::Info::Layer2::HPVC
+
+Subclass for HP VirtualConnect Switches
+
+See documentation in L<SNMP::Info::Layer2::HPVC> for details.
+
 =item SNMP::Info::Layer2::N2270
 
 Subclass for Nortel 2270 wireless switches.
@@ -523,6 +574,12 @@ Subclass for Nortel 222x series wireless access points.
 
 See documentation in L<SNMP::Info::Layer2::NAP222x> for details.
 
+=item SNMP::Info::Layer2::Netgear
+
+Subclass for Netgear switches
+
+See documentation in L<SNMP::Info::Layer2::Netgear> for details.
+
 =item SNMP::Info::Layer2::Orinoco
 
 Subclass for Orinoco/Proxim wireless access points.
@@ -556,6 +613,12 @@ Note Layer2::Aironet
 
 See documentation in L<SNMP::Info::Layer3::Aironet> for details.
 
+=item SNMP::Info::Layer3::AlcatelLucent
+
+Alcatel-Lucent OmniSwitch Class.
+
+See documentation in L<SNMP::Info::Layer3::AlcatelLucent> for details.
+
 =item SNMP::Info::Layer3::AlteonAD
 
 Subclass for Nortel Alteon Series Layer 2-7 load balancing switches
@@ -563,6 +626,20 @@ and Nortel BladeCenter Layer2-3 GbE Switch Modules.
 
 See documentation in L<SNMP::Info::Layer3::AlteonAD> for details.
 
+=item SNMP::Info::Layer3::Altiga
+
+See documentation in L<SNMP::Info::Layer3::Altiga> for details.
+
+=item SNMP::Info::Layer3::Arista
+
+See documentation in L<SNMP::Info::Layer3::Arista> for details.
+
+=item SNMP::Info::Layer3::Aruba
+
+Subclass for Aruba wireless switches.
+
+See documentation in L<SNMP::Info::Layer3::Aruba> for details.
+
 =item SNMP::Info::Layer3::BayRS
 
 Subclass for Nortel Multiprotocol/BayRS routers.  This includes BCN, BLN, ASN,
@@ -570,6 +647,12 @@ ARN, AN, 2430, and 5430 routers.
 
 See documentation in L<SNMP::Info::Layer3::BayRS> for details.
 
+=item SNMP::Info::Layer3::BlueCoatSG
+
+Subclass for Blue Coat SG series proxy devices.
+
+See documentation in L<SNMP::Info::Layer3::BlueCoatSG> for details.
+
 =item SNMP::Info::Layer3::C3550
 
 Subclass for Cisco Catalyst 3550,3540,3560 2/3 switches running IOS.
@@ -595,6 +678,12 @@ This is a simple wrapper around Layer3 for IOS devices.  It adds on CiscoVTP.
 
 See documentation in L<SNMP::Info::Layer3::Cisco> for details.
 
+=item SNMP::Info::Layer3::CiscoFWSM
+
+Subclass for Cisco Firewall Services Modules.
+
+See documentation in L<SNMP::Info::Layer3::CiscoFWSM> for details.
+
 =item SNMP::Info::Layer3::Contivity
 
 Subclass for Nortel Contivity/VPN Routers.  
@@ -621,6 +710,12 @@ Subclass for Extreme Networks switches.
 
 See documentation in L<SNMP::Info::Layer3::Extreme> for details.
 
+=item SNMP::Info::Layer3::Force10
+
+Subclass for Force10 devices.
+
+See documentation in L<SNMP::Info::Layer3::Force10> for details.
+
 =item SNMP::Info::Layer3::Foundry
 
 Subclass for Foundry Network devices.
@@ -630,7 +725,7 @@ See documentation in L<SNMP::Info::Layer3::Foundry> for details.
 =item SNMP::Info::Layer3::HP9300
 
 Subclass for HP network devices which Foundry Networks was the
-Original Equipment Manufacturer (OEM) such as the HP ProCurve 9300 series.
+Original Equipment Manufacturer (OEM) such as the HP ProCurve 9300 and 6300 series.
 
 See documentation in L<SNMP::Info::Layer3::HP9300> for details.
 
@@ -646,6 +741,12 @@ Subclass for Generic Microsoft Routers running Microsoft Windows OS.
 
 See documentation in L<SNMP::Info::Layer3::Microsoft> for details.
 
+=item SNMP::Info::Layer3::Mikrotik
+
+Subclass for Mikrotik devices running RouterOS.
+
+See documentation in L<SNMP::Info::Layer3::Mikrotik> for details.
+
 =item SNMP::Info::Layer3::N1600
 
 Subclass for Nortel Ethernet Routing Switch 1600 series.
@@ -664,6 +765,18 @@ Subclass for Juniper NetScreen.
 
 See documentation in L<SNMP::Info::Layer3::Netscreen> for details.
 
+=item SNMP::Info::Layer3::Nexus
+
+Subclass for Cisco Nexus devices running NX-OS
+
+See documentation in L<SNMP::Info::Layer3::Nexus> for details.
+
+=item SNMP::Info::Layer3::PacketFront
+
+Subclass for PacketFront DRG series CPE.
+
+See documentation in L<SNMP::Info::Layer3::PacketFront> for details.
+
 =item SNMP::Info::Layer3::Passport
 
 Subclass for Nortel Ethernet Routing Switch/Passport 8000 series and Accelar
@@ -671,12 +784,61 @@ series switches.
 
 See documentation in L<SNMP::Info::Layer3::Passport> for details.
 
+=item SNMP::Info::Layer3::Pf
+
+Subclass for FreeBSD-Based Firewalls using Pf /Pf Sense
+
+See documentation in L<SNMP::Info::Layer3::Pf> for details.
+
+=item SNMP::Info::Layer3::SonicWALL
+
+Subclass for generic SonicWALL devices. See documentation in
+L<SNMP::Info::Layer3::SonicWALL> for details.
+
 =item SNMP::Info::Layer3::Sun
 
 Subclass for Generic Sun Routers running SunOS.
 
 See documentation in L<SNMP::Info::Layer3::Sun> for details.
 
+=item SNMP::Info::Layer3::Tasman
+
+Subclass for Avaya Secure Routers.
+
+See documentation in L<SNMP::Info::Layer3::Tasman> for details.
+
+=item SNMP::Info::Layer3::Timetra
+
+Alcatel-Lucent SR Class.
+
+See documentation in L<SNMP::Info::Layer3::Timetra> for details.
+
+=back
+
+=back
+
+=over 4
+
+=item SNMP::Info::Layer7
+
+Generic Layer7 Devices.
+
+See documentation in L<SNMP::Info::Layer7> for details.
+
+=over 4
+
+=item SNMP::Info::Layer7::APC
+
+SNMP Interface to APC UPS devices
+
+See documentation in L<SNMP::Info::Layer7::APC> for details.
+
+=item SNMP::Info::Layer7::Neoteris
+
+SNMP Interface to Juniper SSL VPN appliances
+
+See documentation in L<SNMP::Info::Layer7::Neoteris> for details.
+
 =back
 
 =back
@@ -722,14 +884,14 @@ SNMP::Info Specific Arguments :
 
 Returns an object of a more specific device class
 
-(default on)
+(default 0, which means "off")
 
 =item BigInt
 
 Return Math::BigInt objects for 64 bit counters.  Sets on a global scope,
 not object.
 
-(default off)
+(default 0, which means "off")
 
 =item BulkWalk
 
@@ -737,7 +899,7 @@ Set to C<0> to turn off BULKWALK commands for SNMPv2 connections.
 
 Note that BULKWALK is turned off for Net-SNMP versions 5.1.x because of a bug.
 
-(default on)
+(default 1, which means "on")
 
 =item BulkRepeaters
 
@@ -755,14 +917,14 @@ operation, Net-SNMP's internal bulkwalk function must detect the loop.
 
 Set to C<0> to turn off loop detection.
 
-(default on)
+(default 1, which measn "on")
 
 =item Debug
 
 Prints Lots of debugging messages.
 Pass 2 to print even more debugging messages.
 
-(default off)
+(default 0, which means "off")
 
 =item DebugSNMP
 
@@ -784,7 +946,7 @@ such variable in this MIB".  Set to false if so desired.  This feature lets
 you read SNMPv2 data from an SNMP version 1 connection, and should probably
 be left on.
 
-(default true)
+(default 1, which means "on")
 
 =item Session
 
@@ -1097,71 +1259,8 @@ SNMP::Info::Layer3 subclasses.
 If the device still can be connected to via SNMP::Info, then 
 SNMP::Info is returned.  
 
-Algorithm for Subclass Detection:
-
-        Layer3 Support                     -> SNMP::Info::Layer3
-            Aironet (BR500,AP340,350,1200) -> SNMP::Info::Layer3::Aironet
-                     AP4800... All Non IOS
-            Alcatel-Lucent OmniSwitch      -> SNMP::Info::Layer3::AlcatelLucent
-            Alcatel-Lucent Service Router  -> SNMP::Info::Layer3::Timetra
-            Catalyst 3550,3548,3560        -> SNMP::Info::Layer3::C3550
-            Catalyst 4000,4500             -> SNMP::Info::Layer3::C4000
-            Catalyst 6500,3750             -> SNMP::Info::Layer3::C6500
-            Cisco Generic L3 IOS device    -> SNMP::Info::Layer3::Cisco
-            Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-            Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-            D-Link                         -> SNMP::Info::Layer3::Dell
-            Enterasys                      -> SNMP::Info::Layer3::Enterasys
-            Extreme                        -> SNMP::Info::Layer3::Extreme
-            Foundry                        -> SNMP::Info::Layer3::Foundry
-            HP Procurve                    -> SNMP::Info::Layer2::HP
-            HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-            Juniper                        -> SNMP::Info::Layer3::Juniper
-            Microsoft                      -> SNMP::Info::Layer3::Microsoft
-            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
-            Nortel Contivity               -> SNMP::Info::Layer3::Contivity
-            Nortel BayRS Router            -> SNMP::Info::Layer3::BayRS
-            Sun Router                     -> SNMP::Info::Layer3::Sun
-         Elsif Layer2 (no Layer3)          -> SNMP::Info::Layer2
-            Aironet - IOS Devices          -> SNMP::Info::Layer2::Aironet
-            Catalyst 1900                  -> SNMP::Info::Layer2::C1900
-            Catalyst 2900XL,2940,2950,
-                     3500XL                -> SNMP::Info::Layer2::C2900
-            Catalyst 2960, 2970            -> SNMP::Info::Layer3::C6500
-            Catalyst 3550/3548             -> SNMP::Info::Layer3::C3550
-            Cisco 3400 w/ MetroBase        -> SNMP::Info::Layer3::C3550
-            Catalyst WS-C 2926,5xxx        -> SNMP::Info::Layer2::Catalyst
-            Cisco (Airespace) Wireless     -> SNMP::Info::Layer2::Airespace
-            Cisco (not covered by above)   -> SNMP::Info::Layer2::Cisco
-            Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-            Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-            D-Link                         -> SNMP::Info::Layer3::Dell
-            Enterasys                      -> SNMP::Info::Layer3::Enterasys
-            Extreme                        -> SNMP::Info::Layer3::Extreme
-            Foundry                        -> SNMP::Info::Layer3::Foundry
-            HP Procurve                    -> SNMP::Info::Layer2::HP
-            HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-            IBM BladeCenter GbESM          -> SNMP::Info::Layer3::Dell
-            Nortel/Bay Centillion ATM      -> SNMP::Info::Layer2::Centillion
-            Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-            Nortel Business Ethernet Switch-> SNMP::Info::Layer2::Baystack
-            Nortel Passport/Accelar 8100   -> SNMP::Info::Layer3::Passport
-            Nortel AP 222x                 -> SNMP::Info::Layer2::NAP222x
-            Orinco AP                      -> SNMP::Info::Layer2::Orinoco
-            Nortel 2270 WSS                -> SNMP::Info::Layer2::N2270
-        Elsif Layer1 Support               -> SNMP::Info::Layer1
-            Allied                         -> SNMP::Info::Layer1::Allied
-            Asante                         -> SNMP::Info::Layer1::Asante
-            Nortel/Bay Hub                 -> SNMP::Info::Layer1::Bayhub
-            Bay/Synoptics Hub              -> SNMP::Info::Layer1::S3000
-        Else                               -> SNMP::Info
-            ZyXEL_DSLAM                    -> SNMP::Info::Layer2::ZyXEL_DSLAM
-            Aruba wireless                 -> SNMP::Info::Layer2::Aruba
-            Alcatel OmniAccess             -> SNMP::Info::Layer2::Aruba
-            Juniper NetScreen              -> SNMP::Info::Layer3::Netscreen
+See L<http://netdisco.org/doc/DeviceMatrix.html> or L<DeviceMatrix.txt> for more details
+about device support, or view C<device_type()> in F<Info.pm>.
 
 =cut
 
@@ -1170,18 +1269,23 @@ sub device_type {
 
     my $objtype = "SNMP::Info";
 
-    my $layers = $info->layers();
-
-    # if we dont have sysServices, we dont have anything else either probably.
-    return unless ( defined $layers and length($layers) );
+    my $layers = $info->layers() || '00000000';
 
     my $desc = $info->description() || 'undef';
     $desc =~ s/[\r\n\l]+/ /g;
-    my $id = $info->id() || 'undef';
 
-    $info->debug()
-        and print
-        "SNMP::Info::device_type() layers:$layers id:$id sysDescr:\"$desc\"\n";
+    # Some devices don't implement sysServices, but do return a description. 
+    # In that case, log a warning and continue.
+    if ( $layers eq '00000000' ) {
+        if ($desc ne 'undef') {
+            carp("Device doesn't implement sysServices but did return sysDescr. Might give unexpected results.\n") if $info->debug();
+        } else {
+            # No sysServices, no sysDescr 
+            return;
+        }
+    }
+
+    my $id = $info->id() || 'undef';
 
     # Hash for generic fallback to a device class if unable to determine using
     # the sysDescr regex.
@@ -1199,10 +1303,18 @@ sub device_type {
         2272 => 'SNMP::Info::Layer3::Passport',
         2636 => 'SNMP::Info::Layer3::Juniper',
         2925 => 'SNMP::Info::Layer1::Cyclades',
+        3076 => 'SNMP::Info::Layer3::Altiga',
+        3417 => 'SNMP::Info::Layer3::BlueCoatSG',
+        4526 => 'SNMP::Info::Layer2::Netgear',
         5624 => 'SNMP::Info::Layer3::Enterasys',
+        6027 => 'SNMP::Info::Layer3::Force10',
         6486 => 'SNMP::Info::Layer3::AlcatelLucent',
         6527 => 'SNMP::Info::Layer3::Timetra',
         8072 => 'SNMP::Info::Layer3::NetSNMP',
+        9303 => 'SNMP::Info::Layer3::PacketFront',
+        12325 => 'SNMP::Info::Layer3::Pf',
+        14988 => 'SNMP::Info::Layer3::Mikrotik',
+        30065 => 'SNMP::Info::Layer3::Arista',
     );
 
     my %l2sysoidmap = (
@@ -1217,13 +1329,24 @@ sub device_type {
         2925  => 'SNMP::Info::Layer1::Cyclades',
         4526  => 'SNMP::Info::Layer2::Netgear',
         5624  => 'SNMP::Info::Layer3::Enterasys',
+        11898 => 'SNMP::Info::Layer2::Orinoco',
         14179 => 'SNMP::Info::Layer2::Airespace',
-        14823 => 'SNMP::Info::Layer2::Aruba',
+        14823 => 'SNMP::Info::Layer3::Aruba',
+    );
+
+    my %l7sysoidmap = (
+        318   => 'SNMP::Info::Layer7::APC',
+        12532 => 'SNMP::Info::Layer7::Neoteris',
     );
 
     # Get just the enterprise number for generic mapping
     $id = $1 if ( defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/ );
 
+    if ($info->debug()) {
+        print "SNMP::Info $VERSION\n";
+        print "SNMP::Info::device_type() layers:$layers id:$id sysDescr:\"$desc\"\n";
+    }
+
     # Layer 3 Supported
     #   (usually has layer2 as well, so we check for 3 first)
     if ( $info->has_layer(3) ) {
@@ -1243,13 +1366,37 @@ sub device_type {
             and $desc =~ /\D(CAP340|AP340|CAP350|350|1200)\D/ );
         $objtype = 'SNMP::Info::Layer3::Aironet'
             if ( $desc =~ /Aironet/ and $desc =~ /\D(AP4800)\D/ );
+
+	# Cat6k with older SUPs (hybrid CatOS/IOS?)
         $objtype = 'SNMP::Info::Layer3::C6500' if $desc =~ /(c6sup2|c6sup1)/;
 
+	# Cat6k with Sup720, Sup720 or Sup2T (and Sup2 running native IOS?)
+        $objtype = 'SNMP::Info::Layer3::C6500'
+            if $desc =~ /(s72033_rp|s3223_rp|s32p3_rp|s222_rp|s2t54)/;
+
         # Next one untested. Reported working by DA
         $objtype = 'SNMP::Info::Layer3::C6500'
             if ( $desc =~ /cisco/i and $desc =~ /3750/ );
+
+        #   Cisco 2970
         $objtype = 'SNMP::Info::Layer3::C6500'
-            if $desc =~ /(s72033_rp|s3223_rp|s222_rp)/;
+            if ( $desc =~ /(C2970|C2960)/ );
+
+        #   Cisco 3400 w/ Layer3 capable image
+        $objtype = 'SNMP::Info::Layer3::C3550'
+            if ( $desc =~ /(ME340x)/ );
+
+        # Various Cisco blade switches, CBS30x0 and CBS31x0 models
+        $objtype = 'SNMP::Info::Layer3::C6500'
+            if ( $desc =~ /cisco/i and $desc =~ /CBS3[0-9A-Za-z]{3}/ );
+
+        # Cisco Nexus running NX-OS
+        $objtype = 'SNMP::Info::Layer3::Nexus'
+            if ( $desc =~ /^Cisco\s+NX-OS/ );
+
+        # HP, older ProCurve models (1600, 2400, 2424m, 4000, 8000)
+        $objtype = 'SNMP::Info::Layer2::HP4000'
+            if $desc =~ /\b(J4093A|J4110A|J4120A|J4121A|J4122A|J4122B)\b/;
 
         # HP, Foundry OEM
         $objtype = 'SNMP::Info::Layer3::HP9300'
@@ -1269,12 +1416,27 @@ sub device_type {
             if $desc =~ /Alteon\s[1A][8D]/;
 
         # Nortel Contivity
-        $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /\bCES\b/;
+        $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /(\bCES\b|\bNVR\sV\d)/;
 
-    # Allied Telesyn Layer2 managed switches. They report they have L3 support
+        # SonicWALL
+        $objtype = 'SNMP::Info::Layer3::SonicWALL' if $desc =~ /SonicWALL/i;
+
+        # Allied Telesis Layer2 managed switches. They report they have L3 support
         $objtype = 'SNMP::Info::Layer2::Allied'
             if ( $desc =~ /Allied.*AT-80\d{2}\S*/i );
 
+        # Cisco FWSM
+        $objtype = 'SNMP::Info::Layer3::CiscoFWSM'
+            if ( $desc =~ /Cisco Firewall Services Module/i );
+        
+        # Avaya Secure Router
+        $objtype = 'SNMP::Info::Layer3::Tasman'
+            if ( $desc =~ /^(avaya|nortel)\s+(SR|secure\srouter)\s+\d{4}/i );
+
+        # HP VirtualConnect blade switches
+        $objtype = 'SNMP::Info::Layer2::HPVC'
+            if ( $desc =~ /HP\sVC\s/ );
+
         # Generic device classification based upon sysObjectID
         if (    ( $objtype eq 'SNMP::Info::Layer3' )
             and ( defined($id) )
@@ -1298,7 +1460,7 @@ sub device_type {
 
         #   Catalyst 2900 and 3500XL (IOS) series override
         $objtype = 'SNMP::Info::Layer2::C2900'
-            if ( $desc =~ /(C2900XL|C2950|C3500XL|C2940|CGESM)/i );
+            if ( $desc =~ /(C2900XL|C2950|C3500XL|C2940|CGESM|CIGESM)/i );
 
         #   Catalyst WS-C series override 2926,4k,5k,6k in Hybrid
         $objtype = 'SNMP::Info::Layer2::Catalyst' if ( $desc =~ /WS-C\d{4}/ );
@@ -1308,10 +1470,18 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::C3550'
             if ( $desc =~ /(C3550|ME340x)/ );
 
+        # Cisco blade switches, CBS30x0 and CBS31x0 models with L2 only
+        $objtype = 'SNMP::Info::Layer3::C6500'
+            if ( $desc =~ /cisco/i and $desc =~ /CBS3[0-9A-Za-z]{3}/ );
+
         #   Cisco 2970
         $objtype = 'SNMP::Info::Layer3::C6500'
             if ( $desc =~ /(C2970|C2960)/ );
 
+        # HP, older ProCurve models (1600, 2400, 2424m, 4000, 8000)
+        $objtype = 'SNMP::Info::Layer2::HP4000'
+            if $desc =~ /\b(J4093A|J4110A|J4120A|J4121A|J4122A|J4122B)\b/;
+
         # HP, Foundry OEM
         $objtype = 'SNMP::Info::Layer3::HP9300'
             if $desc =~ /\b(J4874A|J4138A|J4139A|J4840A|J4841A)\b/;
@@ -1320,10 +1490,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::Dell'
             if ( $desc =~ /^IBM Gigabit Ethernet Switch Module$/ );
 
-        # Linksys 2048
+        # Linksys 2024/2048
         $objtype = 'SNMP::Info::Layer3::Dell'
             if (
-            $desc =~ /^48-Port 10\/100\/1000 Gigabit Switch with WebView$/ );
+            $desc =~ /^(24|48)-Port 10\/100\/1000 Gigabit Switch (with |w\/)WebView$/ );
 
         #  Centillion ATM
         $objtype = 'SNMP::Info::Layer2::Centillion' if ( $desc =~ /MCP/ );
@@ -1338,6 +1508,10 @@ sub device_type {
             =~ /^(BayStack|Ethernet\s+(Routing\s+)??Switch)\s[2345](\d){2,3}/i
             );
 
+        # Kentrox DataSMART DSU/CSU
+        $objtype = 'SNMP::Info::Layer2::Kentrox'
+            if ( $desc =~ /^DataSMART/i );
+
         #  Nortel Business Ethernet Switch
         $objtype = 'SNMP::Info::Layer2::Baystack'
             if ( $desc =~ /^Business Ethernet Switch\s[12]\d\d/i );
@@ -1346,7 +1520,7 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::NAP222x'
             if ( $desc =~ /Access\s+Point\s+222/ );
 
-        #  Orinco
+        #  Orinoco
         $objtype = 'SNMP::Info::Layer2::Orinoco'
             if ( $desc =~ /(AP-\d{3}|WavePOINT)/ );
 
@@ -1359,11 +1533,19 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::Aironet'
             if ( $desc =~ /Cisco/ and $desc =~ /\D(BR500)\D/ );
 
+        # Airespace (WLC) Module
+        $objtype = 'SNMP::Info::Layer2::Airespace'
+            if ( $desc =~ /Cisco Controller/ );
+
         #Nortel 2270
         $objtype = 'SNMP::Info::Layer2::N2270'
             if (
             $desc =~ /Nortel\s+(Networks\s+)??WLAN\s+-\s+Security\s+Switch/ );
 
+        # HP VirtualConnect blade switches
+        $objtype = 'SNMP::Info::Layer2::HPVC'
+            if ( $desc =~ /HP\sVC\s/ );
+
         # Generic device classification based upon sysObjectID
         if (    ( $objtype eq 'SNMP::Info::Layer2' )
             and ( defined($id) )
@@ -1386,8 +1568,8 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer1::Bayhub'
             if ( $desc =~ /\bBay\s*Stack.*Hub/i );
 
-#  Synoptics Hub
-#  This will override Bay Hub only for specific devices supported by this class
+        #  Synoptics Hub
+        #  This will override Bay Hub only for specific devices supported by this class
         $objtype = 'SNMP::Info::Layer1::S3000'
             if ( $desc =~ /\bNMM\s+(281|3000|3030)/i );
 
@@ -1398,16 +1580,16 @@ sub device_type {
             if ( $desc =~ /8-port .DSL Module\(Annex .\)/i );
 
         # Aruba wireless switches
-        $objtype = 'SNMP::Info::Layer2::Aruba'
+        $objtype = 'SNMP::Info::Layer3::Aruba'
             if ( $desc =~ /(ArubaOS|AirOS)/ );
 
         # Alcatel-Lucent branded Aruba
-        $objtype = 'SNMP::Info::Layer2::Aruba'
+        $objtype = 'SNMP::Info::Layer3::Aruba'
             if ( $desc =~ /^AOS-W/ );
 
         #Juniper NetScreen
         $objtype = 'SNMP::Info::Layer3::Netscreen'
-            if ( $desc =~ /NetScreen/i );
+            if ( $desc =~ /NetScreen|SSG/i );
 
         # Cisco PIX
         $objtype = 'SNMP::Info::Layer3::Cisco'
@@ -1416,6 +1598,23 @@ sub device_type {
         # Cisco ASA
         $objtype = 'SNMP::Info::Layer3::Cisco'
             if ( $desc =~ /Cisco Adaptive Security Appliance/i );
+
+        # HP VirtualConnect blade switches
+        $objtype = 'SNMP::Info::Layer2::HPVC'
+            if ( $desc =~ /HP\sVC\s/ );
+
+        # Generic device classification based upon sysObjectID
+        if ( defined($id) and $objtype eq 'SNMP::Info') {
+            if ( defined $l3sysoidmap{$id} ) {
+                $objtype = $l3sysoidmap{$id};
+            } elsif ( defined $l2sysoidmap{$id}) {
+                $objtype = $l2sysoidmap{$id};
+            } elsif ( defined $l7sysoidmap{$id}) {
+                $objtype = $l7sysoidmap{$id};
+            } elsif ($info->has_layer(7)) {
+                $objtype = 'SNMP::Info::Layer7'
+            }
+        }
     }
 
     return $objtype;
@@ -1729,6 +1928,11 @@ sub i_speed_raw {
     my $info    = shift;
     my $partial = shift;
 
+    # remove the speed formating
+    my $munge_i_speed = delete $info->{munge}{i_speed};
+    # also for highspeed interfaces e.g. TenGigabitEthernet
+    my $munge_i_speed_high = delete $info->{munge}{i_speed_high};
+
     my $i_speed_raw = $info->orig_i_speed($partial);
 
     my $i_speed_high = undef;
@@ -1740,6 +1944,11 @@ sub i_speed_raw {
                 if ( $i_speed_high->{$i} );
         }
     }
+
+    # restore the speed formating
+    $info->{munge}{i_speed} = $munge_i_speed;
+    $info->{munge}{i_speed_high} = $munge_i_speed_high;
+
     return $i_speed_raw;
 }
 
@@ -2199,6 +2408,9 @@ ALTEON-TS-PHYSICAL-MIB::agPortCurCfgPortName.
     'i_qlen_out'        => 'ifOutQLen',
     'i_specific'        => 'ifSpecific',
 
+    # IF-MIB::IfStackTable
+    'i_stack_status'    => 'ifStackStatus',
+
     # IP Address Table
     'ip_index'     => 'ipAdEntIfIndex',
     'ip_table'     => 'ipAdEntAddr',
@@ -2485,6 +2697,11 @@ Makes human friendly speed ratings using %SPEED_MAP
                 '2488000000' => 'OC-48',
              )
 
+Note: high speed interfaces (usually 1 Gbps or faster) have their link 
+speed in C<ifHighSpeed>. i_speed() automatically determines whether to use 
+C<ifSpeed> or C<ifHighSpeed>; if the latter is used, the value is munged by 
+munge_highspeed(). SNMP::Info can return speeds up to terabit levels this way.
+
 =cut
 
 %SPEED_MAP = (
@@ -2678,10 +2895,9 @@ sub munge_counter64 {
 
 =item munge_i_up
 
-There is a collision between data in C<IF-MIB> and C<RFC-1213>. 
-For devices that fully implement C<IF-MIB> it might return 7 for 
-a port that is down.  This munges the data against the C<IF-MIB> 
-by hand.
+Net-SNMP tends to load C<RFC1213-MIB> first, and so ignores the
+updated enumeration for C<ifOperStatus> in C<IF-MIB>.  This munge
+handles the "newer" definitions for the enumeration in IF-MIB.
 
 TODO: Get the precedence of MIBs and overriding of MIB data in Net-SNMP
 figured out.  Heirarchy/precendence of MIBS in SNMP::Info.
@@ -2692,9 +2908,11 @@ sub munge_i_up {
     my $i_up = shift;
     return unless defined $i_up;
 
-    $i_up = 'down' if $i_up eq '7';
-
-    return $i_up;
+    my %ifOperStatusMap = ( '4' => 'unknown',
+                            '5' => 'dormant',
+                            '6' => 'notPresent',
+                            '7' => 'lowerLayerDown' );
+    return $ifOperStatusMap{$i_up} || $i_up;
 }
 
 =item munge_port_list
@@ -3647,11 +3865,11 @@ sub AUTOLOAD {
     # Load data if it both not cached and we are not requesting partial info.
     if ( defined $funcs{$attr} ) {
         return $self->_load_attr( $attr, $funcs{$attr}, @_ )
-            unless ( defined $self->{"_${attr}"} and !scalar(@_) );
+            unless ( defined $self->{"_${attr}"} and !defined $_[0] );
     }
     if ($table_leaf) {
         return $self->_load_attr( $attr, $attr, @_ )
-            unless ( defined $self->{"_${attr}"} and !scalar(@_) );
+            unless ( defined $self->{"_${attr}"} and !defined $_[0] );
     }
 
     return $self->_show_attr($attr);
@@ -3661,7 +3879,8 @@ sub AUTOLOAD {
 =head1 COPYRIGHT AND LICENSE
 
 Changes from SNMP::Info Version 0.7 and on are:
-Copyright (c) 2003-2008 Max Baker - All rights reserved.
+Copyright (c) 2003-2010 Max Baker and SNMP::Info Developers
+All rights reserved.
 
 Original Code is:
 Copyright (c) 2002-2003, Regents of the University of California

Info/AdslLine.pm

@@ -0,0 +1,172 @@
+# SNMP::Info::AdslLine
+#
+# Copyright (c) 2009 Alexander Hartmaier
+# All rights reserved.
+#
+# 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::AdslLine;
+
+use strict;
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::AdslLine::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::AdslLine::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );
+
+%GLOBALS = ();
+
+%FUNCS = (
+    # ADSL-LINE-MIB::adslAtucChanTable
+    'adsl_atuc_interleave_delay'    => 'adslAtucChanInterleaveDelay',
+    'adsl_atuc_curr_tx_rate'        => 'adslAtucChanCurrTxRate',
+    'adsl_atuc_prev_tx_rate'        => 'adslAtucChanPrevTxRate',
+    'adsl_atuc_crc_block_len'       => 'adslAtucChanCrcBlockLength',
+    
+    # ADSL-LINE-MIB::adslAturChanTable
+    'adsl_atur_interleave_delay'    => 'adslAturChanInterleaveDelay',
+    'adsl_atur_curr_tx_rate'        => 'adslAturChanCurrTxRate',
+    'adsl_atur_prev_tx_rate'        => 'adslAturChanPrevTxRate',
+    'adsl_atur_crc_block_len'       => 'adslAturChanCrcBlockLength',
+);
+
+%MUNGE = ();
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::AdslLine - SNMP Interface to the ADSL-LINE-MIB
+
+=head1 AUTHOR
+
+Alexander Hartmaier
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $info = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $info->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::AdslLine is a subclass of SNMP::Info that provides 
+information about the adsl interfaces of a device.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item F<ADSL-LINE-MIB>
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBALS
+
+=over
+
+=item none
+
+=back
+
+=head1 TABLE METHODS
+
+=head2 ATUC channel table (C<adslAtucChanTable>)
+
+This table provides one row for each ATUC channel.
+ADSL channel interfaces are those ifEntries where ifType
+is equal to adslInterleave(124) or adslFast(125).
+
+=over
+
+=item $info->adsl_atuc_interleave_delay()
+
+(C<adslAtucChanInterleaveDelay>)
+
+=item $info->adsl_atuc_curr_tx_rate()
+
+(C<adslAtucChanCurrTxRate>)
+
+=item $info->adsl_atuc_prev_tx_rate()
+
+(C<adslAtucChanPrevTxRate>)
+
+=item $info->adsl_atuc_crc_block_len()
+
+(C<adslAtucChanCrcBlockLength>)
+
+=back
+
+=head2 ATUR channel table (C<adslAturChanTable>)
+
+This table provides one row for each ATUR channel.
+ADSL channel interfaces are those ifEntries where ifType
+is equal to adslInterleave(124) or adslFast(125).
+
+=over
+
+=item $info->adsl_atur_interleave_delay()
+
+(C<adslAturChanInterleaveDelay>)
+
+=item $info->adsl_atur_curr_tx_rate()
+
+(C<adslAturChanCurrTxRate>)
+
+=item $info->adsl_atur_prev_tx_rate()
+
+(C<adslAturChanPrevTxRate>)
+
+=item $info->adsl_atur_crc_block_len()
+
+(C<adslAturChanCrcBlockLength>)
+
+=back
+
+=cut

Info/Airespace.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,
@@ -83,18 +83,20 @@ $VERSION = '2.00';
     'airespace_ess_qos'       => 'bsnDot11EssQualityOfService',
     'airespace_ess_ifname'    => 'bsnDot11EssInterfaceName',
     'airespace_ess_aclname'   => 'bsnDot11EssAclName',
-
+    'airespace_ess_bcast'     => 'bsnDot11EssBroadcastSsid',
+    
     # AIRESPACE-WIRELESS-MIB::bsnAPTable
-    'airespace_ap_mac'    => 'bsnAPDot3MacAddress',
-    'airespace_ap_name'   => 'bsnAPName',
-    'airespace_ap_ip'     => 'bsnApIpAddress',
-    'airespace_ap_loc'    => 'bsnAPLocation',
-    'airespace_ap_sw'     => 'bsnAPSoftwareVersion',
-    'airespace_ap_fw'     => 'bsnAPBootVersion',
-    'airespace_ap_model'  => 'bsnAPModel',
-    'airespace_ap_serial' => 'bsnAPSerialNumber',
-    'airespace_ap_type'   => 'bsnAPType',
-    'airespace_ap_status' => 'bsnAPAdminStatus',
+    'airespace_ap_mac'      => 'bsnAPDot3MacAddress',
+    'airespace_ap_name'     => 'bsnAPName',
+    'airespace_ap_ip'       => 'bsnApIpAddress',
+    'airespace_ap_loc'      => 'bsnAPLocation',
+    'airespace_ap_sw'       => 'bsnAPSoftwareVersion',
+    'airespace_ap_fw'       => 'bsnAPBootVersion',
+    'airespace_ap_model'    => 'bsnAPModel',
+    'airespace_ap_serial'   => 'bsnAPSerialNumber',
+    'airespace_ap_type'     => 'bsnAPType',
+    'airespace_ap_status'   => 'bsnAPAdminStatus',
+    'airespace_ap_ethermac' => 'bsnAPEthernetMacAddress',
 
     # AIRESPACE-WIRELESS-MIB::bsnAPIfTable
     'airespace_apif_slot'   => 'bsnAPIfSlotId',
@@ -104,6 +106,7 @@ $VERSION = '2.00';
     'airespace_apif'        => 'bsnAPIfOperStatus',
     'airespace_apif_oride'  => 'bsnAPIfWlanOverride',
     'airespace_apif_admin'  => 'bsnAPIfAdminStatus',
+    'airespace_apif_a_pwr'  => 'bsnAPIfAbsolutePowerList',
 
     # AIRESPACE-WIRELESS-MIB::bsnMobileStationTable
     'airespace_sta_mac'     => 'bsnMobileStationAPMacAddr',
@@ -112,6 +115,7 @@ $VERSION = '2.00';
     'airespace_sta_ess_idx' => 'bsnMobileStationEssIndex',
     'airespace_sta_ssid'    => 'bsnMobileStationSsid',
     'airespace_sta_delete'  => 'bsnMobileStationDeleteAction',
+    'airespace_sta_ip'      => 'bsnMobileStationIpAddress',
 
     # AIRESPACE-WIRELESS-MIB::bsnUsersTable
     'airespace_user_name'    => 'bsnUserName',
@@ -148,15 +152,16 @@ $VERSION = '2.00';
 
 %MUNGE = (
     %SNMP::Info::MUNGE,
-    'airespace_ap_mac'  => \&SNMP::Info::munge_mac,
-    'fw_port'           => \&SNMP::Info::munge_mac,
-    'airespace_bl_mac'  => \&SNMP::Info::munge_mac,
-    'airespace_if_mac'  => \&SNMP::Info::munge_mac,
-    'airespace_sta_mac' => \&SNMP::Info::munge_mac,
+    'airespace_ap_mac'      => \&SNMP::Info::munge_mac,
+    'airespace_ap_ethermac' => \&SNMP::Info::munge_mac,
+    'fw_port'               => \&SNMP::Info::munge_mac,
+    'airespace_bl_mac'      => \&SNMP::Info::munge_mac,
+    'airespace_if_mac'      => \&SNMP::Info::munge_mac,
+    'airespace_sta_mac'     => \&SNMP::Info::munge_mac,
 );
 
 sub layers {
-    return '00000011';
+    return '00000111';
 }
 
 sub serial {
@@ -416,11 +421,12 @@ sub i_mac {
             next unless defined $mac;
             $i_mac{$iid} = $mac;
         }
-
-        # Don't grab AP MACs - we want the AP to show up on edge switch
-        # ports
+        elsif ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            $index =~ s/\.\d+$//;
+            next unless defined $index;
+            $i_mac{$iid} = $index;
+        }
         # Some switch interfaces have MACs, virtuals report 00:00:00:00:00:00
-
         else {
             my $mac = $if_mac->{$iid};
             next unless defined $mac;
@@ -628,20 +634,86 @@ sub i_ssidbcast {
     my $airespace = shift;
     my $partial   = shift;
 
-    my $ssidlist = $airespace->i_ssidlist($partial)   || {};
-    my $bc_mode  = $airespace->airespace_bssid_mode() || 'enable';
+    my $ssidlist    = $airespace->i_ssidlist($partial)   || {};
+    my $bc_mode     = $airespace->airespace_bssid_mode() || 'enable';
+    my $ess_bc_mode = $airespace->airespace_ess_bcast()  || {};
+    my $ssids       = $airespace->airespace_ess_ssid()   || {};
+    my %ssid_index  = reverse %$ssids;
 
     my %bcmap     = qw/enable 1 disable 0/;
     my $broadcast = $bcmap{$bc_mode};
 
     my %i_ssidbcast;
     foreach my $iid ( keys %$ssidlist ) {
-        $i_ssidbcast{$iid} = $broadcast;
+        if (!$broadcast) {
+            $i_ssidbcast{$iid} = $broadcast;
+            next;
+        }
+        else {
+            my $ssid     = $ssidlist->{$iid};
+            my $ssid_idx = $ssid_index{$ssid};
+            my $bc       = $ess_bc_mode->{$ssid_idx};
+            $i_ssidbcast{$iid} = $bcmap{$bc};
+        }
     }
 
     return \%i_ssidbcast;
 }
 
+# Secret decoder ring for BSSID: https://supportforums.cisco.com/docs/DOC-2935
+# We need radio base MAC, SSID index, radio band, and whether AP is
+# VxWorks or IOS based then we can do the arithmetic
+
+sub i_ssidmac {
+    my $airespace = shift;
+    my $partial   = shift;
+
+    my $ssidlist  = $airespace->i_ssidlist($partial)  || {};
+    my $apif_type = $airespace->airespace_apif_type() || {};
+    my $ap_ios    = $airespace->bsnAPIOSVersion()     || {};
+
+    my %i_ssidmac;
+    foreach my $oid ( keys %$ssidlist ) {
+
+        my @parts    = split( /\./, $oid );
+        my $ssid_idx = pop (@parts);
+        my $slot     = pop (@parts);
+        my $last     = pop (@parts);
+
+        my $iid = $oid;
+        # Get radio band
+        $iid =~ s/\.\d+$//;
+        my $ap_type = $apif_type->{$iid};
+        # Determine if IOS based
+        $iid =~ s/\.\d+$//;
+        my $ios = $ap_ios->{$iid} || '';
+        
+        # Four cases:
+        # IOS and 2.4Ghz count up, starts at zero
+        if ($ios and $ap_type =~ /b$/) {
+            $last = $last + ($ssid_idx - 1);
+        }
+        # IOS and 5Ghz - count down from maximum of 16
+        elsif ($ios and $ap_type =~ /a$/) {
+            $last = $last + (16 - $ssid_idx);
+        }
+        # VxWorks and 5Ghz - count up, starts at zero
+        elsif ($ios and $ap_type =~ /a$/) {
+            $last = $last + ($ssid_idx - 1);
+        }
+        # VxWorks and 2.4Ghz - count down from maximum of 16
+        else {
+            $last = $last + (16 - $ssid_idx);
+        }
+        
+       push (@parts, $last);
+       my $bssid = join( ':', map { sprintf( "%02x", $_ ) } @parts );
+       $i_ssidmac{$oid} = $bssid;
+    }
+
+   return \%i_ssidmac;
+}
+
 sub i_80211channel {
     my $airespace = shift;
     my $partial   = shift;
@@ -658,6 +730,28 @@ sub i_80211channel {
     return \%i_80211channel;
 }
 
+sub dot11_cur_tx_pwr_mw {
+    my $airespace = shift;
+    my $partial   = shift;
+    my $cur       = $airespace->airespace_apif_power($partial);
+    my $pwr_abs   = $airespace->airespace_apif_a_pwr($partial);
+    
+    my $dot11_cur_tx_pwr_mw = {};
+    foreach my $idx ( keys %$cur ) {
+        my $pwr = $cur->{$idx};
+        if ( $pwr >= 1 && $pwr <= 8 ) {
+
+            my @pwr_list = split(/,/, $pwr_abs->{$idx} ); 
+            $dot11_cur_tx_pwr_mw->{$idx} = $pwr_list[$pwr-1]; 
+
+        }
+        else {
+            next;
+        }
+    }
+    return $dot11_cur_tx_pwr_mw;
+}
+
 # Pseudo ENTITY-MIB methods
 
 sub e_index {
@@ -896,6 +990,47 @@ sub e_parent {
     return \%e_parent;
 }
 
+# arpnip:
+#
+# This is the controller snooping on the MAC->IP mappings.
+# Pretending this is arpnip data allows us to get MAC->IP
+# mappings even for stations that only communicate locally.
+# Also use the controller's knowledge of the APs' MAC and
+# IP addresses to augment the data.
+
+sub at_paddr {
+    my $airespace = shift;
+    my $mac2ip = $airespace->airespace_sta_ip();
+    my $apethermac = $airespace->airespace_ap_ethermac();
+
+    my $ret = {};
+    foreach my $idx ( keys %$mac2ip ) {
+	next if ( $mac2ip->{ $idx } eq '0.0.0.0' );
+	my $mac = join( ":", map { sprintf "%02x", $_ } split /\./, $idx );
+	$ret->{$idx} = $mac;
+    }
+    foreach my $idx ( keys %$apethermac ) {
+	$ret->{$idx} = $apethermac->{$idx};
+    }
+    return $ret;
+}
+
+sub at_netaddr {
+    my $airespace = shift;
+    my $mac2ip = $airespace->airespace_sta_ip();
+    my $ap2ip = $airespace->airespace_ap_ip();
+
+    my $ret = {};
+    foreach my $idx ( keys %$mac2ip ) {
+	next if ( $mac2ip->{ $idx } eq '0.0.0.0' );
+	$ret->{$idx} = $mac2ip->{ $idx };
+    }
+    foreach my $idx ( keys %$ap2ip ) {
+	$ret->{$idx} = $ap2ip->{ $idx };
+    }
+    return $ret;
+}
+
 1;
 __END__
 
@@ -1074,6 +1209,9 @@ switch.
 Returns 00000011.  Class emulates Layer 2 functionality for Thin APs through
 proprietary MIBs.
 
+=item $airespace->at_netaddr()
+=item $airespace->at_paddr()
+
 =item $airespace->serial()
 
 (C<agentInventorySerialNumber>)
@@ -1100,6 +1238,16 @@ Returns reference to hash.  Indicates whether the SSID is broadcast.
 Returns reference to hash.  Current operating frequency channel of the radio
 interface.
 
+=item $dot11->dot11_cur_tx_pwr_mw()
+
+Returns reference to hash.  Current transmit power, in milliwatts, of the
+radio interface.
+
+=item $airespace->i_ssidmac()
+
+With the same keys as i_ssidlist, returns the Basic service set
+identification (BSSID), MAC address, the AP is using for the SSID. 
+
 =back
 
 =head2 Dot11 Ess Table  (C<bsnDot11EssTable>)
@@ -1167,6 +1315,12 @@ enabled.
 
 (C<bsnDot11EssAclName>)           
 
+=item $airespace->airespace_ess_bcast()
+
+This attribute when enabled allows the switch to broadcast this SSID.
+
+(C<bsnDot11EssBroadcastSsid>)
+
 =back
 
 =head2 AP Table (C<bsnAPTable>)
@@ -1270,6 +1424,12 @@ However, if this is enabled, then only those WLANs that appear in the
 
 (C<bsnAPIfAdminStatus>)
 
+=item $airespace->airespace_apif_a_pwr()
+
+List of comma separated absolute power levels supported by the radio.
+
+(C<bsnAPIfAbsolutePowerList>)
+
 =back
 
 =head2 Mobile Station Table (C<bsnMobileStationTable>)

Info/Bridge.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
@@ -55,9 +55,11 @@ $VERSION = '2.00';
     'b_type'  => 'dot1dBaseType',
 
     # Spanning Tree Protocol
-    'stp_ver'  => 'dot1dStpProtocolSpecification',
-    'stp_time' => 'dot1dStpTimeSinceTopologyChange',
-    'stp_root' => 'dot1dStpDesignatedRoot',
+    'stp_ver'       => 'dot1dStpProtocolSpecification',
+    'stp_time'      => 'dot1dStpTimeSinceTopologyChange',
+    'stp_root'      => 'dot1dStpDesignatedRoot',
+    'stp_root_port' => 'dot1dStpRootPort',
+    'stp_priority'  => 'dot1dStpPriority',
 
     # Q-BRIDGE-MIB
     'qb_vlans_max'       => 'dot1qMaxSupportedVlans',
@@ -103,6 +105,7 @@ $VERSION = '2.00';
 
     # Q-BRIDGE-MIB : dot1qVlanStaticTable
     'v_name'           => 'dot1qVlanStaticName',
+    'qb_v_name'        => 'dot1qVlanStaticName',
     'qb_v_egress'      => 'dot1qVlanStaticEgressPorts',
     'qb_v_fbdn_egress' => 'dot1qVlanForbiddenEgressPorts',
     'qb_v_untagged'    => 'dot1qVlanStaticUntaggedPorts',
@@ -628,7 +631,7 @@ identifier (iid)
 
 Returns reference to hash of forwarding table entries status
 
-(C<dot2dTpFdbStatus>)
+(C<dot1dTpFdbStatus>)
 
 =back
 

Info/CDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
@@ -69,6 +69,10 @@ $VERSION = '2.00';
     'c_vlan'         => 'cdpCacheNativeVLAN',
     'c_duplex'       => 'cdpCacheDuplex',
     'c_power'        => 'cdpCachePowerConsumption',
+    'c_pri_mgmt_type'=> 'cdpCachePrimaryMgmtAddrType',
+    'c_pri_mgmt_addr'=> 'cdpCachePrimaryMgmtAddr',
+    'c_sec_mgmt_type'=> 'cdpCacheSecondaryMgmtAddrType',
+    'c_sec_mgmt_addr'=> 'cdpCacheSecondaryMgmtAddr',
 );
 
 %MUNGE = (

Info/CiscoConfig.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
@@ -449,7 +449,7 @@ devices running older code revisions.
 
  Example:
  $ciscoconfig->copy_run_tftp('1.2.3.4', 'myconfig') 
-    or die Couldn't save config. ",$ciscoconfig->error(1);
+    or die "Couldn't save config. ",$ciscoconfig->error(1);
 
 =item $ciscoconfig->copy_run_start()
 

Info/CiscoImage.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', );
 

Info/CiscoPortSecurity.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',

Info/CiscoPower.pm

@@ -39,13 +39,17 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
-%MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex' );
+%MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
+          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );
 
 %GLOBALS = ();
 
-%FUNCS = ( 'cpeth_ent_phy' => 'cpeExtPsePortEntPhyIndex', );
+%FUNCS = ( 
+    'cpeth_ent_phy'     => 'cpeExtPsePortEntPhyIndex', 
+    'peth_port_power'   => 'cpeExtPsePortPwrConsumption', 
+);
 
 %MUNGE = ();
 
@@ -69,6 +73,31 @@ sub peth_port_ifindex {
     return $peth_port_ifindex;
 }
 
+# peth_port_neg_power uses the same index as the other peth_port_* tables.
+# However, cdpCachePowerConsumption uses <ifIndex>.<neighbor>.
+# Therefore, we have to invert peth_port_ifindex, to get to
+# the index that is expected and the rest of the code can re-invert it.
+sub peth_port_neg_power {
+    my $cpeth   = shift;
+    my $partial = shift;
+
+    # Ignoring partial, since it's not easy to implement properly.
+    my $index = $cpeth->peth_port_ifindex();
+    my %inverse_index;
+    foreach my $i ( keys %$index ) {
+	$inverse_index{ $index->{$i} } = $i;
+    }
+    my $neg_power = $cpeth->cdpCachePowerConsumption();
+    my $peth_port_neg_power = {};
+    foreach my $i ( keys %$neg_power ) {
+	my( $ifIndex, $nbrIndex ) = split( /\./, $i );
+	if ( defined( $inverse_index{ $ifIndex } ) ) {
+		$peth_port_neg_power->{ $inverse_index{ $ifIndex } } = $neg_power->{ $i };
+	}
+    }
+    return $peth_port_neg_power;
+}
+
 1;
 
 __END__
@@ -143,6 +172,22 @@ to a hash.
 
 Maps the C<pethPsePortTable> to C<ifIndex> by way of the F<ENTITY-MIB>.
 
+=item $poe->peth_port_power()
+
+Power supplied by PoE ports, in milliwatts
+("cpeExtPsePortPwrConsumption")
+ 
+=back
+
+=head2 CDP Port table
+
+=over
+
+=item $poe->peth_port_neg_power()
+
+Power negotiated using CDP, in milliwats
+("cdpCachePowerConsumption")
+
 =back
 
 =cut

Info/CiscoQOS.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
 

Info/CiscoRTT.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 

Info/CiscoStack.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
 
@@ -65,6 +65,7 @@ $VERSION = '2.00';
     'm_type'         => 'moduleType',
     'm_model'        => 'moduleModel',
     'm_serial'       => 'moduleSerialNumber',
+    'm_serial_string' => 'moduleSerialNumberString',
     'm_status'       => 'moduleStatus',
     'm_name'         => 'moduleName',
     'm_ports'        => 'moduleNumPorts',
@@ -159,7 +160,7 @@ sub i_duplex {
         next if ( defined $partial and $iid !~ /^$partial$/ );
 
         # Test for gigabit
-        if ( $p_duplex_cap->{$port} == 0 ) {
+        if ( defined $p_duplex_cap->{$port} and $p_duplex_cap->{$port} == 0 ) {
             $i_duplex->{$iid} = 'full';
         }
 
@@ -194,7 +195,7 @@ sub i_duplex_admin {
         next if ( defined $partial and $iid !~ /^$partial$/ );
 
         # Test for gigabit
-        if ( $p_duplex_cap->{$port} == 0 ) {
+        if ( defined $p_duplex_cap->{$port} and $p_duplex_cap->{$port} == 1 ) {
             $i_duplex_admin->{$iid} = 'full';
         }
 

Info/CiscoStats.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::CiscoStats
 # $Id$
 #
-# Changes since Version 0.7 Copyright (c) 2008 Max Baker
+# Changes since Version 0.7 Copyright (c) 2008-2009 Max Baker and SNMP::Info Developers
 # All rights reserved.
 #
 # Copyright (c) 2003 Regents of the University of California
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'SNMPv2-MIB'            => 'sysDescr',
@@ -50,6 +50,7 @@ $VERSION = '2.00';
     'CISCO-MEMORY-POOL-MIB' => 'ciscoMemoryPoolUsed',
     'OLD-CISCO-SYSTEM-MIB'  => 'writeMem',
     'CISCO-PRODUCTS-MIB'    => 'sysName',
+    'ENTITY-MIB'            => 'entPhysicalSoftwareRev',
 
     # some older catalysts live here
     'CISCO-STACK-MIB'                 => 'wsc1900sysID',
@@ -59,6 +60,7 @@ $VERSION = '2.00';
 
 %GLOBALS = (
     'description' => 'sysDescr',
+    'ent_physical_software_rev' => 'entPhysicalSoftwareRev.1',
 
     # We will use the numeric OID's so that we don't require people
     # to install v1 MIBs, which can conflict.
@@ -74,6 +76,7 @@ $VERSION = '2.00';
 
     # OLD-CISCO-SYSTEM-MIB
     'write_mem' => 'writeMem',
+    'rom_id'    => 'romId',
 );
 
 %FUNCS = (
@@ -88,6 +91,10 @@ $VERSION = '2.00';
 
 %MUNGE = ();
 
+sub vendor {
+    return 'cisco';
+}
+
 sub os {
     my $l2 = shift;
     my $descr = $l2->description() || '';
@@ -96,6 +103,35 @@ sub os {
     # in their description field.
     return 'ios'      if ( $descr =~ /IOS/ );
     return 'catalyst' if ( $descr =~ /catalyst/i );
+    return 'css'      if ( $descr =~ /Content Switch SW/ );
+    return 'css-sca'  if ( $descr =~ /Cisco Systems Inc CSS-SCA-/ );
+    return 'pix'      if ( $descr =~ /Cisco PIX Security Appliance/ );
+    return 'asa'      if ( $descr =~ /Cisco Adaptive Security Appliance/ );
+
+    if ( $descr =~ /Application Control Engine Service Module/ ) {
+        # Only the admin context implements the entity MIB
+        return 'ace-admin' if defined $l2->ent_physical_software_rev();
+        return 'ace-context';
+    }
+
+    # Pre-version 3 FWSMs
+    return 'fwsm'     if ( $descr =~ /Cisco Secure FWSM Firewall/ );
+
+    # Version 3+ FWSMs (currently untested against version 4)
+    if ( $descr =~ /Firewall Services Module/ ) {
+
+        my $model = $l2->model();
+
+        if ( defined $model && $model eq "WsSvcFwm1sc" ) {
+            # Only the admin context implements the entity MIB
+            return 'fwsm-admin' if defined $l2->ent_physical_software_rev();
+            return 'fwsm-context';
+        }
+
+        # Non context mode FWSM
+        return 'fwsm';
+    }
+
     return;
 }
 
@@ -113,12 +149,69 @@ sub os_ver {
         return $1;
     }
 
+    if ( defined $os
+        and $os eq 'css'
+        and defined $descr
+        and $descr =~ m/Content Switch SW Version ([0-9\.\(\)]+) with SNMPv1\/v2c Agent/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'css-sca'
+        and defined $descr
+        and $descr =~ m/Cisco Systems Inc CSS-SCA-2FE-K9, ([0-9\.\(\)]+) Release / )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'pix'
+        and defined $descr
+        and $descr =~ m/Cisco PIX Security Appliance Version ([0-9\.\(\)]+)/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'asa'
+        and defined $descr
+        and $descr =~ m/Cisco Adaptive Security Appliance Version ([0-9\.\(\)]+)/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os =~ /^ace/ )
+    {
+        return $l2->ent_physical_software_rev();
+    }
+
+    if ( defined $os
+        and $os =~ /^fwsm/
+        and defined $descr
+        and $descr =~ m/Version (\d+\.\d+(\(\d+\)){0,1})/ )
+    {
+        return $1;
+    }
+
+
     # Newer Catalysts and IOS devices
     if ( defined $descr
         and $descr =~ m/Version (\d+\.\d+\([^)]+\)[^,\s]*)(,|\s)+/ )
     {
         return $1;
     }
+
+    return;
+}
+
+sub os_bin {
+    my $self   = shift;
+    my $rom_id = $self->rom_id();
+    if ($rom_id =~ m/Version ([^,]+),/)  {
+        return $1;
+    }
     return;
 }
 
@@ -214,7 +307,7 @@ Devices
 
 =head1 AUTHOR
 
-Max Baker
+Eric Miller, Max Baker, Sam Stickland
 
 =head1 SYNOPSIS
 
@@ -263,6 +356,8 @@ None.
 
 =item F<CISCO-FLASH-MIB>
 
+=item F<ENTITY-MIB>
+
 =back
 
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
@@ -287,14 +382,65 @@ Returns ios_cpu_5min() or cat_cpu5min(), whichever is available.
 
 Returns mem_free() + mem_used()
 
+=item $ciscostats->vendor()
+
+ 'cisco'
+
 =item $ciscostats->os()
 
 Tries to parse if device is running IOS or CatOS from description()
 
+Available values :
+
+=over
+
+=item pix
+
+Cisco PIX
+
+=item asa
+
+Cisco ASA
+
+=item fwsm
+
+Single-mode FWSM
+
+=item fwsm-admin
+
+Admin context of multi-context FWSM
+
+=item fwsm-context
+
+Standard context of multi-context FWSM
+
+=item ace-admin
+
+Admin context of ACE module
+
+=item ace-context
+
+Standard context of ACE module (NB: No OS version detection
+is available, but will be the same as it's 'ace admin')
+
+=item css
+
+Cisco Content Switch
+
+=item css-sca
+
+Cisco Content Switch Secure Content Acceleration
+
+=back
+
 =item $ciscostats->os_ver()
 
 Tries to parse device operating system version from description()
 
+=item $ciscostats->os_bin()
+
+Tries to parse ROMMON version from rom_id() string
+
 =item $ciscostats->ios_cpu()
 
 Current CPU usage in percent.

Info/CiscoStpExtensions.pm

@@ -0,0 +1,353 @@
+# SNMP::Info::CiscoStpExtensions
+#
+# Copyright (c)2009 Carlos Vicente
+# All rights reserved.  
+#
+# 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 author 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::CiscoStpExtensions;
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Bridge;
+
+use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
+$VERSION = '2.11';
+@SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
+@SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
+
+%MIBS    = (
+            %SNMP::Info::Bridge::MIBS,
+            'CISCO-STP-EXTENSIONS-MIB' => 'stpxSpanningTreeType',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Bridge::GLOBALS,
+            'stpx_mst_config_digest' => 'stpxSMSTConfigDigest',
+            'stpx_mst_region_name'   => 'stpxMSTRegionName',
+            'stpx_mst_region_rev'    => 'stpxSMSTRegionRevision',
+            'stpx_stp_type'          => 'stpxSpanningTreeType',
+            'stpx_bpduguard_enable'  => 'stpxFastStartBpduGuardEnable',
+            'stpx_bpdufilter_enable' => 'stpxFastStartBpduFilterEnable',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Bridge::FUNCS,
+            'stpx_rootguard_enabled'      => 'stpxRootGuardConfigEnabled',
+            'stpx_loopguard_enabled'      => 'stpxLoopGuardConfigEnabled',
+            'stpx_port_bpduguard_mode'    => 'stpxFastStartPortBpduGuardMode',
+            'stpx_port_bpdufilter_mode'   => 'stpxFastStartPortBpduFilterMode',
+            'stpx_smst_root'              => 'stpxSMSTInstanceCISTRegionalRoot',
+            'stpx_smst_vlans_mapped_1k2k' => 'stpxSMSTInstanceVlansMapped1k2k',
+            'stpx_smst_vlans_mapped_3k4k' => 'stpxSMSTInstanceVlansMapped3k4k',
+           );
+
+%MUNGE   = (
+            %SNMP::Info::Bridge::MUNGE,
+           'stpx_mst_config_digest'     => \&SNMP::Info::CiscoStpExtensions::oct2str,
+           );
+
+
+# Report version of STP via standard method
+sub stp_ver {
+     my $self = shift;
+     my $stp_ver = $self->SUPER::stp_ver();
+     if ( $stp_ver eq 'unknown' ){
+         if ( defined $self->stpx_stp_type() ){
+             $stp_ver = $self->stpx_stp_type();
+         }
+     }
+     return $stp_ver;
+}
+
+sub mst_config_digest {
+    my $self = shift;
+    return $self->stpx_mst_config_digest;
+}
+
+sub mst_region_name {
+    my $self = shift;
+    return $self->stpx_mst_region_name;
+}
+
+sub mst_region_rev {
+    my $self = shift;
+    return $self->stpx_mst_region_rev;
+}
+
+
+sub mst_vlan2instance {
+    my $self = shift;
+    
+    # Get MST vlan-to-instance mapping
+    my $m1k2k = $self->stpx_smst_vlans_mapped_1k2k;
+    my $m3k4k = $self->stpx_smst_vlans_mapped_3k4k;
+   
+    # Get list of VLANs
+    my $vlan_membership = $self->i_vlan_membership;
+    my @vlans;
+    foreach my $iid ( keys %$vlan_membership ){
+        if ( my $vm = $vlan_membership->{$iid} ){
+            foreach my $vid ( @$vm ){
+                push @vlans, $vid;
+            }
+        }
+    }
+    my %res;
+    foreach my $vlan ( @vlans ){
+        if ( $vlan < 2048 ){
+            foreach my $inst ( keys %$m1k2k ){
+                my $list = $m1k2k->{$inst};
+                my $vlanlist = [split(//, unpack("B*", $list))];
+                if ( @$vlanlist[$vlan] ){
+                    $res{$vlan} = $inst;
+                    last;
+                }
+            }
+        }else{
+            foreach my $inst ( keys %$m3k4k ){
+                my $list = $m3k4k->{$inst};
+                my $vlanlist = [split(//, unpack("B*", $list))];
+                if ( @$vlanlist[$vlan-2048] ){
+                    $res{$vlan} = $inst;
+                    last;
+                }
+            }       
+        }
+    }
+    return \%res;
+}
+
+sub i_rootguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $rg_enabled = $self->stpx_rootguard_enabled();
+    my $bp_index   = $self->bp_index($partial);
+
+    my %res;
+    foreach my $index ( keys %$rg_enabled ){
+        my $enabled = $rg_enabled->{$index};
+        my $iid     = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $enabled;
+        $res{$iid} = $enabled;
+    }
+    return \%res;
+}  
+
+sub i_loopguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $lg_enabled = $self->stpx_loopguard_enabled();
+    my $bp_index   = $self->bp_index($partial);
+
+    my %res;
+    foreach my $index ( keys %$lg_enabled ){
+        my $enabled = $lg_enabled->{$index};
+        my $iid     = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $enabled;
+        $res{$iid} = $enabled;
+    }
+    return \%res;
+}  
+
+sub i_bpduguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $bpdugm_default = $self->stpx_bpduguard_enable();
+    my $bp_index       = $self->bp_index($partial);
+    my $bpdugm         = $self->stpx_port_bpduguard_mode();
+    
+    my %res;
+    foreach my $index ( keys %$bpdugm ){
+        my $mode = $bpdugm->{$index};
+        my $iid  = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $mode;
+        if ( $mode eq 'default' ){
+            $res{$iid} =  $bpdugm_default;
+        }else{
+            $res{$iid} = $mode;
+        }
+    }
+    return \%res;
+}
+
+sub i_bpdufilter_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $bpdufm_default = $self->stpx_bpdufilter_enable();
+    my $bp_index       = $self->bp_index($partial);
+    my $bpdufm         = $self->stpx_port_bpdufilter_mode();
+    
+    my %res;
+    foreach my $index ( keys %$bpdufm ){
+        my $mode = $bpdufm->{$index};
+        my $iid  = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $mode;
+        if ( $mode eq 'default' ){
+            $res{$iid} =  $bpdufm_default;
+        }else{
+            $res{$iid} = $mode;
+        }
+    }
+    return \%res;
+}
+
+
+sub oct2str {
+    my ($v) = @_;
+    return sprintf('%s', unpack('H*', $v));
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoStpExtensions - SNMP Interface to C<CISCO-STP-EXTENSIONS-MIB>
+
+=head1 AUTHOR
+
+Carlos Vicente
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+Create or use a subclass of SNMP::Info that inherits this class.  Do not use
+directly.
+
+For debugging you can call new() directly as you would in SNMP::Info 
+
+ my $stpx = new SNMP::Info::CiscoStpExtensions(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info 
+
+=item SNMP::Info::Bridge 
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $stpx->stp_ver()
+
+Returns the particular STP version running on this device.  
+Meant to override SNMP::Info::Brigde::stp_ver()
+
+Values: C<pvstPlus>, C<mistp>, C<mistpPvstPlus>, C<mst>, C<rapidPvstPlus>
+
+(C<stpxSpanningTreeType>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $stpx->mst_config_digest()
+
+Returns the Multiple Spanning Tree (MST) configuration digest 
+
+(C<stpxSMSTConfigDigest>)
+
+=item $stpx->mst_region_name()
+
+Returns the Multiple Spanning Tree (MST) region name 
+
+(C<stpxMSTRegionName>)
+
+=item $stpx->mst_region_rev()
+
+Returns the Multiple Spanning Tree (MST) region name 
+
+(C<stpxSMSTRegionRevision>)
+
+=item $stpx->mst_vlan2instance()
+
+Returns the mapping of vlan to MST instance in the form of a hash reference 
+with key = VLAN id, value = STP instance
+
+=item $stpx->i_rootguard_enabled()
+
+Returns 1 or 0 depending on whether C<RootGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxRootGuardConfigEnabled>)
+
+=item $stpx->i_loopguard_enabled()
+
+Returns 1 or 0 depending on whether C<LoopGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxLoopGuardConfigEnabled>)
+
+=item $stpx->i_bpduguard_enabled()
+
+Returns 1 or 0 depending on whether C<BpduGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxFastStartPortBpduGuardMode>)
+
+=item $stpx->i_bpdufilter_enabled()
+
+Returns 1 or 0 depending on whether C<BpduFilter> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxFastStartBpduFilterEnable>)
+
+=back
+
+=head1 MUNGES
+
+=over
+
+=item oct2str()
+
+Unpacks H* into a string
+
+=back
+
+=cut

Info/CiscoVTP.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'CISCO-VTP-MIB'                       => 'vtpVlanName',
@@ -244,6 +244,7 @@ sub i_vlan_membership {
                 next unless $list;
                 my $vlanlist = [ split( //, unpack( "B*", $list ) ) ];
                 foreach my $vlan ( keys %oper_vlans ) {
+                    next if (($vlan < $offset) or ($vlan - $offset > 1024));
                     push( @{ $i_vlan_membership->{$port} }, $vlan )
                         if ( @$vlanlist[ $vlan - $offset ] );
                 }

Info/EDP.pm

@@ -0,0 +1,295 @@
+# SNMP::Info::EDP
+#
+# Copyright (c) 2012 Eric Miller
+# All rights reserved.
+#
+# 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::EDP;
+
+use strict;
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::LLDP::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::LLDP::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
+);
+
+%GLOBALS = (
+
+);
+
+%FUNCS = (
+    # EXTREME-EDP-MIB::extremeEdpTable
+    'edp_rem_sysname'  => 'extremeEdpNeighborName',
+);
+
+%MUNGE = (
+    'edp_rem_sysname'   => \&SNMP::Info::munge_null,
+);
+
+sub hasEDP {
+    my $edp = shift;
+
+    my $edp_ip = $edp->extremeEdpNeighborVlanIpAddress() || {};
+
+    return 1 if ( scalar( keys %$edp_ip ) );
+    
+    return;
+}
+
+# Since we need to get IP Addresses from the extremeEdpNeighborTable which has
+# a different index (adds VLAN name) than the extremeEdpTable which holds
+# the remote device details use the index from extremeEdpNeighborTable but skip
+# indexes which have an address of 0.0.0.0.  Would like to include only one
+# address since they should all originate from the same device, but we don't
+# know if they would all be reachable from the network management application.
+#
+# We don't inplement partials since this is private index function
+sub _edp_index {
+    my $edp = shift;
+
+    my $edp_ip  = $edp->extremeEdpNeighborVlanIpAddress() || {};
+    
+    my %edp_index;
+    foreach my $key ( keys %$edp_ip ) {
+        my $ip = $edp_ip->{$key};
+        next if ($ip eq '0.0.0.0');
+        next unless $ip;
+        $edp_index{$key} = $key;
+    }
+    return \%edp_index;
+}
+
+sub edp_if {
+    my $edp = shift;
+
+    my $index = $edp->_edp_index() || {};
+
+    my %edp_if;
+    foreach my $key (keys %$index) {
+        my $iid = $key;
+        # ifIndex is first part of the iid
+        $iid = $1 if $iid =~ /^(\d+)\./;
+        $edp_if{$key} = $iid;
+    }
+ 
+  return \%edp_if;
+}
+
+sub edp_ip {
+    my $edp = shift;
+
+    my $index  = $edp->_edp_index() || {};
+    my $edp_ip = $edp->extremeEdpNeighborVlanIpAddress() || {};
+
+    my %edp_ip;
+    foreach my $key ( keys %$index ) {
+        my $ip = $edp_ip->{$key};
+        # MIB says should only be IPv4
+        next unless ($ip =~ /\d+(\.\d+){3}/);
+        $edp_ip{$key} = $ip;
+    }
+    return \%edp_ip;
+}
+
+sub edp_port {
+    my $edp = shift;
+
+    my $index    = $edp->_edp_index() || {};
+    my $edp_rport = $edp->extremeEdpNeighborPort() || {};
+    my $edp_rslot = $edp->extremeEdpNeighborSlot() || {};
+
+    my %edp_port;
+    foreach my $key ( sort keys %$edp_rport ) {
+        my $port = $edp_rport->{$key};
+        my $slot = $edp_rslot->{$key} || 0;
+        next unless $port;
+        my $slotport = defined $slot ?  "$slot\/$port" : $port;
+
+        foreach my $iid ( sort keys %$index ) {
+            $edp_port{$iid} = $slotport if ($iid =~ /^$key/);
+        }
+    }
+    return \%edp_port;
+}
+
+sub edp_id {
+    my $edp = shift;
+
+    my $index    = $edp->_edp_index() || {};
+    my $edp_name = $edp->edp_rem_sysname() || {};
+
+    my %edp_name;
+    foreach my $key ( sort keys %$edp_name ) {
+        my $name = $edp_name->{$key} || 0;
+        next unless $name;
+
+        foreach my $iid ( sort keys %$index ) {
+            $edp_name{$iid} = $name if ($iid =~ /^$key/);
+        }
+    }
+    return \%edp_name;
+}
+
+sub edp_ver {
+    my $edp = shift;
+
+    my $index   = $edp->_edp_index() || {};
+    my $edp_ver = $edp->extremeEdpNeighborSoftwareVersion() || {};
+
+    my %edp_ver;
+    foreach my $key ( sort keys %$edp_ver ) {
+        my $ver = $edp_ver->{$key} || 0;
+        next unless $ver;
+
+        foreach my $iid ( sort keys %$index ) {
+            $edp_ver{$iid} = $ver if ($iid =~ /^$key/);
+        }
+    }
+    return \%edp_ver;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::EDP - SNMP Interface to the Extreme Discovery Protocol (EDP)
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ my $edp = new SNMP::Info ( 
+                             AutoSpecify => 1,
+                             Debug       => 1,
+                             DestHost    => 'router', 
+                             Community   => 'public',
+                             Version     => 2
+                           );
+
+ my $class = $edp->class();
+ print " Using device sub class : $class\n";
+
+ $haslldp   = $edp->hasLLDP() ? 'yes' : 'no';
+
+ # Print out a map of device ports with LLDP neighbors:
+ my $interfaces    = $edp->interfaces();
+ my $edp_if       = $edp->edp_if();
+ my $edp_ip       = $edp->edp_ip();
+ my $edp_port     = $edp->edp_port();
+
+ foreach my $edp_key (keys %$edp_ip){
+    my $iid           = $edp_if->{$edp_key};
+    my $port          = $interfaces->{$iid};
+    my $neighbor      = $edp_ip->{$edp_key};
+    my $neighbor_port = $edp_port->{$edp_key};
+    print "Port : $port connected to $neighbor / $neighbor_port\n";
+ }
+
+=head1 DESCRIPTION
+
+SNMP::Info::EDP is a subclass of SNMP::Info that provides an object oriented 
+interface to EDP information through SNMP.
+
+EDP is a Layer 2 protocol that allows a network device to advertise its
+identity and capabilities on the local network providing topology information.
+
+Create or use a device subclass that inherits this class.  Do not use
+directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item F<EXTREME-EDP-MIB>
+
+=back
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $edp->hasEDP()
+
+Is EDP is active in this device?  
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $edp->edp_id()
+
+Returns the string value used to identify the chassis component associated
+with the remote system.
+
+(C<extremeEdpNeighborName>)
+
+=item $edp->edp_if()
+
+Returns the mapping to the SNMP Interface Table.
+
+=item  $edp->edp_ip()
+
+Returns remote IPv4 address.
+
+=item $edp->edp_port()
+
+Returns remote port ID
+
+=item $edp->edp_ver()
+
+Returns the operating system version of the remote system.
+
+Nulls are removed before the value is returned. 
+
+(C<extremeEdpNeighborSoftwareVersion>)
+
+=back
+
+=cut
+

Info/Entity.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 
@@ -207,7 +207,7 @@ Human Friendly
 
 =item $entity->e_fru()
 
-BOOLEAN. Field Replaceable unit?
+BOOLEAN. Is a Field Replaceable unit?
 
 (C<entPhysicalFRU>)
 

Info/EtherLike.pm

@@ -41,9 +41,9 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
-%MIBS = ( 'ETHERLIKE-MIB' => 'etherMIB' );
+%MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
 
 %GLOBALS = ();
 

Info/FDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
 

Info/IEEE802dot11.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
 

Info/IPv6.pm

@@ -0,0 +1,484 @@
+# SNMP::Info::IPv6
+#
+# Copyright (c) 2010 Jeroen van Ingen and Carlos Vicente
+# All rights reserved.
+#
+# 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::IPv6;
+
+use strict;
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::IPv6::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::IPv6::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE $METHOD/;
+
+use constant {
+    IPMIB   => 1,
+    CISCO   => 2,
+    IPV6MIB => 3,
+};
+
+$VERSION = '2.11';
+
+
+
+%MIBS = ( 
+    'IP-MIB'            => 'ipv6InterfaceTableLastChange',
+    'IPV6-MIB'          => 'ipv6IfTableLastChange',
+    'CISCO-IETF-IP-MIB' => 'cInetNetToMediaNetAddress', 
+);
+
+%GLOBALS = ();
+
+%FUNCS = ( 
+    'ip_n2p_phys_addr'  => 'ipNetToPhysicalPhysAddress',    # IP-MIB
+    'c_inet_phys_addr'  => 'cInetNetToMediaPhysAddress',    # CISCO-IETF-IP-MIB
+    'i6_n2p_phys_addr'  => 'ipv6NetToMediaNetAddress',      # IPV6-MIB
+
+    'ip_n2p_phys_type'  => 'ipNetToPhysicalType',           # IP-MIB
+    'c_inet_phys_type'  => 'cInetNetToMediaType',           # CISCO-IETF-IP-MIB
+    'i6_n2p_phys_type'  => 'ipv6NetToMediaType',            # IPV6-MIB
+
+    'ip_n2p_phys_state' => 'ipNetToPhysicalState',          # IP-MIB
+    'c_inet_phys_state' => 'cInetNetToMediaState',          # CISCO-IETF-IP-MIB
+    'i6_n2p_phys_state' => 'ipv6NetToMediaState',           # IPV6-MIB
+
+    'ip_pfx_origin'     => 'ipAddressPrefixOrigin',         # IP-MIB
+    'c_pfx_origin'      => 'cIpAddressPfxOrigin',           # CISCO-IETF-IP-MIB 
+
+    'ip_addr6_pfx'      => 'ipAddressPrefix',              # IP-MIB 
+    'c_addr6_pfx'       => 'cIpAddressPrefix',              # CISCO-IETF-IP-MIB 
+
+    'ip_addr6_index'    => 'ipAddressIfIndex',              # IP-MIBw
+    'c_addr6_index'     => 'cIpAddressIfIndex',             # CISCO-IETF-IP-MIB 
+
+    'ip_addr6_type'     => 'ipAddressType',                 # IP-MIB
+    'c_addr6_type'      => 'cIpAddressType',                # CISCO-IETF-IP-MIB
+    
+);
+
+%MUNGE = (
+    'ip_n2p_phys_addr'  => \&SNMP::Info::munge_mac,
+    'c_inet_phys_addr'  => \&munge_physaddr,
+    'i6_n2p_phys_addr'  => \&SNMP::Info::munge_mac,
+);
+
+
+sub ipv6_n2p_mac {
+    my $info = shift;
+    my $return;
+    my $phys_addr = &_test_methods( $info, {
+        ip_n2p_phys_addr => IPMIB,
+        c_inet_phys_addr => CISCO,
+        i6_n2p_phys_addr => IPV6MIB,
+    });
+    return unless defined $phys_addr;
+    foreach my $row (keys %$phys_addr) {
+        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
+            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
+            if ($info::METHOD == IPV6MIB) { 
+                # IPV6-MIB doesn't include the addrtype in the index; 
+                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
+                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
+                $addrtype = 2;
+            }
+            if (($addrtype == 2) && (defined $phys_addr->{$row})) { # IPv6
+                $return->{$row} = substr($phys_addr->{$row}, 0, 17);
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_n2p_addr {
+    my $info = shift;
+    my $return;
+    my $net_addr = &_test_methods( $info, {
+        ip_n2p_phys_addr => IPMIB,
+        c_inet_phys_addr => CISCO,
+        i6_n2p_phys_addr => IPV6MIB,
+    });
+    return unless defined $net_addr;
+    foreach my $row (keys %$net_addr) {
+        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
+            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
+            if ($info::METHOD == IPV6MIB) { 
+                # IPV6-MIB doesn't include the addrtype in the index; 
+                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
+                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
+                $addrtype = 2;
+            }
+            if ($addrtype == 2) { # IPv6
+                my $v6_packed = pack("C*", split(/\./, $v6addr));
+                if (length($v6_packed) == 15) {
+                    # Workaround for some some IP-MIB implementations, eg on Cisco Nexus: no explicit addrsize, 
+                    # so what we've collected in that variable is actually the first byte of the address.
+                    $v6_packed = pack('C', $addrsize) . $v6_packed;
+                }
+                if (length($v6_packed) == 16) {
+                    $v6addr = join(':', map { sprintf("%04x", $_) } unpack("n*", $v6_packed) );
+                    $return->{$row} = $v6addr;
+                } else {
+                    printf("Invalid size for IPv6 address: expected 16 bytes, got %d (%s = %s)\n", length($v6_packed), $row, $net_addr->{$row});
+                }
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_n2p_if {
+    my $info = shift;
+    my $return;
+    my $phys_addr = &_test_methods( $info, {
+        ip_n2p_phys_addr => IPMIB,
+        c_inet_phys_addr => CISCO,
+        i6_n2p_phys_addr => IPV6MIB,
+    });
+    return unless defined $phys_addr;
+    foreach my $row (keys %$phys_addr) {
+        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
+            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
+            if ($info::METHOD == IPV6MIB) { 
+                # IPV6-MIB doesn't include the addrtype in the index; 
+                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
+                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
+                $addrtype = 2;
+            }
+            if ($addrtype == 2) { # IPv6
+                $return->{$row} = $ifindex;
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_n2p_type {
+    my $info = shift;
+    my $return;
+    my $phys_type = &_test_methods( $info, {
+        ip_n2p_phys_type => IPMIB,
+        c_inet_phys_type => CISCO,
+        i6_n2p_phys_type => IPV6MIB,
+    });
+    return unless defined $phys_type;
+    foreach my $row (keys %$phys_type) {
+        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
+            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
+            if ($info::METHOD == IPV6MIB) { 
+                # IPV6-MIB doesn't include the addrtype in the index; 
+                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
+                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
+                $addrtype = 2;
+            }
+            if ($addrtype == 2) { # IPv6
+                $return->{$row} = $phys_type->{$row};
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_n2p_state {
+    my $info = shift;
+    my $return;
+    my $phys_state = &_test_methods( $info, {
+        ip_n2p_phys_state => IPMIB,
+        c_inet_phys_state => CISCO,
+        i6_n2p_phys_state => IPV6MIB,
+    });
+    return unless defined $phys_state;
+    foreach my $row (keys %$phys_state) {
+        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
+            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
+            if ($info::METHOD == IPV6MIB) { 
+                # IPV6-MIB doesn't include the addrtype in the index; 
+                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
+                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
+                $addrtype = 2;
+            }
+            if ($addrtype == 2) { # IPv6
+                $return->{$row} = $phys_state->{$row};
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_index {
+    my $info = shift;
+    my $return;
+    my $ipv6_index = &_test_methods( $info, {
+	ip_addr6_index  => IPMIB,
+	c_addr6_index   => CISCO,
+				    });
+    return unless defined $ipv6_index;
+    foreach my $row (keys %$ipv6_index){
+        if ($row =~ /^(\d+)\.([\d\.]+)$/) {
+            my $addrtype = $1; my $v6addr = $2;
+            if ($addrtype == 2) { # IPv6
+		$return->{$row} = $ipv6_index->{$row};
+	    }
+	}
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_type {
+    my $info = shift;
+    my $return;
+    my $ipv6_type = &_test_methods( $info, {
+	ip_addr6_type  => IPMIB,
+	c_addr6_type   => CISCO,
+				    });
+    return unless defined $ipv6_type;
+    foreach my $row (keys %$ipv6_type){
+        if ($row =~ /^(\d+)\.([\d\.]+)$/) {
+            my $addrtype = $1; my $v6addr = $2;
+            if ($addrtype == 2) { # IPv6
+		$return->{$row} = $ipv6_type->{$row};
+	    }
+	}
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_pfx_origin {
+    my $info = shift;
+    my $return;
+    my $ipv6_pfx_origin = &_test_methods( $info, {
+	ip_pfx_origin  => IPMIB,
+	c_pfx_origin   => CISCO,
+				    });
+    return unless defined $ipv6_pfx_origin;
+    foreach my $row (keys %$ipv6_pfx_origin){
+        if ($row =~ /^(\d+)\.(\d+)\.([\d\.]+)\.(\d+)$/) {
+            my $ifindex = $1; my $type = $2; my $pfx = $3; my $len = $4;
+            if ($type == 2) { # IPv6
+		$return->{$row} = $ipv6_pfx_origin->{$row};
+	    }
+	}
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_addr_prefix {
+    my $info = shift;
+    my $return;
+    my $ipv6_addr_prefix = &_test_methods( $info, {
+	ip_addr6_pfx  => IPMIB,
+	c_addr6_pfx   => CISCO,
+				    });
+    return unless defined $ipv6_addr_prefix;
+    foreach my $row (keys %$ipv6_addr_prefix){
+        if ($row =~ /^(\d+)\.[\d\.]+$/) {
+            my $type = $1;
+            if ($type == 2) { # IPv6
+		# Remove the OID part from the value
+		my $val = $ipv6_addr_prefix->{$row};
+		if ( $val =~ /^.+?((?:\d+\.){19}\d+)$/ ){
+		    $val = $1;
+		    $return->{$row} = $val;
+		}
+	    }
+	}
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub _method_used {
+    my $info = shift;
+    my $return = 'none of the MIBs';
+    if (defined $info::METHOD) {
+        if ($info::METHOD eq IPMIB) {
+            $return = 'IP-MIB';
+        } elsif ($info::METHOD eq IPV6MIB) {
+            $return = 'IPV6-MIB';
+        } elsif ($info::METHOD eq CISCO) {
+            $return = 'CISCO-IETF-IP-MIB';
+        }
+    }
+    return $return;
+}
+
+sub _test_methods {
+    my $info = shift;
+    my $test = shift;
+    my $return = {};
+    foreach my $method (sort {$test->{$a} <=> $test->{$b}} keys %$test) {
+        $return = $info->$method || {};
+        if (scalar keys %$return) {
+            $info::METHOD = $test->{$method};
+            last;
+        }
+    }
+    return $return;
+}
+
+sub _my_sub_name {
+    my @callinfo = caller(1);
+    return $callinfo[3];
+}
+
+sub munge_physaddr {
+    my $addr = shift;
+    return unless defined $addr;
+    return unless length $addr;
+    $addr = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $addr ) );
+    return $addr;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::IPv6 - SNMP Interface for obtaining IPv6 addresses and IPv6
+address mappings
+
+=head1 AUTHOR
+
+Jeroen van Ingen and Carlos Vicente
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $info = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $info->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+The SNMP::Info::IPv6 class implements functions to for mapping IPv6 addresses 
+to MAC addresses, interfaces and more. It will use data from the IP-MIB, IPV6-MIB 
+or the CISCO-IETF-IP-MIB, whichever is supported by the device.
+
+This class is inherited by Info::Layer3 to provide IPv6 node tracking across  
+device classes.
+
+For debugging purposes you can call this class directly as you would
+SNMP::Info
+
+ my $info = new SNMP::Info::IPv6 (...);
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item F<IP-MIB>
+=item F<IPV6-MIB>
+=item F<CISCO-IETF-IP-MIB>
+
+=back
+
+=head1 GLOBALS
+
+none.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2  Internet Address Table
+
+=over
+
+=item $info->ipv6_n2p_addr()
+
+=item $info->ipv6_n2p_if()
+
+=item $info->ipv6_n2p_mac()
+
+=item $info->ipv6_n2p_state()
+
+=item $info->ipv6_n2p_type()
+
+=item $info->ipv6_index()
+
+Maps an IPv6 address to an interface C<ifIndex>
+
+=item $info->ipv6_type()
+
+Maps an IPv6 address to its type (unicast, anycast, etc.)
+
+=item $info->ipv6_pfx_origin()
+
+Maps an IPv6 prefix with its origin (manual, well-known, dhcp, etc.)
+
+=item $info->ipv6_addr_prefix() 
+
+Maps IPv6 addresses with their prefixes
+
+=back
+
+=head2  Internet Address Translation Table
+
+=over
+
+=item $info->c_inet_phys_address()
+
+Maps an address of type C<cInetNetToMediaNetAddressType> on interface C<ifIndex> to a physical address.
+
+=back
+
+=head1 MUNGES
+
+=over 
+
+=item munge_physaddr()
+
+Takes an octet stream (HEX-STRING) and returns a colon separated ASCII hex
+string.
+
+=back
+
+=cut

Info/LLDP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'LLDP-MIB'          => 'lldpLocSysCapEnabled',
@@ -97,12 +97,24 @@ sub lldp_if {
     my $lldp    = shift;
     my $partial = shift;
 
-    my $addr = $lldp->lldp_rem_pid($partial) || {};
-
+    my $addr    = $lldp->lldp_rem_pid($partial) || {};
+    my $i_descr = $lldp->i_description() || {};
+    my %r_i_descr = reverse %$i_descr;
+    
     my %lldp_if;
     foreach my $key ( keys %$addr ) {
         my @aOID = split( '\.', $key );
         my $port = $aOID[1];
+        next unless $port;
+        # Local LLDP port may not equate to ifIndex
+        # Cross reference lldpLocPortDesc with ifDescr to get ifIndex
+        my $lldp_desc = $lldp->lldpLocPortDesc($port);
+        my $desc = $lldp_desc->{$port};
+        # If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum
+        if ( exists $r_i_descr{$desc} ) {
+            $port = $r_i_descr{$desc};
+        }
+        
         $lldp_if{$key} = $port;
     }
     return \%lldp_if;
@@ -192,6 +204,13 @@ sub lldp_id {
         if ( $type =~ /mac/ ) {
             $id = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $id ) );
         }
+        elsif ($type eq 'networkAddress') {
+            if ( length(unpack('H*', $id)) == 10 ) {
+                # IP address (first octet is sign, I guess)
+                my @octets = (map { sprintf "%02x",$_ } unpack('C*', $id))[1..4];
+                $id = join '.', map { hex($_) } @octets;
+            }
+        }
         $lldp_id{$key} = $id;
     }
     return \%lldp_id;
@@ -337,7 +356,7 @@ Nulls are removed before the value is returned.
 The string value used to identify the system description of the local system.
 If the local agent supports IETF RFC 3418, C<lldpLocSysDesc> object should
 have the same value of C<sysDesc> object.
- 
+
 Nulls are removed before the value is returned.
 
 (C<lldpLocSysDesc>)
@@ -385,14 +404,16 @@ to a hash.
 
 =item $lldp->lldp_id()
 
-Returns the string value used to identify the chassis component	associated
+Returns the string value used to identify the chassis component associated
 with the remote system.
 
 (C<lldpRemChassisId>)
 
 =item $lldp->lldp_if()
 
-Returns the mapping to the SNMP Interface Table.
+Returns the mapping to the SNMP Interface Table.  Trys to cross reference 
+(C<lldpLocPortDesc>) with (C<ifDescr>) to get (C<ifIndex>), if unable 
+defaults to (C<lldpRemLocalPortNum>).
 
 =item  $lldp->lldp_ip()
 
@@ -423,7 +444,7 @@ the remote system.
 
 =item $lldp->lldp_rem_id()
 
-Returns the string value used to identify the chassis component	associated
+Returns the string value used to identify the chassis component    associated
 with the remote system.
 
 (C<lldpRemChassisId>)

Info/Layer1.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
 

Info/Layer1/Allied.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );

Info/Layer1/Asante.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );

Info/Layer1/Bayhub.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer1/Cyclades.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer1::MIBS,

Info/Layer1/S3000.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2.pm

@@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,

Info/Layer2/Airespace.pm

@@ -41,11 +41,13 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
     %SNMP::Info::CDP::MIBS, %SNMP::Info::Airespace::MIBS,
+    'AIRESPACE-SWITCHING-MIB' => 'agentInterfaceVlanId',
+    'CISCO-LWAPP-DOT11-CLIENT-MIB' => 'cldcClientCurrentTxRateSet',
 );
 
 %GLOBALS = (
@@ -56,11 +58,26 @@ $VERSION = '2.00';
 %FUNCS = (
     %SNMP::Info::FUNCS,      %SNMP::Info::Bridge::FUNCS,
     %SNMP::Info::CDP::FUNCS, %SNMP::Info::Airespace::FUNCS,
+
+    # This needs to be cleaned up, but for now we pretend to
+    # have the CISCO-DOT11-MIB for signal strengths, etc.
+    'cd11_sigstrength' => 'bsnMobileStationRSSI',	# kinda
+    'cd11_sigqual'     => 'bsnMobileStationSnr',	# kinda
+    'cd11_rxbyte'      => 'bsnMobileStationBytesReceived',
+    'cd11_txbyte'      => 'bsnMobileStationBytesSent',
+    'cd11_rxpkt'       => 'bsnMobileStationPacketsReceived',
+    'cd11_txpkt'       => 'bsnMobileStationPacketsSent',
+    'cd11_txrate'      => 'cldcClientCurrentTxRateSet',
+    'cd11_rateset'     => 'cldcClientDataRateSet',
 );
 
 %MUNGE = (
     %SNMP::Info::MUNGE,      %SNMP::Info::Bridge::MUNGE,
     %SNMP::Info::CDP::MUNGE, %SNMP::Info::Airespace::MUNGE,
+    'cd11_rxpkt'	=> \&munge_64bits,
+    'cd11_txpkt'	=> \&munge_64bits,
+    'cd11_txrate'       => \&munge_cd11_txrate,
+    'cd11_rateset'      => \&munge_cd11_rateset,
 );
 
 sub os {
@@ -79,6 +96,42 @@ sub model {
     return $model;
 }
 
+# vlan:
+# AIRESPACE-SWITCHING-MIB::agentInterfaceVlanId
+
+sub cd11_mac {
+    my $airespace = shift;
+    my $cd11_sigstrength = $airespace->cd11_sigstrength();
+
+    my $ret = {};
+    foreach my $idx ( keys %$cd11_sigstrength ) {
+	my $mac = join( ":", map { sprintf "%02x", $_ } split /\./, $idx );
+	$ret->{$idx} = $mac
+    }
+    return $ret;
+}
+
+sub munge_cd11_txrate {
+    my $rate = shift;
+    if ( $rate ) {
+        return [ $rate * 1.0 ];
+    } else {
+        return [ 0.0 ];
+    }
+}
+
+sub munge_cd11_rateset {
+    my $rates = shift;
+    return [ map { $_ * 1.0 } split /,/, $rates ];
+}
+
+sub munge_64bits {
+    # The controller sometimes hands off a ridiculous value for packets.
+    # Just truncate it to 32 bits.
+    my $value = shift;
+    return $value & 0xffffffff;
+}
+
 1;
 __END__
 
@@ -181,14 +234,14 @@ See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.
 
+=over 
+
+=item cd11_mac()
+
+=back 
+
 =head2 Overrides
 
-=over
-
-=item None
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Airespace
 
 See documentation in L<SNMP::Info::Airespace/"TABLE METHODS"> for details.
@@ -201,4 +254,16 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 
+=head1 MUNGES
+
+=over
+
+=item munge_64bits()
+
+=item munge_cd11_rateset()
+
+=item munge_cd11_txrate()
+
+=back
+
 =cut

Info/Layer2/Aironet.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer2::Aironet
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
@@ -38,17 +38,18 @@ use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
 use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::CDP;
 use SNMP::Info::IEEE802dot11;
 
 @SNMP::Info::Layer2::Aironet::ISA
     = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike
-    SNMP::Info::CiscoStats SNMP::Info::CDP Exporter/;
+    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig SNMP::Info::CDP Exporter/;
 @SNMP::Info::Layer2::Aironet::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %GLOBALS = (
     %SNMP::Info::IEEE802dot11::GLOBALS,
@@ -56,6 +57,7 @@ $VERSION = '2.00';
     %SNMP::Info::Entity::GLOBALS,
     %SNMP::Info::EtherLike::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     'serial' => 'entPhysicalSerialNum.1',
     'descr'  => 'sysDescr'
@@ -67,11 +69,11 @@ $VERSION = '2.00';
     %SNMP::Info::Entity::FUNCS,
     %SNMP::Info::EtherLike::FUNCS,
     %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
     %SNMP::Info::CDP::FUNCS,
-    'i_ssidlist'       => 'cd11IfAuxSsid',
-    'i_ssidbcast'      => 'cd11IfAuxSsidBroadcastSsid',
     'i_80211channel'   => 'cd11IfPhyDsssCurrentChannel',
     'c_dot11subif'     => 'cDot11ClientSubIfIndex',
+    'cd11_rateset'     => 'cDot11ClientDataRateSet',
     'cd11_txrate'      => 'cDot11ClientCurrentTxRateSet',
     'cd11_uptime'      => 'cDot11ClientUpTime',
     'cd11_sigstrength' => 'cDot11ClientSignalStrength',
@@ -89,7 +91,7 @@ $VERSION = '2.00';
     %SNMP::Info::Entity::MIBS,
     %SNMP::Info::EtherLike::MIBS,
     %SNMP::Info::CiscoStats::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CDP::MIBS,
     'CISCO-DOT11-IF-MIB'                  => 'cd11IfAuxSsid',
     'CISCO-DOT11-ASSOCIATION-MIB'         => 'cDot11ClientSubIfIndex',
@@ -103,8 +105,10 @@ $VERSION = '2.00';
     %SNMP::Info::Entity::MUNGE,
     %SNMP::Info::EtherLike::MUNGE,
     %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,
     %SNMP::Info::CDP::MUNGE,
     'cd11_txrate'   => \&munge_cd11_txrate,
+    'cd11_rateset'  => \&munge_cd11_txrate,
     'mbss_mac_addr' => \&SNMP::Info::munge_mac,
 );
 
@@ -189,7 +193,7 @@ sub _aironet_breakout_dot11idx {
 sub fw_mac {
     my $aironet = shift;
 
-    return qb_fw_mac($aironet) unless _aironet_special($aironet);
+    return $aironet->qb_fw_mac() unless _aironet_special($aironet);
     my $c_dot11subif = $aironet->c_dot11subif();
     my $fw_mac       = {};
 
@@ -314,6 +318,19 @@ sub cd11_mac {
     return \%ret;
 }
 
+# Map VLAN N on interface I to its actual ifIndex.
+sub _vlan_map_n_stack {
+    my $aironet  = shift;
+    my $vlan_idx = $aironet->cviRoutedVlanIfIndex();
+
+    my $vlan_map = {};
+    foreach my $idx ( keys %$vlan_idx ) {
+        my ( $vlan, $num ) = split( /\./, $idx );
+        $vlan_map->{$vlan}->{$num} = $vlan_idx->{$idx};
+    }
+    return $vlan_map;
+}
+
 # When using MBSS, the ifTable reports the
 # base MAC address, but the actual association is
 # with a different MAC address for MBSS.
@@ -363,6 +380,83 @@ sub i_mac {
     return $mbss_mac;
 }
 
+sub i_ssidlist {
+    my $aironet = shift;
+
+    # no partial is possible due to the levels
+    # of indirection.
+    my $ssid_row  = $aironet->cdot11SecInterfSsidRowStatus();
+    my $ssid_vlan = $aironet->cdot11SecAuxSsidVlan();
+    if ( !defined($ssid_row) || !defined($ssid_vlan) ) {
+        return $aironet->cd11IfAuxSsid();
+    }
+    my $ssidlist     = {};
+    my $if_ssidcount = {};
+    my $vlan_map     = $aironet->_vlan_map_n_stack();
+    foreach my $idx ( keys %$ssid_row ) {
+        next unless $ssid_row->{$idx} eq 'active';
+
+        # ssid_row index is radio.ssid
+        my ( $interface, $ssid ) = split( /\./, $idx, 2 );
+        my ( $len, @ssidt ) = split( /\./, $ssid );
+        my $mappedintf = $vlan_map->{ $ssid_vlan->{$ssid} }->{$interface};
+        next unless $mappedintf;
+        if ( !$if_ssidcount->{$mappedintf} ) {
+            $if_ssidcount->{$mappedintf} = 1;
+        }
+        my $ssidlist_idx
+            = sprintf( "%s.%d", $mappedintf, $if_ssidcount->{$mappedintf} );
+        $ssidlist->{$ssidlist_idx} = pack( "C*", @ssidt );
+        $if_ssidcount->{$mappedintf}++;
+    }
+    return $ssidlist;
+}
+
+sub i_ssidbcast {
+    my $aironet    = shift;
+    my $partial    = shift;
+    my $mbss_bcast = $aironet->cdot11SecAuxSsidMbssidBroadcast();
+    if ( !defined($mbss_bcast) ) {
+        return $aironet->cd11IfAuxSsidBroadcastSsid($partial);
+    }
+    my $map = {};
+    foreach my $key ( keys %$mbss_bcast ) {
+        my (@idx) = split( /\./, $key );
+        my $len = shift(@idx);
+        $map->{ pack( "C*", @idx ) } = $mbss_bcast->{$key};
+    }
+
+    # This needs to return the same indexes as i_ssidlist.
+    # mbss_bcast maps ssid -> broadcasting
+    #  so we just replace the i_ssidlist values with the mbss_bcast ones.
+    my $i_ssidlist  = $aironet->i_ssidlist();
+    my $i_ssidbcast = {};
+    foreach my $key ( keys %$i_ssidlist ) {
+        $i_ssidbcast->{$key} = $map->{ $i_ssidlist->{$key} };
+    }
+    return $i_ssidbcast;
+}
+
+sub i_ssidmac {
+    my $aironet    = shift;
+    my $partial    = shift;
+    my $mbss_mac_addr = $aironet->mbss_mac_addr();
+
+    # Same logic as i_ssidbcast to return same indexes as i_ssidlist 
+    my $map = {};
+    foreach my $key ( keys %$mbss_mac_addr ) {
+        my ( $interface, @idx ) = split( /\./, $key );
+        $map->{ pack( "C*", @idx ) } = $mbss_mac_addr->{$key};
+    }
+
+    my $i_ssidlist  = $aironet->i_ssidlist();
+    my $i_ssidmac = {};
+    foreach my $key ( keys %$i_ssidlist ) {
+        $i_ssidmac->{$key} = $map->{ $i_ssidlist->{$key} };
+    }
+    return $i_ssidmac;
+}
+
 1;
 __END__
 
@@ -424,7 +518,9 @@ my $aironet = new SNMP::Info::Layer2::Aironet(...);
 
 =item SNMP::Info::EtherLike
 
-=item SNMP::Info::CiscoVTP
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoConfig
 
 =back
 
@@ -536,6 +632,22 @@ Returns VLAN IDs
 
 Returns VLAN names
 
+=item $aironet->i_ssidlist()
+
+Returns a list of SSIDs associated with interfaces.  This function
+is C<MBSSID> aware, so when using C<MBSSID> can map SSIDs to the sub-interface
+to which they belong.
+
+=item $aironet->i_ssidbcast()
+
+With the same keys as i_ssidlist, returns whether the given SSID is
+being broadcast.
+
+=item $aironet->i_ssidmac()
+
+With the same keys as i_ssidlist, returns the Basic service set
+identification (BSSID), MAC address, the AP is using for the SSID. 
+
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer2

Info/Layer2/Allied.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
 
@@ -129,7 +129,7 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::Allied - SNMP Interface to Allied Telesyn switches
+SNMP::Info::Layer2::Allied - SNMP Interface to Allied Telesis switches
 
 =head1 AUTHOR
 

Info/Layer2/Bay.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 # Set for No CDP
 %GLOBALS = (

Info/Layer2/Baystack.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
@@ -82,20 +82,26 @@ sub os {
     my $descr    = $baystack->description();
     my $model    = $baystack->model();
 
-    if ((   defined $model
-            and $model
-            =~ /(325|420|425|470|460|BPS|2500|3510|4524|4526|4548|4550|5510|5520|5530)/
-        )
-        and ( defined $descr and $descr =~ m/SW:v[3-5]/i )
-        )
-    {
-        return 'boss';
-    }
     if ( ( defined $descr and $descr =~ /Business Ethernet Switch.*SW:v/i ) )
     {
         return 'bes';
     }
-    return 'baystack';
+    if (
+        (
+           (defined $model and $model =~ /(420|425|BPS)/ )
+        and
+           (defined $descr and $descr =~ m/SW:v[1-2]/i )
+        )
+        or
+        (
+            (defined $model and $model =~ /(410|450|380)/ )
+        )
+       )
+    {
+        return 'baystack';
+    }
+
+    return 'boss';
 }
 
 sub os_bin {
@@ -156,7 +162,7 @@ sub interfaces {
         next unless defined $index;
 
         # Ignore cascade ports
-        next if $index > 513;
+        next if $index > $index_factor * 8;
 
         my $port = ( $index % $index_factor );
         my $slot = ( int( $index / $index_factor ) ) + $slot_offset;
@@ -210,14 +216,23 @@ sub index_factor {
     my $baystack = shift;
     my $model    = $baystack->model();
     my $os       = $baystack->os();
+    my $os_ver   = $baystack->os_ver();
     my $op_mode  = $baystack->ns_op_mode();
 
     $op_mode = 'pure' unless defined $op_mode;
+    if ( $os_ver =~ m/^(\d+)\./ ) {
+        $os_ver = $1;
+    } else {
+        $os_ver = 1;
+    }
 
     my $index_factor = 32;
     $index_factor = 64
         if ( ( defined $model and $model =~ /(470)/ )
         or ( $os =~ m/(boss|bes)/ ) and ( $op_mode eq 'pure' ) );
+    $index_factor = 128
+        if ( ( defined $model and $model =~ /(5[56]\d\d)/ )
+        and ( $os_ver >= 6 ) );
 
     return $index_factor;
 }
@@ -437,6 +452,23 @@ sub e_vendor {
     return $stack->SUPER::e_vendor($partial) || $stack->ns_e_vendor($partial);
 }
 
+# fix for stack of switches without POE on module 1
+# https://sourceforge.net/tracker/?func=detail&aid=3317739&group_id=70362&atid=527529
+sub peth_port_ifindex {
+    my $stack = shift;
+    my $partial = shift;
+
+    my %peth_port_ifindex = ();
+    my $poe_port_st = $stack->peth_port_status($partial);
+    my $if_index = $stack->interfaces($partial);
+
+    foreach my $i (keys %$if_index) {
+        next unless defined $poe_port_st->{$if_index->{$i}};
+        $peth_port_ifindex{$if_index->{$i}} = $i;
+    }
+    return \%peth_port_ifindex;
+}
+
 1;
 
 __END__
@@ -613,6 +645,10 @@ revisions of Baystack firmware report all zeros for each port mac.
 Crosses C<ifName> with C<ifAlias> and returns the human set port name if
 exists.
 
+=item $poe->peth_port_ifindex()
+
+Maps the C<pethPsePortTable> to C<ifIndex> by way of the F<ENTITY-MIB>.
+
 =back
 
 =head2 F<ENTITY-MIB> Information

Info/Layer2/C1900.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,
@@ -251,6 +251,18 @@ sub i_vlan_membership {
     return $i_vlan_membership;
 }
 
+sub bp_index {
+    my $c1900   = shift;
+    my $partial = shift;
+
+    my $if_index = $c1900->i_index($partial);
+    my $index = $c1900->orig_bp_index($partial) || {};
+    foreach my $iid ( keys %$if_index ) {
+        $index->{$iid} = $iid if(!defined $index->{$iid});
+    }
+    return $index;
+}
+
 1;
 __END__
 
@@ -432,6 +444,13 @@ bridge group IDs.
     print "Port: $port VLAN: $vlan\n";
   }
 
+
+=item $c1900->bp_index()
+
+Returns a bp_index that contains the original bp_index entries and extra
+entries for those interfaces listed in if_index, as some C1900 devices do not
+return complete bp_indexes.
+
 =back
 
 =head2 F<STAND-ALONE-ETHERNET-SWITCH-MIB> Switch Port Table Entries:

Info/Layer2/C2900.pm

@@ -47,7 +47,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,

Info/Layer2/Catalyst.pm

@@ -49,7 +49,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoPortSecurity::MIBS,
@@ -148,7 +148,9 @@ sub interfaces {
     foreach my $iid ( keys %$i_index ) {
         next unless defined $iid;
         my $if   = $i_index->{$iid};
+        $if =~ s/\./\// if $if;
         my $port = $portmap{$iid};
+        $port =~ s/\./\// if $port;
         $interfaces{$iid} = $port || $if;
     }
     return \%interfaces;

Info/Layer2/Centillion.pm

@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/Cisco.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,

Info/Layer2/Foundry.pm

@@ -44,7 +44,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,    %SNMP::Info::FDP::MIBS,

Info/Layer2/HP.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer2::HP - SNMP Interface to HP ProCurve Switches
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -46,7 +46,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -55,12 +55,13 @@ $VERSION = '2.00';
     %SNMP::Info::CDP::MIBS,
     'RFC1271-MIB'    => 'logDescription',
     'HP-ICF-OID'     => 'hpSwitch4000',
-    'HP-VLAN'        => 'hpVlanMemberIndex',
     'STATISTICS-MIB' => 'hpSwitchCpuStat',
     'NETSWITCH-MIB'  => 'hpMsgBufFree',
     'CONFIG-MIB'     => 'hpSwitchConfig',
-    'SEMI-MIB'       => 'hpHttpMgSerialNumber',
     'HP-ICF-CHASSIS' => 'hpicfSensorObjectId',
+    'HP-ICF-BRIDGE'  => 'hpicfBridgeRstpForceVersion',
+    'HP-ICF-POE-MIB' => 'hpicfPoePethPsePortCurrent',
+    'SEMI-MIB'       => 'hpHttpMgSerialNumber',
 );
 
 %GLOBALS = (
@@ -75,9 +76,10 @@ $VERSION = '2.00';
     'mem_free'     => 'hpGlobalMemFreeBytes.1',
     'mem_used'     => 'hpGlobalMemAllocBytes.1',
     'os_version'   => 'hpSwitchOsVersion.0',
+    'os_version2'  => 'hpHttpMgVersion.0',
     'os_bin'       => 'hpSwitchRomVersion.0',
     'mac'          => 'hpSwitchBaseMACAddress.0',
-    'hp_vlans'     => 'hpVlanNumber',
+    'rstp_ver'     => 'hpicfBridgeRstpForceVersion',
 );
 
 %FUNCS = (
@@ -85,104 +87,143 @@ $VERSION = '2.00';
     %SNMP::Info::MAU::FUNCS,
     %SNMP::Info::LLDP::FUNCS,
     %SNMP::Info::CDP::FUNCS,
-    'bp_index2' => 'dot1dBasePortIfIndex',
     'i_type2'   => 'ifType',
 
     # RFC1271
     'l_descr' => 'logDescription',
 
-    # HP-VLAN-MIB
-    'hp_v_index'    => 'hpVlanDot1QID',
-    'hp_v_name'     => 'hpVlanIdentName',
-    'hp_v_state'    => 'hpVlanIdentState',
-    'hp_v_type'     => 'hpVlanIdentType',
-    'hp_v_status'   => 'hpVlanIdentStatus',
-    'hp_v_mac'      => 'hpVlanAddrPhysAddress',
-    'hp_v_if_index' => 'hpVlanMemberIndex',
-    'hp_v_if_tag'   => 'hpVlanMemberTagged2',
-
     # CONFIG-MIB::hpSwitchPortTable
     'hp_duplex'       => 'hpSwitchPortEtherMode',
     'hp_duplex_admin' => 'hpSwitchPortFastEtherMode',
+    'vendor_i_type'   => 'hpSwitchPortType',
 
     # HP-ICF-CHASSIS
     'hp_s_oid'    => 'hpicfSensorObjectId',
     'hp_s_name'   => 'hpicfSensorDescr',
     'hp_s_status' => 'hpicfSensorStatus',
+    
+    # HP-ICF-POE-MIB
+    'peth_port_power'   => 'hpicfPoePethPsePortPower',
 );
 
 %MUNGE = (
-
     # Inherit all the built in munging
     %SNMP::Info::Layer3::MUNGE,
     %SNMP::Info::MAU::MUNGE,
     %SNMP::Info::LLDP::MUNGE,
-    %SNMP::Info::CDP::MUNGE
+    %SNMP::Info::CDP::MUNGE,
+    'c_id'   => \&munge_hp_c_id,
 );
 
+
+# Model map, reverse sorted by common model name (sort -k2 -r)
+# Potential sources for model information: http://www.hp.com/rnd/software/switches.htm or HP-ICF-OID MIB 
 %MODEL_MAP = (
-    'J4093A' => '2424M',
-    'J4110A' => '8000M',
-    'J4120A' => '1600M',
-    'J4121A' => '4000M',
-    'J4122A' => '2400M',
-    'J4122B' => '2424M',
-    'J4138A' => '9308M',
-    'J4139A' => '9304M',
-    'J4812A' => '2512',
-    'J4813A' => '2524',
-    'J4815A' => '3324XL',
-    'J4819A' => '5308XL',
-    'J4840A' => '6308M-SX',
-    'J4841A' => '6208M-SX',
-    'J4850A' => '5304XL',
-    'J4851A' => '3124',
-    'J4865A' => '4108GL',
-    'J4874A' => '9315M',
-    'J4887A' => '4104GL',
-    'J4899A' => '2650',
-    'J4899B' => '2650-CR',
-    'J4900A' => '2626',
-    'J4900B' => '2626-CR',
-    'J4902A' => '6108',
-    'J4903A' => '2824',
-    'J4904A' => '2848',
-    'J4905A' => '3400cl-24G',
-    'J4906A' => '3400cl-48G',
-    'J8130A' => 'WAP-420-NA',
     'J8131A' => 'WAP-420-WW',
+    'J8130A' => 'WAP-420-NA',
     'J8133A' => 'AP520WL',
-    'J8164A' => '2626-PWR',
-    'J8165A' => '2650-PWR',
-    'J8433A' => 'CX4-6400cl-6XG',
-    'J8474A' => 'MF-6400cl-6XG',
-    'J8680A' => '9608sl',
-    'J8692A' => '3500yl-24G-PWR',
-    'J8693A' => '3500yl-48G-PWR',
-    'J8697A' => '5406zl',
-    'J8698A' => '5412zl',
-    'J8718A' => '5404yl',
-    'J8719A' => '5408yl',
-    'J8770A' => '4204vl',
-    'J8771A' => '4202vl-48G',
-    'J8772A' => '4202vl-72',
-    'J8773A' => '4208vl',
-    'J8762A' => '2600-8-PWR',
+    'J8680A' => '9408sl',
+    'J9091A' => '8212zl',
+    'J9475A' => '8206zl',
+    'J9265A' => '6600ml-24XG',
+    'J9264A' => '6600ml-24G-4XG',
+    'J9263A' => '6600ml-24G',
+    'J9452A' => '6600-48G-4XG',
+    'J9451A' => '6600-48G',
+    'J8474A' => '6410cl-6XG',
+    'J8433A' => '6400cl-6XG',
     'J8992A' => '6200yl-24G',
-    'J9019A' => '2510-24A',
-    'J9020A' => '2510-48A',
-    'J9021A' => '2810-24G',
-    'J9022A' => '2810-48G',
-    'J9028A' => '1800-24G',
-    'J9029A' => '1800-8G',
+    'J4902A' => '6108',
+    'J8698A' => '5412zl',
+    'J8719A' => '5408yl',
+    'J8697A' => '5406zl',
+    'J8718A' => '5404yl',
+    'J4819A' => '5308XL',
+    'J4850A' => '5304XL',
+    'J8773A' => '4208vl',
+    'J8770A' => '4204vl',
+    'J8772A' => '4202vl-72',
+    'J9032A' => '4202vl-68G',
+    'J9031A' => '4202vl-68',
+    'J8771A' => '4202vl-48G',
+    'J4865A' => '4108GL',
+    'J4887A' => '4104GL',
+    'J9588A' => '3800-48G-PoE+-4XG',
+    'J9574A' => '3800-48G-PoE+-4SFP+',
+    'J9586A' => '3800-48G-4XG',
+    'J9576A' => '3800-48G-4SFP+',
+    'J9584A' => '3800-24SFP-2SFP+',
+    'J9587A' => '3800-24G-PoE+-2XG',
+    'J9573A' => '3800-24G-PoE+-2SFP+',
+    'J9585A' => '3800-24G-2XG',
+    'J9575A' => '3800-24G-2SFP+',
+    'J8693A' => '3500yl-48G-PWR',
+    'J8692A' => '3500yl-24G-PWR',
+    'J9473A' => '3500-48-PoE',
+    'J9472A' => '3500-48',
+    'J9471A' => '3500-24-PoE',
+    'J9470A' => '3500-24',
+    'J4906A' => '3400cl-48G',
+    'J4905A' => '3400cl-24G',
+    'J4815A' => '3324XL',
+    'J4851A' => '3124',
+    'J9562A' => '2915-8G-PoE',
+    'J9148A' => '2910al-48G-PoE+',
+    'J9147A' => '2910al-48G',
+    'J9146A' => '2910al-24G-PoE+',
+    'J9145A' => '2910al-24G',
     'J9050A' => '2900-48G',
     'J9049A' => '2900-24G',
-    'J9032A' => '4202vl-68G',
-    'J9091A' => '8212zl',
+    'J4904A' => '2848',
+    'J4903A' => '2824',
+    'J9022A' => '2810-48G',
+    'J9021A' => '2810-24G',
+    'J8165A' => '2650-PWR',
+    'J4899B' => '2650-CR',
+    'J4899C' => '2650C',
+    'J4899A' => '2650',
+    'J8164A' => '2626-PWR',
+    'J4900B' => '2626-CR',
+    'J4900C' => '2626C',
+    'J4900A' => '2626',
+    'J9627A' => '2620-48-PoE+',
+    'J9624A' => '2620-48',
+    'J9624A' => '2620-24-PPoE+',
+    'J9625A' => '2620-24-PoE+',
+    'J9623A' => '2620-24',
+    'J9565A' => '2615-8-PoE',
+    'J9089A' => '2610-48-PWR',
+    'J9088A' => '2610-48',
+    'J9087A' => '2610-24-PWR',
+    'J9086A' => '2610-24/12PWR',
+    'J9085A' => '2610-24',
+    'J8762A' => '2600-8-PWR',
+    'J4813A' => '2524',
+    'J9298A' => '2520G-8-PoE',
+    'J9299A' => '2520G-24-PoE',
+    'J9137A' => '2520-8-PoE',
+    'J9138A' => '2520-24-PoE',
+    'J4812A' => '2512',
+    'J9280A' => '2510G-48',
+    'J9279A' => '2510G-24',
+    'J9020A' => '2510-48A',
+    'J9019B' => '2510-24B',
+    'J9019A' => '2510-24A',
+    'J4818A' => '2324',
+    'J4817A' => '2312',
+    'J9449A' => '1810G-8',
+    'J9450A' => '1810G-24',
+    'J9029A' => '1800-8G',
+    'J9028A' => '1800-24G',
 );
 
 # Method Overrides
 
+sub stp_ver {
+    my $hp = shift;
+    return $hp->rstp_ver() || $hp->SUPER::stp_ver();
+}
+
 sub cpu {
     my $hp = shift;
     return $hp->hp_cpu();
@@ -199,7 +240,7 @@ sub os {
 
 sub os_ver {
     my $hp         = shift;
-    my $os_version = $hp->os_version();
+    my $os_version = $hp->os_version() || $hp->os_version2();
     return $os_version if defined $os_version;
 
     # Some older ones don't have this value,so we cull it from the description
@@ -210,6 +251,16 @@ sub os_ver {
     return;
 }
 
+# Regular managed ProCurve switches have the serial num in entity mib, 
+# the web-managed models in the semi mib (hphttpmanageable).
+sub serial {
+    my $hp = shift;
+
+    my $serial = $hp->serial1() || $hp->serial2() || undef;;
+
+    return $serial;
+}
+
 # Lookup model number, and translate the part number to the common number
 sub model {
     my $hp = shift;
@@ -223,15 +274,6 @@ sub model {
     return defined $MODEL_MAP{$model} ? $MODEL_MAP{$model} : $model;
 }
 
-# Some have the serial in entity mib, some have it in SEMI-MIB::hphttpmanageable
-sub serial {
-    my $hp = shift;
-
-    my $serial = $hp->serial1() || $hp->serial2() || undef;
-
-    return $serial;
-}
-
 sub interfaces {
     my $hp         = shift;
     my $interfaces = $hp->i_index();
@@ -371,116 +413,7 @@ sub _sensor {
     return $result;
 }
 
-# Bridge MIB does not map Bridge Port to ifIndex correctly on all models
-sub bp_index {
-    my $hp      = shift;
-    my $partial = shift;
-
-    my $if_index = $hp->i_index($partial);
-    my $model    = $hp->model();
-    my $bp_index = $hp->bp_index2($partial);
-
-    unless ( defined $model and $model =~ /(1600|2424|4000|8000)/ ) {
-        return $bp_index;
-    }
-
-    my %mod_bp_index;
-    foreach my $iid ( keys %$if_index ) {
-        $mod_bp_index{$iid} = $iid;
-    }
-    return \%mod_bp_index;
-}
-
-# VLAN methods.  Newer HPs use Q-BRIDGE, older use proprietary MIB.  Use
-# Q-BRIDGE if available.
-
-sub v_index {
-    my $hp      = shift;
-    my $partial = shift;
-
-    # Newer devices
-    my $q_index = $hp->SUPER::v_index($partial);
-    if ( defined $q_index and scalar( keys %$q_index ) ) {
-        return $q_index;
-    }
-
-    # Older devices
-    return $hp->hp_v_index($partial);
-}
-
-sub v_name {
-    my $hp      = shift;
-    my $partial = shift;
-
-    # Newer devices
-    my $q_name = $hp->SUPER::v_name($partial);
-    if ( defined $q_name and scalar( keys %$q_name ) ) {
-        return $q_name;
-    }
-
-    # Older devices
-    return $hp->hp_v_name($partial);
-}
-
-sub i_vlan {
-    my $hp = shift;
-
-    # Newer devices use Q-BRIDGE-MIB
-    my $qb_i_vlan = $hp->SUPER::i_vlan();
-    if ( defined $qb_i_vlan and scalar( keys %$qb_i_vlan ) ) {
-        return $qb_i_vlan;
-    }
-
-    # HP4000 ... get it from HP-VLAN
-    # the hpvlanmembertagged2 table has an entry in the form of
-    #   vlan.interface = /untagged/no/tagged/auto
-    my $i_vlan      = {};
-    my $hp_v_index  = $hp->hp_v_index();
-    my $hp_v_if_tag = $hp->hp_v_if_tag();
-    foreach my $row ( keys %$hp_v_if_tag ) {
-        my ( $index, $if ) = split( /\./, $row );
-
-        my $tag  = $hp_v_if_tag->{$row};
-        my $vlan = $hp_v_index->{$index};
-
-        next unless ( defined $tag and $tag =~ /untagged/ );
-
-        $i_vlan->{$if} = $vlan if defined $vlan;
-    }
-
-    return $i_vlan;
-}
-
-sub i_vlan_membership {
-    my $hp = shift;
-
-    # Newer devices use Q-BRIDGE-MIB
-    my $qb_i_vlan = $hp->SUPER::i_vlan_membership();
-    if ( defined $qb_i_vlan and scalar( keys %$qb_i_vlan ) ) {
-        return $qb_i_vlan;
-    }
-
-    # Older get it from HP-VLAN
-    my $i_vlan_membership = {};
-    my $hp_v_index        = $hp->hp_v_index();
-    my $hp_v_if_tag       = $hp->hp_v_if_tag();
-    foreach my $row ( keys %$hp_v_if_tag ) {
-        my ( $index, $if ) = split( /\./, $row );
-
-        my $tag  = $hp_v_if_tag->{$row};
-        my $vlan = $hp_v_index->{$index};
-
-        next unless ( defined $tag );
-        next if ( $tag eq 'no' );
-
-        push( @{ $i_vlan_membership->{$if} }, $vlan );
-    }
-
-    return $i_vlan_membership;
-}
-
 #  Use CDP and/or LLDP
-
 sub hasCDP {
     my $hp = shift;
 
@@ -553,7 +486,6 @@ sub c_port {
     foreach my $iid ( keys %$lldp ) {
         my $port = $lldp->{$iid};
         next unless defined $port;
-
         $c_port{$iid} = $port;
     }
     return \%c_port;
@@ -570,19 +502,32 @@ sub c_id {
     foreach my $iid ( keys %$cdp ) {
         my $id = $cdp->{$iid};
         next unless defined $id;
-
+	
         $c_id{$iid} = $id;
     }
-
+    
     foreach my $iid ( keys %$lldp ) {
-        my $id = $lldp->{$iid};
-        next unless defined $id;
-
-        $c_id{$iid} = $id;
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
     }
     return \%c_id;
 }
 
+sub munge_hp_c_id {
+    my ($v) = @_;
+    if ( length(unpack('H*', $v)) == 12 ){
+	return join(':',map { sprintf "%02x", $_ } unpack('C*', $v));
+    }if ( length(unpack('H*', $v)) == 10 ){
+	# IP address (first octet is sign, I guess)
+	my @octets = (map { sprintf "%02x",$_ } unpack('C*', $v))[1..4];
+	return join '.', map { hex($_) } @octets;
+    }else{
+	return $v;
+    }
+}
+
 sub c_platform {
     my $hp      = shift;
     my $partial = shift;
@@ -627,6 +572,76 @@ sub peth_port_ifindex {
     return $peth_port_ifindex;
 }
 
+sub set_i_vlan {
+    my $hp = shift;
+    my $rv;
+
+    my $qb_i_vlan = $hp->qb_i_vlan_t();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        my $vlan = shift;
+        my $iid = shift;
+
+        my $qb_v_egress = $hp->qb_v_egress();
+        if (defined $qb_v_egress and scalar($qb_v_egress->{$vlan})) {
+            # store current untagged VLAN to remove it from the port list later
+            my $old_untagged = $qb_i_vlan->{$iid};
+
+            # set new untagged / native VLAN
+            $rv = $hp->set_qb_i_vlan($vlan, $iid);
+
+            # If change is successful, the old native VLAN will now be a tagged VLAN on the port. This is generally not what we want.
+            # We'll have to remove this VLAN from the "egress list" on the port.
+            if (defined $rv and $old_untagged != $vlan) {
+                if (defined $old_untagged and defined $qb_v_egress and scalar($qb_v_egress->{$vlan})){
+
+                    # First, get the egress list of the old native VLAN (arrayref structure)
+                    my $egressports = $qb_v_egress->{$old_untagged};
+
+                    # Since arrays are zero-based, we have to change the element at Index - 1
+                    $egressports->[$iid-1] = "0";
+
+                    # After changing, pack the array into a binary structure (expected by set_qb_v_egress) and set the new value on the device.
+                    my $new_egresslist = pack("B*", join('', @$egressports));
+
+                    $rv = $hp->set_qb_v_egress($new_egresslist, $old_untagged);
+                }
+            }
+        } else {
+            $hp->error_throw(sprintf("Requested VLAN %s doesn't seem to exist on device...", $vlan));
+        }
+    }
+    return $rv;
+}
+
+sub set_i_vlan_tagged {
+    my $hp = shift;
+    my $rv;
+
+    my $qb_i_vlan = $hp->qb_i_vlan_t();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        my $vlan = shift;
+        my $iid = shift;
+
+        my $qb_v_egress = $hp->qb_v_egress();
+        if (defined $qb_v_egress and scalar($qb_v_egress->{$vlan})) {
+
+            # First, get the egress list of the VLAN we want to add to the port.
+            my $egressports = $qb_v_egress->{$vlan};
+
+            # Since arrays are zero-based, we have to change the element at Index - 1
+            $egressports->[$iid-1] = "1";
+
+            # After changing, pack the array into a binary structure (expected by set_qb_v_egress) and set the new value on the device.
+            my $new_egresslist = pack("B*", join('', @$egressports));
+            $rv = $hp->set_qb_v_egress($new_egresslist, $vlan);
+            return $rv;
+        } else {
+            $hp->error_throw(sprintf("Requested VLAN %s doesn't seem to exist on device...", $vlan));
+        }
+    }
+    return;
+}
+
 1;
 __END__
 
@@ -689,8 +704,6 @@ Included in V2 mibs from Cisco
 
 =item F<HP-ICF-OID>
 
-=item F<HP-VLAN>
-
 (this MIB new with SNMP::Info 0.8)
 
 =item F<STATISTICS-MIB>
@@ -699,9 +712,13 @@ Included in V2 mibs from Cisco
 
 =item F<CONFIG-MIB>
 
+=item F<HP-ICF-BRIDGE>
+
+=item F<HP-ICF-POE-MIB>
+
 =back
 
-The last five MIBs listed are from HP and can be found at
+The last four MIBs listed are from HP and can be found at
 L<http://www.hp.com/rnd/software> or
 L<http://www.hp.com/rnd/software/MIBs.htm>
 
@@ -742,66 +759,104 @@ Returns bytes of used memory
 Returns the model number of the HP Switch.  Will translate between the HP Part
 number and the common model number with this map :
 
- %MODEL_MAP = ( 
-                'J4093A' => '2424M',
-                'J4110A' => '8000M',
-                'J4120A' => '1600M',
-                'J4121A' => '4000M',
-                'J4122A' => '2400M',
-                'J4122B' => '2424M',
-                'J4138A' => '9308M',
-                'J4139A' => '9304M',
-                'J4812A' => '2512',
-                'J4813A' => '2524',
-                'J4815A' => '3324XL',
-                'J4819A' => '5308XL',
-                'J4840A' => '6308M-SX',
-                'J4841A' => '6208M-SX',
-                'J4850A' => '5304XL',
-                'J4851A' => '3124',
-                'J4865A' => '4108GL',
-                'J4874A' => '9315M',
-                'J4887A' => '4104GL',
-                'J4899A' => '2650',
-                'J4899B' => '2650-CR',
-                'J4900A' => '2626',
-                'J4900B' => '2626-CR',
-                'J4902A' => '6108',
-                'J4903A' => '2824',
-                'J4904A' => '2848',
-                'J4905A' => '3400cl-24G',
-                'J4906A' => '3400cl-48G',
-                'J8130A' => 'WAP-420-NA',
-                'J8131A' => 'WAP-420-WW',
-                'J8133A' => 'AP520WL',
-                'J8164A' => '2626-PWR',
-                'J8165A' => '2650-PWR',
-                'J8433A' => 'CX4-6400cl-6XG',
-                'J8474A' => 'MF-6400cl-6XG',
-                'J8680A' => '9608sl',
-                'J8692A' => '3500yl-24G-PWR',
-                'J8693A' => '3500yl-48G-PWR',
-                'J8697A' => '5406zl',
-                'J8698A' => '5412zl',
-                'J8718A' => '5404yl',
-                'J8719A' => '5408yl',
-                'J8770A' => '4204vl',
-                'J8771A' => '4202vl-48G',
-                'J8772A' => '4202vl-72',
-                'J8773A' => '4208vl',
-                'J8762A' => '2600-8-PWR',
-                'J8992A' => '6200yl-24G',
-                'J9019A' => '2510-24A',
-                'J9020A' => '2510-48A',
-                'J9021A' => '2810-24G',
-                'J9022A' => '2810-48G',
-                'J9028A' => '1800-24G',
-                'J9029A' => '1800-8G',
-                'J9050A' => '2900-48G',
-                'J9049A' => '2900-24G',
-                'J9032A' => '4202vl-68G',
-                'J9091A' => '8212zl',
-                );
+%MODEL_MAP = (
+    'J8131A' => 'WAP-420-WW',
+    'J8130A' => 'WAP-420-NA',
+    'J8133A' => 'AP520WL',
+    'J8680A' => '9408sl',
+    'J9091A' => '8212zl',
+    'J9475A' => '8206zl',
+    'J9265A' => '6600ml-24XG',
+    'J9264A' => '6600ml-24G-4XG',
+    'J9263A' => '6600ml-24G',
+    'J9452A' => '6600-48G-4XG',
+    'J9451A' => '6600-48G',
+    'J8474A' => '6410cl-6XG',
+    'J8433A' => '6400cl-6XG',
+    'J8992A' => '6200yl-24G',
+    'J4902A' => '6108',
+    'J8698A' => '5412zl',
+    'J8719A' => '5408yl',
+    'J8697A' => '5406zl',
+    'J8718A' => '5404yl',
+    'J4819A' => '5308XL',
+    'J4850A' => '5304XL',
+    'J8773A' => '4208vl',
+    'J8770A' => '4204vl',
+    'J8772A' => '4202vl-72',
+    'J9032A' => '4202vl-68G',
+    'J9031A' => '4202vl-68',
+    'J8771A' => '4202vl-48G',
+    'J4865A' => '4108GL',
+    'J4887A' => '4104GL',
+    'J9588A' => '3800-48G-PoE+-4XG',
+    'J9574A' => '3800-48G-PoE+-4SFP+',
+    'J9586A' => '3800-48G-4XG',
+    'J9576A' => '3800-48G-4SFP+',
+    'J9584A' => '3800-24SFP-2SFP+',
+    'J9587A' => '3800-24G-PoE+-2XG',
+    'J9573A' => '3800-24G-PoE+-2SFP+',
+    'J9585A' => '3800-24G-2XG',
+    'J9575A' => '3800-24G-2SFP+',
+    'J8693A' => '3500yl-48G-PWR',
+    'J8692A' => '3500yl-24G-PWR',
+    'J9473A' => '3500-48-PoE',
+    'J9472A' => '3500-48',
+    'J9471A' => '3500-24-PoE',
+    'J9470A' => '3500-24',
+    'J4906A' => '3400cl-48G',
+    'J4905A' => '3400cl-24G',
+    'J4815A' => '3324XL',
+    'J4851A' => '3124',
+    'J9562A' => '2915-8G-PoE',
+    'J9148A' => '2910al-48G-PoE+',
+    'J9147A' => '2910al-48G',
+    'J9146A' => '2910al-24G-PoE+',
+    'J9145A' => '2910al-24G',
+    'J9050A' => '2900-48G',
+    'J9049A' => '2900-24G',
+    'J4904A' => '2848',
+    'J4903A' => '2824',
+    'J9022A' => '2810-48G',
+    'J9021A' => '2810-24G',
+    'J8165A' => '2650-PWR',
+    'J4899B' => '2650-CR',
+    'J4899C' => '2650C',
+    'J4899A' => '2650',
+    'J8164A' => '2626-PWR',
+    'J4900B' => '2626-CR',
+    'J4900C' => '2626C',
+    'J4900A' => '2626',
+    'J9627A' => '2620-48-PoE+',
+    'J9624A' => '2620-48',
+    'J9624A' => '2620-24-PPoE+',
+    'J9625A' => '2620-24-PoE+',
+    'J9623A' => '2620-24',
+    'J9565A' => '2615-8-PoE',
+    'J9089A' => '2610-48-PWR',
+    'J9088A' => '2610-48',
+    'J9087A' => '2610-24-PWR',
+    'J9086A' => '2610-24/12PWR',
+    'J9085A' => '2610-24',
+    'J8762A' => '2600-8-PWR',
+    'J4813A' => '2524',
+    'J9298A' => '2520G-8-PoE',
+    'J9299A' => '2520G-24-PoE',
+    'J9137A' => '2520-8-PoE',
+    'J9138A' => '2520-24-PoE',
+    'J4812A' => '2512',
+    'J9280A' => '2510G-48',
+    'J9279A' => '2510G-24',
+    'J9020A' => '2510-48A',
+    'J9019B' => '2510-24B',
+    'J9019A' => '2510-24A',
+    'J4818A' => '2324',
+    'J4817A' => '2312',
+    'J9449A' => '1810G-8',
+    'J9450A' => '1810G-24',
+    'J9029A' => '1800-8G',
+    'J9028A' => '1800-24G',
+);
 
 =item $hp->os()
 
@@ -844,6 +899,16 @@ Power supply 1 status
 
 Power supply 2 status
 
+=item $hp->peth_port_power()
+
+Power supplied by PoE ports, in milliwatts
+("hpicfPoePethPsePortPower")
+
+=item $hp->stp_ver()
+
+Returns what version of STP the device is running.
+("hpicfBridgeRstpForceVersion" with fallback to inherited stp_ver())
+
 =back
 
 =head2 Globals imported from SNMP::Info::Layer2
@@ -879,53 +944,14 @@ Returns reference to map of IIDs to current link duplex.
 
 Returns reference to hash of IIDs to admin duplex setting.
 
+=item $hp->vendor_i_type()
+
+Returns reference to hash of IIDs to HP specific port type (hpSwitchPortType).
+
 =item $hp->i_name()
 
 Crosses i_name() with $hp->e_name() using $hp->e_port() and i_alias()
 
-=item $hp->i_vlan()
-
-Returns a mapping between C<ifIndex> and the PVID (default VLAN) or untagged
-port when using F<HP-VLAN>.
-
-Looks in F<Q-BRIDGE-MIB> first (L<SNMP::Info::Bridge/"TABLE METHODS">) and for
-older devices looks in F<HP-VLAN>.
-
-=item $hp->i_vlan_membership()
-
-Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
-IDs.  These are the VLANs which are members of the egress list for the port.
-It  is the union of tagged, untagged, and auto ports when using F<HP-VLAN>.
-
-Looks in F<Q-BRIDGE-MIB> first (L<SNMP::Info::Bridge/"TABLE METHODS">) and for
-older devices looks in F<HP-VLAN>.
-
-  Example:
-  my $interfaces = $hp->interfaces();
-  my $vlans      = $hp->i_vlan_membership();
-  
-  foreach my $iid (sort keys %$interfaces) {
-    my $port = $interfaces->{$iid};
-    my $vlan = join(',', sort(@{$vlans->{$iid}}));
-    print "Port: $port VLAN: $vlan\n";
-  }
-
-=item $hp->v_index()
-
-Returns VLAN IDs
-
-=item $hp->v_name()
-
-Returns VLAN names
-
-=item $hp->bp_index()
-
-Returns reference to hash of bridge port table entries map back to interface
-identifier (iid)
-
-Returns (C<ifIndex>) for both key and value for 1600, 2424, 4000, and 8000
-models since they seem to have problems with F<BRIDGE-MIB>
-
 =item $hp->peth_port_ifindex()
 
 Returns reference to hash of power Ethernet port table entries map back to
@@ -992,4 +1018,27 @@ See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
 
+=head1 MUNGES
+
+=over
+
+=item munge_hp_c_id()
+
+Munge for c_id which handles CDP and LLDP.
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods
+or provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set
+operations. 
+
+=over
+
+=item set_i_vlan()
+
+=item set_i_vlan_tagged()
+
 =cut

Info/Layer2/HP4000.pm

@@ -0,0 +1,721 @@
+# SNMP::Info::Layer2::HP4000 - SNMP Interface to older HP ProCurve Switches (1600, 2400, 2424M, 4000 and 8000)
+#
+# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+#
+# 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:
+#
+#     * 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::Layer2::HP4000;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::CDP;
+
+@SNMP::Info::Layer2::HP4000::ISA
+    = qw/SNMP::Info::Layer3 SNMP::Info::MAU
+    SNMP::Info::CDP Exporter/;
+@SNMP::Info::Layer2::HP4000::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::CDP::MIBS,
+    'RFC1271-MIB'    => 'logDescription',
+    'HP-ICF-OID'     => 'hpSwitch4000',
+    'HP-VLAN'        => 'hpVlanMemberIndex',
+    'STATISTICS-MIB' => 'hpSwitchCpuStat',
+    'NETSWITCH-MIB'  => 'hpMsgBufFree',
+    'CONFIG-MIB'     => 'hpSwitchConfig',
+    'SEMI-MIB'       => 'hpHttpMgSerialNumber',
+    'HP-ICF-CHASSIS' => 'hpicfSensorObjectId',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    'serial1'      => 'hpHttpMgSerialNumber.0',
+    'hp_cpu'       => 'hpSwitchCpuStat.0',
+    'hp_mem_total' => 'hpGlobalMemTotalBytes.1',
+    'mem_free'     => 'hpGlobalMemFreeBytes.1',
+    'mem_used'     => 'hpGlobalMemAllocBytes.1',
+    'os_version'   => 'hpSwitchOsVersion.0',
+    'os_bin'       => 'hpSwitchRomVersion.0',
+    'mac'          => 'hpSwitchBaseMACAddress.0',
+    'hp_vlans'     => 'hpVlanNumber',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    'bp_index2' => 'dot1dBasePortIfIndex',
+    'i_type2'   => 'ifType',
+
+    # RFC1271
+    'l_descr' => 'logDescription',
+
+    # HP-VLAN-MIB
+    'hp_v_index'    => 'hpVlanDot1QID',
+    'hp_v_name'     => 'hpVlanIdentName',
+    'hp_v_state'    => 'hpVlanIdentState',
+    'hp_v_type'     => 'hpVlanIdentType',
+    'hp_v_status'   => 'hpVlanIdentStatus',
+    'hp_v_mac'      => 'hpVlanAddrPhysAddress',
+    'hp_v_if_index' => 'hpVlanMemberIndex',
+    'hp_v_if_tag'   => 'hpVlanMemberTagged2',
+
+    # CONFIG-MIB::hpSwitchPortTable
+    'hp_duplex'       => 'hpSwitchPortEtherMode',
+    'hp_duplex_admin' => 'hpSwitchPortFastEtherMode',
+    'vendor_i_type'   => 'hpSwitchPortType',
+
+    # HP-ICF-CHASSIS
+    'hp_s_oid'    => 'hpicfSensorObjectId',
+    'hp_s_name'   => 'hpicfSensorDescr',
+    'hp_s_status' => 'hpicfSensorStatus',
+);
+
+%MUNGE = (
+
+    # Inherit all the built in munging
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::CDP::MUNGE
+);
+
+%MODEL_MAP = (
+    'J4093A' => '2424M',
+    'J4110A' => '8000M',
+    'J4120A' => '1600M',
+    'J4121A' => '4000M',
+    'J4122A' => '2400M',
+    'J4122B' => '2424M',
+);
+
+# Method Overrides
+
+sub cpu {
+    my $hp = shift;
+    return $hp->hp_cpu();
+}
+
+sub mem_total {
+    my $hp = shift;
+    return $hp->hp_mem_total();
+}
+
+sub os {
+    return 'hp';
+}
+
+sub os_ver {
+    my $hp         = shift;
+    my $os_version = $hp->os_version();
+    return $os_version if defined $os_version;
+
+    # Some older ones don't have this value,so we cull it from the description
+    my $descr = $hp->description();
+    if ( $descr =~ m/revision ([A-Z]{1}\.\d{2}\.\d{2})/ ) {
+        return $1;
+    }
+    return;
+}
+
+# Lookup model number, and translate the part number to the common number
+sub model {
+    my $hp = shift;
+    my $id = $hp->id();
+    return unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    $model =~ s/^hpswitch//i;
+
+    return defined $MODEL_MAP{$model} ? $MODEL_MAP{$model} : $model;
+}
+
+sub interfaces {
+    my $hp         = shift;
+    my $interfaces = $hp->i_index();
+    my $i_descr    = $hp->i_description();
+
+    my %if;
+    foreach my $iid ( keys %$interfaces ) {
+        my $descr = $i_descr->{$iid};
+        next unless defined $descr;
+        $if{$iid} = $descr if ( defined $descr and length $descr );
+    }
+
+    return \%if
+}
+
+sub i_name {
+    my $hp      = shift;
+    my $i_alias = $hp->i_alias();
+    my $e_name  = $hp->e_name();
+    my $e_port  = $hp->e_port();
+
+    my %i_name;
+
+    foreach my $port ( keys %$e_name ) {
+        my $iid = $e_port->{$port};
+        next unless defined $iid;
+        my $alias = $i_alias->{$iid};
+        next unless defined $iid;
+        $i_name{$iid} = $e_name->{$port};
+
+        # Check for alias
+        $i_name{$iid} = $alias if ( defined $alias and length($alias) );
+    }
+
+    return \%i_name;
+}
+
+sub i_duplex {
+    my $hp = shift;
+
+    return $hp->mau_i_duplex();
+}
+
+sub i_duplex_admin {
+    my $hp      = shift;
+    my $partial = shift;
+
+    # Try HP MIB first
+    my $hp_duplex = $hp->hp_duplex_admin($partial);
+    if ( defined $hp_duplex and scalar( keys %$hp_duplex ) ) {
+
+        my %i_duplex;
+        foreach my $if ( keys %$hp_duplex ) {
+            my $duplex = $hp_duplex->{$if};
+            next unless defined $duplex;
+
+            $duplex = 'half' if $duplex =~ /half/i;
+            $duplex = 'full' if $duplex =~ /full/i;
+            $duplex = 'auto' if $duplex =~ /auto/i;
+            $i_duplex{$if} = $duplex;
+        }
+        return \%i_duplex;
+    }
+    else {
+        return $hp->mau_i_duplex_admin();
+    }
+}
+
+sub vendor {
+    return 'hp';
+}
+
+sub log {
+    my $hp = shift;
+
+    my $log = $hp->l_descr();
+
+    my $logstring = undef;
+
+    foreach my $val ( values %$log ) {
+        next if $val =~ /^Link\s+(Up|Down)/;
+        $logstring .= "$val\n";
+    }
+
+    return $logstring;
+}
+
+sub slots {
+    my $hp = shift;
+
+    my $e_name = $hp->e_name();
+
+    return unless defined $e_name;
+
+    my $slots;
+    foreach my $slot ( keys %$e_name ) {
+        $slots++ if $e_name->{$slot} =~ /slot/i;
+    }
+
+    return $slots;
+}
+
+sub fan {
+    my $hp = shift;
+    return &_sensor( $hp, 'fan' );
+}
+
+sub ps1_status {
+    my $hp = shift;
+    return &_sensor( $hp, 'power', '^power supply 1' )
+        || &_sensor( $hp, 'power', '^power supply sensor' );
+}
+
+sub ps2_status {
+    my $hp = shift;
+    return &_sensor( $hp, 'power', '^power supply 2' )
+        || &_sensor( $hp, 'power', '^redundant' );
+}
+
+sub _sensor {
+    my $hp          = shift;
+    my $search_type = shift || 'fan';
+    my $search_name = shift || '';
+    my $hp_s_oid    = $hp->hp_s_oid();
+    my $result;
+    foreach my $sensor ( keys %$hp_s_oid ) {
+        my $sensortype = &SNMP::translateObj( $hp_s_oid->{$sensor} );
+        if ( $sensortype =~ /$search_type/i ) {
+            my $sensorname   = $hp->hp_s_name()->{$sensor};
+            my $sensorstatus = $hp->hp_s_status()->{$sensor};
+            if ( $sensorname =~ /$search_name/i ) {
+                $result = $sensorstatus;
+            }
+        }
+    }
+    return $result;
+}
+
+# Bridge MIB does not map Bridge Port to ifIndex correctly on older models, but Bridge Port equals ifIndex in these devices
+sub bp_index {
+    my $hp      = shift;
+    my $partial = shift;
+
+    my $if_index = $hp->i_index($partial);
+    my %mod_bp_index;
+    foreach my $iid ( keys %$if_index ) {
+        $mod_bp_index{$iid} = $iid;
+    }
+    return \%mod_bp_index;
+}
+
+# VLAN methods. Devices in this class use the proprietary HP-VLAN-MIB.
+
+sub v_index {
+    my $hp      = shift;
+    my $partial = shift;
+
+    return $hp->hp_v_index($partial);
+}
+
+sub v_name {
+    my $hp      = shift;
+    my $partial = shift;
+
+    return $hp->hp_v_name($partial);
+}
+
+sub i_vlan {
+    my $hp = shift;
+
+    # the hpvlanmembertagged2 table has an entry in the form of
+    #   vlan.interface = /untagged/no/tagged/auto
+    my $i_vlan      = {};
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    foreach my $row ( keys %$hp_v_if_tag ) {
+        my ( $index, $if ) = split( /\./, $row );
+
+        my $tag  = $hp_v_if_tag->{$row};
+        my $vlan = $hp_v_index->{$index};
+
+        next unless ( defined $tag and $tag =~ /untagged/ );
+
+        $i_vlan->{$if} = $vlan if defined $vlan;
+    }
+
+    return $i_vlan;
+}
+
+sub i_vlan_membership {
+    my $hp = shift;
+
+    my $i_vlan_membership = {};
+    my $hp_v_index        = $hp->hp_v_index();
+    my $hp_v_if_tag       = $hp->hp_v_if_tag();
+    foreach my $row ( keys %$hp_v_if_tag ) {
+        my ( $index, $if ) = split( /\./, $row );
+
+        my $tag  = $hp_v_if_tag->{$row};
+        my $vlan = $hp_v_index->{$index};
+
+        next unless ( defined $tag );
+        next if ( $tag eq 'no' );
+
+        push( @{ $i_vlan_membership->{$if} }, $vlan );
+    }
+
+    return $i_vlan_membership;
+}
+
+sub set_i_vlan {
+    my $hp = shift;
+    my $rv;
+
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    if (defined $hp_v_index and scalar(keys %$hp_v_index)){
+        my $vlan = shift;
+        my $iid = shift;
+        my $old_untagged;
+        # Hash to lookup VLAN index of the VID (dot1q tag)
+        my %vl_trans = reverse %$hp_v_index;
+
+        # Translate the VLAN identifier (tag) value to the index used by the HP-VLAN MIB
+        my $vlan_index = $vl_trans{$vlan};
+        if (defined $vlan_index) {
+
+            # First, loop through table to determine current untagged vlan for the port we're about to change
+            foreach my $row (keys %$hp_v_if_tag){
+                my ($index,$if) = split(/\./,$row);
+                if ($if == $iid and $hp_v_if_tag->{$row} =~ /untagged/) {
+                    # Store the row information of the current untagged VLAN and temporarily set it to tagged
+                    $old_untagged = $row;
+                    $rv = $hp->set_hp_v_if_tag(1, $row);
+                    last;
+                }
+            }
+
+            # Then set our port untagged in the desired VLAN
+            my $rv = $hp->set_hp_v_if_tag(2, "$vlan_index.$iid");
+            if (defined $rv) {
+                # If vlan change is successful, remove VLAN that used to be untagged from the port
+                if (defined $old_untagged) {
+                    $rv = $hp->set_hp_v_if_tag(3, $old_untagged);
+                    $hp->error_throw("Error removing previous untagged vlan from port, should never happen...\n") unless defined $rv;
+                }
+            } else {
+                # If vlan change was not succesful, try to revert to the old situation.
+                if (defined $old_untagged) {
+                    $rv = $hp->set_hp_v_if_tag(2, $old_untagged) if defined $old_untagged;
+                    if (defined $rv) {
+                        $hp->error_throw("VLAN change failed, restored port to previous configuration.\n");
+                    } else {
+                        $hp->error_throw("VLAN change failed, unable to restore old configuration. Check device.\n");
+                    }
+                }
+            }
+        } else {
+            $hp->error_throw("Requested VLAN (VLAN ID: $vlan) not available on device.\n");
+        }
+    } else {
+        $hp->error_throw("Error retrieving VLAN information from device.\n");
+    }
+    return $rv;
+}
+
+sub set_i_vlan_tagged {
+    my $hp = shift;
+    my $vlan = shift;
+    my $iid = shift;
+    my $rv;
+
+    my $hp_v_index  = $hp->hp_v_index();
+    if (defined $hp_v_index and scalar(keys %$hp_v_index)){
+        # Hash to lookup VLAN index of the VID (dot1q tag)
+        my %vl_trans = reverse %$hp_v_index;
+
+        # Translate the VLAN identifier (tag) value to the index used by the HP-VLAN MIB
+        my $vlan_index = $vl_trans{$vlan};
+        if (defined $vlan_index) {
+            # Set our port tagged in the desired VLAN
+            $rv = $hp->set_hp_v_if_tag(1, "$vlan_index.$iid");
+        } else {
+            $hp->error_throw("Requested VLAN (VLAN ID: $vlan) not available on device.\n");
+        }
+    }
+    return $rv;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::HP4000 - SNMP Interface to older HP ProCurve Switches (1600, 2400, 2424M, 4000 and 8000)
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $hp = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $hp->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+HP ProCurve Switch via SNMP. 
+
+Note:  Some HP Switches will connect via SNMP version 1, but a lot of config
+data will not be available.  Make sure you try and connect with Version 2
+first, and then fail back to version 1.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $hp = new SNMP::Info::Layer2::HP4000(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+
+=item SNMP::Info::MAU
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<RFC1271-MIB>
+
+Included in V2 mibs from Cisco
+
+=item F<HP-ICF-OID>
+
+=item F<HP-VLAN>
+
+(this MIB new with SNMP::Info 0.8)
+
+=item F<STATISTICS-MIB>
+
+=item F<NETSWITCH-MIB>
+
+=item F<CONFIG-MIB>
+
+=back
+
+The last five MIBs listed are from HP and can be found at
+L<http://www.hp.com/rnd/software> or
+L<http://www.hp.com/rnd/software/MIBs.htm>
+
+=head1 Change Log
+
+Version 0.4 - Removed F<ENTITY-MIB> e_*() methods to separate sub-class -
+SNMP::Info::Entity
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $hp->cpu()
+
+Returns CPU Utilization in percentage.
+
+=item $hp->log()
+
+Returns all the log entries from the switch's log that are not Link up or
+down messages.
+
+=item $hp->mem_free()
+
+Returns bytes of free memory
+
+=item $hp->mem_total()
+
+Return bytes of total memory
+
+=item $hp->mem_used()
+
+Returns bytes of used memory
+
+=item $hp->model()
+
+Returns the model number of the HP Switch.  Will translate between the HP Part
+number and the common model number with this map :
+
+ %MODEL_MAP = ( 
+                'J4093A' => '2424M',
+                'J4110A' => '8000M',
+                'J4120A' => '1600M',
+                'J4121A' => '4000M',
+                'J4122A' => '2400M',
+                'J4122B' => '2424M',
+                );
+
+=item $hp->os()
+
+Returns hp
+
+=item $hp->os_bin()
+
+C<hpSwitchRomVersion.0>
+
+=item $hp->os_ver()
+
+Tries to use os_version() and if that fails will try and cull the version from
+the description field.
+
+=item $hp->os_version()
+
+C<hpSwitchOsVersion.0>
+
+=item $hp->serial()
+
+Returns serial number if available through SNMP
+
+=item $hp->slots()
+
+Returns number of entries in $hp->e_name that have 'slot' in them.
+
+=item $hp->vendor()
+
+hp
+
+=item $hp->fan()
+
+Returns fan status
+
+=item $hp->ps1_status()
+
+Power supply 1 status
+
+=item $hp->ps2_status()
+
+Power supply 2 status
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $hp->interfaces() 
+
+Uses $hp->i_description()
+
+=item $hp->i_duplex()
+
+Returns reference to map of IIDs to current link duplex.
+
+=item $hp->i_duplex_admin()
+
+Returns reference to hash of IIDs to admin duplex setting.
+
+=item $hp->vendor_i_type()
+
+Returns reference to hash of IIDs to HP specific port type (hpSwitchPortType).
+
+=item $hp->i_name()
+
+Crosses i_name() with $hp->e_name() using $hp->e_port() and i_alias()
+
+=item $hp->i_vlan()
+
+Returns a mapping between C<ifIndex> and the PVID (default VLAN) or untagged
+port when using F<HP-VLAN>.
+
+=item $hp->i_vlan_membership()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the egress list for the port.
+It is the union of tagged, untagged, and auto ports.
+
+  Example:
+  my $interfaces = $hp->interfaces();
+  my $vlans      = $hp->i_vlan_membership();
+  
+  foreach my $iid (sort keys %$interfaces) {
+    my $port = $interfaces->{$iid};
+    my $vlan = join(',', sort(@{$vlans->{$iid}}));
+    print "Port: $port VLAN: $vlan\n";
+  }
+
+=item $hp->v_index()
+
+Returns VLAN IDs
+
+=item $hp->v_name()
+
+Returns VLAN names
+
+=item $hp->bp_index()
+
+Returns reference to hash of bridge port table entries map back to interface
+identifier (iid)
+
+Returns (C<ifIndex>) for both key and value for 1600, 2424, 4000, and 8000
+models since they seem to have problems with F<BRIDGE-MIB>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods
+or provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set
+operations. 
+
+=over
+
+=item set_i_vlan()
+
+=item set_i_vlan_tagged()
+
+=cut

Info/Layer2/HPVC.pm

@@ -0,0 +1,209 @@
+# SNMP::Info::Layer2::HPVC - SNMP Interface to HP VirtualConnect Switches
+#
+# Copyright (c) 2011 Jeroen van Ingen
+#
+# All rights reserved.
+#
+# 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::Layer2::HPVC;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::HPVC::ISA
+    = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::HPVC::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'HPVC-MIB'       => 'vcDomainName',
+    'CPQSINFO-MIB'   => 'cpqSiSysSerialNum',
+    'HPVCMODULE-MIB' => 'vcModuleDomainName',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    'serial1'      => 'cpqSiSysSerialNum.0',
+    'os_ver'       => 'cpqHoSWRunningVersion.1',
+    'os_bin'       => 'cpqHoFwVerVersion.1',
+    'productname'  => 'cpqSiProductName.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    
+);
+
+%MUNGE = (
+    # Inherit all the built in munging
+    %SNMP::Info::Layer2::MUNGE,
+);
+
+
+# Method Overrides
+
+sub os {
+    return 'hpvc';
+}
+
+sub vendor {
+    return 'hp';
+}
+
+sub model {
+    my $hp = shift;
+    return $hp->productname();
+}
+
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::HPVC - SNMP Interface to HP VirtualConnect Switches
+
+=head1 AUTHOR
+
+Jeroen van Ingen
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $hp = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $hp->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+HP VirtualConnect Switch via SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $hp = new SNMP::Info::Layer2::HPVC(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<HPVC-MIB>
+
+=item F<CPQSINFO-MIB>
+
+=item F<HPVCMODULE-MIB>
+
+=back
+
+All required MIBs can be found in the netdisco-mibs package.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $hp->os()
+
+Returns hpvc
+
+=item $hp->os_bin()
+
+C<cpqHoFwVerVersion.1>
+
+=item $hp->os_ver()
+
+C<cpqHoSWRunningVersion.1>
+
+=item $hp->serial()
+
+C<cpqSiSysSerialNum.0>
+
+=item $hp->vendor()
+
+hp
+
+=item $hp->model()
+
+C<cpqSiProductName.0>
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head1 MUNGES
+
+=over
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods
+or provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set
+operations. 
+
+=cut

Info/Layer2/Kentrox.pm

@@ -0,0 +1,180 @@
+package SNMP::Info::Layer2::Kentrox;
+
+# Copyright (c) 2011 Netdisco Project
+# All rights reserved.
+#
+# 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.
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Kentrox::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Kentrox::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+        #from DATASMART-MIB
+        # MIB isn't yet in netdisco-mibs (not clear permission)
+        # ... when it is, this can change to dsScWyv
+        'ds_sysinfo' => '.1.3.6.1.4.1.181.2.2.12.15.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
+
+sub os {
+    return 'Kentrox';
+}
+
+sub os_ver {
+    my $dsver = shift;
+    my $descr = $dsver->description();
+    if ( $descr =~ /^\S+\s\S+\s\S+\s(\S+)/){
+        return $1;
+    }
+}
+
+sub serial {
+    my $dsserial = shift;
+    my $serial = $dsserial->ds_sysinfo();
+    if ( $serial =~ /SERIAL\s(\S+)/){
+        my $str = substr($1,8,10);
+        return $str;
+    }
+
+}
+sub vendor {
+    return 'Kentrox';
+}
+
+sub model {
+    my $dsmodel = shift;
+    my $descr = $dsmodel->description();
+    if ( $descr =~ /^(\S+\s\S+)/){
+        return $1;
+    }
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Kentrox - SNMP Interface to L2 Kentrox DataSMART DSU/CSU
+
+=head1 AUTHOR
+
+phishphreek@gmail.com
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $router = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 1
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $router->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Kentrox DataSMART DSU/CSU
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $router->vendor()
+
+=item $router->os()
+
+=item $router->os_ver()
+
+=item $router->model()
+
+=item $router->serial()
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
+

Info/Layer2/N2270.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,

Info/Layer2/NAP222x.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,

Info/Layer2/Netgear.pm

@@ -33,21 +33,26 @@ package SNMP::Info::Layer2::Netgear;
 use strict;
 use Exporter;
 use SNMP::Info::Layer2;
+use SNMP::Info::LLDP;
 
-@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
 @SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
-%MIBS = ( %SNMP::Info::Layer2::MIBS, );
+%MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::LLDP::MIBS, );
 
-%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, );
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
+    ng_serial => '.1.3.6.1.4.1.4526.10.1.1.1.4.0',
+    ng_osver  => '.1.3.6.1.4.1.4526.10.1.1.1.13.0',
+);
 
-%FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::LLDP::FUNCS, );
 
-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, );
 
 sub vendor {
     return 'netgear';
@@ -86,6 +91,63 @@ sub fw_port {
     return $ret;
 }
 
+# these seem to work for GSM models but not GS
+# https://sourceforge.net/tracker/?func=detail&aid=3085413&group_id=70362&atid=527529
+sub os_ver {
+    my $self = shift;
+    return if $self->model and $self->model =~ m/GS\d/i;
+    return $self->ng_osver();
+}
+
+sub serial {
+    my $self = shift;
+    return if $self->model and $self->model =~ m/GS\d/i;
+    return $self->ng_serial();
+}
+
+#  Use LLDP
+
+sub hasCDP {
+    my $netgear = shift;
+    return $netgear->hasLLDP();
+}
+
+sub c_ip {
+    my $netgear = shift;
+    my $partial  = shift;
+
+    return $netgear->lldp_ip($partial);
+}
+
+sub c_if {
+    my $netgear = shift;
+    my $partial  = shift;
+
+    return $netgear->lldp_if($partial);
+}
+
+sub c_port {
+    my $netgear = shift;
+    my $partial  = shift;
+
+    return $netgear->lldp_port($partial);
+}
+
+sub c_id {
+    my $netgear = shift;
+    my $partial  = shift;
+
+    return $netgear->lldp_id($partial);
+}
+
+sub c_platform {
+    my $netgear = shift;
+    my $partial  = shift;
+
+    return $netgear->lldp_rem_sysdesc($partial);
+}
+
+
 1;
 
 __END__
@@ -96,7 +158,9 @@ SNMP::Info::Layer2::Netgear - SNMP Interface to Netgear switches
 
 =head1 AUTHOR
 
-Bill Fenner and Zoltan Erszenyi
+Bill Fenner and Zoltan Erszenyi, 
+Hacked in LLDP support from Baystack.pm by 
+ Nic Bernstein <nic@onlight.com>
 
 =head1 SYNOPSIS
 
@@ -124,6 +188,7 @@ inherited methods.
 =over
 
 =item SNMP::Info::Layer2
+=item SNMP::Info::LLDP
 
 =back
 
@@ -136,6 +201,8 @@ inherited methods.
 MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and its inherited
 classes.
 
+See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
+
 =back
 
 =head1 GLOBALS
@@ -158,12 +225,24 @@ Returns 'netgear'
 
 Returns description()
 
+=item $netgear->os_ver()
+
+Returns OS Version.
+
+=item $netgear->serial()
+
+Returns Serial Number.
+
 =back
 
 =head2 Global Methods imported from SNMP::Info::Layer2
 
 See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of
@@ -192,6 +271,49 @@ C<Q-BRIDGE-MIB> doesn't return anything.
 
 =back
 
+=head2 Topology information
+
+Based upon the software version devices may support Link Layer Discovery 
+Protocol (LLDP).
+
+=over
+
+=item $netgear->hasCDP()
+
+Returns true if the device is running LLDP.
+
+=item $netgear->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $netgear->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-LLDP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $netgear->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $netgear->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $netgear->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::Layer2
 
 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.

Info/Layer2/Orinoco.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
@@ -114,6 +114,8 @@ sub model {
 
     return $1             if ( $descr =~ /(AP-\d+)/ );
     return 'WavePOINT-II' if ( $descr =~ /WavePOINT-II/ );
+    return 'Outdoor Router' if ( $descr =~ /Wireless Router/ );
+
     return;
 }
 

Info/Layer2/ZyXEL_DSLAM.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

Info/Layer3.pm

@@ -39,22 +39,28 @@ use SNMP::Info::Bridge;
 use SNMP::Info::EtherLike;
 use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;
+use SNMP::Info::IPv6;
+use SNMP::Info::AdslLine;
 
-@SNMP::Info::Layer3::ISA = qw/SNMP::Info::PowerEthernet
+@SNMP::Info::Layer3::ISA = qw/
+    SNMP::Info::PowerEthernet SNMP::Info::IPv6
     SNMP::Info::Entity SNMP::Info::EtherLike
-    SNMP::Info::Bridge SNMP::Info Exporter/;
+    SNMP::Info::Bridge SNMP::Info::AdslLine
+    SNMP::Info Exporter/;
 @SNMP::Info::Layer3::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,
+    %SNMP::Info::AdslLine::MIBS,
     %SNMP::Info::Bridge::MIBS,
     %SNMP::Info::EtherLike::MIBS,
     %SNMP::Info::Entity::MIBS,
     %SNMP::Info::PowerEthernet::MIBS,
+    %SNMP::Info::IPv6::MIBS,
     'IP-MIB'   => 'ipNetToMediaIfIndex',
     'OSPF-MIB' => 'ospfRouterId',
     'BGP4-MIB' => 'bgpIdentifier',
@@ -64,10 +70,12 @@ $VERSION = '2.00';
 
     # Inherit the super class ones
     %SNMP::Info::GLOBALS,
+    %SNMP::Info::AdslLine::GLOBALS,
     %SNMP::Info::Bridge::GLOBALS,
     %SNMP::Info::EtherLike::GLOBALS,
     %SNMP::Info::Entity::GLOBALS,
     %SNMP::Info::PowerEthernet::GLOBALS,
+    %SNMP::Info::IPv6::GLOBALS,
     'mac' => 'ifPhysAddress.1',
     'serial1' =>
         '.1.3.6.1.4.1.9.3.6.3.0',    # OLD-CISCO-CHASSIS-MIB::chassisId.0
@@ -78,10 +86,12 @@ $VERSION = '2.00';
 
 %FUNCS = (
     %SNMP::Info::FUNCS,
+    %SNMP::Info::AdslLine::FUNCS,
     %SNMP::Info::Bridge::FUNCS,
     %SNMP::Info::EtherLike::FUNCS,
     %SNMP::Info::Entity::FUNCS,
     %SNMP::Info::PowerEthernet::FUNCS,
+    %SNMP::Info::IPv6::FUNCS,
 
     # Obsolete Address Translation Table (ARP Cache)
     'old_at_index'   => 'atIfIndex',
@@ -120,18 +130,29 @@ $VERSION = '2.00';
     'bgp_peer_in_upd'         => 'bgpPeerInUpdates',
     'bgp_peer_out_tot_msgs'   => 'bgpPeerOutTotalMessages',
     'bgp_peer_out_upd'        => 'bgpPeerOutUpdates',
+
+    # IP-MIB Net to Physical Table (ARP Cache)
+    'n2p_paddr' => 'ipNetToPhysicalPhysAddress',
+    'n2p_lastupdate' => 'ipNetToPhysicalLastUpdated',
+    'n2p_ptype' => 'ipNetToPhysicalType',
+    'n2p_pstate' => 'ipNetToPhysicalState',
+    'n2p_pstatus' => 'ipNetToPhysicalRowStatus',
+
 );
 
 %MUNGE = (
 
     # Inherit all the built in munging
     %SNMP::Info::MUNGE,
+    %SNMP::Info::AdslLine::MUNGE,
     %SNMP::Info::Bridge::MUNGE,
     %SNMP::Info::EtherLike::MUNGE,
     %SNMP::Info::Entity::MUNGE,
     %SNMP::Info::PowerEthernet::MUNGE,
+    %SNMP::Info::IPv6::MUNGE,
     'old_at_paddr' => \&SNMP::Info::munge_mac,
     'at_paddr'     => \&SNMP::Info::munge_mac,
+    'n2p_paddr' => \&SNMP::Info::munge_mac,
 );
 
 # Method OverRides
@@ -142,6 +163,14 @@ sub root_ip {
     my $router_ip = $l3->router_ip();
     my $ospf_ip   = $l3->ospf_ip();
 
+    # if the router ip exists and is a route advertised by the device we prefer
+    # it over the others
+    return $router_ip
+        if (( defined $router_ip )
+        and ( $router_ip ne '0.0.0.0' )
+        and ( grep { $ospf_ip->{$_} eq $router_ip } (keys %$ospf_ip))
+        and ( $l3->snmp_connect_ip($router_ip) ) );
+
     # return the first one found here (should be only one)
     if ( defined $ospf_ip and scalar( keys %$ospf_ip ) ) {
         foreach my $key ( keys %$ospf_ip ) {
@@ -153,10 +182,6 @@ sub root_ip {
         }
     }
 
-    return $router_ip
-        if (( defined $router_ip )
-        and ( $router_ip ne '0.0.0.0' )
-        and ( $l3->snmp_connect_ip($router_ip) ) );
     return;
 }
 
@@ -286,7 +311,12 @@ sub vendor {
     my $l3 = shift;
 
     my $descr = $l3->description();
+    my $id = $l3->id();
 
+    # .1.3.6.1.4.1.9.1 is the CISCO-PRODUCTS-MIB
+    # .1.3.6.1.4.1.9.9.368.4 is an old tree that Cisco CSSs were numbered from
+    return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.1.\E\d+$/;
+    return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.9.368.4.\E\d+/;
     return 'cisco'   if ( $descr =~ /(cisco|\bios\b)/i );
     return 'foundry' if ( $descr =~ /foundry/i );
 
@@ -380,6 +410,10 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::Entity
 
+=item SNMP::Info::PowerEthernet
+
+=item SNMP::Info::IPv6
+
 =back
 
 =head2 Required MIBs
@@ -404,6 +438,10 @@ See L<SNMP::Info::EtherLike/"Required MIBs"> for its MIB requirements.
 
 See L<SNMP::Info::Entity/"Required MIBs"> for its MIB requirements.
 
+See L<SNMP::Info::PowerEthernet/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::IPv6/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS
 
 These are methods that return scalar value from SNMP
@@ -744,4 +782,12 @@ See L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.
 
 See L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::PowerEthernet
+
+See L<SNMP::Info::PowerEthernet/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::IPv6
+
+See L<SNMP::Info::IPv6/"TABLE METHODS"> for details.
+
 =cut

Info/Layer3/Aironet.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/AlcatelLucent.pm

@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/AlteonAD.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Altiga.pm

@@ -0,0 +1,400 @@
+# SNMP::Info::Layer3::Altiga
+# $Id$
+#
+# Copyright (c) 2008 Jeroen van Ingen Schenau
+# All rights reserved.
+#
+# 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::Altiga;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Altiga::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Altiga::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
+            $int_include_vpn $fake_idx $type_class/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,
+            'ALTIGA-VERSION-STATS-MIB'  => 'alVersionString',
+            'ALTIGA-SESSION-STATS-MIB'  => 'alActiveSessionCount',
+            'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type',  
+    );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            # From ALTIGA-VERSION-STATS-MIB
+            'os_ver'          => 'alVersionString',
+            # From ALTIGA-SESSION-STATS-MIB
+            'vpn_act_sess'    => 'alActiveSessionCount',
+            'vpn_total_sess'  => 'alTotalSessionCount',
+            'vpn_max_sess'    => 'alMaxSessionCount',
+            'vpn_l2l_sess'    => 'alActiveLanToLanSessionCount',
+            'vpn_mgmt_sess'   => 'alActiveManagementSessionCount',
+            'vpn_ras_sess'    => 'alActiveRemoteAccessSessionCount',
+            # From ALTIGA-HARDWARE-STATS-MIB
+            'ps1_type'        => 'alHardwarePs1Type',
+            'ps1_3v_alarm'    => 'alHardwarePs1Voltage3vAlarm',
+            'ps1_5v_alarm'    => 'alHardwarePs1Voltage5vAlarm',
+            'ps2_type'        => 'alHardwarePs2Type',
+            'ps2_3v_alarm'    => 'alHardwarePs2Voltage3vAlarm',
+            'ps2_5v_alarm'    => 'alHardwarePs2Voltage5vAlarm',
+            'fan1_alarm'      => 'alHardwareFan1RpmAlarm',
+            'fan2_alarm'      => 'alHardwareFan2RpmAlarm',
+            'fan3_alarm'      => 'alHardwareFan3RpmAlarm',
+            
+       );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+            'i_type2'           => 'ifType',
+            'i_lastchange2'     => 'ifLastChange',
+            'vpn_sess_status'   => 'alActiveSessionRowStatus',
+            'vpn_sess_user'     => 'alActiveSessionUserName',
+            'vpn_sess_peer_ip'  => 'alActiveSessionIpAddress',
+            'vpn_sess_protocol' => 'alActiveSessionProtocol',
+            'vpn_sess_encr'     => 'alActiveSessionEncrType',
+            'vpn_sess_start'    => 'alActiveSessionStartTime',
+            'vpn_sess_conntime' => 'alActiveSessionConnectTime',
+            'vpn_sess_out_oct'  => 'alActiveSessionOctetsSent',
+            'vpn_sess_in_oct'   => 'alActiveSessionOctetsRcvd',
+            'vpn_sess_group'    => 'alActiveSessionGroupName',
+            'vpn_sess_gid'      => 'alActiveSessionGroupId',
+            'vpn_sess_rem_ip'   => 'alActiveSessionPublicIpAddress',
+     );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+            'ps1_3v_alarm'    => \&munge_alarm,
+            'ps1_5v_alarm'    =>  \&munge_alarm,
+            'ps2_3v_alarm'    =>  \&munge_alarm,
+            'ps2_5v_alarm'    =>  \&munge_alarm,
+            'fan1_alarm'      =>  \&munge_alarm,
+            'fan2_alarm'      =>  \&munge_alarm,
+            'fan3_alarm'      =>  \&munge_alarm,
+
+     );
+
+# Variable to modify behaviour of "interfaces" subroutine.
+# * When set to 0, "interfaces" returns only fixed interfaces from the IF-MIB,
+# * When set to 1, "interfaces" returns fixed interfaces from IF-MIB and LAN-to-LAN tunnels from ALTIGA-SESSION-MIB
+# TODO: This should be an instance method, not a class global
+$int_include_vpn = 1;
+
+# Variable to prepended to each tunnel index when tunnel is added to %interfaces, to avoid overwriting "real" ifIndex entries
+$fake_idx = 3076;
+
+# Variable to classify session types into categories: 0 - unclassified, 1 - LAN-to-LAN or fixed, 2 - RAS or dynamic, 3 - administrative
+$type_class = {
+    'pptp'                  => 2,
+    'l2tp'                  => 2,
+    'ipsec'                 => 2,
+    'http'                  => 3,
+    'ftp'                   => 3,
+    'telnet'                => 3,
+    'snmp'                  => 3,
+    'tftp'                  => 3,
+    'console'               => 3,
+    'debugTelnet'           => 3,
+    'debugConsole'          => 3,
+    'other'                 => 3,
+    'ike'                   => 0,
+    'l2tpOverIpSec'         => 2,
+    'ipsecLanToLan'         => 1,
+    'ipsecOverUdp'          => 2,
+    'ssh'                   => 3,
+    'vcaLanToLan'           => 1,
+    'ipsecOverTcp'          => 2,
+    'pppoe'                 => 2,
+    'ipsecOverNatT'         => 2,
+    'ipsecLan2LanOverNatT'  => 1,
+    'l2tpOverIpsecOverNatT' => 2,
+    'userHttps'             => 2,
+    'pop3s'                 => 2,
+    'imap4s'                => 2,
+    'smtps'                 => 2,
+    'httpsTunnel'           => 2,
+};
+
+sub vendor {
+    return 'altiga';
+}
+
+sub os {
+    return 'altiga';
+}
+
+sub hasCDP {
+    return 0;
+}
+
+# $altiga->interfaces() - Map the Interfaces to their physical names
+# Add interface number to interface name to prevent duplicate ifDescr
+# Included statically configured VPN tunnels if ($int_include_vpn)
+sub interfaces {
+    my $altiga = shift;
+    my $partial = shift;
+
+    my $interfaces = $altiga->i_index($partial);
+    my $descriptions = $altiga->i_description($partial);
+
+    my %int_rev = ();
+    my %interfaces = ();
+    foreach my $iid (sort {$a cmp $b} keys %$interfaces) {
+        my $desc = $descriptions->{$iid};
+        next unless defined $desc;
+        if (!exists $int_rev{$desc}) {
+            $interfaces{$iid} = $desc;
+            $int_rev{$desc} = $iid;
+        } else {
+            my $done = 0;
+            my $unique_desc;
+            my $cnt = 1;
+            until ($done) {
+                $cnt++;
+                $unique_desc = sprintf("%s (%d)", $desc, $cnt);
+                if (!exists $int_rev{$unique_desc}) {
+                    $done++;
+                }
+            }
+            $int_rev{$unique_desc} = $iid;
+            $interfaces{$iid} = $unique_desc;
+            $interfaces{ $int_rev{$desc} } = sprintf("%s (%d)", $desc, 1);
+        }
+    }
+    if ($int_include_vpn) {
+        my $tun_type = $altiga->vpn_sess_protocol();
+        my $peer = $altiga->vpn_sess_peer_ip();
+        my $remote = $altiga->vpn_sess_rem_ip(); 
+        my $group = $altiga->vpn_sess_gid();
+        foreach my $tunnel (keys %$tun_type) {
+            if ($type_class->{$tun_type->{$tunnel}} eq 1) {
+                $interfaces{"$fake_idx.$tunnel"} = sprintf("%s VPN to %s", uc($tun_type->{$tunnel}), $remote->{$tunnel});
+            }
+        }
+    }
+            
+    return \%interfaces;
+}
+
+sub i_type {
+    my $altiga = shift;
+    my $partial = shift;
+    my $types = $altiga->i_type2();
+    if ($int_include_vpn) {
+        my $tun_type = $altiga->vpn_sess_protocol();
+        foreach my $tunnel (keys %$tun_type) {
+            $types->{"$fake_idx.$tunnel"} = $tun_type->{$tunnel};
+        }
+    }
+    return $types;
+}
+
+sub i_lastchange {
+    my $altiga = shift;
+    my $partial = shift;
+
+    # TODO: This is what munges are for.
+    my $lastchange = $altiga->i_lastchange2();
+    if ($int_include_vpn) {
+        my $tun_start = $altiga->vpn_sess_start();
+        foreach my $tunnel (keys %$tun_start) {
+            $lastchange->{"$fake_idx.$tunnel"} = $tun_start->{$tunnel};
+        }
+    }
+    return $lastchange;
+}
+
+sub ps1_status {
+    my $altiga = shift;
+    my $alarm_3v = $altiga->ps1_3v_alarm() || "";
+    my $alarm_5v = $altiga->ps1_5v_alarm() || "";
+    return sprintf("3V: %s, 5V: %s", $alarm_3v, $alarm_5v);
+}
+
+sub ps2_status {
+    my $altiga = shift;
+    my $alarm_3v = $altiga->ps2_3v_alarm() || "";
+    my $alarm_5v = $altiga->ps2_5v_alarm() || "";
+    return sprintf("3V: %s, 5V: %s", $alarm_3v, $alarm_5v);
+}
+
+sub fan {
+    my $altiga = shift;
+    my $alarm_fan1 = $altiga->fan1_alarm() || "";
+    my $alarm_fan2 = $altiga->fan2_alarm() || "";
+    my $alarm_fan3 = $altiga->fan3_alarm() || "";
+    return sprintf("Fan 1: %s, Fan 2: %s, Fan 3: %s", $alarm_fan1, $alarm_fan2, $alarm_fan3);
+}
+
+sub munge_alarm {
+    my $alarm = shift;
+    if ($alarm eq 'false') {
+        return 'OK';
+    } elsif ($alarm eq 'true') {
+        return 'FAIL';
+    } else {
+        return "(n/a)";
+    }
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Altiga - SNMP Interface to Cisco (formerly Altiga) VPN concentrators
+
+=head1 AUTHOR
+
+Jeroen van Ingen Schenau
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $altiga = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'my_vpn_host',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $altiga->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Cisco (formerly Altiga) VPN concentrators
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 Class Variables (options)
+
+=over
+
+=item $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+Variable to modify behavior of "interfaces" subroutine.
+
+  * When set to 0, "interfaces" returns only fixed interfaces from the IF-MIB,
+  * When set to 1, "interfaces" returns fixed interfaces from IF-MIB and
+    LAN-to-LAN tunnels from ALTIGA-SESSION-MIB (default)
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $altiga->vendor()
+
+Returns 'altiga'
+
+=item $altiga->os()
+
+Returns 'altiga'
+
+=item $altiga->os_ver()
+
+Tries to determine OS version from the C<sysDescr.0> field. Returns version or C<sysDescr.0>
+
+=item $altiga->fan()
+
+Combines results from C<fan1_alarm>, C<fan2_alarm>, and C<fam3_alarm> methods.
+
+=item $altiga->hasCDP()
+
+No.
+
+=item $altiga->ps1_status()
+
+Combines C<ps1_3v_alarm> and C<ps1_5v_alarm> methods.
+
+=item $altiga->ps2_status()
+
+Combines C<ps2_3v_alarm> and C<ps2_5v_alarm> methods.
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $altiga->interfaces()
+
+This method overrides the interfaces() method inherited from SNMP::Info.
+It provides a mapping between the Interface Table Index (iid) and the physical 
+port name, adding a port number to the port name to prevent duplicate names.
+
+=item $altiga->i_lastchange()
+
+Filters out the results depending on the value of $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+=item $altiga->i_type()
+
+Filters out the results depending on the value of $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+=back
+
+=head1 MUNGES
+
+=over
+
+=item munge_alarm()
+
+Changes C<true> and C<false> to C<FAIL>, C<OK>, and C<(n/a)>.
+
+=back
+
+=cut

Info/Layer3/Arista.pm

@@ -0,0 +1,324 @@
+# SNMP::Info::Layer3::Arista
+# $Id$
+#
+# Copyright (c) 2008 Arista Networks, Inc.
+# All rights reserved.
+#
+# 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 Arista Networks, Inc. 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::Arista;
+
+use strict;
+use Exporter;
+
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::Arista::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Arista::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'ARISTA-PRODUCTS-MIB' => 'aristaProducts',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::Arista::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::Arista::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub vendor {
+    return 'arista';
+}
+
+sub os {
+    return 'EOS';
+}
+
+sub os_ver {
+    my $arista = shift;
+    my $descr   = $arista->description();
+    my $os_ver  = undef;
+
+    $os_ver = $1 if ( $descr =~ /\s+EOS\s+version\s+(\S+)\s+/ );
+    return $os_ver;
+}
+
+sub model {
+    my $arista = shift;
+    my $id     = $arista->id();
+
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    $model =~ s/^arista//;
+    return $model;
+}
+
+# Use Q-BRIDGE-MIB
+
+sub fw_mac {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->qb_fw_port($partial);
+}
+
+# Use LLDP
+
+sub hasCDP {
+    my $arista = shift;
+
+    return $arista->hasLLDP();
+}
+
+sub c_ip {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_ip($partial);
+}
+
+sub c_if {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_if($partial);
+}
+
+sub c_port {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_port($partial);
+}
+
+sub c_id {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_id($partial);
+}
+
+sub c_platform {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_rem_sysdesc($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Arista - SNMP Interface to Arista Networks EOS
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $arista = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $arista->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Arista Networks EOS-based devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<ARISTA-PRODUCTS-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $arista->vendor()
+
+    Returns 'Arista Networks, Inc.'
+
+=item $arista->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $arista->model()
+
+Tries to reference $arista->id() to one of the product MIBs listed above
+
+Removes 'arista' from the name for readability.
+
+=item $arista->os()
+
+Returns 'EOS'
+
+=item $arista->os_ver()
+
+Grabs the os version from C<sysDescr>
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $arista->fw_mac()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $arista->fw_port()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $arista->c_id()
+
+Returns LLDP information.
+
+=item $arista->c_if()
+
+Returns LLDP information.
+
+=item $arista->c_ip()
+
+Returns LLDP information.
+
+=item $arista->c_platform()
+
+Returns LLDP information.
+
+=item $arista->c_port()
+
+Returns LLDP information.
+
+=item $arista->i_duplex_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $arista->i_speed_admin()
+
+Returns info from F<MAU-MIB>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Aruba.pm

@@ -1,4 +1,4 @@
-# SNMP::Info::Layer2::Aruba
+# SNMP::Info::Layer3::Aruba
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
@@ -28,31 +28,31 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-package SNMP::Info::Layer2::Aruba;
+package SNMP::Info::Layer3::Aruba;
 
 use strict;
 use Exporter;
-use SNMP::Info::Layer2;
+use SNMP::Info::Layer3;
 
-@SNMP::Info::Layer2::Aruba::ISA       = qw/SNMP::Info::Layer2 Exporter/;
-@SNMP::Info::Layer2::Aruba::EXPORT_OK = qw//;
+@SNMP::Info::Layer3::Aruba::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Aruba::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
-    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::Layer3::MIBS,
     'WLSX-SWITCH-MIB'         => 'wlsxHostname',
     'WLSX-WLAN-MIB'           => 'wlanAPFQLN',
     'WLSR-AP-MIB'             => 'wlsrHideSSID',
     #'ALCATEL-IND1-TP-DEVICES' => 'familyOmniAccessWireless',
 );
 
-%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, );
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
 
 %FUNCS = (
-    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,
 
     # WLSX-SWITCH-MIB::wlsxSwitchAccessPointTable
     # Table index leafs do not return information
@@ -79,10 +79,10 @@ $VERSION = '2.00';
     'fw_user' => 'staUserName',
 );
 
-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
 
 sub layers {
-    return '00000011';
+    return '00000111';
 }
 
 sub os {
@@ -421,7 +421,7 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::Aruba - SNMP Interface to Aruba wireless switches
+SNMP::Info::Layer3::Aruba - SNMP Interface to Aruba wireless switches
 
 =head1 AUTHOR
 
@@ -444,7 +444,7 @@ Eric Miller
 
 =head1 DESCRIPTION
 
-SNMP::Info::Layer2::Aruba is a subclass of SNMP::Info that provides an
+SNMP::Info::Layer3::Aruba is a subclass of SNMP::Info that provides an
 interface to Aruba wireless switches.  The Aruba platform utilizes
 intelligent wireless switches which control thin access points.  The thin
 access points themselves are unable to be polled for end station information.
@@ -456,13 +456,13 @@ the end station is using for communication.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 
- my $aruba = new SNMP::Info::Layer2::Aruba(...);
+ my $aruba = new SNMP::Info::Layer3::Aruba(...);
 
 =head2 Inherited Classes
 
 =over
 
-=item SNMP::Info::Layer2
+=item SNMP::Info::Layer3
 
 =back
 
@@ -478,7 +478,7 @@ after determining a more specific class using the method above.
 
 =head2 Inherited MIBs
 
-See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+See L<SNMP::Info::Layer3/"Required MIBs"> for its MIB requirements.
 
 =head1 GLOBALS
 
@@ -516,9 +516,9 @@ proprietary MIBs.
 
 =back
 
-=head2 Globals imported from SNMP::Info::Layer2
+=head2 Globals imported from SNMP::Info::Layer3
 
-See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+See L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
 =head1 TABLE METHODS
 
@@ -641,8 +641,8 @@ Returns F<aruba_perap_fqln> indexed by BSSID instead of by AP.
 
 =back
 
-=head2 Table Methods imported from SNMP::Info::Layer2
+=head2 Table Methods imported from SNMP::Info::Layer3
 
-See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+See L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
 =cut

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 = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer3/BlueCoatSG.pm

@@ -0,0 +1,168 @@
+package SNMP::Info::Layer3::BlueCoatSG;
+
+# Copyright (c) 2011 Netdisco Project
+# All rights reserved.
+#
+# 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.
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::BlueCoatSG::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::BlueCoatSG::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
+    'BLUECOAT-SG-PROXY-MIB' => 'sgProxyAdmin',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
+    #From BLUECOAT-SG-PROXY-MIB
+    'serial1'=> 'sgProxySerialNumber',
+    'sw_ver' => 'sgProxyVersion',
+);
+
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'Blue Coat';
+}
+
+sub os {
+    return 'sgos';
+}
+
+sub os_ver {
+    my $sg = shift;
+    my $os_string = $sg->sw_ver();
+    if ($os_string =~ /^Version:\s(\w+)\s([\d\.]+)/) {
+        return $2;
+    } else {
+        return ''; # perhaps we can try sysDescr or some other object...
+    }
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::BlueCoatSG - SNMP Interface to Blue Coat SG Series proxy devices
+
+=head1 AUTHOR
+
+Jeroen van Ingen
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $router = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 1
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $router->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Blue Coat SG Series proxy devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+BLUECOAT-SG-PROXY-MIB
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $router->vendor()
+
+Returns C<'Blue Coat'>
+
+=item $router->os()
+
+Returns C<'sgos'>
+
+=item $router->os_ver()
+
+Tries to resolve version string from "sgProxyVersion"
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut
+

Info/Layer3/C3550.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::C3550
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 # Copyright (c) 2004 Regents of the University of California
 # All rights reserved.
 #
@@ -35,62 +35,82 @@ use strict;
 use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
+use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
-
-@SNMP::Info::Layer3::C3550::ISA
-    = qw/SNMP::Info::CiscoVTP SNMP::Info::CiscoStack
-    SNMP::Info::CDP SNMP::Info::CiscoStats
-    SNMP::Info::CiscoPortSecurity
-    SNMP::Info::CiscoImage SNMP::Info::CiscoPower
-    SNMP::Info::Layer3
-    Exporter/;
-@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
+use SNMP::Info::CiscoStpExtensions;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+# NOTE : Top-most items gets precedence for @ISA
+@SNMP::Info::Layer3::C3550::ISA = qw/
+    SNMP::Info::CiscoVTP
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::CiscoStack
+    SNMP::Info::LLDP
+    SNMP::Info::CDP
+    SNMP::Info::CiscoStats
+    SNMP::Info::CiscoImage
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoConfig
+    SNMP::Info::CiscoPower
+    SNMP::Info::Layer3
+    Exporter/;
+
+@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
+
+$VERSION = '2.11';
+
+# NOTE: Order creates precedence
+#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
+#       Bridge is called from Layer3 and CiscoStpExtensions
+#       So we want CiscoVTP to come last to get the right one.
+# The @ISA order should match these orders.
 
 %MIBS = (
-    %SNMP::Info::Layer3::MIBS,            %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoPortSecurity::MIBS, %SNMP::Info::CiscoImage::MIBS,
-    %SNMP::Info::CiscoStats::MIBS,        %SNMP::Info::CDP::MIBS,
-    %SNMP::Info::CiscoStack::MIBS,        %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::LLDP::MIBS,               %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::CiscoStack::MIBS,         %SNMP::Info::CiscoStpExtensions::MIBS, 
+    %SNMP::Info::CiscoVTP::MIBS,
 );
 
+
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
     %SNMP::Info::CiscoPower::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
     %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::CiscoStack::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS,
-    'ports2' => 'ifNumber',
 );
 
 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,            %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoPortSecurity::FUNCS, %SNMP::Info::CiscoImage::FUNCS,
-    %SNMP::Info::CiscoStats::FUNCS,        %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::CiscoStack::FUNCS,        %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,               %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::CiscoStack::FUNCS,         %SNMP::Info::CiscoStpExtensions::FUNCS, 
+    %SNMP::Info::CiscoVTP::FUNCS,    
 );
 
 %MUNGE = (
-
-    # Inherit all the built in munging
-    %SNMP::Info::Layer3::MUNGE,
-    %SNMP::Info::CiscoPower::MUNGE,
-    %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,
-    %SNMP::Info::CiscoStats::MUNGE,
-    %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::CiscoStack::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,             %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,        %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,         %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,               %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,         %SNMP::Info::CiscoStpExtensions::MUNGE, 
     %SNMP::Info::CiscoVTP::MUNGE,
 );
 
@@ -115,14 +135,14 @@ sub model {
 sub ports {
     my $c3550 = shift;
 
-    my $ports2 = $c3550->ports2();
-
     my $id    = $c3550->id();
     my $model = &SNMP::translateObj($id);
     if ( $model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/ ) {
         return $1;
     }
-    return $ports2;
+
+    my $ports = $c3550->orig_ports();
+    return $ports;
 }
 
 #  Verions prior to 12.1(22)EA1a use the older CiscoStack method
@@ -216,6 +236,141 @@ sub cisco_comm_indexing {
     return 1;
 }
 
+#  Use CDP and/or LLDP
+sub hasCDP {
+    my $c3550 = shift;
+    return $c3550->hasLLDP() || $c3550->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $c3550      = shift;
+    my $partial = shift;
+
+    my $cdp  = $c3550->SUPER::c_ip($partial) || {};
+    my $lldp = $c3550->lldp_ip($partial)     || {};
+
+    my %c_ip;
+    foreach my $iid ( keys %$cdp ) {
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $c3550      = shift;
+    my $partial = shift;
+
+    my $cdp  = $c3550->SUPER::c_if($partial)  || {};
+
+    my %c_if;
+    foreach my $iid ( keys %$cdp ) {
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    # We need to match the lldp key with the ifIndex
+    # via lldpLocPortId and ifName
+    my $i_name = $c3550->ifName($partial) || {};
+    my $i_name_rev = {};
+    while ( my($key,$val) = each %$i_name ){
+	$i_name_rev->{$val} = $key;
+    }
+    my $loc_port_id = $c3550->lldpLocPortId($partial) || {};
+    my $lldp = $c3550->lldp_if($partial) || {};
+
+    foreach my $iid ( keys %$lldp ) {
+        my $if = $lldp->{$iid} || next;
+	my $name = $loc_port_id->{$if} || next;
+	my $i_index = $i_name_rev->{$name} || next;
+        $c_if{$iid} = $i_index;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $c3550   = shift;
+    my $partial = shift;
+
+    my $lldp = $c3550->lldp_port($partial)     || {};
+    my $cdp  = $c3550->SUPER::c_port($partial) || {};
+
+    my %c_port;
+    foreach my $iid ( keys %$cdp ) {
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $c3550   = shift;
+    my $partial = shift;
+
+    my $lldp = $c3550->lldp_id($partial)     || {};
+    my $cdp  = $c3550->SUPER::c_id($partial) || {};
+
+    my %c_id;
+    foreach my $iid ( keys %$cdp ) {
+        my $id = $cdp->{$iid};
+        next unless defined $id;
+	
+        $c_id{$iid} = $id;
+    }
+    
+    foreach my $iid ( keys %$lldp ) {
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $c3550      = shift;
+    my $partial = shift;
+
+    my $lldp = $c3550->lldp_rem_sysdesc($partial)  || {};
+    my $cdp  = $c3550->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid ( keys %$cdp ) {
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
+
 1;
 __END__
 
@@ -263,6 +418,8 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::CiscoSTPExtensions
+
 =item SNMP::Info::CiscoPower
 
 =item SNMP::Info::CiscoPortSecurity
@@ -273,6 +430,8 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::CDP
 
+=item SNMP::Info::LLDP
+
 =item SNMP::Info::CiscoStats
 
 =item SNMP::Info::CiscoImage
@@ -287,6 +446,8 @@ after determining a more specific class using the method above.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
 See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
@@ -302,6 +463,8 @@ See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
 =back
 
 =head1 GLOBALS
@@ -331,10 +494,31 @@ Returns 1.  Use vlan indexing.
 
 =back
 
+=head2 Topology information
+
+Based upon the firmware version Cisco devices may support Link Layer Discovery 
+Protocol (LLDP) in addition to Cisco Discovery Protocol (CDP).  These methods
+will query both and return the combination of all information.  As a result,
+there may be identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and remove duplicates if necessary.
+
+=over
+
+=item $c3550->hasCDP()
+
+Returns true if the device is running either CDP or LLDP.
+
+=back
+
 =head2 Globals imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::CiscoPower
 
 See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
@@ -355,6 +539,10 @@ See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::CiscoStats
 
 See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
@@ -368,6 +556,40 @@ See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.
 
+=over 
+
+=item $c3550->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $c3550->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-CDP/LLDP device in between two
+or more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $c3550->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $c3550->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $c3550->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back 
+
 =head2 Overrides
 
 =over
@@ -412,6 +634,10 @@ Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port C<ifIndex>.
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::CiscoPower
 
 See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
@@ -433,6 +659,10 @@ See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::CiscoStats
 
 See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.

Info/Layer3/C4000.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/C6500.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::C6500
 # $Id$
 #
-# Copyright (c) 2008 Max Baker
+# Copyright (c) 2008-2009 Max Baker
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,8 +32,8 @@ package SNMP::Info::Layer3::C6500;
 
 use strict;
 use Exporter;
-use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
+use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoImage;
@@ -41,28 +41,46 @@ use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
+use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::CiscoVTP;
 
-@SNMP::Info::Layer3::C6500::ISA
-    = qw/SNMP::Info::CiscoVTP SNMP::Info::CiscoStack
-    SNMP::Info::CDP SNMP::Info::CiscoStats
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+# NOTE : Top-most items gets precedence for @ISA
+@SNMP::Info::Layer3::C6500::ISA = qw/
+    SNMP::Info::CiscoVTP 
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::CiscoStack
+    SNMP::Info::LLDP
+    SNMP::Info::CDP 
     SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig
     SNMP::Info::CiscoPower
     SNMP::Info::Layer3
-    Exporter/;
+    Exporter
+/;
+
 @SNMP::Info::Layer3::C6500::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
+
+# NOTE: Order creates precedence
+#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
+#       Bridge is called from Layer3 and CiscoStpExtensions
+#       So we want CiscoVTP to come last to get the right one.
+# The @ISA order should match these orders.
 
 %MIBS = (
-    %SNMP::Info::Layer3::MIBS,      %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoConfig::MIBS, %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,  %SNMP::Info::CiscoStats::MIBS,
-    %SNMP::Info::CDP::MIBS,         %SNMP::Info::CiscoStack::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,                %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::CiscoStack::MIBS,         %SNMP::Info::CiscoStpExtensions::MIBS, 
+    %SNMP::Info::CiscoVTP::MIBS,    
 );
 
 %GLOBALS = (
@@ -73,24 +91,29 @@ $VERSION = '2.00';
     %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
     %SNMP::Info::CiscoStack::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS,
 );
 
 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,      %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoConfig::FUNCS, %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,  %SNMP::Info::CiscoStats::FUNCS,
-    %SNMP::Info::CDP::FUNCS,         %SNMP::Info::CiscoStack::FUNCS,
-    %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,                %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::CiscoStack::FUNCS,         %SNMP::Info::CiscoStpExtensions::FUNCS, 
+    %SNMP::Info::CiscoVTP::FUNCS,    
 );
 
+
 %MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,      %SNMP::Info::CiscoPower::MUNGE,
-    %SNMP::Info::CiscoConfig::MUNGE, %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,  %SNMP::Info::CiscoStats::MUNGE,
-    %SNMP::Info::CDP::MUNGE,         %SNMP::Info::CiscoStack::MUNGE,
-    %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,             %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,        %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,         %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,                %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,         %SNMP::Info::CiscoStpExtensions::MUNGE, 
+    %SNMP::Info::CiscoVTP::MUNGE,    
 );
 
 sub vendor {
@@ -184,6 +207,133 @@ sub set_i_duplex_admin {
     }
 }
 
+#  Use CDP and/or LLDP
+sub hasCDP {
+    my $c6500 = shift;
+
+    return $c6500->hasLLDP() || $c6500->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $c6500   = shift;
+    my $partial = shift;
+
+    my $cdp  = $c6500->SUPER::c_ip($partial) || {};
+    my $lldp = $c6500->lldp_ip($partial)     || {};
+
+    my %c_ip;
+    foreach my $iid ( keys %$cdp ) {
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $c6500   = shift;
+    my $partial = shift;
+
+    my $lldp = $c6500->lldp_if($partial)     || {};
+    my $cdp  = $c6500->SUPER::c_if($partial) || {};
+
+    my %c_if;
+    foreach my $iid ( keys %$cdp ) {
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $c6500   = shift;
+    my $partial = shift;
+
+    my $lldp = $c6500->lldp_port($partial)     || {};
+    my $cdp  = $c6500->SUPER::c_port($partial) || {};
+
+    my %c_port;
+    foreach my $iid ( keys %$cdp ) {
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $c6500   = shift;
+    my $partial = shift;
+
+    my $lldp = $c6500->lldp_id($partial)     || {};
+    my $cdp  = $c6500->SUPER::c_id($partial) || {};
+
+    my %c_id;
+    foreach my $iid ( keys %$cdp ) {
+        my $id = $cdp->{$iid};
+        next unless defined $id;
+	
+        $c_id{$iid} = $id;
+    }
+    
+    foreach my $iid ( keys %$lldp ) {
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $c6500   = shift;
+    my $partial = shift;
+
+    my $lldp = $c6500->lldp_rem_sysdesc($partial)  || {};
+    my $cdp  = $c6500->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid ( keys %$cdp ) {
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
+
 1;
 __END__
 
@@ -247,6 +397,8 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::CiscoStpExtensions
+
 =back
 
 =head2 Required MIBs
@@ -274,6 +426,8 @@ See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
 =back
 
 =head1 GLOBALS
@@ -328,6 +482,10 @@ See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
@@ -373,6 +531,53 @@ Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port C<ifIndex>.
 
 =back
 
+=head2 Topology information
+
+Based upon the firmware version Cisco devices may support Link Layer Discover
+Protocol (LLDP) in addition to the Cisco-proprietary CDP.  These methods
+will query both and return the combination of all information.  As a result,
+there may be identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and remove duplicates if necessary.
+
+=over
+
+=item $c6500->hasCDP()
+
+Returns true if the device is running either CDP or LLDP.
+
+=item $c6500->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $c6500->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-CDP/LLDP device in between two
+or more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $c6500->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $c6500->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $c6500->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::CiscoVTP
 
 See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
@@ -406,9 +611,13 @@ See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
 =head2 Table Methods imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
 =cut
 

Info/Layer3/Cisco.pm

@@ -52,7 +52,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/CiscoFWSM.pm

@@ -0,0 +1,223 @@
+# SNMP::Info::Layer3::CiscoFWSM
+# $Id$
+#
+# Copyright (c) 2010 Brian De Wolf
+# All rights reserved.
+#
+# 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::CiscoFWSM;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3::Cisco;
+
+@SNMP::Info::Layer3::CiscoFWSM::ISA = qw/SNMP::Info::Layer3::Cisco
+    Exporter/;
+@SNMP::Info::Layer3::CiscoFWSM::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::Cisco::MIBS,
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::Cisco::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::Cisco::FUNCS,
+
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::Cisco::MUNGE,
+);
+
+
+# For FWSMs, the ipNetToPhysicalPhysAddress table appears to be of the form:
+# $ifindex.$inetaddresstype.$proto.$ip_address -> $mac_address
+#
+# Using the output of ipNetToPhysicalPhysAddress, we can emulate the other
+# functions.
+#
+# This doesn't really line up to what at_* return, so we munge it
+
+sub at_paddr {
+    my ($fwsm)    = shift;
+    my ($partial)  = shift;
+
+    my $paddrs = $fwsm->n2p_paddr($partial);
+    my $n_paddrs = {};
+    
+    foreach my $key (keys %$paddrs) {
+        my $paddr = $paddrs->{$key};
+        my @parts = split /\./, $key;
+	my ($ifindex, $addrtype, $proto) = splice @parts, 0, 3;
+	my $ip = join ".", @parts;
+
+	next if($proto != 4); # at_paddr doesn't support non-IPv4
+
+        $n_paddrs->{"$ifindex.$ip"} = $paddr;
+    }
+    return $n_paddrs;
+}
+
+sub at_netaddr {
+    my ($fwsm)    = shift;
+    my ($partial)  = shift;
+
+    my $paddrs = $fwsm->n2p_paddr($partial);
+
+    my $netaddrs = {};
+    
+    foreach my $key (keys %$paddrs) {
+        my $paddr = $paddrs->{$key};
+        my @parts = split /\./, $key;
+	my ($ifindex, $addrtype, $proto) = splice @parts, 0, 3;
+	my $ip = join ".", @parts;
+
+	next if($proto != 4); # at_netaddr doesn't support non-IPv4
+
+        $netaddrs->{"$ifindex.$ip"} = $ip;
+    }
+    return $netaddrs;
+}
+
+sub at_ifaddr {
+    my ($fwsm)    = shift;
+    my ($partial)  = shift;
+
+    my $paddrs = $fwsm->n2p_paddr($partial);
+
+    my $ifaddrs = {};
+    
+    foreach my $key (keys %$paddrs) {
+        my $paddr = $paddrs->{$key};
+        my @parts = split /\./, $key;
+	my ($ifindex, $addrtype, $proto) = splice @parts, 0, 3;
+	my $ip = join ".", @parts;
+
+	next if($proto != 4); # at_ifaddr doesn't support non-IPv4
+
+        $ifaddrs->{"$ifindex.$ip"} = $ip;
+    }
+    return $ifaddrs;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::CiscoFWSM - SNMP Interface to Firewall Services Modules for
+features not covered elsewhere.
+
+=head1 AUTHOR
+
+Brian De Wolf
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $fwsm = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $fwsm->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Cisco Firewall Services Modules
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3::Cisco
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3::Cisco/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+=head2 Global Methods imported from SNMP::Info::Layer3::Cisco
+
+See documentation in L<SNMP::Info::Layer3::Cisco/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $fwsm->at_paddr()
+
+This function derives the at_paddr information from the n2p_paddr() table as
+the MIB to provide that information isn't supported on FWSMs.
+
+=item $fwsm->at_netaddr()
+
+This function derives the at_netaddr information from the n2p_paddr() table as
+the MIB to provide that information isn't supported on FWSMs.
+
+=item $fwsm->at_ifaddr()
+
+This function derives the at_ifaddr information from the n2p_paddr() table as
+the MIB to provide that information isn't supported on FWSMs.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3::Cisco
+
+See documentation in L<SNMP::Info::Layer3::Cisco/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Contivity.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::Contivity
 # $Id$
 #
-# Copyright (c) 2008 Eric Miller
+# Copyright (c) 2010 Eric Miller
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@ use SNMP::Info::Entity;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,
@@ -77,7 +77,7 @@ sub model {
 
     my $model = $e_model->{1} || undef;
 
-    return $1 if ( defined $model and $model =~ /(CES\d+)/i );
+    return $1 if ( defined $model and $model =~ /(CES\d+|NVR\d+)/i );
     return;
 }
 

Info/Layer3/Dell.pm

@@ -33,16 +33,18 @@ package SNMP::Info::Layer3::Dell;
 use strict;
 use Exporter;
 use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;
 
-@SNMP::Info::Layer3::Dell::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Dell::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
 @SNMP::Info::Layer3::Dell::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
     'RADLAN-Physicaldescription-MIB' => 'rlPhdStackReorder',
     'RADLAN-rlInterfaces'            => 'rlIfNumOfLoopbackPorts',
     'RADLAN-HWENVIROMENT'            => 'rlEnvPhysicalDescription',
@@ -51,12 +53,14 @@ $VERSION = '2.00';
 
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
     'os_ver'       => 'productIdentificationVersion',
     'dell_id_name' => 'productIdentificationDisplayName',
 );
 
 %FUNCS = (
     %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
 
     # RADLAN-rlInterfaces:swIfTable
     'dell_duplex_admin' => 'swIfDuplexAdminMode',
@@ -102,7 +106,7 @@ $VERSION = '2.00';
     'dell_fan_desc'  => 'rlEnvMonFanStatusDescr',
 );
 
-%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::LLDP::MUNGE, );
 
 # Method OverRides
 
@@ -154,7 +158,7 @@ sub interfaces {
     my $partial = shift;
 
     my $i_descr = $dell->i_description($partial) || {};
-    my $i_name  = $dell->i_name($partial)        || {};
+    my $i_name  = $dell->orig_i_name($partial)   || {};
 
     # Descriptions are all the same on some Dells, so use name instead if
     # available
@@ -228,6 +232,47 @@ sub _vendor {
     }
 }
 
+# lldp support
+sub hasCDP {
+    my $dell = shift;
+    return $dell->hasLLDP();
+}
+
+sub c_ip {
+    my $dell    = shift;
+    my $partial = shift;
+
+    return $dell->lldp_ip($partial);
+}
+
+sub c_if {
+    my $dell    = shift;
+    my $partial = shift;
+
+    return $dell->lldp_if($partial);
+}
+
+sub c_port {
+    my $dell    = shift;
+    my $partial = shift;
+
+    return $dell->lldp_port($partial);
+}
+
+sub c_id {
+    my $dell    = shift;
+    my $partial = shift;
+
+    return $dell->lldp_id($partial);
+}
+
+sub c_platform {
+    my $dell    = shift;
+    my $partial = shift;
+
+    return $dell->lldp_rem_sysdesc($partial);
+}
+
 1;
 __END__
 
@@ -323,6 +368,10 @@ id().  Defaults to 'dlink'.
 Returns 'dell', 'dlink', or 'ibm' based upon the IANA enterprise number in
 id().  Defaults to 'dlink'.
 
+=item $dell->hasCDP()
+
+Returns whether LLDP is enabled.
+
 =back
 
 =head2 Overrides
@@ -415,6 +464,26 @@ Some devices don't implement the C<BRIDGE-MIB> forwarding table, so we use
 the C<Q-BRIDGE-MIB> forwarding table.  Fall back to the C<BRIDGE-MIB> if
 C<Q-BRIDGE-MIB> doesn't return anything.
 
+=item $dell->c_id()
+
+Returns LLDP information.
+
+=item $dell->c_if()
+
+Returns LLDP information.
+
+=item $dell->c_ip()
+
+Returns LLDP information.
+
+=item $dell->c_platform()
+
+Returns LLDP information.
+
+=item $dell->c_port()
+
+Returns LLDP information.
+
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer3

Info/Layer3/Enterasys.pm

@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,

Info/Layer3/Extreme.pm

@@ -36,27 +36,35 @@ use strict;
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+use SNMP::Info::EDP;
 
 @SNMP::Info::Layer3::Extreme::ISA
-    = qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
+    = qw/SNMP::Info::Layer3 SNMP::Info::MAU SNMP::Info::LLDP
+    SNMP::Info::EDP Exporter/;
 @SNMP::Info::Layer3::Extreme::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
     %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::EDP::MIBS,
     'EXTREME-BASE-MIB'   => 'extremeAgent',
     'EXTREME-SYSTEM-MIB' => 'extremeSystem',
     'EXTREME-FDB-MIB'    => 'extremeSystem',
     'EXTREME-VLAN-MIB'   => 'extremeVlan',
+    'EXTREME-POE-MIB'    => 'extremePethSystemAdminEnable',
 );
 
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
     %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::EDP::GLOBALS,
     'serial1'        => 'extremeSystemID.0',
     'temp'           => 'extremeCurrentTemperature',
     'ps1_status_old' => 'extremePrimaryPowerOperational.0',
@@ -69,6 +77,8 @@ $VERSION = '2.00';
 %FUNCS = (
     %SNMP::Info::Layer3::FUNCS,
     %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::EDP::FUNCS,
     'fan_state' => 'extremeFanOperational',
 
     # EXTREME-FDB-MIB:extremeFdbMacFdbTable
@@ -82,6 +92,8 @@ $VERSION = '2.00';
 
     # EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
     'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
+
+    'peth_port_power'   => 'extremePethPortMeasuredPower',
 );
 
 %MUNGE = (
@@ -89,6 +101,8 @@ $VERSION = '2.00';
     # Inherit all the built in munging
     %SNMP::Info::Layer3::MUNGE,
     %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::EDP::MUNGE,
     'ex_fw_mac'      => \&SNMP::Info::munge_mac,
     'ps1_status_old' => \&munge_true_ok,
     'ps1_status_new' => \&munge_power_stat,
@@ -126,7 +140,15 @@ sub vendor {
 }
 
 sub os {
-    return 'extreme';
+    my $extreme = shift;
+
+    my $desc = $extreme->description();
+
+    if ($desc =~ /xos/i) {
+        return 'xos';
+    }
+    
+    return 'extremeware';
 }
 
 sub os_ver {
@@ -134,7 +156,7 @@ sub os_ver {
     my $descr   = $extreme->description();
     return unless defined $descr;
 
-    if ( $descr =~ m/Version ([\d.]*)/ ) {
+    if ( $descr =~ m/Version\s+([^ ]+)/ ) {
         return $1;
     }
 
@@ -527,6 +549,125 @@ sub set_add_i_vlan_tagged {
     return $rv;
 }
 
+#  Use EDP and/or LLDP
+sub hasCDP {
+    my $extreme = shift;
+
+    return $extreme->hasLLDP() || $extreme->hasEDP();
+}
+
+sub c_ip {
+    my $extreme = shift;
+    my $partial = shift;
+
+    my $edp  = $extreme->edp_ip() || {};
+    my $lldp = $extreme->lldp_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $iid ( keys %$edp ) {
+        my $ip = $edp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $extreme = shift;
+    my $partial = shift;
+
+    my $lldp = $extreme->lldp_if($partial) || {};
+    my $edp  = $extreme->edp_if() || {};
+
+    my %c_if;
+    foreach my $iid ( keys %$edp ) {
+        my $if = $edp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $extreme      = shift;
+    my $partial = shift;
+
+    my $lldp = $extreme->lldp_port($partial) || {};
+    my $edp  = $extreme->edp_port() || {};
+
+    my %c_port;
+    foreach my $iid ( keys %$edp ) {
+        my $port = $edp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $extreme      = shift;
+    my $partial = shift;
+
+    my $lldp = $extreme->lldp_id($partial) || {};
+    my $edp  = $extreme->edp_id() || {};
+
+    my %c_id;
+    foreach my $iid ( keys %$edp ) {
+        my $id = $edp->{$iid};
+        next unless defined $id;
+	
+        $c_id{$iid} = $id;
+    }
+    
+    foreach my $iid ( keys %$lldp ) {
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $extreme      = shift;
+    my $partial = shift;
+
+    my $lldp = $extreme->lldp_rem_sysdesc($partial)  || {};
+
+    my %c_platform;
+
+    foreach my $iid ( keys %$lldp ) {
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
 1;
 
 __END__
@@ -573,6 +714,10 @@ my $extreme = new SNMP::Info::Layer3::Extreme(...);
 
 =item SNMP::Info::MAU
 
+=item SNMP::Info::LLDP
+
+=item SNMP::Info::EDP
+
 =back
 
 =head2 Required MIBs
@@ -587,6 +732,8 @@ my $extreme = new SNMP::Info::Layer3::Extreme(...);
 
 =item F<EXTREME-VLAN-MIB>
 
+=item F<EXTREME-POE-MIB>
+
 =item Inherited Classes' MIBs
 
 See classes listed above for their required MIBs.
@@ -653,12 +800,6 @@ Returns base mac
 
 =back
 
-=head2 Overrides
-
-=over
-
-=back
-
 =head2 Globals imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
@@ -667,6 +808,14 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::EDP
+
+See documentation in L<SNMP::Info::EDP/"GLOBALS"> for details.
+
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
@@ -748,6 +897,63 @@ identifier (iid)
 Returns (C<ifIndex>) for both key and value since we're using
 F<EXTREME-FDB-MIB> rather than F<BRIDGE-MIB>.
 
+=item $extreme->peth_port_power()
+
+Power supplied by PoE ports, in milliwatts
+("extremePethPortMeasuredPower")
+
+=back
+
+=head2 Topology information
+
+Based upon the firmware version Extreme devices may support Extreme Discovery
+Protocol (EDP), Link Layer Discovery Protocol (LLDP), or both.  These methods
+will query both and return the combination of all information.  As a result,
+there may be identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and remove duplicates if necessary.
+
+=over
+
+=item $extreme->hasCDP()
+
+Returns true if the device is running either EDP or LLDP.
+
+=item $extreme->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $extreme->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+With EDP multiple entries may exist with the same local port, c_if(), and
+different IPv4 addresses, c_ip(), as EDP reports addresses for each VLAN
+transported across the trunk.  In the case of LLDP with multiple addresses
+there is either a non-LLDP device in between two or more devices or multiple
+devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $extreme->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $extreme->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $extreme->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+This information is only available from LLDP.  EDP does not provide an 
+equivalent.
+
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer3
@@ -758,6 +964,14 @@ See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::EDP
+
+See documentation in L<SNMP::Info::EDP/"TABLE METHODS"> for details.
+
 =head1 SET METHODS
 
 These are methods that provide SNMP set functionality for overridden methods

Info/Layer3/Force10.pm

@@ -0,0 +1,400 @@
+# SNMP::Info::Layer3::Force10
+# $Id$
+#
+# Copyright (c) 2012 William Bulley
+# All rights reserved.
+#
+# 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 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::Force10;
+
+use strict;
+use Exporter;
+
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::Force10::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Force10::EXPORT_OK = qw//;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'F10-PRODUCTS-MIB' => 'f10Products',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::Force10::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::Force10::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub vendor {
+    return 'force10';
+}
+
+sub os {
+    return 'ftos';
+}
+
+sub os_ver {
+    my $force10 = shift;
+    my $descr   = $force10->description();
+    my $os_ver  = undef;
+
+    $os_ver = $1 if ( $descr =~ /Force10\s+Application\s+Software\s+Version:\s+(\S+)/s );
+
+    return $os_ver;
+}
+
+sub model {
+    my $force10 = shift;
+    my $id      = $force10->id();
+
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    return $model;
+}
+
+# Use Q-BRIDGE-MIB
+
+sub fw_mac {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->qb_fw_port($partial);
+}
+
+sub v_name {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->qb_v_name($partial);
+}
+
+# ------------------- stub for now-----------------
+sub i_vlan {
+    my $force10 = shift;
+    my $partial = shift;
+
+    my $i_vlan = {};
+
+    return $i_vlan;
+}
+
+sub i_vlan_membership {
+    my $force10 = shift;
+    my $partial = shift;
+
+    my $index = $force10->bp_index();
+    my $v_index = $force10->v_index();
+
+    my $v_ports  = $force10->qb_v_egress();
+
+    # If given a partial it will be an ifIndex, we need to use dot1dBasePort
+    if ($partial) {
+        my %r_index = reverse %$index;
+        $partial    = $r_index{$partial};
+    }
+
+    my $i_vlan_membership = {};
+
+    foreach my $idx ( sort keys %{$v_ports} ) {
+        next unless ( defined $v_ports->{$idx} );
+        my $portlist = $v_ports->{$idx}; # is an array reference
+        my $ret      = [];
+        my $vlan_ndx = $idx;
+
+        # Convert portlist bit array to bp_index array
+        for ( my $i = 0; $i <= $#$portlist; $i++ ) {
+            push( @{$ret}, $i + 1 ) if ( @$portlist[$i] );
+        }
+
+        #Create HoA ifIndex -> VLAN array
+        foreach my $port ( @{$ret} ) {
+            my $ifindex = $index->{$port};
+            next unless ( defined($ifindex) );    # shouldn't happen
+            next if ( defined $partial and $ifindex !~ /^$partial$/ );
+            my $vlan_tag = $v_index->{$vlan_ndx};
+
+            # FIXME: would be preferable to use
+            # the mapping from Q-BRIDGE-MIB::dot1qVlanFdbId 
+            my $mod = $vlan_tag % 4096;
+
+            push ( @{ $i_vlan_membership->{$ifindex} }, ($mod) );
+        }
+    }
+
+    return $i_vlan_membership;
+}
+
+# Use LLDP
+
+sub hasCDP {
+    my $force10 = shift;
+
+    return $force10->hasLLDP();
+}
+
+sub c_ip {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->lldp_ip($partial);
+}
+
+sub c_if {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->lldp_if($partial);
+}
+
+sub c_port {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->lldp_port($partial);
+}
+
+sub c_id {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->lldp_id($partial);
+}
+
+sub c_platform {
+    my $force10 = shift;
+    my $partial = shift;
+
+    return $force10->lldp_rem_sysdesc($partial);
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Force10 - SNMP Interface to Force10 Networks FTOS
+
+=head1 AUTHOR
+
+William Bulley
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $force10 = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $force10->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Force10 Networks FTOS-based devices.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<F10-PRODUCTS-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP:
+
+=over
+
+=item $force10->vendor()
+
+    Returns 'force10'
+
+=item $force10->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $force10->model()
+
+Tries to reference $force10->id() to the Force10 product MIB listed above.
+
+=item $force10->os()
+
+Returns 'ftos'
+
+=item $force10->os_ver()
+
+Grabs the operating system version from C<sysDescr>
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $force10->v_name()
+
+Returns the VLAN names.
+
+=item $force10->i_vlan()
+
+Currently not implemented.
+
+=item $force10->i_vlan_membership()
+
+Returns reference to hash of arrays:
+key = C<ifIndex>, value = array of VLAN IDs.
+These are the VLANs which are members of the egress list for the port.
+
+=item $force10->fw_mac()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $force10->fw_port()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $force10->c_id()
+
+Returns LLDP information.
+
+=item $force10->c_if()
+
+Returns LLDP information.
+
+=item $force10->c_ip()
+
+Returns LLDP information.
+
+=item $force10->c_platform()
+
+Returns LLDP information.
+
+=item $force10->c_port()
+
+Returns LLDP information.
+
+=item $force10->i_duplex_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $force10->i_speed_admin()
+
+Returns info from F<MAU-MIB>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Foundry.pm

@@ -44,7 +44,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -192,6 +192,9 @@ sub os_ver {
         }
     }
 
+    # See if we report from Flash if wouldn't report from running above
+    return $foundry->snAgFlashImgVer() if ( defined $foundry->snAgFlashImgVer() );
+    
     # Last resort
     return $foundry->SUPER::os_ver();
 
@@ -270,7 +273,7 @@ sub stp_p_state {
 sub hasCDP {
     my $foundry = shift;
 
-    return $foundry->hasLLDP() || $foundry->SUPER::hasCDP();
+    return $foundry->hasLLDP() || $foundry->hasFDP();
 }
 
 sub c_ip {

Info/Layer3/HP9300.pm

@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Juniper.pm

@@ -33,25 +33,52 @@ package SNMP::Info::Layer3::Juniper;
 use strict;
 use Exporter;
 use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;
 
-@SNMP::Info::Layer3::Juniper::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Juniper::ISA       = qw/SNMP::Info::Layer3 SNMP::Info::LLDP  Exporter/;
 @SNMP::Info::Layer3::Juniper::EXPORT_OK = qw//;
 
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
     'JUNIPER-CHASSIS-DEFINES-MIB' => 'jnxChassisDefines',
     'JUNIPER-MIB'                 => 'jnxBoxAnatomy',
+    'JUNIPER-VIRTUALCHASSIS-MIB'  => 'jnxVirtualChassisMemberTable',
+    'JUNIPER-VLAN-MIB'            => 'jnxVlanMIBObjects',
 );
 
-%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, 'serial' => 'jnxBoxSerialNo.0', );
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, 
+	     %SNMP::Info::LLDP::GLOBALS,
+	     'serial' => 'jnxBoxSerialNo.0',
+	     'mac'    => 'dot1dBaseBridgeAddress',
+	     );
 
-%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, 
+	   %SNMP::Info::LLDP::FUNCS,
+	   
+	   # JUNIPER-VLAN-MIB::jnxExVlanTable
+	   'v_index'    => 'jnxExVlanTag',
+	   'v_type'     => 'jnxExVlanType',
+	   'v_name'     => 'jnxExVlanName',
+	   
+	   # JUNIPER-VLAN-MIB::jnxExVlanPortGroupTable
+	   'i_trunk'    => 'jnxExVlanPortAccessMode',
+	   
+	   # JUNPIER-MIB
+           'e_contents_type'   => 'jnxContentsType',
+           'e_containers_type' => 'jnxContainersType',
+           'e_hwver'           => 'jnxContentsRevision',
+);
 
-%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, 
+	   %SNMP::Info::LLDP::MUNGE,
+	   'e_containers_type' => \&SNMP::Info::munge_e_type,
+	   'e_contents_type' => \&SNMP::Info::munge_e_type,
+);
 
 sub vendor {
     return 'juniper';
@@ -63,12 +90,16 @@ sub os {
 
 sub os_ver {
     my $juniper = shift;
-    my $descr   = $juniper->description();
-    return unless defined $descr;
+
+    my $descr        = $juniper->description() || '';
+    my $lldp_descr   = $juniper->lldp_sysdesc() || '';
 
     if ( $descr =~ m/kernel JUNOS (\S+)/ ) {
         return $1;
     }
+    elsif ( $lldp_descr =~ m/version\s(\S+)\s/ ) {
+	return $1;
+    }
     return;
 }
 
@@ -97,22 +128,449 @@ sub serial {
     return $juniper->orig_serial();
 }
 
-sub i_vlan {
+# 'i_trunk'    => 'jnxExVlanPortAccessMode',
+sub i_trunk {
+    my $juniper = shift;
+    my $partial = shift;
+
+    my $access  = $juniper->jnxExVlanPortAccessMode($partial);
+
+    my %i_trunk;
+
+    foreach (keys %$access)
+    {
+	my $old_key = $_;
+	m/^\d+\.(\d+)$/o;
+	my $new_key = $1;
+	$i_trunk{$new_key} = $access->{$old_key};
+    }
+
+    return \%i_trunk;
+}
+
+# 'v_type'     => 'jnxExVlanType',
+sub v_type {
+    my $juniper = shift;
+    my $partial = shift;
+
+    my $v_type  = $juniper->jnxExVlanType($partial);
+
+    return $v_type;
+}
+
+# 'v_index'    => 'jnxExVlanTag',
+sub v_index {
     my ($juniper) = shift;
     my ($partial) = shift;
 
-    my ($i_type)  = $juniper->i_type($partial);
-    my ($i_descr) = $juniper->i_description($partial);
-    my %i_vlan;
+    my ($v_index)  = $juniper->jnxExVlanTag($partial);
 
-    foreach my $idx ( keys %$i_descr ) {
-        if ( $i_type->{$idx} eq 'l2vlan' || $i_type->{$idx} eq 135 ) {
-            if ( $i_descr->{$idx} =~ /\.(\d+)$/ ) {
-                $i_vlan{$idx} = $1;
-            }
+    return $v_index;
+}
+
+sub i_vlan {
+    my $juniper = shift;
+    my $partial = shift;
+
+    my $index = $juniper->bp_index();
+
+    # If given a partial it will be an ifIndex, we need to use dot1dBasePort
+    if ($partial) {
+        my %r_index = reverse %$index;
+        $partial = $r_index{$partial};
+    }
+
+    my $v_index  = $juniper->jnxExVlanTag();
+    my $i_pvid   = $juniper->qb_i_vlan($partial) || {};
+    my $i_vlan = {};
+
+    foreach my $bport ( keys %$i_pvid ) {
+        my $q_vlan  = $i_pvid->{$bport};
+	my $vlan    = $v_index->{$q_vlan};
+        my $ifindex = $index->{$bport};
+        unless ( defined $ifindex ) {
+            print "  Port $bport has no bp_index mapping. Skipping.\n"
+                if $DEBUG;
+            next;
+        }
+        $i_vlan->{$ifindex} = $vlan;
+    }
+
+    return $i_vlan;
+}
+
+sub i_vlan_membership {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    my $index = $juniper->bp_index();
+    my ($v_index)  = $juniper->jnxExVlanTag($partial);
+
+    my $v_ports = $juniper->qb_v_egress() || {};
+
+    my $i_vlan_membership = {};
+
+    foreach my $idx ( sort keys %$v_ports ) {
+        next unless ( defined $v_ports->{$idx} );
+        my $portlist = $v_ports->{$idx}; # is an array reference
+        my $ret      = [];
+        my $vlan_ndx = $idx;
+
+        # Convert portlist bit array to bp_index array
+        for ( my $i = 0; $i <= $#$portlist; $i++ ) {
+            push( @{$ret}, $i + 1 ) if ( @$portlist[$i] );
+        }
+
+        #Create HoA ifIndex -> VLAN array
+        foreach my $port ( @{$ret} ) {
+            my $ifindex = $index->{$port};
+            next unless ( defined($ifindex) );    # shouldn't happen
+            next if ( defined $partial and $ifindex !~ /^$partial$/ );
+            push ( @{ $i_vlan_membership->{$ifindex} }, $v_index->{$vlan_ndx} );
         }
     }
-    return \%i_vlan;
+
+    return $i_vlan_membership;
+}
+
+# Use Q-BRIDGE-MIB for bridge forwarding tables
+sub fw_mac {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->qb_fw_port($partial);
+}
+
+# Use LLDP
+
+sub hasCDP {
+    my $juniper = shift;
+
+    return $juniper->hasLLDP();
+}
+
+sub c_ip {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->lldp_ip($partial);
+}
+
+sub c_if {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->lldp_if($partial);
+}
+
+sub c_port {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->lldp_port($partial);
+}
+
+sub c_id {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->lldp_id($partial);
+}
+
+sub c_platform {
+    my $juniper  = shift;
+    my $partial = shift;
+
+    return $juniper->lldp_rem_sysdesc($partial);
+}
+
+# Pseudo ENTITY-MIB methods
+
+# This class supports both virtual chassis (stackable) and physical chassis
+# based devices, identify if we have a virtual chassis so that we return
+# appropriate entPhysicalClass and correct ordering
+
+sub _e_is_virtual {
+    my $juniper = shift;
+
+    my $v_test = $juniper->jnxVirtualChassisMemberRole() || {};
+    
+    #If we are functioning as a stack someone should be master
+    foreach my $iid ( keys %$v_test ) {
+	my $role = $v_test->{$iid};
+	return 1 if ($role =~ /master/i);
+    }
+    return 0;
+}
+
+sub _e_virtual_index {
+    my $juniper = shift;
+
+    my $containers = $juniper->jnxContainersWithin() || {};
+    my $members    = $juniper->jnxVirtualChassisMemberRole() || {};
+    
+    my %v_index;
+    foreach my $key (keys %$containers) {
+	foreach my $member ( keys %$members ) {
+	    # Virtual chassis members start at zero
+	    $member++;
+	    # We will be duplicating and eliminating some keys,
+	    # but this is for the benefit of e_parent()
+	    my $index  = sprintf ("%02d", $key) . sprintf ("%02d", $member) . "0000";
+	    my $iid = "$key\.$member\.0\.0";
+	    $v_index{$iid} = $index;
+	}
+	unless ($containers->{$key}) {
+	    my $index = sprintf ("%02d", $key) . "000000";
+	    $v_index{$key} = $index;
+	}
+    }
+    return \%v_index;
+}
+
+sub e_index {
+    my $juniper = shift;
+
+    my $contents   = $juniper->jnxContentsDescr() || {};
+    my $containers = $juniper->jnxContainersDescr() || {};
+    my $virtuals   = $juniper->_e_virtual_index() || {};
+    my $is_virtual = $juniper->_e_is_virtual();
+
+    # Format into consistent integer format so that numeric sorting works     
+    my %e_index;
+    if ($is_virtual) {
+	foreach my $key ( keys %$virtuals ) {
+	    $e_index{$key} = $virtuals->{$key};
+	}
+    }
+    else {
+	foreach my $key ( keys %$containers ) {
+	    $e_index{$key} = sprintf ("%02d", $key) . "000000";
+	}
+    }
+    foreach my $key ( keys %$contents ) {
+	$e_index{$key} = join( '', map { sprintf "%02d", $_ } split /\./, $key );
+    }
+ 
+    return \%e_index;
+}
+
+sub e_class {
+    my $juniper = shift;
+
+    my $e_index    = $juniper->e_index() || {};
+    my $fru_type   = $juniper->jnxFruType() || {};
+    my $c_type     = $juniper->jnxContainersDescr() || {};
+    my $is_virtual = $juniper->_e_is_virtual();
+
+    my %e_class;
+    foreach my $iid ( keys %$e_index ) {
+	
+	my $type      = $fru_type->{$iid} || 0;
+	my $container = $c_type->{$iid} || 0;
+	
+        if ( $type =~ /power/i  ) {
+            $e_class{$iid} = 'powerSupply';
+        }
+        elsif ( $type =~ /fan/i ) {
+            $e_class{$iid} = 'fan';
+        }
+	elsif ( $type ) {
+	    $e_class{$iid} = 'module';
+	}
+	# Shouldn't get here if we have type which means
+	# we only have container, chassis, and stack left
+        elsif (($container =~ /chassis/i) and (!$is_virtual) ) {
+            $e_class{$iid} = 'chassis';
+        }
+        elsif (($container =~ /chassis/i) and ($is_virtual)) {
+            $e_class{$iid} = 'stack';
+	}
+	# Were calling the second level chassis a container in the case
+	# of a virtual chassis but not sure that it really matters
+        else {
+            $e_class{$iid} = 'container';
+        }
+    }
+    return \%e_class;
+}
+
+sub e_descr {
+    my $juniper = shift;
+
+    my $e_index    = $juniper->e_index() || {};
+    my $box_descr  = $juniper->jnxBoxDescr || 0;
+    my $contents   = $juniper->jnxContentsDescr() || {};
+    my $containers = $juniper->jnxContainersDescr() || {};
+
+    my %e_descr;
+    foreach my $iid ( keys %$e_index ) {
+	
+	my $content_descr   = $contents->{$iid} || 0;
+	my $container_descr = $containers->{$iid} || 0;
+	
+	if ($content_descr) {
+	    $e_descr{$iid} = $content_descr;
+	}
+	elsif ($container_descr and $container_descr !~ /chassis/) {
+	    $e_descr{$iid} = $container_descr;
+	}
+	elsif ($container_descr and $container_descr =~ /chassis/) {
+	    $e_descr{$iid} = $box_descr;
+	}
+	# We should only be left with virtual entries created in
+	# _e_virtual_index()
+	elsif ($iid =~ /^(\d+)\.(\d+)(\.0)+?/) {
+	    my $descr = $containers->{$1};
+	    $e_descr{$iid} = $descr;
+	}
+	# Anything past here undef
+    }
+    return \%e_descr;
+}
+
+sub e_serial {
+    my $juniper = shift;
+
+    my $e_index    = $juniper->e_index() || {};
+    my $serials    = $juniper->jnxContentsSerialNo() || {};
+    my $e_class    = $juniper->e_class() || {};
+    my $is_virtual = $juniper->_e_is_virtual();
+    my $box_serial = $juniper->serial();
+
+    my %e_serial;
+    foreach my $iid ( keys %$e_index ) {
+	my $serial = $serials->{$iid} || '';
+	my $class  = $e_class->{$iid} || '';
+	# Chassis serial number is seperate on true chassis
+	# Virtual chassis (stack) report master switch serial
+	if (!$is_virtual and ($class =~ /chassis/i)){
+	    $e_serial{$iid} = $box_serial;
+	}
+	elsif (($serial !~ /^\w/) or ($serial =~ /builtin/i)) {
+	    next;
+	}
+	else {
+	    $e_serial{$iid} = $serial;
+	}
+    }
+    return  \%e_serial;
+}
+
+sub e_fru {
+    my $juniper = shift;
+
+    my $e_index = $juniper->e_index() || {};
+    my $frus    = $juniper->jnxContentsPartNo() || {};
+
+    my %e_fru;
+    foreach my $iid ( keys %$e_index ) {
+	my $fru = $frus->{$iid} || '';
+	if ( ($fru !~ /^\w/) or ($fru =~ /builtin/i)) {
+	    $e_fru{$iid} = "false";
+	}
+	else {
+	    $e_fru{$iid} = "true";
+	}
+    }
+    return  \%e_fru;
+}
+
+sub e_type {
+    my $juniper = shift;
+
+    my $e_index    = $juniper->e_index() || {};
+    my $contents   = $juniper->e_contents_type() || {};
+    my $containers = $juniper->e_containers_type() || {};
+
+    my %e_type;
+    foreach my $iid ( keys %$e_index ) {
+	
+	my $content_type   = $contents->{$iid} || 0;
+	my $container_type = $containers->{$iid} || 0;
+	
+	if ($content_type) {
+	    $content_type =~ s/\.0//;
+	    $e_type{$iid} = $content_type;
+	}
+	elsif ($container_type) {
+	    $container_type =~ s/\.0//;
+	    $e_type{$iid} = $container_type;
+	}
+	# We should only be left with virtual entries created in
+	# _e_virtual_index()
+	elsif ($iid =~ /^(\d+)\.(\d+)(\.0)+?/) {
+	    my $descr = $containers->{$1};
+	    $descr =~ s/\.0//;
+	    $e_type{$iid} = $descr;
+	}
+	# Anything past here undef
+    }
+    return \%e_type;
+}
+
+sub e_vendor {
+    my $juniper = shift;
+
+    my $e_idx = $juniper->e_index() || {};
+
+    my %e_vendor;
+    foreach my $iid ( keys %$e_idx ) {
+        $e_vendor{$iid} = 'juniper';
+    }
+    return \%e_vendor;
+}
+
+sub e_pos {
+    my $juniper = shift;
+
+    # We could look at index levels, but his will work as well
+    return $juniper->e_index();
+}
+
+sub e_parent {
+    my $juniper = shift;
+
+    my $e_idx      = $juniper->e_index() || {};
+    my $c_within   = $juniper->jnxContainersWithin() || {};
+    my $e_descr    = $juniper->e_descr() || {};
+    my $is_virtual = $juniper->_e_is_virtual();
+    
+    my %e_parent;
+    foreach my $iid ( keys %$e_idx ) {
+        next unless $iid;
+	
+	my ($idx, $l1,$l2, $l3) = split /\./, $iid;
+	my $within = $c_within->{$idx};
+	my $descr  = $e_descr->{$iid};
+	
+        if ( !$is_virtual and ($iid =~ /^(\d+)\.\d+/) ) {
+            $e_parent{$iid} = sprintf ("%02d", $1) . "000000";
+        }
+	elsif ( $is_virtual and ($descr =~ /chassis/i) and ($iid =~ /^(\d+)\.(\d+)(\.0)+?/) ) {
+	    $e_parent{$iid} = sprintf ("%02d", $1) . "000000";
+	}
+	elsif ( $is_virtual and ($iid =~ /^(\d+)\.(\d+)(\.0)+?/) ) {
+	    $e_parent{$iid} = sprintf ("%02d", $within) . sprintf ("%02d", $2) . "0000";
+	}
+	elsif ( $is_virtual and ($iid =~ /^(\d+)\.(\d+)\.[1-9]+/) ) {
+	    $e_parent{$iid} = sprintf ("%02d", $1) . sprintf ("%02d", $2) . "0000";
+	}
+	elsif ( defined $within and $iid =~ /\d+/ ) {
+            $e_parent{$iid} = sprintf ("%02d", $within) . "000000";
+	}
+        else {
+            next;
+        }
+    }
+    return \%e_parent;
 }
 
 1;
@@ -143,7 +601,7 @@ Bill Fenner
 
 =head1 DESCRIPTION
 
-Subclass for Generic Juniper Routers running JUNOS
+Subclass for Juniper Devices running JUNOS
 
 =head2 Inherited Classes
 
@@ -151,17 +609,29 @@ Subclass for Generic Juniper Routers running JUNOS
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::LLDP
+
 =back
 
 =head2 Required MIBs
 
 =over
 
-=item Inherited Classes' MIBs
+=item F<JUNIPER-VLAN-MIB> dated "200901090000Z" -- Fri Jan 09 00:00:00 2009 UTC or later.
+
+=item F<JUNIPER-CHASSIS-DEFINES-MIB>
+
+=item F<JUNIPER-MIB>
+
+=item F<JUNIPER-VIRTUALCHASSIS-MIB>
+
+=back
+
+=head2 Inherited Classes' MIBs
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
-=back
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
 
 =head1 GLOBALS
 
@@ -171,19 +641,20 @@ These are methods that return scalar value from SNMP
 
 =item $juniper->vendor()
 
-Returns C<'juniper'>
+Returns 'juniper'
 
 =item $juniper->os()
 
-Returns C<'junos'>
+Returns 'junos'
 
 =item $juniper->os_ver()
 
-Returns the software version extracted from C<sysDescr>.
+Returns the software version extracted first from C<sysDescr> or
+C<lldpLocSysDesc> if not available in C<sysDescr>.
 
 =item $juniper->model()
 
-Returns the model from C<sysObjectID>, with C<jnxProductNameremoved> from the
+Returns the model from C<sysObjectID>, with C<jnxProductName> removed from the
 beginning.
 
 =item $juniper->serial()
@@ -192,12 +663,27 @@ Returns serial number
 
 (C<jnxBoxSerialNo.0>)
 
+=item $juniper->serial()
+
+Returns the MAC address used by this bridge when it must be referred
+to in a unique fashion.
+
+(C<dot1dBaseBridgeAddress>)
+
+=item $juniper->hasCDP()
+
+Returns whether LLDP is enabled.
+
 =back
 
 =head2 Globals imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
+=head2 Global Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
@@ -205,10 +691,135 @@ to a hash.
 
 =over
 
+=item $juniper->v_index()
+
+(C<jnxExVlanTag>)
+
+=item $juniper->v_name()
+
+(C<jnxExVlanName>)
+
+=item $juniper->v_type()
+
+(C<jnxExVlanType>)
+
+=item $juniper->i_trunk()
+
+(C<jnxExVlanPortAccessMode>)
+
 =item $juniper->i_vlan()
 
-Returns the list of interfaces whose C<ifType> is l2vlan(135), and
-the VLAN ID extracted from the interface description.
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.
+
+=item $juniper->i_vlan_membership()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the egress list for the port.
+
+=back
+
+=head2 Topology information
+
+These methods return Link Layer Discovery Protocol (LLDP) information.  See
+documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=over
+
+=item $juniper->c_id()
+
+Returns C<lldp_id>
+
+=item $juniper->c_if()
+
+Returns C<lldp_if>
+
+=item $juniper->c_ip()
+
+Returns C<lldp_ip>
+
+=item $juniper->c_platform()
+
+Returns C<lldp_rem_sysdesc>
+
+=item $juniper->c_port()
+
+Returns C<lldp_port>
+
+=back
+
+=head2 Forwarding Table (C<dot1dTpFdbEntry>)
+
+=over 
+
+=item $juniper->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses
+
+(C<dot1dTpFdbAddress>)
+
+=item $juniper->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+(C<dot1dTpFdbPort>)
+
+=back 
+
+=head2 Pseudo F<ENTITY-MIB> information
+
+These methods emulate F<ENTITY-MIB> Physical Table methods using
+F<JUNIPER-MIB> and F<JUNIPER-VIRTUALCHASSIS-MIB>. 
+
+=over
+
+=item $juniper->e_index()
+
+Returns reference to hash.  Key: IID, Value: Integer, Indices are combined
+into a eight digit integer, each index is two digits padded with leading zero
+if required.
+
+=item $juniper->e_class()
+
+Returns reference to hash.  Key: IID, Value: General hardware type.
+
+=item $juniper->e_descr()
+
+Returns reference to hash.  Key: IID, Value: Human friendly name
+
+=item $juniper->e_hwver()
+
+Returns reference to hash.  Key: IID, Value: Hardware version
+
+=item $juniper->e_vendor()
+
+Returns reference to hash.  Key: IID, Value: juniper
+
+=item $juniper->e_serial()
+
+Returns reference to hash.  Key: IID, Value: Serial number
+
+=item $juniper->e_pos()
+
+Returns reference to hash.  Key: IID, Value: The relative position among all
+entities sharing the same parent.
+
+=item $juniper->e_type()
+
+Returns reference to hash.  Key: IID, Value: Type of component/sub-component
+as defined in F<JUNIPER-CHASSIS-DEFINES-MIB>.
+
+=item $juniper->e_parent()
+
+Returns reference to hash.  Key: IID, Value: The value of e_index() for the
+entity which 'contains' this entity.  A value of zero indicates	this entity
+is not contained in any other entity.
+
+=item $entity->e_fru()
+
+BOOLEAN. Is a Field Replaceable unit?
+
+(C<entPhysicalFRU>)
 
 =back
 
@@ -216,4 +827,8 @@ the VLAN ID extracted from the interface description.
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
 =cut

Info/Layer3/Microsoft.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Mikrotik.pm

@@ -0,0 +1,175 @@
+# SNMP::Info::Layer3::Mikrotik
+# $Id$
+#
+# Copyright (c) 2011 Jeroen van Ingen
+# All rights reserved.
+#
+# 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::Mikrotik;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Mikrotik::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Mikrotik::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    'HOST-RESOURCES-MIB'       => 'hrSystem',
+    'MIKROTIK-MIB'             => 'mtxrLicVersion',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    'hrSystemUptime' => 'hrSystemUptime',
+    'os_ver'         => 'mtxrLicVersion',
+);
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'mikrotik';
+}
+
+sub model {
+    my $mikrotik = shift;
+    my $descr = $mikrotik->description() || '';
+    my $model = undef;
+    $model = $1 if ( $descr =~ /^RouterOS\s+(\S+)$/i );
+    return $model;
+}
+
+sub os {
+    return 'routeros';
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Mikrotik - SNMP Interface to Mikrotik devices
+
+=head1 AUTHORS
+
+Jeroen van Ingen
+initial version based on SNMP::Info::Layer3::NetSNMP by Bradley Baetz and Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $mikrotik = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $mikrotik->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Mikrotik devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<HOST-RESOURCES-MIB>
+
+=item F<MIKROTIK-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $mikrotik->vendor()
+
+Returns 'mikrotik'.
+
+=item $mikrotik->os()
+
+Returns 'routeros'.
+
+=item $mikrotik->model()
+
+Tries to extract the device model from C<sysDescr>.
+
+=item $mikrotik->os_ver()
+
+Returns the value of C<mtxrLicVersion>.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head1 TABLE ENTRIES
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+None.
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+
+=cut

Info/Layer3/N1600.pm

@@ -41,7 +41,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/NetSNMP.pm

@@ -33,16 +33,18 @@ package SNMP::Info::Layer3::NetSNMP;
 use strict;
 use Exporter;
 use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;
 
-@SNMP::Info::Layer3::NetSNMP::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::NetSNMP::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
 @SNMP::Info::Layer3::NetSNMP::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
     'UCD-SNMP-MIB'       => 'versionTag',
     'NET-SNMP-TC'        => 'netSnmpAgentOIDs',
     'HOST-RESOURCES-MIB' => 'hrSystem',
@@ -50,13 +52,20 @@ $VERSION = '2.00';
 
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
     'netsnmp_vers'   => 'versionTag',
     'hrSystemUptime' => 'hrSystemUptime',
 );
 
-%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
 
-%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
 
 sub vendor {
     return 'Net-SNMP';
@@ -121,6 +130,42 @@ sub i_ignore {
     return \%i_ignore;
 }
 
+# Use LLDP
+sub hasCDP {
+    my $netsnmp = shift;
+    return $netsnmp->hasLLDP();
+}
+
+sub c_ip {
+    my $netsnmp  = shift;
+    my $partial = shift;
+    return $netsnmp->lldp_ip($partial);
+}
+
+sub c_if {
+    my $netsnmp  = shift;
+    my $partial = shift;
+    return $netsnmp->lldp_if($partial);
+}
+
+sub c_port {
+    my $netsnmp  = shift;
+    my $partial = shift;
+    return $netsnmp->lldp_port($partial);
+}
+
+sub c_id {
+    my $netsnmp  = shift;
+    my $partial = shift;
+    return $netsnmp->lldp_id($partial);
+}
+
+sub c_platform {
+    my $netsnmp  = shift;
+    my $partial = shift;
+    return $netsnmp->lldp_rem_sysdesc($partial);
+}
+
 1;
 __END__
 
@@ -173,6 +218,8 @@ Subclass for Generic Net-SNMP devices
 
 See L<SNMP::Info::Layer3> for its own MIB requirements.
 
+See L<SNMP::Info::LLDP> for its own MIB requirements.
+
 =back
 
 =head1 GLOBALS
@@ -210,6 +257,10 @@ Returns ''.
 
 See documentation in L<SNMP::Info::Layer3> for details.
 
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP> for details.
+
 =head1 TABLE ENTRIES
 
 These are methods that return tables of information in the form of a reference
@@ -227,10 +278,54 @@ Ignores loopback
 
 =back
 
+=head2 Topology information
+
+Link Layer Discovery Protocol (LLDP) support.  The device must be running
+an optional LLDP agent, such as lldpd, which can integrate with the SNMP agent. 
+
+=over
+
+=item $netsnmp->hasCDP()
+
+Returns true if the device is running LLDP.
+
+=item $netsnmp->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $netsnmp->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-LLDP device in between two
+or more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $netsnmp->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $netsnmp->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $netsnmp->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3> for details.
 
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP> for details.
+
 =head1 NOTES
 
 In order to cause SNMP::Info to classify your device into this class, it

Info/Layer3/Netscreen.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -92,6 +92,26 @@ sub serial {
     return;
 }
 
+sub model {
+    my $netscreen = shift;
+
+    my $id = $netscreen->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::model() - Device does not support sysObjectID\n"
+            if $netscreen->debug();
+        return;
+    }
+
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^netscreen//i;
+    return $model;
+}
+
 1;
 
 __END__
@@ -161,6 +181,10 @@ These are methods that return scalar value from SNMP
 
 =over
 
+=item $netscreen->model()
+
+(C<chassisModel>)
+
 =item $netscreen->vendor()
 
 Returns 'netscreen'

Info/Layer3/Nexus.pm

@@ -0,0 +1,564 @@
+# SNMP::Info::Layer3::Nexus
+#
+# Copyright (c) 2012 Eric Miller
+# All rights reserved.
+#
+# 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::Nexus;
+
+use strict;
+use Exporter;
+use SNMP::Info::LLDP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoPortSecurity;
+use SNMP::Info::CiscoConfig;
+use SNMP::Info::CiscoPower;
+use SNMP::Info::Layer3;
+use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::CiscoVTP;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+# NOTE : Top-most items gets precedence for @ISA
+@SNMP::Info::Layer3::Nexus::ISA = qw/
+    SNMP::Info::CiscoVTP 
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::LLDP
+    SNMP::Info::CDP 
+    SNMP::Info::CiscoImage
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoConfig
+    SNMP::Info::CiscoPower
+    SNMP::Info::Layer3
+    Exporter
+/;
+
+@SNMP::Info::Layer3::Nexus::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+# NOTE: Order creates precedence
+#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
+#       Bridge is called from Layer3 and CiscoStpExtensions
+#       So we want CiscoVTP to come last to get the right one.
+# The @ISA order should be reverse of these orders.
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,
+    %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::CiscoStpExtensions::MIBS, 
+    %SNMP::Info::CiscoVTP::MIBS,
+    'CISCO-ENTITY-VENDORTYPE-OID-MIB' => 'cevMIBObjects',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::CiscoPower::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoPortSecurity::GLOBALS,
+    %SNMP::Info::CiscoImage::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS,
+    'mac' => 'dot1dBaseBridgeAddress',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::FUNCS, 
+    %SNMP::Info::CiscoVTP::FUNCS,    
+);
+
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,         
+    %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE, 
+    %SNMP::Info::CiscoVTP::MUNGE,    
+);
+
+sub cisco_comm_indexing { return 1; }
+
+sub vendor {
+    return 'cisco';
+}
+
+sub os {
+    return 'nx-os';
+}
+
+sub os_ver {
+    my $nexus = shift; 
+    my $descr = $nexus->description();
+    
+    return $1 if ( $descr =~ /\),\s+Version\s+(.+?),/ );
+    return $descr;
+}
+
+sub serial {
+    my $nexus = shift;
+
+    my $e_class = $nexus->e_class();
+
+    foreach my $iid ( keys %$e_class ) {
+        my $class = $e_class->{$iid} || '';
+        if ($class =~ /chassis/) {
+	    my $serial = $nexus->e_serial($iid);
+	    return $serial->{$iid};
+	}
+    }    
+    return;
+}
+
+# sysObjectID returns an IID to an entry in the CISCO-ENTITY-VENDORTYPE-OID-MIB.
+# Look it up and return it.
+sub model {
+    my $nexus = shift;
+    my $id    = $nexus->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::Nexus::model() - Device does not support sysObjectID\n"
+            if $nexus->debug();
+        return;
+    }
+
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^cevChassis//i;
+    return $model;
+}
+
+#  Use CDP and/or LLDP
+sub hasCDP {
+    my $nexus = shift;
+
+    return $nexus->hasLLDP() || $nexus->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $nexus   = shift;
+    my $partial = shift;
+
+    my $cdp  = $nexus->SUPER::c_ip($partial) || {};
+    my $lldp = $nexus->lldp_ip($partial)     || {};
+
+    my %c_ip;
+    foreach my $iid ( keys %$cdp ) {
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $nexus   = shift;
+    my $partial = shift;
+
+    my $lldp = $nexus->lldp_if($partial)     || {};
+    my $cdp  = $nexus->SUPER::c_if($partial) || {};
+
+    my %c_if;
+    foreach my $iid ( keys %$cdp ) {
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $nexus   = shift;
+    my $partial = shift;
+
+    my $lldp = $nexus->lldp_port($partial)     || {};
+    my $cdp  = $nexus->SUPER::c_port($partial) || {};
+
+    my %c_port;
+    foreach my $iid ( keys %$cdp ) {
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $nexus   = shift;
+    my $partial = shift;
+
+    my $lldp = $nexus->lldp_id($partial)     || {};
+    my $cdp  = $nexus->SUPER::c_id($partial) || {};
+
+    my %c_id;
+    foreach my $iid ( keys %$cdp ) {
+        my $id = $cdp->{$iid};
+        next unless defined $id;
+	
+        $c_id{$iid} = $id;
+    }
+    
+    foreach my $iid ( keys %$lldp ) {
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $nexus   = shift;
+    my $partial = shift;
+
+    my $lldp = $nexus->lldp_rem_sysdesc($partial)  || {};
+    my $cdp  = $nexus->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid ( keys %$cdp ) {
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid ( keys %$lldp ) {
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Nexus - SNMP Interface to Cisco Nexus Switches running
+NX-OS
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $nexus = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $nexus->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Cisco Nexus Switches running NX-OS.  
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $nexus = new SNMP::Info::Layer3::Nexus(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoImage
+
+=item SNMP::Info::CiscoPortSecurity
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::CiscoPower
+
+=item SNMP::Info::CiscoStpExtensions
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<CISCO-ENTITY-VENDORTYPE-OID-MIB>
+
+=back
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
+requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return a scalar value from SNMP
+
+=over
+
+=item $nexus->vendor()
+
+Returns 'cisco'
+
+=item $nexus->os()
+
+Returns 'nx-os'
+
+=item $nexus->os_ver()
+
+Returns operating system version extracted fron C<sysDescr>.
+
+=item $nexus->serial()
+
+Returns the serial number of the chassis from F<ENTITY-MIB>.
+
+=item $nexus->model()
+
+Tries to reference $nexus->id() to F<CISCO-ENTITY-VENDORTYPE-OID-MIB>
+
+Removes 'cevChassis' for readability.
+
+=item $nexus->mac()
+
+C<dot1dBaseBridgeAddress>
+
+=item $nexus->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Topology information
+
+Based upon the firmware version Cisco devices may support Link Layer Discover
+Protocol (LLDP) in addition to the Cisco-proprietary CDP.  These methods
+will query both and return the combination of all information.  As a result,
+there may be identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and remove duplicates if necessary.
+
+=over
+
+=item $nexus->hasCDP()
+
+Returns true if the device is running either CDP or LLDP.
+
+=item $nexus->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $nexus->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-CDP/LLDP device in between two
+or more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $nexus->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $nexus->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $nexus->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
+details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/PacketFront.pm

@@ -0,0 +1,220 @@
+# SNMP::Info::Layer3::PacketFront
+# $Id$
+#
+# Copyright (c) 2011 Jeroen van Ingen
+# All rights reserved.
+#
+# 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::PacketFront;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::PacketFront::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::PacketFront::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    'UCD-SNMP-MIB'             => 'versionTag',
+    'NET-SNMP-TC'              => 'netSnmpAgentOIDs',
+    'HOST-RESOURCES-MIB'       => 'hrSystem',
+    'PACKETFRONT-PRODUCTS-MIB' => 'drg100',
+    'PACKETFRONT-DRG-MIB'      => 'productName',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    'snmpd_vers'     => 'versionTag',
+    'hrSystemUptime' => 'hrSystemUptime',
+);
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'packetfront';
+}
+
+sub os {
+    # Only DRGOS for now (not tested with other product lines than DRG series)
+    my $pfront = shift;
+    my $descr   = $pfront->description();
+    if ( $descr =~ /drgos/i ) {
+        return 'drgos';
+    } else {
+        return;
+    }
+}
+
+sub os_ver {
+    my $pfront = shift;
+    my $descr   = $pfront->description();
+    my $os_ver  = undef;
+
+    if ( $descr =~ /Version:\sdrgos-(\w+)-([\w\-\.]+)/ ) {
+        $os_ver = $2;
+    }
+    return $os_ver;
+}
+
+sub serial {
+    my $pfront = shift;
+    return $pfront->productSerialNo();
+}
+
+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::PacketFront - SNMP Interface to PacketFront devices
+
+=head1 AUTHORS
+
+Jeroen van Ingen
+initial version based on SNMP::Info::Layer3::NetSNMP by Bradley Baetz and Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $pfront = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $pfront->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for PacketFront devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<UCD-SNMP-MIB>
+
+=item F<NET-SNMP-TC>
+
+=item F<HOST-RESOURCES-MIB>
+
+=item F<PACKETFRONT-PRODUCTS-MIB>
+
+=item F<PACKETFRONT-DRG-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $pfront->vendor()
+
+Returns 'packetfront'.
+
+=item $pfront->os()
+
+Returns the OS extracted from C<sysDescr>.
+
+=item $pfront->os_ver()
+
+Returns the software version extracted from C<sysDescr>.
+
+=item $pfront->serial()
+
+Returns the value of productSerialNo. 
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head1 TABLE ENTRIES
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $pfront->i_ignore()
+
+Returns reference to hash.  Increments value of IID if port is to be ignored.
+
+Ignores loopback
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+
+=cut

Info/Layer3/Passport.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS,

Info/Layer3/Pf.pm

@@ -0,0 +1,294 @@
+# SNMP::Info::Layer3::Pf
+# $Id$
+#
+# Copyright (c) 2010 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:
+#
+#     * 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 Pf Networks, Inc. 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::Pf;
+
+use strict;
+use Exporter;
+
+use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::Pf::ISA = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Pf::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    # Enterprise container where BEGEMOT-* lives
+    'FOKUS-MIB' => 'fokus',
+    # MIBs used included in Layer3 and above:
+    # UDP-MIB
+    # TCP-MIB
+    # IF-MIB
+    #
+    # Stuff in these MIBs but not used for Netdisco yet for my test device:
+    #
+    #'BEGEMOT-SNMPD-MIB',
+    #'BEGEMOT-PF-MIB',
+    #'BEGEMOT-NETGRAPH-MIB',
+    #'BEGEMOT-MIB2-MIB',
+    #'BEGEMOT-HOSTRES-MIB',
+    # HOST-RESOURCES-MIB
+    # IP-FORWARD-MIB
+    #
+    # Nothing in these MIBs for my test device:
+    #
+    #'BEGEMOT-IP-MIB',
+    #'BEGEMOT-MIB',
+    #'BEGEMOT-BRIDGE-MIB',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+sub vendor {
+    return 'FreeBSD';
+}
+
+sub model {
+    my $pf = shift;
+    my $descr   = $pf->description() || '';
+    my $model  = undef;
+    $model = $1 if ( $descr =~ /FreeBSD\s+(\S+)/ );
+    return $model if defined $model;
+    return $pf->os_ver();
+}
+
+sub os {
+    return 'Pf';
+}
+
+sub os_ver {
+    my $pf = shift;
+    my $id = $pf->id();
+
+    my $os_ver = &SNMP::translateObj($id);
+    return $id unless defined $os_ver;
+
+    # From /usr/share/snmp/defs/tree.def on a Pf Machine
+    # (2 begemotSnmpdDefs
+    #   (1 begemotSnmpdAgent
+    #     (1 begemotSnmpdAgentFreeBSD OID op_dummy)
+    # We're leaving the 1.1 and trimming off up to the 2
+    $os_ver =~ s/fokus.1.1.2.//;
+    return $os_ver;
+}
+
+# Use LLDP
+sub hasCDP {
+    my $pf = shift;
+    return $pf->hasLLDP();
+}
+
+sub c_ip {
+    my $pf  = shift;
+    my $partial = shift;
+    return $pf->lldp_ip($partial);
+}
+
+sub c_if {
+    my $pf  = shift;
+    my $partial = shift;
+    return $pf->lldp_if($partial);
+}
+
+sub c_port {
+    my $pf  = shift;
+    my $partial = shift;
+    return $pf->lldp_port($partial);
+}
+
+sub c_id {
+    my $pf  = shift;
+    my $partial = shift;
+    return $pf->lldp_id($partial);
+}
+
+sub c_platform {
+    my $pf  = shift;
+    my $partial = shift;
+    return $pf->lldp_rem_sysdesc($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Pf - SNMP Interface to FreeBSD-Based Firewalls using Pf /Pf Sense
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $pf = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $pf->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Free-BSD PF-Based devices
+
+=head1 LLDP Support
+
+LLDP Support is included but untested in this Device Class.  It is reported
+that the available CDP/LLDP modules for net-snmp don't work on FreeBSD (on
+which pfSense is based) as they assume certain Linux specific Ethernet
+structures.  This problem is apparently solved on PF based firewall appliances
+by using the ladvd package, for which a port may be found here:
+L<http://www.freshports.org/net/ladvd/>.  I'm not sure if this module ties into 
+Net-SNMP or not.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<FOKUS-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $pf->vendor()
+
+    Returns 'FreeBSD'
+
+=item $pf->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $pf->model()
+
+Grabs the os version from C<sysDescr>
+
+=item $pf->os()
+
+Returns 'Pf'
+
+=item $pf->os_ver()
+
+Tries to reference $pf->id() to one of the product MIBs listed above.
+Will probably return a truncation of the default OID for pf-based systems 
+C<enterprises.12325.1.1.2.1.1>.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $pf->c_id()
+
+Returns LLDP information.
+
+=item $pf->c_if()
+
+Returns LLDP information.
+
+=item $pf->c_ip()
+
+Returns LLDP information.
+
+=item $pf->c_platform()
+
+Returns LLDP information.
+
+=item $pf->c_port()
+
+Returns LLDP information.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/SonicWALL.pm

@@ -0,0 +1,189 @@
+package SNMP::Info::Layer3::SonicWALL;
+
+# Copyright (c) 2011 Netdisco Project
+# All rights reserved.
+#
+# 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.
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::SonicWALL::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::SonicWALL::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
+    'SNWL-COMMON-MIB' => 'snwlCommonModule',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
+    #From SNWL-COMMON-MIB
+    'sw_model' => 'snwlSysModel',
+    'sw_serial' => 'snwlSysSerialNumber',
+    'sw_firmware' => 'snwlSysFirmwareVersion',
+);
+
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'SonicWALL';
+}
+
+sub os {
+        my $sonicos = shift;
+        my $swos = $sonicos->sw_firmware();
+        if ($swos =~ /Enhanced/) {
+            return 'SonicOS Enhanced';
+        }
+        return 'SonicOS Standard';
+}
+
+sub os_ver {
+    my $sonicosver = shift;
+        my $osver = $sonicosver->sw_firmware();
+        if ( $osver =~ /\S+\s\S+\s(\S+)/) {
+            return $1
+        }
+}
+
+sub serial {
+        my $sw = shift;
+        my $serial = $sw->sw_serial();
+        return $serial;
+}
+
+sub model {
+        my $swmodel = shift;
+        my $model = $swmodel->sw_model();
+        return $model;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::SonicWALL - SNMP Interface to L3 SonicWALL Firewall
+
+=head1 AUTHOR
+
+phishphreek@gmail.com
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $router = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 1
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $router->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic SonicWALL Firewalls
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $router->vendor()
+
+Returns C<'SonicWALL'>
+
+=item $router->os()
+
+Returns C<'SonicOS'>
+
+=item $router->os_ver()
+
+Returns '4.2.0.0-10e'
+
+=item $router->model()
+
+Returns C<'PRO 3060 Enhanced'>
+
+=item $router->serial()
+
+Returns the MAC address of the first X0/LAN interface.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut
+

Info/Layer3/Sun.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Tasman.pm

@@ -0,0 +1,278 @@
+# SNMP::Info::Layer3::Tasman
+#
+# Copyright (c) 2012 Eric Miller
+# All Rights Reserved
+#
+# 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::Tasman;
+
+use strict;
+use Exporter;
+
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+
+@SNMP::Info::Layer3::Tasman::ISA = qw/SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Tasman::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    'NT-ENTERPRISE-DATA-MIB' => 'ntEnterpriseRouters',
+    'SYSTEM-MIB'             => 'nnsysVersion',
+    'CHASSIS-MIB'            => 'nnchassisModel',
+    'ENVIRONMENT-MIB'        => 'nnenvPwrsupStatus',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    'ps1_type'   => 'nnenvPwrsupType.1',
+    'ps1_status' => 'nnenvPwrsupStatus.1',
+    'ps2_type'   => 'nnenvPwrsupType.2',
+    'ps2_status' => 'nnenvPwrsupStatus.2',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+);
+
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::Tasman::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::Tasman::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub vendor {
+    return 'avaya';
+}
+
+sub os {
+    return 'tasman';
+}
+
+sub os_ver {
+    my $tasman  = shift;
+    my $version = $tasman->nnsysVersion() || "";
+    my $descr   = $tasman->description()  || "";
+
+    # Newer versions
+    return $1 if ( $version =~ /^SW:\s+(.+?)\s+/ );
+    # Older versions
+    return $1 if ( $descr =~ /Software Version\s+=\s+[r]*(.+),/);
+    # Can't find
+    return;
+}
+
+sub model {
+    my $tasman = shift;
+
+    my $id        = $tasman->id();
+    my $ch_model = $tasman->nnchassisModel();
+    
+    return $ch_model if $ch_model;
+
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    $model =~ s/^ntSecureRouter/SR/;
+    return $model;
+}
+
+sub serial {
+    my $tasman = shift;
+
+    # Newer versions of the software redefined the MIB in a non-backwards
+    # compatible manner.  Try the old OID first.
+    my $serial = $tasman->nnchassisOperStatus();
+    # Newer versions populate status, serial should contain some numbers
+    return $serial if ($serial !~ /^\D+$/);
+
+    # Unfortunately newer versions don't seem to populate the newer OID.
+    return $tasman->nnchassisSerialNumber();
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Tasman - SNMP Interface to Avaya Secure Routers
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $tasman = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $tasman->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Avaya Secure Routers
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<NT-ENTERPRISE-DATA-MIB>
+
+=item F<SYSTEM-MIB>
+
+=item F<CHASSIS-MIB>
+
+=item F<ENVIRONMENT-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $tasman->vendor()
+
+Returns 'avaya'
+
+=item $tasman->model()
+
+Tries to get the model from C<nnchassisModel> and if not available 
+cross references $tasman->id() to F<NT-ENTERPRISE-DATA-MIB>.
+
+Substitutes 'SR' for 'ntSecureRouter' in the name for readability.
+
+=item $tasman->os()
+
+Returns 'tasman'
+
+=item $tasman->os_ver()
+
+Grabs the os version from C<nnsysVersion>
+
+=item $tasman->ps1_type()
+
+(C<nnenvPwrsupType.1>)
+
+=item $tasman->ps1_status()
+
+(C<nnenvPwrsupStatus.1>)
+
+=item $tasman->ps2_type()
+
+(C<nnenvPwrsupType.2>)
+
+=item $tasman->ps2_status()
+
+(C<nnenvPwrsupStatus.2>)
+
+=item $tasman->serial()
+
+Tries both (C<nnchassisOperStatus>) and (C<nnchassisSerialNumber>) as OID's
+were redefined between versions.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over 4
+
+=item $stack->i_duplex_admin()
+
+Returns reference to hash of iid to administrative duplex setting.
+
+First checks for fixed gigabit ports which are always full duplex. Next checks
+the port administrative speed (C<portAdminSpeed>) which if set to
+autonegotiate then the duplex will also autonegotiate, otherwise it uses the
+reported port duplex (C<portDuplex>).
+
+=item $stack->i_speed_admin()
+
+Returns reference to hash of iid to administrative speed setting.
+
+C<portAdminSpeed>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Timetra.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
 

Info/Layer7.pm

@@ -0,0 +1,244 @@
+# SNMP::Info::Layer7 - SNMP Interface to Layer7 Devices
+#
+# Copyright (c) 2011 Jeroen van Ingen
+#
+# All rights reserved.
+#
+# 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::Layer7;
+
+use strict;
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::Layer7::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::Layer7::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::MIBS,
+);
+
+%GLOBALS = (
+    %SNMP::Info::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::FUNCS,
+);
+
+%MUNGE = (
+    # Inherit all the built in munging
+    %SNMP::Info::MUNGE,
+);
+
+
+# $l7->model() - Looks at sysObjectID which gives the oid of the system
+#       name, contained in a proprietary  MIB.
+sub model {
+    my $l7    = shift;
+    my $id    = $l7->id();
+    my $model = &SNMP::translateObj($id);
+
+    # Neoteris (Juniper IVE)    
+    $model =~ s/^ive//i;
+
+    return $model;
+}
+
+sub vendor {
+    my $l7    = shift;
+    my $id    = $l7->id();
+    my $vendor = 'unknown';
+    if ( defined($id) && $id =~ /^(\.1\.3\.6\.1\.4\.1\.\d+)/ ) {
+        my $enterprise = &SNMP::translateObj($1);
+        $vendor = $enterprise if defined $enterprise;
+    }
+    return $vendor;
+}
+
+# By Default we'll use the description field
+sub interfaces {
+    my $l7      = shift;
+    my $partial = shift;
+
+    my $interfaces = $l7->i_index($partial)       || {};
+    my $i_descr    = $l7->i_description($partial) || {};
+
+    # Replace the Index with the ifDescr field.
+    foreach my $iid ( keys %$i_descr ) {
+        my $port = $i_descr->{$iid};
+        next unless defined $port;
+        $interfaces->{$iid} = $port;
+    }
+    return $interfaces;
+}
+
+sub i_ignore {
+    my $l7      = shift;
+    my $partial = shift;
+
+    my $i_type = $l7->i_type($partial) || {};
+
+    my %i_ignore = ();
+
+    foreach my $if ( keys %$i_type ) {
+        my $type = $i_type->{$if};
+        $i_ignore{$if}++
+            if $type =~ /(loopback|other|cpu)/i;
+    }
+
+    return \%i_ignore;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer7 - SNMP Interface to network devices serving Layer7 only.
+
+=head1 AUTHOR
+
+Jeroen van Ingen
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $l7 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $l7->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+ # Let's get some basic Port information
+ my $interfaces = $l7->interfaces();
+ my $i_up       = $l7->i_up();
+ my $i_speed    = $l7->i_speed();
+
+ foreach my $iid (keys %$interfaces) {
+    my $port  = $interfaces->{$iid};
+    my $up    = $i_up->{$iid};
+    my $speed = $i_speed->{$iid}
+    print "Port $port is $up. Port runs at $speed.\n";
+ }
+
+=head1 DESCRIPTION
+
+This class is usually used as a superclass for more specific device classes
+listed under SNMP::Info::Layer7::*   Please read all docs under SNMP::Info
+first.
+
+Provides abstraction to the configuration information obtainable from a 
+Layer7 device through SNMP.  Information is stored in a number of MIBs.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $l7 = new SNMP::Info::Layer7(...);
+
+=head2 Inherited Classes 
+
+=over
+
+=item SNMP::Info
+
+=back
+
+=head2 Required MIBs 
+
+=over
+
+=item None
+
+=back
+
+MIBs required for L<SNMP::Info/"Required MIBs">
+
+See L<SNMP::Info/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $l7->model()
+
+Cross references $l7->id() with product IDs.
+
+=item $l7->vendor()
+
+Tries to discover the vendor by looking up the enterprise number in
+C<sysObjectID>.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $l7->interfaces()
+
+Returns reference to the map between IID and physical Port.
+
+=item $l7->i_ignore()
+
+Returns reference to hash.  Increments value of IID if port is to be ignored.
+
+Ignores loopback, other, and cpu
+
+=back
+
+=head2 Table Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+
+=cut

Info/Layer7/APC.pm

@@ -0,0 +1,237 @@
+# SNMP::Info::Layer7::APC - SNMP Interface to APC UPS devices
+#
+# Copyright (c) 2011 Jeroen van Ingen
+#
+# All rights reserved.
+#
+# 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::Layer7::APC;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer7;
+
+@SNMP::Info::Layer7::APC::ISA
+    = qw/SNMP::Info::Layer7 Exporter/;
+@SNMP::Info::Layer7::APC::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer7::MIBS,
+    'PowerNet-MIB' => 'upsBasicIdentModel',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer7::GLOBALS,
+    'ups_serial'   => 'upsAdvIdentSerialNumber.0',
+    'mgmt_serial'  => 'experimental.2.4.1.2.1',
+    'os_ver'       => 'experimental.2.4.1.4.1',
+    'os_bin'       => 'experimental.2.4.1.4.2',
+    'ups_model'    => 'upsBasicIdentModel.0',
+    'ps1_status'   => 'upsBasicOutputStatus.0',
+    'ps2_status'   => 'upsBasicBatteryStatus.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer7::FUNCS,
+    
+);
+
+%MUNGE = (
+    # Inherit all the built in munging
+    %SNMP::Info::Layer7::MUNGE,
+);
+
+
+# Method Overrides
+
+sub os {
+    return 'aos';
+}
+
+sub vendor {
+    return 'apc';
+}
+
+sub model {
+    my $apc = shift;
+    return $apc->ups_model();
+}
+
+sub serial {
+    my $apc = shift;
+    my $ups = $apc->ups_serial() || 'unknown';
+    my $mgmt = $apc->mgmt_serial() || 'unknown';
+    return sprintf("UPS: %s, management card: %s", $ups, $mgmt);
+}
+
+sub ps1_type {
+    return 'UPS status';
+}
+
+sub ps2_type {
+    return 'Battery status';
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer7::APC - SNMP Interface to APC UPS devices
+
+=head1 AUTHOR
+
+Jeroen van Ingen
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $apc = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $apc->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+APC UPS via SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $apc = new SNMP::Info::Layer7::APC(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer7
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<POWERNET-MIB>
+
+=back
+
+All required MIBs can be found in the netdisco-mibs package.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $apc->os()
+
+Returns 'aos'
+
+=item $apc->os_bin()
+
+C<POWERNET-MIB::experimental.2.4.1.4.2>
+
+=item $apc->os_ver()
+
+C<POWERNET-MIB::experimental.2.4.1.4.1>
+
+=item $apc->serial()
+
+Combines the UPS serial C<upsAdvIdentSerialNumber.0> with the managment
+card serial C<POWERNET-MIB::experimental.2.4.1.2.1> into a pretty string.
+
+=item $apc->vendor()
+
+apc
+
+=item $apc->model()
+
+C<upsBasicIdentModel.0>
+
+=item $apc->ps1_type()
+
+Returns 'UPS status'
+
+=item $apc->ps1_status()
+
+Returns the main UPS status from C<upsBasicOutputStatus.0>
+
+=item $apc->ps2_type()
+
+Returns 'Battery status'
+
+=item $apc->ps2_status()
+
+Returns the battery status from C<upsBasicBatteryStatus.0>
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer7
+
+See documentation in L<SNMP::Info::Layer7/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer7
+
+See documentation in L<SNMP::Info::Layer7/"TABLE METHODS"> for details.
+
+=head1 MUNGES
+
+=over
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods
+or provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set
+operations. 
+
+=cut

Info/Layer7/Neoteris.pm

@@ -0,0 +1,164 @@
+# SNMP::Info::Layer7::Neoteris
+#
+# Copyright (c) 2012 Eric Miller
+# All rights reserved.
+#
+# 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::Layer7::Neoteris;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer7;
+
+@SNMP::Info::Layer7::Neoteris::ISA       = qw/SNMP::Info::Layer7 Exporter/;
+@SNMP::Info::Layer7::Neoteris::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.11';
+
+%MIBS = (
+    %SNMP::Info::Layer7::MIBS,
+    'UCD-SNMP-MIB'       => 'versionTag',
+    'JUNIPER-IVE-MIB'    => 'productVersion',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer7::GLOBALS,
+    'os_ver' => 'productVersion',
+    'cpu'    => 'iveCpuUtil',
+);
+
+%FUNCS = ( %SNMP::Info::Layer7::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer7::MUNGE, );
+
+sub vendor {
+    return 'juniper';
+}
+
+sub os {
+    return 'ive';
+}
+
+sub serial {
+    return '';
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer7::Neoteris - SNMP Interface to Juniper SSL VPN appliances
+
+=head1 AUTHORS
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $neoteris = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $neoteris->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Juniper SSL VPN appliances
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer7
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<UCD-SNMP-MIB>
+
+=item F<JUNIPER-IVE-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer7> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $neoteris->vendor()
+
+Returns 'juniper'.
+
+=item $neoteris->os()
+
+Returns 'ive'.
+
+=item $neoteris->os_ver()
+
+C<productVersion>
+
+=item $neoteris->cpu()
+
+C<iveCpuUtil>
+
+=item $neoteris->serial()
+
+Returns ''.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer7
+
+See documentation in L<SNMP::Info::Layer7> 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::Layer7
+
+See documentation in L<SNMP::Info::Layer7> for details.
+
+=cut

Info/MAU.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'MAU-MIB' => 'mauMod' );
 

Info/NortelStack.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
 

Info/PowerEthernet.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' );
 
@@ -89,6 +89,28 @@ sub peth_port_ifindex {
     return $peth_port_ifindex;
 }
 
+# Subclasses are encouraged to override this method to report
+# what has actually been negotiated with the device, if a
+# protocol with more values (e.g., CDP) has been used.
+sub peth_port_neg_power {
+    my $peth    = shift;
+    my $partial = shift;
+
+    my $peth_port_status = $peth->peth_port_status($partial);
+    my $peth_port_class = $peth->peth_port_class($partial);
+
+    my $poemax = { 'class0' => 12950, 'class1' => 3840, 'class2' => 6490, 'class3' => 12950,
+		   'class4' => 25500 };
+
+    my $peth_port_neg_power = {};
+    foreach my $i ( keys %$peth_port_status ) {
+	if ($peth_port_status->{$i} eq 'deliveringPower') {
+	    $peth_port_neg_power->{$i} = $poemax->{ $peth_port_class->{$i} };
+	}
+    }
+    return $peth_port_neg_power;
+}
+
 1;
 
 __END__
@@ -187,6 +209,14 @@ implement; the MIB gives only very weak guidance.
 A given device class may implement its own version
 of this function (e.g., see Info::CiscoPower).
 
+=item $poe->peth_port_neg_power()
+
+The power, in milliwatts, that has been committed to this port.
+This value is derived from the 802.3af class of the device being
+powered, but may be overridden by a subclass that has information
+from another source (e.g., if a different protocol, such as CDP,
+was used to negotiate the power level.)
+
 =back
 
 =head2 Power Supply Table

Info/RapidCity.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = ( 'RAPID-CITY' => 'rapidCity', );
 

Info/SONMP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '2.00';
+$VERSION = '2.11';
 
 %MIBS = (
     'SYNOPTICS-ROOT-MIB'           => 'synoptics',

MANIFEST

@@ -1,7 +1,9 @@
 ChangeLog
 COPYRIGHT
+DEVELOP
 DeviceMatrix.txt
 Info.pm
+Info/AdslLine.pm
 Info/Airespace.pm
 Info/Bridge.pm
 Info/CDP.pm
@@ -13,11 +15,14 @@ Info/CiscoQOS.pm
 Info/CiscoRTT.pm
 Info/CiscoStack.pm
 Info/CiscoStats.pm
+Info/CiscoStpExtensions.pm
 Info/CiscoVTP.pm
+Info/EDP.pm
 Info/Entity.pm
 Info/EtherLike.pm
 Info/FDP.pm
 Info/IEEE802dot11.pm
+Info/IPv6.pm
 Info/Layer1.pm
 Info/Layer1/Allied.pm
 Info/Layer1/Asante.pm
@@ -28,7 +33,6 @@ Info/Layer2.pm
 Info/Layer2/Airespace.pm
 Info/Layer2/Aironet.pm
 Info/Layer2/Allied.pm
-Info/Layer2/Aruba.pm
 Info/Layer2/Bay.pm
 Info/Layer2/Baystack.pm
 Info/Layer2/C1900.pm
@@ -38,6 +42,9 @@ Info/Layer2/Centillion.pm
 Info/Layer2/Cisco.pm
 Info/Layer2/Foundry.pm
 Info/Layer2/HP.pm
+Info/Layer2/HP4000.pm
+Info/Layer2/HPVC.pm
+Info/Layer2/Kentrox.pm
 Info/Layer2/N2270.pm
 Info/Layer2/NAP222x.pm
 Info/Layer2/Netgear.pm
@@ -47,25 +54,40 @@ Info/Layer3.pm
 Info/Layer3/Aironet.pm
 Info/Layer3/AlcatelLucent.pm
 Info/Layer3/AlteonAD.pm
+Info/Layer3/Altiga.pm
+Info/Layer3/Arista.pm
+Info/Layer3/Aruba.pm
 Info/Layer3/BayRS.pm
+Info/Layer3/BlueCoatSG.pm
 Info/Layer3/C3550.pm
 Info/Layer3/C4000.pm
 Info/Layer3/C6500.pm
 Info/Layer3/Cisco.pm
+Info/Layer3/CiscoFWSM.pm
 Info/Layer3/Contivity.pm
 Info/Layer3/Dell.pm
 Info/Layer3/Enterasys.pm
 Info/Layer3/Extreme.pm
+Info/Layer3/Force10.pm
 Info/Layer3/Foundry.pm
 Info/Layer3/HP9300.pm
 Info/Layer3/Juniper.pm
 Info/Layer3/Microsoft.pm
+Info/Layer3/Mikrotik.pm
 Info/Layer3/N1600.pm
 Info/Layer3/Netscreen.pm
 Info/Layer3/NetSNMP.pm
+Info/Layer3/Nexus.pm
+Info/Layer3/PacketFront.pm
 Info/Layer3/Passport.pm
+Info/Layer3/Pf.pm
+Info/Layer3/SonicWALL.pm
 Info/Layer3/Sun.pm
+Info/Layer3/Tasman.pm
 Info/Layer3/Timetra.pm
+Info/Layer7.pm
+Info/Layer7/APC.pm
+Info/Layer7/Neoteris.pm
 Info/LLDP.pm
 Info/MAU.pm
 Info/NortelStack.pm
@@ -81,4 +103,6 @@ t/make_dev_matrix.pl
 t/pod-coverage.t
 t/pod.t
 t/prereq.t
+t/push_ver
+t/run_test
 t/test_class.pl

MANIFEST.SKIP

@@ -3,6 +3,7 @@
 \bCVS\b
 ,v$
 \B\.svn\b
+\B\.git\b
 
 # Makemaker generated files and dirs.
 ^MANIFEST\.

README

@@ -5,15 +5,23 @@ NAME
 
 VERSION
 
-    SNMP::Info - Version 2.00
+    SNMP::Info - Version 2.11
 
 AUTHOR
 
-    SNMP::Info was created at UCSC for the netdisco project
-    (www.netdisco.org) and was originally written by Max Baker.
+    SNMP::Info is maintained by team of Open Source authors headed by Eric
+    Miller, Bill Fenner, Max Baker, Jeroen van Ingen and Oliver Gorwits.
 
-    Currently being maintained by team of Open Source authors headed by Eric
-    Miller and Bill Fenner.
+    Please visit <http://sourceforge.net/projects/snmp-info/> for most
+    up-to-date list of developers.
+
+    SNMP::Info was originally created at UCSC for the Netdisco project
+    <http://netdisco.org> by Max Baker.
+
+DEVICES SUPPORTED
+
+    See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt for
+    more details.
 
 SYNOPSIS
 
@@ -82,9 +90,6 @@ DESCRIPTION
     SNMP::Info gives an object oriented interface to information obtained
     through SNMP.
 
-    This module lives at http://snmp-info.sourceforge.net Check for newest
-    version and documentation.
-
     This module is geared towards network devices. Subclasses exist for a
     number of network devices and common MIBs.
 
@@ -125,13 +130,10 @@ REQUIREMENTS
 
         Net-SNMP can be found at http://net-snmp.sourceforge.net
 
-        Version 5.1.2 or greater is recommended.
+        Version 5.3.2 or greater is recommended.
 
-        Various version 4's and 5.0 and 5.1 series will work. 5.0.1 is kinda
-        flaky on the Perl side.
-
-        Versions 5.0301 and 5.0203 have issues with bulkwalk, turn off
-        bulkwalk.
+        Versions 5.0.1, 5.0301 and 5.0203 have issues with bulkwalk and are
+        not supported.
 
         Redhat Users: Some versions that come with certain versions of
         Redhat/Fedora don't have the Perl library installed. Uninstall the
@@ -142,8 +144,8 @@ REQUIREMENTS
 
         If you are using SNMP::Info separate from Netdisco, download the
         Netdisco MIB package at
-
-         http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517
+        <http://sourceforge.net/project/showfiles.php?group_id=80033&package
+        _id=135517>
 
         Make sure that your snmp.conf is updated to point to your MIB
         directory and that the MIBs are world-readable.
@@ -152,11 +154,13 @@ DESIGN GOALS
 
     1. Use of textual MIB leaf identifier and enumerated values
 
-        * All values are retrieved via MIB Leaf node names
+        *   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.
+        *   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
 
@@ -190,6 +194,13 @@ SUBCLASSES
 
     For more info run "perldoc" on any of the following module names.
 
+    SNMP::Info::AdslLine
+        SNMP Interface to the ADSL-LINE-MIB for ADSL interfaces.
+
+        Requires the ADSL-LINE-MIB, downloadable from Cisco.
+
+        See documentation in SNMP::Info::AdslLine for details.
+
     SNMP::Info::Airespace
         AIRESPACE-WIRELESS-MIB and AIRESPACE-SWITCHING-MIB. Inherited by
         devices based on the Airespace wireless platform.
@@ -225,6 +236,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoPortSecurity for details.
 
+    SNMP::Info::CiscoPower
+        CISCO-POWER-ETHERNET-EXT-MIB.
+
+        See documentation in SNMP::Info::CiscoPower for details.
+
     SNMP::Info::CiscoQOS
         CISCO-CLASS-BASED-QOS-MIB. A collection of OIDs providing
         information about a Cisco device's QOS config.
@@ -242,6 +258,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoStack for details.
 
+    SNMP::Info::CiscoStpExtensions
+        CISCO-STP-EXTENSIONS-MIB
+
+        See documentation in SNMP::Info::CiscoStpExtensions for details.
+
     SNMP::Info::CiscoStats
         OLD-CISCO-CPU-MIB, CISCO-PROCESS-MIB, and CISCO-MEMORY-POOL-MIB.
         Provides common interfaces for memory, cpu, and os statistics for
@@ -255,13 +276,18 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoVTP for details.
 
+    SNMP::Info::EDP
+        Extreme Discovery Protocol. EXTREME-EDP-MIB
+
+        See documentation in SNMP::Info::EDP for details.
+
     SNMP::Info::Entity
         ENTITY-MIB. Used for device info in Cisco and other vendors.
 
         See documentation in SNMP::Info::Entity for details.
 
     SNMP::Info::EtherLike
-        ETHERLIKE-MIB (RFC1398) - Some Layer3 devices implement this MIB, as
+        EtherLike-MIB (RFC1398) - Some Layer3 devices implement this MIB, as
         well as some Aironet Layer 2 devices (non Cisco).
 
         See documentation in SNMP::Info::EtherLike for details.
@@ -271,6 +297,13 @@ SUBCLASSES
 
         See documentation in SNMP::Info::FDP for details.
 
+    SNMP::Info::IPv6
+        SNMP Interface for obtaining configured IPv6 addresses and mapping
+        IPv6 addresses to MACs and interfaces, using information from
+        IP-MIB, IPV6-MIB and/or CISCO-IETF-IP-MIB.
+
+        See documentation in SNMP::Info::IPv6 for details.
+
     SNMP::Info::IEEE802dot11
         IEEE802dot11-MIB. A collection of OIDs providing information about
         standards based 802.11 wireless devices.
@@ -294,6 +327,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::NortelStack for details.
 
+    SNMP::Info::PowerEthernet
+        POWER-ETHERNET-MIB
+
+        See documentation in SNMP::Info::PowerEthernet for details.
+
     SNMP::Info::RapidCity
         RAPID-CITY. Inherited by Nortel switches for duplex and VLAN
         information.
@@ -321,7 +359,7 @@ SUBCLASSES
         See documentation in SNMP::Info::Layer1 for details.
 
         SNMP::Info::Layer1::Allied
-            Subclass for Allied Telesys Repeaters / Hubs.
+            Subclass for Allied Telesis Repeaters / Hubs.
 
             Requires ATI-MIB
 
@@ -368,15 +406,10 @@ SUBCLASSES
             See documentation in SNMP::Info::Layer2::Aironet for details.
 
         SNMP::Info::Layer2::Allied
-            Allied Telesys switches.
+            Allied Telesis switches.
 
             See documentation in SNMP::Info::Layer2::Allied for details.
 
-        SNMP::Info::Layer2::Aruba
-            Subclass for Aruba wireless switches.
-
-            See documentation in SNMP::Info::Layer2::Aruba for details.
-
         SNMP::Info::Layer2::Bay
             Depreciated. Use BayStack.
 
@@ -388,6 +421,10 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer2::Baystack for details.
 
+        SNMP::Info::Layer2::Kentrox
+            Class for Kentrox DataSMART DSU/CSU. See
+            SNMP::Info::Layer2::Kentrox for details.
+
         SNMP::Info::Layer2::C1900
             Subclass for Cisco Catalyst 1900 and 1900c Devices running
             CatOS.
@@ -423,12 +460,24 @@ SUBCLASSES
             Depreciated. Use SNMP::Info::Layer3::Foundry.
 
         SNMP::Info::Layer2::HP
-            Subclass for HP Procurve Switches
+            Subclass for more recent HP Procurve Switches
 
             Requires HP-ICF-OID and ENTITY-MIB downloaded from HP.
 
             See documentation in SNMP::Info::Layer2::HP for details.
 
+        SNMP::Info::Layer2::HP4000
+            Subclass for older HP Procurve Switches
+
+            Requires HP-ICF-OID and ENTITY-MIB downloaded from HP.
+
+            See documentation in SNMP::Info::Layer2::HP4000 for details.
+
+        SNMP::Info::Layer2::HPVC
+            Subclass for HP VirtualConnect Switches
+
+            See documentation in SNMP::Info::Layer2::HPVC for details.
+
         SNMP::Info::Layer2::N2270
             Subclass for Nortel 2270 wireless switches.
 
@@ -439,6 +488,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer2::NAP222x for details.
 
+        SNMP::Info::Layer2::Netgear
+            Subclass for Netgear switches
+
+            See documentation in SNMP::Info::Layer2::Netgear for details.
+
         SNMP::Info::Layer2::Orinoco
             Subclass for Orinoco/Proxim wireless access points.
 
@@ -466,18 +520,40 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Aironet for details.
 
+        SNMP::Info::Layer3::AlcatelLucent
+            Alcatel-Lucent OmniSwitch Class.
+
+            See documentation in SNMP::Info::Layer3::AlcatelLucent for
+            details.
+
         SNMP::Info::Layer3::AlteonAD
             Subclass for Nortel Alteon Series Layer 2-7 load balancing
             switches and Nortel BladeCenter Layer2-3 GbE Switch Modules.
 
             See documentation in SNMP::Info::Layer3::AlteonAD for details.
 
+        SNMP::Info::Layer3::Altiga
+            See documentation in SNMP::Info::Layer3::Altiga for details.
+
+        SNMP::Info::Layer3::Arista
+            See documentation in SNMP::Info::Layer3::Arista for details.
+
+        SNMP::Info::Layer3::Aruba
+            Subclass for Aruba wireless switches.
+
+            See documentation in SNMP::Info::Layer3::Aruba for details.
+
         SNMP::Info::Layer3::BayRS
             Subclass for Nortel Multiprotocol/BayRS routers. This includes
             BCN, BLN, ASN, ARN, AN, 2430, and 5430 routers.
 
             See documentation in SNMP::Info::Layer3::BayRS for details.
 
+        SNMP::Info::Layer3::BlueCoatSG
+            Subclass for Blue Coat SG series proxy devices.
+
+            See documentation in SNMP::Info::Layer3::BlueCoatSG for details.
+
         SNMP::Info::Layer3::C3550
             Subclass for Cisco Catalyst 3550,3540,3560 2/3 switches running
             IOS.
@@ -501,6 +577,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Cisco for details.
 
+        SNMP::Info::Layer3::CiscoFWSM
+            Subclass for Cisco Firewall Services Modules.
+
+            See documentation in SNMP::Info::Layer3::CiscoFWSM for details.
+
         SNMP::Info::Layer3::Contivity
             Subclass for Nortel Contivity/VPN Routers.
 
@@ -523,6 +604,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Extreme for details.
 
+        SNMP::Info::Layer3::Force10
+            Subclass for Force10 devices.
+
+            See documentation in SNMP::Info::Layer3::Force10 for details.
+
         SNMP::Info::Layer3::Foundry
             Subclass for Foundry Network devices.
 
@@ -531,7 +617,7 @@ SUBCLASSES
         SNMP::Info::Layer3::HP9300
             Subclass for HP network devices which Foundry Networks was the
             Original Equipment Manufacturer (OEM) such as the HP ProCurve
-            9300 series.
+            9300 and 6300 series.
 
             See documentation in SNMP::Info::Layer3::HP9300 for details.
 
@@ -546,6 +632,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Microsoft for details.
 
+        SNMP::Info::Layer3::Mikrotik
+            Subclass for Mikrotik devices running RouterOS.
+
+            See documentation in SNMP::Info::Layer3::Mikrotik for details.
+
         SNMP::Info::Layer3::N1600
             Subclass for Nortel Ethernet Routing Switch 1600 series.
 
@@ -561,17 +652,62 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Netscreen for details.
 
+        SNMP::Info::Layer3::Nexus
+            Subclass for Cisco Nexus devices running NX-OS
+
+            See documentation in SNMP::Info::Layer3::Nexus for details.
+
+        SNMP::Info::Layer3::PacketFront
+            Subclass for PacketFront DRG series CPE.
+
+            See documentation in SNMP::Info::Layer3::PacketFront for
+            details.
+
         SNMP::Info::Layer3::Passport
             Subclass for Nortel Ethernet Routing Switch/Passport 8000 series
             and Accelar series switches.
 
             See documentation in SNMP::Info::Layer3::Passport for details.
 
+        SNMP::Info::Layer3::Pf
+            Subclass for FreeBSD-Based Firewalls using Pf /Pf Sense
+
+            See documentation in SNMP::Info::Layer3::Pf for details.
+
+        SNMP::Info::Layer3::SonicWALL
+            Subclass for generic SonicWALL devices. See documentation in
+            SNMP::Info::Layer3::SonicWALL for details.
+
         SNMP::Info::Layer3::Sun
             Subclass for Generic Sun Routers running SunOS.
 
             See documentation in SNMP::Info::Layer3::Sun for details.
 
+        SNMP::Info::Layer3::Tasman
+            Subclass for Avaya Secure Routers.
+
+            See documentation in SNMP::Info::Layer3::Tasman for details.
+
+        SNMP::Info::Layer3::Timetra
+            Alcatel-Lucent SR Class.
+
+            See documentation in SNMP::Info::Layer3::Timetra for details.
+
+    SNMP::Info::Layer7
+        Generic Layer7 Devices.
+
+        See documentation in SNMP::Info::Layer7 for details.
+
+        SNMP::Info::Layer7::APC
+            SNMP Interface to APC UPS devices
+
+            See documentation in SNMP::Info::Layer7::APC for details.
+
+        SNMP::Info::Layer7::Neoteris
+            SNMP Interface to Juniper SSL VPN appliances
+
+            See documentation in SNMP::Info::Layer7::Neoteris for details.
+
 Thanks
 
     Thanks for testing and coding help (in no particular order) to :
@@ -607,13 +743,13 @@ USAGE
         AutoSpecify
             Returns an object of a more specific device class
 
-            (default on)
+            (default 0, which means "off")
 
         BigInt
             Return Math::BigInt objects for 64 bit counters. Sets on a
             global scope, not object.
 
-            (default off)
+            (default 0, which means "off")
 
         BulkWalk
             Set to 0 to turn off BULKWALK commands for SNMPv2 connections.
@@ -621,7 +757,7 @@ USAGE
             Note that BULKWALK is turned off for Net-SNMP versions 5.1.x
             because of a bug.
 
-            (default on)
+            (default 1, which means "on")
 
         BulkRepeaters
             Set number of MaxRepeaters for BULKWALK operation. See "perldoc
@@ -638,13 +774,13 @@ USAGE
 
             Set to 0 to turn off loop detection.
 
-            (default on)
+            (default 1, which measn "on")
 
         Debug
             Prints Lots of debugging messages. Pass 2 to print even more
             debugging messages.
 
-            (default off)
+            (default 0, which means "off")
 
         DebugSNMP
             Set $SNMP::debugging level for Net-SNMP.
@@ -664,7 +800,7 @@ USAGE
             desired. This feature lets you read SNMPv2 data from an SNMP
             version 1 connection, and should probably be left on.
 
-            (default true)
+            (default 1, which means "on")
 
         Session
             SNMP::Session object to use instead of connecting on own.
@@ -754,71 +890,9 @@ USAGE
         If the device still can be connected to via SNMP::Info, then
         SNMP::Info is returned.
 
-        Algorithm for Subclass Detection:
-
-                Layer3 Support                     -> SNMP::Info::Layer3
-                    Aironet (BR500,AP340,350,1200) -> SNMP::Info::Layer3::Aironet
-                             AP4800... All Non IOS
-                    Alcatel-Lucent OmniSwitch      -> SNMP::Info::Layer3::AlcatelLucent
-                    Alcatel-Lucent Service Router  -> SNMP::Info::Layer3::Timetra
-                    Catalyst 3550,3548,3560        -> SNMP::Info::Layer3::C3550
-                    Catalyst 4000,4500             -> SNMP::Info::Layer3::C4000
-                    Catalyst 6500,3750             -> SNMP::Info::Layer3::C6500
-                    Cisco Generic L3 IOS device    -> SNMP::Info::Layer3::Cisco
-                    Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-                    Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-                    D-Link                         -> SNMP::Info::Layer3::Dell
-                    Enterasys                      -> SNMP::Info::Layer3::Enterasys
-                    Extreme                        -> SNMP::Info::Layer3::Extreme
-                    Foundry                        -> SNMP::Info::Layer3::Foundry
-                    HP Procurve                    -> SNMP::Info::Layer2::HP
-                    HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-                    Juniper                        -> SNMP::Info::Layer3::Juniper
-                    Microsoft                      -> SNMP::Info::Layer3::Microsoft
-                    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
-                    Nortel Contivity               -> SNMP::Info::Layer3::Contivity
-                    Nortel BayRS Router            -> SNMP::Info::Layer3::BayRS
-                    Sun Router                     -> SNMP::Info::Layer3::Sun
-                 Elsif Layer2 (no Layer3)          -> SNMP::Info::Layer2
-                    Aironet - IOS Devices          -> SNMP::Info::Layer2::Aironet
-                    Catalyst 1900                  -> SNMP::Info::Layer2::C1900
-                    Catalyst 2900XL,2940,2950,
-                             3500XL                -> SNMP::Info::Layer2::C2900
-                    Catalyst 2960, 2970            -> SNMP::Info::Layer3::C6500
-                    Catalyst 3550/3548             -> SNMP::Info::Layer3::C3550
-                    Cisco 3400 w/ MetroBase        -> SNMP::Info::Layer3::C3550
-                    Catalyst WS-C 2926,5xxx        -> SNMP::Info::Layer2::Catalyst
-                    Cisco (Airespace) Wireless     -> SNMP::Info::Layer2::Airespace
-                    Cisco (not covered by above)   -> SNMP::Info::Layer2::Cisco
-                    Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-                    Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-                    D-Link                         -> SNMP::Info::Layer3::Dell
-                    Enterasys                      -> SNMP::Info::Layer3::Enterasys
-                    Extreme                        -> SNMP::Info::Layer3::Extreme
-                    Foundry                        -> SNMP::Info::Layer3::Foundry
-                    HP Procurve                    -> SNMP::Info::Layer2::HP
-                    HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-                    IBM BladeCenter GbESM          -> SNMP::Info::Layer3::Dell
-                    Nortel/Bay Centillion ATM      -> SNMP::Info::Layer2::Centillion
-                    Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-                    Nortel Business Ethernet Switch-> SNMP::Info::Layer2::Baystack
-                    Nortel Passport/Accelar 8100   -> SNMP::Info::Layer3::Passport
-                    Nortel AP 222x                 -> SNMP::Info::Layer2::NAP222x
-                    Orinco AP                      -> SNMP::Info::Layer2::Orinoco
-                    Nortel 2270 WSS                -> SNMP::Info::Layer2::N2270
-                Elsif Layer1 Support               -> SNMP::Info::Layer1
-                    Allied                         -> SNMP::Info::Layer1::Allied
-                    Asante                         -> SNMP::Info::Layer1::Asante
-                    Nortel/Bay Hub                 -> SNMP::Info::Layer1::Bayhub
-                    Bay/Synoptics Hub              -> SNMP::Info::Layer1::S3000
-                Else                               -> SNMP::Info
-                    ZyXEL_DSLAM                    -> SNMP::Info::Layer2::ZyXEL_DSLAM
-                    Aruba wireless                 -> SNMP::Info::Layer2::Aruba
-                    Alcatel OmniAccess             -> SNMP::Info::Layer2::Aruba
-                    Juniper NetScreen              -> SNMP::Info::Layer3::Netscreen
+        See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt
+        for more details about device support, or view "device_type()" in
+        Info.pm.
 
     $info->error(no_clear)
         Returns Error message if there is an error, or undef if there is
@@ -1197,6 +1271,7 @@ USAGE
                              -- route to a non-local
             indirect(4)      -- host/network/sub-network
 
+
               "The type of route.  Note that the values
               direct(3) and indirect(4) refer to the notion of
               direct and indirect routing in the IP
@@ -1409,6 +1484,7 @@ EXTENDING SNMP::INFO
                  'super_hero_powers' => 'SuperHeroIfPowers'
                 );
 
+
      %MUNGE   = (%SNMP::Info::Layer2::MUNGE,
                  %SNMP::Info::CiscoVTP::MUNGE,
                  'super_hero_powers' => \&munge_powers
@@ -1533,6 +1609,12 @@ SNMP::INFO INTERNALS
                         '2488000000' => 'OC-48',
                      )
 
+        Note: high speed interfaces (usually 1 Gbps or faster) have their
+        link speed in "ifHighSpeed". i_speed() automatically determines
+        whether to use "ifSpeed" or "ifHighSpeed"; if the latter is used,
+        the value is munged by munge_highspeed(). SNMP::Info can return
+        speeds up to terabit levels this way.
+
     munge_highspeed()
         Makes human friendly speed ratings for "ifHighSpeed"
 
@@ -1565,9 +1647,9 @@ SNMP::INFO INTERNALS
         See Math::BigInt for details.
 
     munge_i_up
-        There is a collision between data in "IF-MIB" and "RFC-1213". For
-        devices that fully implement "IF-MIB" it might return 7 for a port
-        that is down. This munges the data against the "IF-MIB" by hand.
+        Net-SNMP tends to load "RFC1213-MIB" first, and so ignores the
+        updated enumeration for "ifOperStatus" in "IF-MIB". This munge
+        handles the "newer" definitions for the enumeration in IF-MIB.
 
         TODO: Get the precedence of MIBs and overriding of MIB data in
         Net-SNMP figured out. Heirarchy/precendence of MIBS in SNMP::Info.
@@ -1657,8 +1739,8 @@ SNMP::INFO INTERNALS
             <obj> - One of the following forms:
                 1) leaf identifier (e.g., C<'sysContact'>)
                 2) An entry in either %FUNCS, %GLOBALS (e.g., 'contact')
-            <iid> - The dotted-decimal, instance identifier. For scalar MIB
-                    objects use '0'
+            <iid> - The dotted-decimal, instance identifier. For scalar MIB objects
+                     use '0'
             <val>  - The SNMP data value being set (e.g., 'netdisco')
             <type> - Optional as the MIB should be loaded.
 
@@ -1749,8 +1831,8 @@ SNMP::INFO INTERNALS
 
 COPYRIGHT AND LICENSE
 
-    Changes from SNMP::Info Version 0.7 and on are: Copyright (c) 2003-2008
-    Max Baker - All rights reserved.
+    Changes from SNMP::Info Version 0.7 and on are: Copyright (c) 2003-2010
+    Max Baker and SNMP::Info Developers All rights reserved.
 
     Original Code is: Copyright (c) 2002-2003, Regents of the University of
     California All rights reserved.

t/00_local_docininfo.t

@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+# 00_local_versionsync.t - Private test to check that all modules are listed in Info.pm
+# $Id$
+
+use warnings;
+use strict;
+use File::Find;
+use Test::More;
+
+eval "use File::Slurp";
+plan skip_all => "File::Slurp required for testing version sync"
+    if $@;
+
+plan qw(no_plan);
+
+my %Items;
+# Grab all the =item's from Info.pm
+open (I,"blib/lib/SNMP/Info.pm") or fail("Can't open Info.pm");
+while (<I>) {
+    next unless /^\s*=item\s*(\S+)/;
+    $Items{$1}++;
+}
+close I;
+
+#warn "items : ",join(', ',keys %Items),"\n";
+
+# Check that each package is represented in Info.pm docs
+find({wanted => \&check_version, no_chdir => 1}, 'blib');
+
+sub check_version {
+    # $_ is the full path to the file
+    return unless (m{blib/lib/}xms and m{\.pm \z}xms);
+
+    my $content = read_file($_);
+
+    # Make sure that this package is listed in Info.pm
+    fail($_) unless $content =~ m/^\s*package\s+(\S+)\s*;/m;
+    
+    my $package = $1;
+
+    return if $package eq 'SNMP::Info';
+
+    fail($_) unless defined $Items{$package};
+
+    pass($_);
+}