prep for 2.04 release

renamed Ipv6.pm to IPv6.pm
change from Ipv6 to IPv6 everywhere
2011-03-31 08:34:57 +00:00 · 2011-03-31 08:24:29 +00:00 · 2011-03-31 08:04:52 +00:00 · 2011-03-30 12:39:00 +00:00 · 2011-02-23 04:32:14 +00:00 · 2011-01-19 00:04:07 +00:00
101 changed files with 19110 additions and 10850 deletions
--- a/2
+++ b/2
@@ -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
--- a/95
+++ b/95
@@ -1,6 +1,101 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 ChangeLog $Id$

+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
+
+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
+    + Support for Alcatel-Lucent Service Router via L3::Timetra
+    + Support for Alcatel-Lucent OmniAccess via L2::Aruba
+
+    * Silence warnings in MAU due to uninitialized variables 
+
+version 1.09 (07/22/08) - Beta/developer release
+    + Added support for HP ProCurve Foundry OEM switches, such as the 9300
+      series, in new class L3::HP9300 (contributions from Douglas McKeown and
+      Ivan Auger)
+    + Added support for CISCO-PAE-MIB in CiscoPortSecurity (Kesy)
+    + Support for D-Link devices through L3::Dell
+    + Support for Linksys SRW2048 through L3::Dell
+    + Support for IBM BladeCenter 4-Port GB Ethernet Switch Module through
+      L3::Dell (Alex Kramarov)
+    + Support for newer Nortel Alteon switches and Nortel BladeCenter Switch
+      Modules in L3::AlteonAD
+    + Support for Cisco 1250 series through L2::Aironet
+    + Updates to fan, power supply, and serial number methods in
+      L2::HP (Jeroen van Ingen)
+    + Use Cisco Client Association MIBs for Aironet client reporting
+      via fw_mac
+    + Support VLANs on Aironet
+    + Get the proper radio MAC address from aironet in MBSS mode
+    + Additional wireless statistics from Aironet
+    + Add support to specify MIB to resolve leaf names conflicts in
+      %GLOBALS and %FUNCS.
+    + Added munge_port_list() and modify_port_list() methods to assist in
+      working with PortList objects. 
+    + Added set_multi() method to enable a SNMP set command on several new
+      values in one request.  Required for complex set operations
+      on some agents.
+    + Infrastructure for SNMPv3 support:
+        + Save the SecName passed into the constructor
+        + Create an update() function, which replaces the underlying
+          SNMP session using different parameters.
+        + Return the SecName instead of community from snmp_comm() when using
+          SNMPv3.
+
+    * L2::HP now isa Layer3 instead of Layer2 to support arpnip
+      (Dudley Freeman)
+    * Silence warnings from Cisco devices which don't return values for
+      extended VLAN range (1024-4096)
+    * Documentation coverage, spelling, and syntax updates
+    * set_i_pvid(), set_i_vlan(), set_add_i_vlan_tagged(),
+      set_remove_i_vlan_tagged() removed from Bridge and HP classes due to
+      incompatibility across devices.
+
 version 1.07 (11/26/07) - Beta/developer release

 version 1.05 (11/25/07) - CVS only. No official release
--- a/29
+++ b/29
@@ -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?
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
@@ -6,7 +6,9 @@

 # $Id$

+#
 # Airespace (pre-Cisco)
+#
 device-vendor: Airespace
 cdp:no
 arpnip: no
@@ -16,14 +18,33 @@ 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: Layer2::Aruba
+device: All
+
+#
 # Allied
+#
 device-vendor: Allied Telesyn
 cdp:no
 class: Layer1::Allied
@@ -40,21 +61,41 @@ 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
 macsuck: yes
 portmac: yes
 duplex: no
 class: Layer2::Aruba
-note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.

 device-family: Aruba Wireless Controllers
+note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.

 device: 5000

+#
 # Asante
+#
 device-vendor: Asante
 class: Layer1::Asante
 ver: 1
@@ -66,16 +107,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 +135,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 +171,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 +191,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 +218,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 +229,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 +275,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 +291,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 +301,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 +332,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 +361,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 +399,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 +439,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 +459,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 +482,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 +527,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 +635,13 @@ device:  Linux routers
 device-family: BSD
 device:  BSD routers

+#
 # NORTEL
+#
 device-vendor: Nortel
 macsuck: yes
 cdp: proprietary
-note: CDP --> SONMP.
+note: SONMP Discovery Protocol Supported

 device-family: BayStack Hub
 duplex: both
@@ -549,23 +662,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 +700,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 +769,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 +820,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 +835,9 @@ device: AP-1000,AP-2000,AP-4000

 device: WavePOINT-II

+#
 # Sun
+#
 device-vendor: Sun
 class: Layer3::Sun

@@ -747,11 +845,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)
--- a/Info.pm
+++ b/Info.pm
--- a/Info/Airespace.pm
+++ b/Info/Airespace.pm
--- a/Info/Bridge.pm
+++ b/Info/Bridge.pm
--- a/Info/CDP.pm
+++ b/Info/CDP.pm
@@ -1,107 +1,95 @@
 # SNMP::Info::CDP
-# Max Baker
+# $Id$
 #
-# Changes since Version 0.7 Copyright (c) 2004 Max Baker 
-# All rights reserved.  
+# Changes since Version 0.7 Copyright (c) 2004 Max Baker
+# All rights reserved.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::CDP;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::CDP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CDP::EXPORT_OK = qw//;

 use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;

+$VERSION = '2.04';
+
 # Five data structures required by SNMP::Info
-%MIBS    = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
+%MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );

 # Notice we dont inherit the default GLOBALS and FUNCS
 # only the default MUNGE.
 %GLOBALS = (
-            'cdp_run'      => 'cdpGlobalRun',
-            'cdp_interval' => 'cdpGlobalMessageInterval',
-            'cdp_holdtime' => 'cdpGlobalHoldTime',
-            'cdp_id'       => 'cdpGlobalDeviceId',
-           );
+    'cdp_run'      => 'cdpGlobalRun',
+    'cdp_interval' => 'cdpGlobalMessageInterval',
+    'cdp_holdtime' => 'cdpGlobalHoldTime',
+    'cdp_id'       => 'cdpGlobalDeviceId',
+);

-%FUNCS  = (
-            'c_index'        => 'cdpCacheIfIndex',
-            'c_proto'        => 'cdpCacheAddressType',
-            'c_addr'         => 'cdpCacheAddress',
-            'c_ver'          => 'cdpCacheVersion',
-            'c_id'           => 'cdpCacheDeviceId',
-            'c_port'         => 'cdpCacheDevicePort',
-            'c_platform'     => 'cdpCachePlatform',
-            'c_capabilities' => 'cdpCacheCapabilities',
-            'c_domain'       => 'cdpCacheVTPMgmtDomain',
-            'c_vlan'         => 'cdpCacheNativeVLAN',
-            'c_duplex'       => 'cdpCacheDuplex',
-            'c_power'        => 'cdpCachePowerConsumption',
-          );
+%FUNCS = (
+    'c_index'        => 'cdpCacheIfIndex',
+    'c_proto'        => 'cdpCacheAddressType',
+    'c_addr'         => 'cdpCacheAddress',
+    'c_ver'          => 'cdpCacheVersion',
+    'c_id'           => 'cdpCacheDeviceId',
+    'c_port'         => 'cdpCacheDevicePort',
+    'c_platform'     => 'cdpCachePlatform',
+    'c_capabilities' => 'cdpCacheCapabilities',
+    'c_domain'       => 'cdpCacheVTPMgmtDomain',
+    '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 = (
-          'c_capabilities' => \&munge_caps,
-          'c_platform'     => \&munge_null,
-          'c_domain'       => \&munge_null,
-          'c_port'         => \&munge_null,
-          'c_id'           => \&munge_null,
-          'c_ver'          => \&munge_null,
-          'c_ip'           => \&SNMP::Info::munge_ip,
-          'c_power'        => \&munge_power,
+    'c_capabilities' => \&SNMP::Info::munge_caps,
+    'c_platform'     => \&SNMP::Info::munge_null,
+    'c_domain'       => \&SNMP::Info::munge_null,
+    'c_port'         => \&SNMP::Info::munge_null,
+    'c_id'           => \&SNMP::Info::munge_null,
+    'c_ver'          => \&SNMP::Info::munge_null,
+    'c_ip'           => \&SNMP::Info::munge_ip,
+    'c_power'        => \&munge_power,

-         );
-
-# munge_null() - removes nulls (\0)
-sub munge_null {
-    my $text = shift || return;
-    
-    $text =~ s/\0//g;
-    return $text;
-}
-
-sub munge_caps {
-    my $caps = shift;
-    return undef unless defined $caps;
-
-    my $bits = substr(unpack("B*",$caps),-7);
-    return $bits;
-}
+);

 sub munge_power {
    my $power = shift;
-    my $decimal = substr($power, -3);
+    my $decimal = substr( $power, -3 );
    $power =~ s/$decimal$/\.$decimal/;
    return $power;
 }
@@ -111,59 +99,62 @@ sub hasCDP {

    my $ver = $cdp->{_version};

-
    # SNMP v1 clients dont have the globals
-    if (defined $ver and $ver == 1){
+    if ( defined $ver and $ver == 1 ) {
        my $c_ip = $cdp->c_ip();
+
        # See if anything in cdp cache, if so we have cdp
-        return 1 if (defined $c_ip and scalar(keys %$c_ip)) ;
-        return undef;
+        return 1 if ( defined $c_ip and scalar( keys %$c_ip ) );
+        return;
    }
-    
+
    return $cdp->cdp_run();
 }

 sub c_if {
-    my $cdp  = shift;
+    my $cdp = shift;

    # See if by some miracle Cisco implemented the cdpCacheIfIndex entry
-    my $c_index     = $cdp->c_index();
+    my $c_index = $cdp->c_index();
    return $c_index if defined $c_index;

    # Nope, didn't think so. Now we fake it.
    my $c_ip = $cdp->c_ip();
-    unless (defined $c_ip){
-        $cdp->error_throw("SNMP::Info::CDP:c_if() - Device doesn't have cdp_ip() data.  Can't fake cdp_index()");
-        return undef;
+    unless ( defined $c_ip ) {
+        $cdp->error_throw(
+            "SNMP::Info::CDP:c_if() - Device doesn't have cdp_ip() data.  Can't fake cdp_index()"
+        );
+        return;
    }

    my %c_if;
-    foreach my $key (keys %$c_ip){
-      next unless defined $key;
-      my $iid = $key;
-      # Truncate .1 from cdp cache entry
-      $iid =~ s/\.\d+$//;
-      $c_if{$key} = $iid;
+    foreach my $key ( keys %$c_ip ) {
+        next unless defined $key;
+        my $iid = $key;
+
+        # Truncate .1 from cdp cache entry
+        $iid =~ s/\.\d+$//;
+        $c_if{$key} = $iid;
    }

    return \%c_if;
 }

 sub c_ip {
-    my $cdp = shift;
+    my $cdp     = shift;
    my $partial = shift;

-    my $c_addr  = $cdp->c_addr($partial) || {};
+    my $c_addr  = $cdp->c_addr($partial)  || {};
    my $c_proto = $cdp->c_proto($partial) || {};
-    
-    my %c_ip;    
-    foreach my $key (keys %$c_addr) {
+
+    my %c_ip;
+    foreach my $key ( keys %$c_addr ) {
        my $addr  = $c_addr->{$key};
        my $proto = $c_proto->{$key};
        next unless defined $addr;
-        next if (defined $proto and $proto ne 'ip');
+        next if ( defined $proto and $proto ne 'ip' );

-        my $ip = join('.',unpack('C4',$addr));
+        my $ip = join( '.', unpack( 'C4', $addr ) );
        $c_ip{$key} = $ip;
    }
    return \%c_ip;
@@ -214,10 +205,12 @@ Max Baker
 SNMP::Info::CDP is a subclass of SNMP::Info that provides an object oriented 
 interface to CDP information through SNMP.

-CDP is a Layer 2 protocol that supplies topology information of devices that also speak CDP, 
-mostly switches and routers.  CDP is implemented in Cisco and some HP devices.
+CDP is a Layer 2 protocol that supplies topology information of devices that
+also speak CDP, mostly switches and routers.  CDP is implemented in Cisco and
+some HP devices.

-Create or use a device subclass that inherits this class.  Do not use directly.
+Create or use a device subclass that inherits this class.  Do not use
+directly.

 Each device implements a subset of the global and cache entries. 
 Check the return value to see if that data is held by the device.
@@ -230,7 +223,7 @@ None.

 =over

-=item CISCO-CDP-MIB
+=item F<CISCO-CDP-MIB>

 =back

@@ -250,30 +243,31 @@ Accounts for SNMP version 1 devices which may have CDP but not cdp_run()

 =item $cdp->cdp_run()

-Is CDP enabled on this device?  Note that a lot of Cisco devices that implement
-CDP don't implement this value. @#%$!
+Is CDP enabled on this device?  Note that a lot of Cisco devices that
+implement CDP don't implement this value. @#%$!

-(B<cdpGlobalRun>)
+(C<cdpGlobalRun>)

 =item $cdp->cdp_interval()

 Interval in seconds at which CDP messages are generated.

-(B<cdpGlobalMessageInterval>)
+(C<cdpGlobalMessageInterval>)

 =item $cdp->cdp_holdtime()

 Time in seconds that CDP messages are kept. 

-(B<cdpGlobalHoldTime>)
+(C<cdpGlobalHoldTime>)

 =item  $cdp->cdp_id() 

 Returns CDP device ID.  

-This is the device id broadcast via CDP to other devices, and is what is retrieved from remote devices with $cdp->id().
+This is the device id broadcast via CDP to other devices, and is what is
+retrieved from remote devices with $cdp->id().

-(B<cdpGlobalDeviceId>)
+(C<cdpGlobalDeviceId>)

 =back

@@ -300,51 +294,59 @@ From L<http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm#1884

 =item (0x40) - Provides level 1 functionality.

-=item (0x20) - The bridge or switch does not forward IGMP Report packets on nonrouter ports.
+=item (0x20) - The bridge or switch does not forward IGMP Report packets on
+non router ports.

-=item (0x10) - Sends and receives packets for at least one network layer protocol. If the device is routing the protocol, this bit should not be set.
+=item (0x10) - Sends and receives packets for at least one network layer
+protocol. If the device is routing the protocol, this bit should not be set.

-=item (0x08) - Performs level 2 switching. The difference between this bit and bit 0x02 is that a switch does not run the Spanning-Tree Protocol. This device is assumed to be deployed in a physical loop-free topology.
+=item (0x08) - Performs level 2 switching. The difference between this bit
+and bit 0x02 is that a switch does not run the Spanning-Tree Protocol. This
+device is assumed to be deployed in a physical loop-free topology.

-=item (0x04) - Performs level 2 source-route bridging. A source-route bridge would set both this bit and bit 0x02.
+=item (0x04) - Performs level 2 source-route bridging. A source-route bridge
+would set both this bit and bit 0x02.

 =item (0x02) - Performs level 2 transparent bridging.

-=item (0x01) - Performs level 3 routing for at least one network layer protocol.
+=item (0x01) - Performs level 3 routing for at least one network layer
+protocol.

 =back

-Thanks to Martin Lorensen C<martin -at- lorensen.dk> for a pointer to this information.
+Thanks to Martin Lorensen C<martin -at- lorensen.dk> for a pointer to this
+information.

-(B<cdpCacheCapabilities>)
+(C<cdpCacheCapabilities>)

 =item $cdp->c_domain()

-Returns remote VTP Management Domain as defined in CISCO-VTP-MIB::managementDomainName
+Returns remote VTP Management Domain as defined in
+C<CISCO-VTP-MIB::managementDomainName>

-(B<cdpCacheVTPMgmtDomain>)
+(C<cdpCacheVTPMgmtDomain>)

 =item $cdp->c_duplex() 

 Returns the port duplex status from remote devices.

-(B<cdpCacheDuplex>)
+(C<cdpCacheDuplex>)

 =item $cdp->c_id()

 Returns remote device id string

-(B<cdpCacheDeviceId>)
+(C<cdpCacheDeviceId>)

 =item $cdp->c_if()

 Returns the mapping to the SNMP Interface Table.

-Note that a lot devices don't implement $cdp->c_index(),  So if it isn't around,
-we fake it. 
+Note that a lot devices don't implement $cdp->c_index(),  So if it isn't
+around, we fake it. 

-In order to map the cdp table entry back to the interfaces() entry, we truncate the last number
-off of it :
+In order to map the cdp table entry back to the interfaces() entry, we
+truncate the last number off of it :

  # it exists, yay.
  my $c_index     = $device->c_index();
@@ -368,54 +370,72 @@ off of it :

 Returns the mapping to the SNMP2 Interface table for CDP Cache Entries. 

-Most devices don't implement this, so you probably want to use $cdp->c_if() instead.
+Most devices don't implement this, so you probably want to use $cdp->c_if()
+instead.

 See c_if() entry.

-(B<cdpCacheIfIndex>)
+(C<cdpCacheIfIndex>)

 =item  $cdp->c_ip()

 If $cdp->c_proto() is supported, returns remote IPV4 address only.  Otherwise
 it will return all addresses.

-(B<cdpCacheAddress>)
+(C<cdpCacheAddress>)

 =item  $cdp->c_addr()

 Returns remote address

-(B<cdpCacheAddress>)
+(C<cdpCacheAddress>)

 =item $cdp->c_platform() 

 Returns remote platform id 

-(B<cdpCachePlatform>)
+(C<cdpCachePlatform>)

 =item $cdp->c_port()

 Returns remote port ID

-(B<cdpDevicePort>)
+(C<cdpDevicePort>)

 =item  $cdp->c_proto()

 Returns remote address type received.  Usually IP.

-(B<cdpCacheAddressType>)
+(C<cdpCacheAddressType>)

 =item $cdp->c_ver() 

 Returns remote hardware version

-(B<cdpCacheVersion>)
+(C<cdpCacheVersion>)

 =item $cdp->c_vlan()

 Returns the remote interface native VLAN.

-(B<cdpCacheNativeVLAN>)
+(C<cdpCacheNativeVLAN>)
+
+=item $cdp->c_power()
+
+Returns the amount of power consumed by remote device in milliwatts munged
+for decimal placement.
+
+(C<cdpCachePowerConsumption>)
+
+=back
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $cdp->munge_power()
+
+Inserts a decimal at the proper location.

 =back

--- a/Info/CiscoConfig.pm
+++ b/Info/CiscoConfig.pm
@@ -1,35 +1,36 @@
 # SNMP::Info::CiscoConfig
-# Justin Hunter, Eric Miller
 # $Id$
 #
+# Copyright (c) 2008 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.
+#     * 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.
+# 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::CiscoConfig;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
 use SNMP::Info;

@@ -38,44 +39,48 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

+$VERSION = '2.04';
+
 %MIBS = (
-         'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
-         'CISCO-FLASH-MIB'       => 'ciscoFlashCopyTable',
-         'OLD-CISCO-SYS-MIB'     => 'writeMem',
-        );
+    'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
+    'CISCO-FLASH-MIB'       => 'ciscoFlashCopyTable',
+    'OLD-CISCO-SYS-MIB'     => 'writeMem',
+);

 %GLOBALS = (
-            # OLD-CISCO-SYS-MIB
-            'old_write_mem'             => 'writeMem',
-            'old_write_net'             => 'writeNet',
-            );
+
+    # OLD-CISCO-SYS-MIB
+    'old_write_mem' => 'writeMem',
+    'old_write_net' => 'writeNet',
+);

 %FUNCS = (
-          # CISCO-COPY-CONFIG-MIB::ccCopyTable
-          'config_protocol'           => 'ccCopyProtocol',
-          'config_source_type'        => 'ccCopySourceFileType',
-          'config_dest_type'          => 'ccCopyDestFileType',
-          'config_server_addr'        => 'ccCopyServerAddress',
-          'config_filename'           => 'ccCopyFileName',
-          'config_username'           => 'ccCopyUserName',
-          'config_password'           => 'ccCopyUserPassword',
-          'config_notify_complete'    => 'ccCopyNotificationOnCompletion',
-          'config_copy_state'         => 'ccCopyState',
-          'config_copy_start_time'    => 'ccCopyTimeStarted',
-          'config_copy_complete_time' => 'ccCopyTimeCompleted',
-          'config_fail_cause'         => 'ccCopyFailCause',
-          'config_row_status'         => 'ccCopyEntryRowStatus',
-          # CISCO-FLASH-MIB::ciscoFlashCopyTable
-          'flash_copy_cmd'            => 'ciscoFlashCopyCommand',
-          'flash_copy_protocol'       => 'ciscoFlashCopyProtocol',
-          'flash_copy_address'        => 'ciscoFlashCopyServerAddress',
-          'flash_copy_source'         => 'ciscoFlashCopySourceName',
-          'flash_copy_dest'           => 'ciscoFlashCopyDestinationName',
-          'flash_copy_row_status'     => 'ciscoFlashCopyEntryStatus',
-         );

-%MUNGE = (
-          );
+    # CISCO-COPY-CONFIG-MIB::ccCopyTable
+    'config_protocol'           => 'ccCopyProtocol',
+    'config_source_type'        => 'ccCopySourceFileType',
+    'config_dest_type'          => 'ccCopyDestFileType',
+    'config_server_addr'        => 'ccCopyServerAddress',
+    'config_filename'           => 'ccCopyFileName',
+    'config_username'           => 'ccCopyUserName',
+    'config_password'           => 'ccCopyUserPassword',
+    'config_notify_complete'    => 'ccCopyNotificationOnCompletion',
+    'config_copy_state'         => 'ccCopyState',
+    'config_copy_start_time'    => 'ccCopyTimeStarted',
+    'config_copy_complete_time' => 'ccCopyTimeCompleted',
+    'config_fail_cause'         => 'ccCopyFailCause',
+    'config_row_status'         => 'ccCopyEntryRowStatus',
+
+    # CISCO-FLASH-MIB::ciscoFlashCopyTable
+    'flash_copy_cmd'        => 'ciscoFlashCopyCommand',
+    'flash_copy_protocol'   => 'ciscoFlashCopyProtocol',
+    'flash_copy_address'    => 'ciscoFlashCopyServerAddress',
+    'flash_copy_source'     => 'ciscoFlashCopySourceName',
+    'flash_copy_dest'       => 'ciscoFlashCopyDestinationName',
+    'flash_copy_row_status' => 'ciscoFlashCopyEntryStatus',
+);
+
+%MUNGE = ();

 sub copy_run_tftp {
    my $ciscoconfig = shift;
@@ -84,83 +89,96 @@ sub copy_run_tftp {
    srand( time() ^ ( $$ + ( $$ << 15 ) ) );
    my $rand = int( rand( 1 << 24 ) );

-    print "Saving running config to $tftphost as $tftpfile\n" if $ciscoconfig->debug();
+    print "Saving running config to $tftphost as $tftpfile\n"
+        if $ciscoconfig->debug();

-    #Try new method first fall back to old method 
+    #Try new method first fall back to old method
    if ( $ciscoconfig->set_config_protocol( 1, $rand ) ) {
        print "Using new method, row iid: $rand\n" if $ciscoconfig->debug();
+
        #Check each set, delete created row if any fail
        unless ( $ciscoconfig->set_config_source_type( 4, $rand ) ) {
            $ciscoconfig->error_throw("Setting source type failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Setting source type failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Setting source type failed and failed to delete row $rand"
+                );
            }
-            return undef;
+            return;
        }
        unless ( $ciscoconfig->set_config_dest_type( 1, $rand ) ) {
            $ciscoconfig->error_throw("Setting destination type failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Setting dest type failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Setting dest type failed and failed to delete row $rand"
+                );
            }
-            return undef;
+            return;
        }
        unless ( $ciscoconfig->set_config_server_addr( $tftphost, $rand ) ) {
            $ciscoconfig->error_throw("Setting tftp server failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Setting tftp server failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Setting tftp server failed and failed to delete row $rand"
+                );
            }
-            return undef;
+            return;
        }
        unless ( $ciscoconfig->set_config_filename( $tftpfile, $rand ) ) {
            $ciscoconfig->error_throw("Setting file name failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Setting file name failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Setting file name failed and failed to delete row $rand"
+                );
            }
-            return undef;
+            return;
        }
        unless ( $ciscoconfig->set_config_row_status( 1, $rand ) ) {
            $ciscoconfig->error_throw("Initiating transfer failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Initiating transfer failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Initiating transfer failed and failed to delete row $rand"
+                );
            }
-            return undef;
-        }            
+            return;
+        }
        my $status = 0;
        my $timer  = 0;
-        # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
-        # option later if needed
-        my $timeout = 300; 
+
+       # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
+       # option later if needed
+        my $timeout = 300;
        while ( $status !~ /successful|failed/ ) {
            my $t = $ciscoconfig->config_copy_state($rand);
            $status = $t->{$rand};
            last if $status =~ /successful|failed/;
            $timer += 1;
-            if ($timer >= $timeout) {
+            if ( $timer >= $timeout ) {
                $status = 'failed';
                last;
            }
            sleep 1;
-        }  
+        }

        unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
+            print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
        }

        if ( $status eq 'successful' ) {
            print "Save operation successful\n" if $ciscoconfig->debug();
            return 1;
-        }        
+        }
        if ( $status eq 'failed' ) {
            $ciscoconfig->error_throw("Save operation failed");
-            return undef;
+            return;
        }

    }

    print "Using old method\n" if $ciscoconfig->debug();
    unless ( $ciscoconfig->set_old_write_net( $tftpfile, $tftphost ) ) {
-            $ciscoconfig->error_throw("Save operation failed");
-            return undef;
+        $ciscoconfig->error_throw("Save operation failed");
+        return;
    }

    return 1;
@@ -176,32 +194,37 @@ sub copy_run_start {

    if ( $ciscoconfig->set_config_source_type( 4, $rand ) ) {
        print "Using new method, row iid: $rand\n" if $ciscoconfig->debug();
+
        #Check each set, delete created row if any fail
        unless ( $ciscoconfig->set_config_dest_type( 3, $rand ) ) {
            $ciscoconfig->error_throw("Setting dest type failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Setting dest type failed and failed to delete row $rand");
+                $ciscoconfig->error_throw(
+                    "Setting dest type failed and failed to delete row $rand"
+                );
            }
-            return undef;
+            return;
        }
        unless ( $ciscoconfig->set_config_row_status( 1, $rand ) ) {
            $ciscoconfig->error_throw("Initiating save failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                $ciscoconfig->error_throw("Initiating save failed and failed to delete row $rand");
-                }
-            return undef;
+                $ciscoconfig->error_throw(
+                    "Initiating save failed and failed to delete row $rand");
+            }
+            return;
        }
        my $status = 0;
        my $timer  = 0;
-        # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
-        # option later if needed
-        my $timeout = 300; 
+
+       # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
+       # option later if needed
+        my $timeout = 300;
        while ( $status !~ /successful|failed/ ) {
            my $t = $ciscoconfig->config_copy_state($rand);
            $status = $t->{$rand};
            last if $status =~ /successful|failed/;
            $timer += 1;
-            if ($timer >= $timeout) {
+            if ( $timer >= $timeout ) {
                $status = 'failed';
                last;
            }
@@ -209,24 +232,24 @@ sub copy_run_start {
        }

        unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
-                print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
+            print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
        }

        if ( $status eq 'successful' ) {
            print "Save operation successful\n" if $ciscoconfig->debug();
            return 1;
-        }        
+        }
        if ( $status eq 'failed' ) {
            $ciscoconfig->error_throw("Save operation failed");
-            return undef;
+            return;
        }

    }

    print "Using old method\n" if $ciscoconfig->debug();
-    unless ( $ciscoconfig->set_old_write_mem( 1 ) ) {
-            $ciscoconfig->error_throw("Save operation failed");
-            return undef;
+    unless ( $ciscoconfig->set_old_write_mem(1) ) {
+        $ciscoconfig->error_throw("Save operation failed");
+        return;
    }

    return 1;
@@ -262,7 +285,7 @@ Justin Hunter, Eric Miller
 =head1 DESCRIPTION

 SNMP::Info::CiscoConfig is a subclass of SNMP::Info that provides an interface
-to C<CISCO-CONFIG-COPY-MIB>, C<CISCO-FLASH-MIB>, and C<OLD-CISCO-SYS-MIB>.
+to F<CISCO-CONFIG-COPY-MIB>, F<CISCO-FLASH-MIB>, and F<OLD-CISCO-SYS-MIB>.
 These MIBs facilitate the writing of configuration files.

 Use or create a subclass of SNMP::Info that inherits this one.
@@ -280,11 +303,11 @@ None.

 =over

-=item CISCO-CONFIG-COPY-MIB
+=item F<CISCO-CONFIG-COPY-MIB>

-=item CISCO-FLASH-MIB
+=item F<CISCO-FLASH-MIB>

-=item OLD-CISCO-SYS-MIB
+=item F<OLD-CISCO-SYS-MIB>

 =back

@@ -296,11 +319,11 @@ These are methods that return scalar value from SNMP

 =item $ciscoconfig->old_write_mem()

-(B<writeMem>)
+(C<writeMem>)

 =item $ciscoconfig->old_write_net()

-(B<writeNet>)
+(C<writeNet>)

 =back

@@ -313,65 +336,65 @@ to a hash.

 =back

-=head2 Config Copy Request Table  (B<ccCopyTable>)
+=head2 Config Copy Request Table  (C<ccCopyTable>)

 =over

 =item $ciscoconfig->config_protocol()

-(B<ccCopyProtocol>)
+(C<ccCopyProtocol>)

 =item $ciscoconfig->config_source_type()

-(B<ccCopySourceFileType>)
+(C<ccCopySourceFileType>)

 =item $ciscoconfig->config_dest_type()

-(B<ccCopyDestFileType>)
+(C<ccCopyDestFileType>)

 =item $ciscoconfig->config_server_addr()

-(B<ccCopyServerAddress>)
+(C<ccCopyServerAddress>)

 =item $ciscoconfig->config_filename()

-(B<ccCopyFileName>)
+(C<ccCopyFileName>)

 =item $ciscoconfig->config_username()

-(B<ccCopyUserName>)
+(C<ccCopyUserName>)

 =item $ciscoconfig->config_password()

-(B<ccCopyUserPassword>)
+(C<ccCopyUserPassword>)

 =item $ciscoconfig->config_notify_complete()

-(B<ccCopyNotificationOnCompletion>)
+(C<ccCopyNotificationOnCompletion>)

 =item $ciscoconfig->config_copy_state()

-(B<ccCopyState>)
+(C<ccCopyState>)

 =item $ciscoconfig->config_copy_start_time()

-(B<ccCopyTimeStarted>)
+(C<ccCopyTimeStarted>)

 =item $ciscoconfig->config_copy_complete_time()

-(B<ccCopyTimeCompleted>)
+(C<ccCopyTimeCompleted>)

 =item $ciscoconfig->config_fail_cause()

-(B<ccCopyFailCause>)
+(C<ccCopyFailCause>)

 =item $ciscoconfig->config_row_status()

-(B<ccCopyEntryRowStatus>)
+(C<ccCopyEntryRowStatus>)

 =back

-=head2 Flash Copy Table (B<ciscoFlashCopyTable>)
+=head2 Flash Copy Table (C<ciscoFlashCopyTable>)

 Table of Flash copy operation entries.

@@ -379,35 +402,36 @@ Table of Flash copy operation entries.

 =item $ciscoconfig->flash_copy_cmd()

-(B<ciscoFlashCopyCommand>)
+(C<ciscoFlashCopyCommand>)

 =item $ciscoconfig->flash_copy_protocol()

-(B<ciscoFlashCopyProtocol>)
+(C<ciscoFlashCopyProtocol>)

 =item $ciscoconfig->flash_copy_address()

-(B<ciscoFlashCopyServerAddress>)
+(C<ciscoFlashCopyServerAddress>)

 =item $ciscoconfig->flash_copy_source()

-(B<ciscoFlashCopySourceName>)
+(C<ciscoFlashCopySourceName>)

 =item $ciscoconfig->flash_copy_dest()

-(B<ciscoFlashCopyDestinationName>)
+(C<ciscoFlashCopyDestinationName>)

 =item $ciscoconfig->flash_copy_row_status()

-(B<ciscoFlashCopyEntryStatus>)
+(C<ciscoFlashCopyEntryStatus>)

 =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. 
+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

@@ -417,9 +441,9 @@ Store the running configuration on a TFTP server.  Equivalent to the CLI
 commands "copy running-config tftp" or "write net".

 This method attempts to use newer "copy running-config tftp" procedure first
-and then the older "write net" procedure if that fails.  The newer procedure is
-supported Cisco devices with the CISCO-CONFIG-COPY-MIB available, Cisco IOS
-software release 12.0 or on some devices as early as release 11.2P.  The
+and then the older "write net" procedure if that fails.  The newer procedure
+is supported Cisco devices with the F<CISCO-CONFIG-COPY-MIB> available, Cisco
+IOS software release 12.0 or on some devices as early as release 11.2P.  The
 older procedure has been depreciated by Cisco and is utilized only to support
 devices running older code revisions.

@@ -429,18 +453,21 @@ devices running older code revisions.

 =item $ciscoconfig->copy_run_start()

-Copy the running configuration to the startup configuration.  Equivalent to
-the CLI command "copy running-config startup-config" or "write mem".
+Copy the running configuration to the start up configuration.  Equivalent to
+the CLI command C<"copy running-config startup-config"> or C<"write mem">.

-This method attempts to use newer "copy running-config startup-config"
-procedure first and then the older "write mem" procedure if that fails.  The
-newer procedure is supported Cisco devices with the CISCO-CONFIG-COPY-MIB
-available, Cisco IOS software release 12.0 or on some devices as early as
-release 11.2P.  The older procedure has been depreciated by Cisco and is
-utilized only to support devices running older code revisions.
+This method attempts to use newer C<"copy running-config startup-config">
+procedure first and then the older C<"write mem"> procedure if that fails.
+The newer procedure is supported Cisco devices with the
+F<CISCO-CONFIG-COPY-MIB> available, Cisco IOS software release 12.0 or on
+some devices as early as release 11.2P.  The older procedure has been
+depreciated by Cisco and is utilized only to support devices running older
+code revisions.

 Example:
 $ciscoconfig->copy_run_start()
    or die "Couldn't save config. ",$ciscoconfig->error(1);

+=back
+
 =cut
--- a/Info/CiscoImage.pm
+++ b/Info/CiscoImage.pm
@@ -1,55 +1,52 @@
-package SNMP::Info::CiscoImage;
-#$Id$
-
+# $Id$
+#
 # Copyright (c) 2005 Matt Tuttle
+# 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.
+#     * 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.
+# 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::CiscoImage;

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
-$VERSION = '1.07';
-
-@SNMP::Info::CiscoImage::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoImage::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoImage::EXPORT_OK = qw//;

-%MIBS    = (
-            'CISCO-IMAGE-MIB' => 'ciscoImageString',
-           );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%GLOBALS = (
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-            'ci_images'         => 'ciscoImageString',
-           );
+%MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', );

-%MUNGE   = (
-           );
+%GLOBALS = ();
+
+%FUNCS = ( 'ci_images' => 'ciscoImageString', );
+
+%MUNGE = ();

 1;
 __END__
@@ -66,13 +63,13 @@ Matt Tuttle (C<mtuttle@americanhebrewacademy.org>)

 # Let SNMP::Info determine the correct subclass for you.
 my $ci = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
-                        )
+                AutoSpecify => 1,
+                Debug       => 1,
+                # These arguments are passed directly on to SNMP::Session
+                DestHost    => 'myswitch',
+                Community   => 'public',
+                Version     => 2
+                )
    or die "Can't connect to DestHost.\n";

 my $class = $ci->class();
@@ -93,7 +90,7 @@ None.

 =over

-=item CISCO-IMAGE-MIB
+=item F<CISCO-IMAGE-MIB>

 =back

@@ -111,7 +108,7 @@ None.

 Returns the table of image strings.

-B<ciscoImageString>
+C<ciscoImageString>

 =back

--- a/Info/CiscoPortSecurity.pm
+++ b/Info/CiscoPortSecurity.pm
@@ -1,98 +1,127 @@
 # SNMP::Info::CiscoPortSecurity
-# Eric Miller
+# $Id$
 #
-# Copyright (c) 2006 Eric Miller 
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::CiscoPortSecurity;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;

-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
-@SNMP::Info::CiscoPortSecurity::ISA = qw/Exporter/;
+@SNMP::Info::CiscoPortSecurity::ISA       = qw/Exporter/;
@SNMP::Info::CiscoPortSecurity::EXPORT_OK = qw//;

-%MIBS    = (
-            'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
-           );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
+    'CISCO-PAE-MIB'           => 'ciscoPaeMIB',
+    'IEEE8021-PAE-MIB'        => 'dot1xAuthLastEapolFrameSource',
+);

 %GLOBALS = (
-            # CISCO-PORT-SECURITY-MIB
-            'cps_clear'     => 'cpsGlobalClearSecureMacAddresses',
-            'cps_notify'    => 'cpsGlobalSNMPNotifControl',
-            'cps_rate'      => 'cpsGlobalSNMPNotifRate',
-            'cps_enable'    => 'cpsGlobalPortSecurityEnable',
-            'cps_mac_count' => 'cpsGlobalTotalSecureAddress',
-            'cps_mac_max'   => 'cpsGlobalMaxSecureAddress',
-           );

-%FUNCS   = (
-            # CISCO-PORT-SECURITY-MIB::cpsIfConfigTable
-            'cps_i_limit_val'  => 'cpsIfInvalidSrcRateLimitValue',
-            'cps_i_limit'      => 'cpsIfInvalidSrcRateLimitEnable',
-            'cps_i_sticky'     => 'cpsIfStickyEnable',
-            'cps_i_clear_type' => 'cpsIfClearSecureMacAddresses',
-            'cps_i_shutdown'   => 'cpsIfShutdownTimeout',
-            'cps_i_flood'      => 'cpsIfUnicastFloodingEnable',
-            'cps_i_clear'      => 'cpsIfClearSecureAddresses',
-            'cps_i_mac'        => 'cpsIfSecureLastMacAddress',
-            'cps_i_count'      => 'cpsIfViolationCount',
-            'cps_i_action'     => 'cpsIfViolationAction',
-            'cps_i_mac_static' => 'cpsIfStaticMacAddrAgingEnable',
-            'cps_i_mac_type'   => 'cpsIfSecureMacAddrAgingType',
-            'cps_i_mac_age'    => 'cpsIfSecureMacAddrAgingTime',
-            'cps_i_mac_count'  => 'cpsIfCurrentSecureMacAddrCount',
-            'cps_i_mac_max'    => 'cpsIfMaxSecureMacAddr',
-            'cps_i_status'     => 'cpsIfPortSecurityStatus',
-            'cps_i_enable'     => 'cpsIfPortSecurityEnable',
-            # CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
-            'cps_i_v_mac_count' => 'cpsIfVlanCurSecureMacAddrCount',
-            'cps_i_v_mac_max'   => 'cpsIfVlanMaxSecureMacAddr',
-            'cps_i_v'           => 'cpsIfVlanIndex',
-            # CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
-            'cps_i_v_mac_status' => 'cpsIfVlanSecureMacAddrRowStatus',
-            'cps_i_v_mac_age'    => 'cpsIfVlanSecureMacAddrRemainAge',
-            'cps_i_v_mac_type'   => 'cpsIfVlanSecureMacAddrType',
-            'cps_i_v_vlan'       => 'cpsIfVlanSecureVlanIndex',
-            'cps_i_v_mac'        => 'cpsIfVlanSecureMacAddress',
-            # CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
-            'cps_m_status' => 'cpsSecureMacAddrRowStatus',
-            'cps_m_age' => 'cpsSecureMacAddrRemainingAge',
-            'cps_m_type' => 'cpsSecureMacAddrType',
-            'cps_m_mac' => 'cpsSecureMacAddress',
-           );
+    # CISCO-PORT-SECURITY-MIB
+    'cps_clear'     => 'cpsGlobalClearSecureMacAddresses',
+    'cps_notify'    => 'cpsGlobalSNMPNotifControl',
+    'cps_rate'      => 'cpsGlobalSNMPNotifRate',
+    'cps_enable'    => 'cpsGlobalPortSecurityEnable',
+    'cps_mac_count' => 'cpsGlobalTotalSecureAddress',
+    'cps_mac_max'   => 'cpsGlobalMaxSecureAddress',
+);

-%MUNGE   = (
-            'cps_i_mac'      => \&SNMP::Info::munge_mac, 
-            'cps_m_mac'      => \&SNMP::Info::munge_mac,
-            'cps_i_v_mac'    => \&SNMP::Info::munge_mac,
-           );
+%FUNCS = (
+
+    # CISCO-PORT-SECURITY-MIB::cpsIfConfigTable
+    'cps_i_limit_val'  => 'cpsIfInvalidSrcRateLimitValue',
+    'cps_i_limit'      => 'cpsIfInvalidSrcRateLimitEnable',
+    'cps_i_sticky'     => 'cpsIfStickyEnable',
+    'cps_i_clear_type' => 'cpsIfClearSecureMacAddresses',
+    'cps_i_shutdown'   => 'cpsIfShutdownTimeout',
+    'cps_i_flood'      => 'cpsIfUnicastFloodingEnable',
+    'cps_i_clear'      => 'cpsIfClearSecureAddresses',
+    'cps_i_mac'        => 'cpsIfSecureLastMacAddress',
+    'cps_i_count'      => 'cpsIfViolationCount',
+    'cps_i_action'     => 'cpsIfViolationAction',
+    'cps_i_mac_static' => 'cpsIfStaticMacAddrAgingEnable',
+    'cps_i_mac_type'   => 'cpsIfSecureMacAddrAgingType',
+    'cps_i_mac_age'    => 'cpsIfSecureMacAddrAgingTime',
+    'cps_i_mac_count'  => 'cpsIfCurrentSecureMacAddrCount',
+    'cps_i_mac_max'    => 'cpsIfMaxSecureMacAddr',
+    'cps_i_status'     => 'cpsIfPortSecurityStatus',
+    'cps_i_enable'     => 'cpsIfPortSecurityEnable',
+
+    # CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
+    'cps_i_v_mac_count' => 'cpsIfVlanCurSecureMacAddrCount',
+    'cps_i_v_mac_max'   => 'cpsIfVlanMaxSecureMacAddr',
+    'cps_i_v'           => 'cpsIfVlanIndex',
+
+    # CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
+    'cps_i_v_mac_status' => 'cpsIfVlanSecureMacAddrRowStatus',
+    'cps_i_v_mac_age'    => 'cpsIfVlanSecureMacAddrRemainAge',
+    'cps_i_v_mac_type'   => 'cpsIfVlanSecureMacAddrType',
+    'cps_i_v_vlan'       => 'cpsIfVlanSecureVlanIndex',
+    'cps_i_v_mac'        => 'cpsIfVlanSecureMacAddress',
+
+    # CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
+    'cps_m_status' => 'cpsSecureMacAddrRowStatus',
+    'cps_m_age'    => 'cpsSecureMacAddrRemainingAge',
+    'cps_m_type'   => 'cpsSecureMacAddrType',
+    'cps_m_mac'    => 'cpsSecureMacAddress',
+
+    # IEEE8021-PAE-MIB::dot1xPaePortEntry
+    'pae_i_capabilities'            => 'dot1xPaePortCapabilities',
+    'pae_i_last_eapol_frame_source' => 'dot1xAuthLastEapolFrameSource',
+);
+
+%MUNGE = (
+    'cps_i_mac'                     => \&SNMP::Info::munge_mac,
+    'cps_m_mac'                     => \&SNMP::Info::munge_mac,
+    'cps_i_v_mac'                   => \&SNMP::Info::munge_mac,
+    'pae_i_last_eapol_frame_source' => \&SNMP::Info::munge_mac,
+    'pae_i_capabilities'            => \&munge_pae_capabilities,
+);
+
+%PAECAPABILITIES = (
+    0 => 'dot1xPaePortAuthCapable',
+    1 => 'dot1xPaePortSuppCapable'
+);
+
+sub munge_pae_capabilities {
+    my $bits = shift;
+
+    return unless defined $bits;
+    my @vals
+        = map( $PAECAPABILITIES{$_}, sprintf( "%x", unpack( 'b*', $bits ) ) );
+    return join( ' ', @vals );
+}

 1;
 __END__
@@ -100,7 +129,7 @@ __END__
 =head1 NAME

 SNMP::Info::CiscoPortSecurity - SNMP Interface to data from
-CISCO-PORT-SECURITY-MIB
+F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>

 =head1 AUTHOR

@@ -110,12 +139,11 @@ Eric Miller

 # Let SNMP::Info determine the correct subclass for you. 
 my $cps = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
                        ) 
    or die "Can't connect to DestHost.\n";

@@ -125,8 +153,8 @@ Eric Miller
 =head1 DESCRIPTION

 SNMP::Info::CiscoPortSecurity is a subclass of SNMP::Info that provides
-an interface to the C<CISCO-PORT-SECURITY-MIB>.  This MIB is used across
-the Catalyst family under CatOS and IOS.
+an interface to the F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>.  These
+MIBs are used across the Catalyst family under CatOS and IOS.

 Use or create in a subclass of SNMP::Info.  Do not use directly.

@@ -138,13 +166,14 @@ None.

 =over

-=item CISCO-PORT-SECURITY-MIB
+=item F<CISCO-PORT-SECURITY-MIB>
+
+=item F<CISCO-PAE-MIB>
+
+=item F<IEEE8021-PAE-MIB>

 =back

-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz or from
-Netdisco-mib package at netdisco.org. 
-
 =head1 GLOBALS

 These are methods that return scalar values from SNMP
@@ -153,175 +182,206 @@ These are methods that return scalar values from SNMP

 =back

-=head2 CISCO-PORT-SECURITY-MIB globals
+=head2 F<CISCO-PORT-SECURITY-MIB> globals

 =over

-=item $stack->cps_clear()
+=item $cps->cps_clear()

-(B<cpsGlobalClearSecureMacAddresses>)
+(C<cpsGlobalClearSecureMacAddresses>)

-=item $stack->cps_notify()
+=item $cps->cps_notify()

-(B<cpsGlobalSNMPNotifControl>)
+(C<cpsGlobalSNMPNotifControl>)

-=item $stack->cps_rate()
+=item $cps->cps_rate()

-(B<cpsGlobalSNMPNotifRate>)
+(C<cpsGlobalSNMPNotifRate>)

-=item $stack->cps_enable()
+=item $cps->cps_enable()

-(B<cpsGlobalPortSecurityEnable>)
+(C<cpsGlobalPortSecurityEnable>)

-=item $stack->cps_mac_count()
+=item $cps->cps_mac_count()

-(B<cpsGlobalTotalSecureAddress>)
+(C<cpsGlobalTotalSecureAddress>)

-=item $stack->cps_mac_max()
+=item $cps->cps_mac_max()

-(B<cpsGlobalMaxSecureAddress>)
+(C<cpsGlobalMaxSecureAddress>)

 =back

 =head1 TABLE METHODS

-=head2 CISCO-PORT-SECURITY-MIB - Interface Config Table
+=head2 C<CISCO-PORT-SECURITY-MIB> - Interface Config Table

 =over

-=item $stack->cps_i_limit_val()
+=item $cps->cps_i_limit_val()

-(B<cpsIfInvalidSrcRateLimitValue>)
+(C<cpsIfInvalidSrcRateLimitValue>)

-=item $stack->cps_i_limit()
+=item $cps->cps_i_limit()

-(B<cpsIfInvalidSrcRateLimitEnable>)
+(C<cpsIfInvalidSrcRateLimitEnable>)

-=item $stack->cps_i_sticky()
+=item $cps->cps_i_sticky()

-(B<cpsIfStickyEnable>)
+(C<cpsIfStickyEnable>)

-=item $stack->cps_i_clear_type()
+=item $cps->cps_i_clear_type()

-(B<cpsIfClearSecureMacAddresses>)
+(C<cpsIfClearSecureMacAddresses>)

-=item $stack->cps_i_shutdown()
+=item $cps->cps_i_shutdown()

-(B<cpsIfShutdownTimeout>)
+(C<cpsIfShutdownTimeout>)

-=item $stack->cps_i_flood()
+=item $cps->cps_i_flood()

-(B<cpsIfUnicastFloodingEnable>)
+(C<cpsIfUnicastFloodingEnable>)

-=item $stack->cps_i_clear()
+=item $cps->cps_i_clear()

-(B<cpsIfClearSecureAddresses>)
+(C<cpsIfClearSecureAddresses>)

-=item $stack->cps_i_mac()
+=item $cps->cps_i_mac()

-(B<cpsIfSecureLastMacAddress>)
+(C<cpsIfSecureLastMacAddress>)

-=item $stack->cps_i_count()
+=item $cps->cps_i_count()

-(B<cpsIfViolationCount>)
+(C<cpsIfViolationCount>)

-=item $stack->cps_i_action()
+=item $cps->cps_i_action()

-(B<cpsIfViolationAction>)
+(C<cpsIfViolationAction>)

-=item $stack->cps_i_mac_static()
+=item $cps->cps_i_mac_static()

-(B<cpsIfStaticMacAddrAgingEnable>)
+(C<cpsIfStaticMacAddrAgingEnable>)

-=item $stack->cps_i_mac_type()
+=item $cps->cps_i_mac_type()

-(B<cpsIfSecureMacAddrAgingType>)
+(C<cpsIfSecureMacAddrAgingType>)

-=item $stack->cps_i_mac_age()
+=item $cps->cps_i_mac_age()

-(B<cpsIfSecureMacAddrAgingTime>)
+(C<cpsIfSecureMacAddrAgingTime>)

-=item $stack->cps_i_mac_count()
+=item $cps->cps_i_mac_count()

-(B<cpsIfCurrentSecureMacAddrCount>)
+(C<cpsIfCurrentSecureMacAddrCount>)

-=item $stack->cps_i_mac_max()
+=item $cps->cps_i_mac_max()

-(B<cpsIfMaxSecureMacAddr>)
+(C<cpsIfMaxSecureMacAddr>)

-=item $stack->cps_i_status()
+=item $cps->cps_i_status()

-(B<cpsIfPortSecurityStatus>)
+(C<cpsIfPortSecurityStatus>)

-=item $stack->cps_i_enable()
+=item $cps->cps_i_enable()

-(B<cpsIfPortSecurityEnable>)
+(C<cpsIfPortSecurityEnable>)

 =back

-=head2 CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
+=head2 C<CISCO-PORT-SECURITY-MIB::cpsIfVlanTable>

 =over

-=item $stack->cps_i_v_mac_count()
+=item $cps->cps_i_v_mac_count()

-(B<cpsIfVlanCurSecureMacAddrCount>)
+(C<cpsIfVlanCurSecureMacAddrCount>)

-=item $stack->cps_i_v_mac_max()
+=item $cps->cps_i_v_mac_max()

-(B<cpsIfVlanMaxSecureMacAddr>)
+(C<cpsIfVlanMaxSecureMacAddr>)

-=item $stack->cps_i_v()
+=item $cps->cps_i_v()

-(B<cpsIfVlanIndex>)
+(C<cpsIfVlanIndex>)

 =back

-=head2 CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
+=head2 C<CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable>

 =over

-=item $stack->cps_i_v_mac_status()
+=item $cps->cps_i_v_mac_status()

-(B<cpsIfVlanSecureMacAddrRowStatus>)
+(C<cpsIfVlanSecureMacAddrRowStatus>)

-=item $stack->cps_i_v_mac_age()
+=item $cps->cps_i_v_mac_age()

-(B<cpsIfVlanSecureMacAddrRemainAge>)
+(C<cpsIfVlanSecureMacAddrRemainAge>)

-=item $stack->cps_i_v_mac_type()
+=item $cps->cps_i_v_mac_type()

-(B<cpsIfVlanSecureMacAddrType>)
+(C<cpsIfVlanSecureMacAddrType>)

-=item $stack->cps_i_v_vlan()
+=item $cps->cps_i_v_vlan()

-(B<cpsIfVlanSecureVlanIndex>)
+(C<cpsIfVlanSecureVlanIndex>)

-=item $stack->cps_i_v_mac()
+=item $cps->cps_i_v_mac()

-(B<cpsIfVlanSecureMacAddress>)
+(C<cpsIfVlanSecureMacAddress>)

 =back

-=head2 CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
+=head2 C<CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable>

 =over

-=item $stack->cps_m_status()
+=item $cps->cps_m_status()

-(B<cpsSecureMacAddrRowStatus>)
+(C<cpsSecureMacAddrRowStatus>)

-=item $stack->cps_m_age()
+=item $cps->cps_m_age()

-(B<cpsSecureMacAddrRemainingAge>)
+(C<cpsSecureMacAddrRemainingAge>)

-=item $stack->cps_m_type()
+=item $cps->cps_m_type()

-(B<cpsSecureMacAddrType>)
+(C<cpsSecureMacAddrType>)

-=item $stack->cps_m_mac()
+=item $cps->cps_m_mac()

-(B<cpsSecureMacAddress>)
+(C<cpsSecureMacAddress>)
+
+=back
+
+=head2 C<IEEE8021-PAE-MIB::dot1xPaePortEntry>
+
+=over
+
+=item $cps->pae_i_capabilities()
+
+C<dot1xPaePortCapabilities>
+
+Indicates the PAE functionality that this Port supports
+and that may be managed through this MIB munged to return either
+C<'dot1xPaePortAuthCapable'> or C<'dot1xPaePortSuppCapable'>.
+
+=item $cps->pae_i_last_eapol_frame_source()
+
+C<dot1xAuthLastEapolFrameSource>
+
+The source MAC address carried in the most recently received EAPOL frame.
+
+=back
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $cps->munge_pae_capabilities()
+
+Return either C<'dot1xPaePortAuthCapable'> or C<'dot1xPaePortSuppCapable'>
+based upon bit value.

 =back

--- a/Info/CiscoPower.pm
+++ b/Info/CiscoPower.pm
@@ -1,81 +1,111 @@
 # SNMP::Info::CiscoPower
-# Bill Fenner
+# $Id$
 #
-# Copyright (c) 2007 Bill Fenner
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 Bill Fenner
+# 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 
+#     * 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.
+#
+# 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::CiscoPower;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::CiscoPower::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoPower::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoPower::EXPORT_OK = qw//;

-%MIBS    = ('CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex');
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%GLOBALS = (
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-	    'cpeth_ent_phy'    => 'cpeExtPsePortEntPhyIndex',
-           );
+%MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
+          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );

-%MUNGE   = (
-           );
+%GLOBALS = ();
+
+%FUNCS = ( 
+    'cpeth_ent_phy'     => 'cpeExtPsePortEntPhyIndex', 
+    'peth_port_power'   => 'cpeExtPsePortPwrConsumption', 
+);
+
+%MUNGE = ();

 # Cisco overcame the limitation of the module.port index of the
 # pethPsePortTable by adding another mapping table, which maps
 # a pethPsePortTable row to an entPhysicalTable index, which can
 # then be mapped to ifIndex.
 sub peth_port_ifindex {
-    my $cpeth = shift;
+    my $cpeth   = shift;
    my $partial = shift;

    my $ent_phy = $cpeth->cpeth_ent_phy($partial);
-    my $e_port = $cpeth->e_port();
+    my $e_port  = $cpeth->e_port();

    my $peth_port_ifindex = {};
-    foreach my $i (keys %$ent_phy) {
-	if ($e_port->{$ent_phy->{$i}}) {
-	    $peth_port_ifindex->{$i} = $e_port->{$ent_phy->{$i}};
-	}
+    foreach my $i ( keys %$ent_phy ) {
+        if ( $e_port->{ $ent_phy->{$i} } ) {
+            $peth_port_ifindex->{$i} = $e_port->{ $ent_phy->{$i} };
+        }
    }
    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__
+
 =head1 NAME

-SNMP::Info::CiscoPower - SNMP Interface to data stored in CISCO-POWER-ETHERNET-EXT-MIB.
+SNMP::Info::CiscoPower - SNMP Interface to data stored in
+F<CISCO-POWER-ETHERNET-EXT-MIB>.

 =head1 AUTHOR

@@ -87,7 +117,6 @@ Bill Fenner
 my $poe = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -100,14 +129,15 @@ Bill Fenner
 =head1 DESCRIPTION

 The Info::PowerEthernet class needs a per-device helper function to
-properly map the pethPsePortTable to ifIndex values.  This class
-provides that helper, using CISCO-POWER-ETHERNET-EXT-MIB.
+properly map the C<pethPsePortTable> to C<ifIndex> values.  This class
+provides that helper, using F<CISCO-POWER-ETHERNET-EXT-MIB>.
 It does not define any helpers for the extra values that this MIB
 contains.

 Create or use a device subclass that inherit this class.  Do not use directly.

-For debugging purposes you can call this class directly as you would SNMP::Info
+For debugging purposes you can call this class directly as you would
+SNMP::Info

 my $poe = new SNMP::Info::CiscoPower (...);

@@ -121,7 +151,7 @@ Note that it requires that the device inherits from Info::Entity.

 =over

-=item CISCO-POWER-ETHERNET-EXT-MIB
+=item F<CISCO-POWER-ETHERNET-EXT-MIB>

 =back

@@ -140,7 +170,23 @@ to a hash.

 =item $poe->peth_port_ifindex()

-Maps the pethPsePortTable to ifIndex by way of the ENTITY-MIB.
+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

--- a/Info/CiscoQOS.pm
+++ b/Info/CiscoQOS.pm
@@ -1,77 +1,77 @@
 # SNMP::Info::CiscoQOS
-# Alexander Hartmaier <alexander.hartmaier@t-systems.at>
+# $Id$
 #
 # Copyright (c) 2005 Alexander Hartmaier
-#
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::CiscoQOS;
-$VERSION = '1.07';

-# $Id$
 use strict;
-
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::CiscoQOS::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoQOS::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoQOS::EXPORT_OK = qw//;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%MIBS    = (
-            'CISCO-CLASS-BASED-QOS-MIB'      => 'cbQosIfIndex',
-           );
+$VERSION = '2.04';

-%GLOBALS = (
-           );
+%MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );

-%FUNCS   = (
-            # CISCO-CLASS-BASED-QOS-MIB::cbQosServicePolicyTable
-            'qos_i_index'             => 'cbQosIfIndex',
-            'qos_i_type'              => 'cbQosIfType',
-            'qos_pol_direction'       => 'cbQosPolicyDirection',
-            # CISCO-CLASS-BASED-QOS-MIB::cbQosObjectsTable
-            'qos_obj_conf_index'      => 'cbQosConfigIndex',
-            'qos_obj_type'            => 'cbQosObjectsType',
-            'qos_obj_parent'          => 'cbQosParentObjectsIndex',
-            # CISCO-CLASS-BASED-QOS-MIB::cbQosCMCfgTable
-            'qos_cm_name'             => 'cbQosCMName',
-            'qos_cm_desc'             => 'cbQosCMDesc',
-            'qos_cm_info'             => 'cbQosCMInfo',
-            # CISCO-CLASS-BASED-QOS-MIB::cbQosCMStatsTable
-            'qos_octet_pre'           => 'cbQosCMPrePolicyByte',
-            'qos_octet_post'          => 'cbQosCMPostPolicyByte',
-            # CISCO-CLASS-BASED-QOS-MIB::cbQosQueueingCfgTable
-            'qos_queueingcfg_bw'        => 'cbQosQueueingCfgBandwidth',
-            'qos_queueingcfg_bw_units'  => 'cbQosQueueingCfgBandwidthUnits',
-           );
+%GLOBALS = ();

-%MUNGE   = (
-           );
+%FUNCS = (
+
+    # CISCO-CLASS-BASED-QOS-MIB::cbQosServicePolicyTable
+    'qos_i_index'       => 'cbQosIfIndex',
+    'qos_i_type'        => 'cbQosIfType',
+    'qos_pol_direction' => 'cbQosPolicyDirection',
+
+    # CISCO-CLASS-BASED-QOS-MIB::cbQosObjectsTable
+    'qos_obj_conf_index' => 'cbQosConfigIndex',
+    'qos_obj_type'       => 'cbQosObjectsType',
+    'qos_obj_parent'     => 'cbQosParentObjectsIndex',
+
+    # CISCO-CLASS-BASED-QOS-MIB::cbQosCMCfgTable
+    'qos_cm_name' => 'cbQosCMName',
+    'qos_cm_desc' => 'cbQosCMDesc',
+    'qos_cm_info' => 'cbQosCMInfo',
+
+    # CISCO-CLASS-BASED-QOS-MIB::cbQosCMStatsTable
+    'qos_octet_pre'  => 'cbQosCMPrePolicyByte',
+    'qos_octet_post' => 'cbQosCMPostPolicyByte',
+
+    # CISCO-CLASS-BASED-QOS-MIB::cbQosQueueingCfgTable
+    'qos_queueingcfg_bw'       => 'cbQosQueueingCfgBandwidth',
+    'qos_queueingcfg_bw_units' => 'cbQosQueueingCfgBandwidthUnits',
+);
+
+%MUNGE = ();

 1;
 __END__
@@ -90,7 +90,6 @@ Alexander Hartmaier
 my $qos = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -115,7 +114,7 @@ none.

 =over

-=item CISCO-CLASS-BASED-QOS-MIB
+=item F<CISCO-CLASS-BASED-QOS-MIB>

 =back

@@ -131,87 +130,89 @@ MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz

 =head1 TABLE METHODS

-=head2 ServicePolicy Table (B<cbQosServicePolicyTable>)
+=head2 Service Policy Table (C<cbQosServicePolicyTable>)

-This table describes the interfaces/media types and the policymap that are
+This table describes the interfaces/media types and the policy map that are
 attached to it.

 =over

 =item $qos->qos_i_index()

-(B<cbQosIfIndex>)
+(C<cbQosIfIndex>)

 =item $qos->qos_i_type()

-(B<cbQosIfType>)
+(C<cbQosIfType>)

 =item $qos->qos_pol_direction()

-(B<cbQosPolicyDirection>)
+(C<cbQosPolicyDirection>)

 =back

-=head2 ClassMap Objects Table (B<cbQosObjectsTable>)
+=head2 Class Map Objects Table (C<cbQosObjectsTable>)

 =over

 =item $qos->qos_obj_index()

-(B<cbQosConfigIndex>)
+(C<cbQosConfigIndex>)

 =item $qos->qos_obj_type()

-(B<cbQosObjectsType>)
+(C<cbQosObjectsType>)

 =item $qos->qos_obj_parent()

-(B<cbQosParentObjectsIndex>)
+(C<cbQosParentObjectsIndex>)

 =back

-=head2 ClassMap Configuration Table (B<cbQosCMCfgTable>)
+=head2 Class Map Configuration Table (C<cbQosCMCfgTable>)

 =over

 =item $qos->qos_cm_name()

-(B<cbQosCMName>)
+(C<cbQosCMName>)

 =item $qos->qos_cm_desc()

-(B<cbQosCMDesc>)
+(C<cbQosCMDesc>)

 =item $qos->qos_cm_info()

-(B<cbQosCMInfo>)
+(C<cbQosCMInfo>)

 =back

-=head2 ClassMap Stats Table (B<cbQosCMStatsTable>)
+=head2 Class Map Stats Table (C<cbQosCMStatsTable>)

 =over

 =item $qos->qos_octet_pre()

-(B<cbQosCMPrePolicyByte>)
+(C<cbQosCMPrePolicyByte>)

 =item $qos->qos_octet_post()

-(B<cbQosCMPostPolicyByte>)
+(C<cbQosCMPostPolicyByte>)

 =back

-=head2 Queueing Configuration Table (B<cbQosQueueingCfgTable>)
+=head2 Queueing Configuration Table (C<cbQosQueueingCfgTable>)

 =over

 =item $qos->qos_queueingcfg_bw()

-(B<cbQosQueueingCfgBandwidth>)
+(C<cbQosQueueingCfgBandwidth>)

 =item $qos->qos_queueingcfg_bw_units()

-(B<cbQosQueueingCfgBandwidthUnits>)
+(C<cbQosQueueingCfgBandwidthUnits>)
+
+=back

 =cut
--- a/Info/CiscoRTT.pm
+++ b/Info/CiscoRTT.pm
@@ -1,62 +1,58 @@
 # SNMP::Info::CiscoRTT
-# Alexander Hartmaier <alexander.hartmaier@t-systems.at>
 # $Id$
 #
 # Copyright (c) 2005 Alexander Hartmaier
-#
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::CiscoRTT;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::CiscoRTT::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoRTT::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoRTT::EXPORT_OK = qw//;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%MIBS    = (
-            'CISCO-RTTMON-MIB'      => 'rttMonCtrlAdminOwner',
-           );
+$VERSION = '2.04';

-%GLOBALS = (
-           );
+%MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );

-%FUNCS   = (
-            # CISCO-RTTMON-MIB
-            'rtt_desc'              => 'rttMonCtrlAdminOwner',
-            'rtt_last'              => 'rttMonLatestRttOperCompletionTime',
-           );
+%GLOBALS = ();

-%MUNGE   = (
-           );
+%FUNCS = (
+
+    # CISCO-RTTMON-MIB
+    'rtt_desc' => 'rttMonCtrlAdminOwner',
+    'rtt_last' => 'rttMonLatestRttOperCompletionTime',
+);
+
+%MUNGE = ();

 1;
 __END__
@@ -75,7 +71,6 @@ Alexander Hartmaier
 my $rtt = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -100,7 +95,7 @@ none.

 =over

-=item CISCO-RTTMON-MIB
+=item F<CISCO-RTTMON-MIB>

 =back

@@ -118,25 +113,25 @@ None

 =head2 Overall Control Group Table

-This table is from CISCO-RTTMAN-MIB::rttMonCtrlAdminTable
+This table is from C<CISCO-RTTMAN-MIB::rttMonCtrlAdminTable>

 =over

 =item $rtt->rtt_desc()

-(B<rttMonCtrlAdminOwner>)
+(C<rttMonCtrlAdminOwner>)

 =back

 =head2 Overall Control Group Table

-This table is from CISCO-RTTMON-MIB::rttMonCtrl
+This table is from C<CISCO-RTTMON-MIB::rttMonCtrl>

 =over

 =item $rtt->rtt_last()

-(B<rttMonLatestRttOperCompletionTime>)
+(C<rttMonLatestRttOperCompletionTime>)

 =back

--- a/Info/CiscoStack.pm
+++ b/Info/CiscoStack.pm
@@ -1,136 +1,141 @@
 # SNMP::Info::CiscoStack
-# Max Baker
+# $Id$
 #
-# Copyright (c)2003,2004,2006 Max Baker 
-# All rights reserved.  
+# Copyright (c) 2008 Max Baker
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::CiscoStack;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
-@SNMP::Info::CiscoStack::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoStack::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoStack::EXPORT_OK = qw//;

-%MIBS    = (
-            'CISCO-STACK-MIB'         => 'ciscoStackMIB',
-           );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
+
+$VERSION = '2.04';
+
+%MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );

 %GLOBALS = (
-            'sysip'       => 'sysIpAddr',    
-            'netmask'     => 'sysNetMask',    
-            'broadcast'   => 'sysBroadcast',
-            'serial1'     => 'chassisSerialNumber',    
-            'serial2'     => 'chassisSerialNumberString',
-            'model1'      => 'chassisModel',    
-            'ps1_type'    => 'chassisPs1Type',    
-            'ps1_status'  => 'chassisPs1Status',    
-            'ps2_type'    => 'chassisPs2Type',    
-            'ps2_status'  => 'chassisPs2Status',    
-            'slots'       => 'chassisNumSlots',    
-            'fan'         => 'chassisFanStatus',
-           );
+    'sysip'      => 'sysIpAddr',
+    'netmask'    => 'sysNetMask',
+    'broadcast'  => 'sysBroadcast',
+    'serial1'    => 'chassisSerialNumber',
+    'serial2'    => 'chassisSerialNumberString',
+    'model1'     => 'chassisModel',
+    'ps1_type'   => 'chassisPs1Type',
+    'ps1_status' => 'chassisPs1Status',
+    'ps2_type'   => 'chassisPs2Type',
+    'ps2_status' => 'chassisPs2Status',
+    'slots'      => 'chassisNumSlots',
+    'fan'        => 'chassisFanStatus',
+);

-%FUNCS   = (
-            # CISCO-STACK-MIB::moduleEntry
-            #   These are blades in a catalyst device
-            'm_type'         => 'moduleType',
-            'm_model'        => 'moduleModel',
-            'm_serial'       => 'moduleSerialNumber',
-            'm_status'       => 'moduleStatus',
-            'm_name'         => 'moduleName',
-            'm_ports'        => 'moduleNumPorts',
-            'm_ports_status' => 'modulePortStatus',
-            'm_hwver'        => 'moduleHwVersion',
-            'm_fwver'        => 'moduleFwVersion',
-            'm_swver'        => 'moduleSwVersion',
-            # Router Blades :
-            'm_ip'           => 'moduleIPAddress',
-            'm_sub1'         => 'moduleSubType',
-            'm_sub2'         => 'moduleSubType2',
-            # CISCO-STACK-MIB::portEntry 
-            'p_name'    => 'portName',
-            'p_type'    => 'portType',
-            'p_status'  => 'portOperStatus',
-            'p_status2' => 'portAdditionalStatus',
-            'p_speed'   => 'portAdminSpeed',
-            'p_duplex'  => 'portDuplex',
-            'p_port'    => 'portIfIndex',
-            'p_rx_flow_control' => 'portOperRxFlowControl',
-            'p_tx_flow_control' => 'portOperTxFlowControl',
-            'p_rx_flow_control_admin' => 'portAdminRxFlowControl',
-            'p_tx_flow_control_admin' => 'portAdminTxFlowControl',
-            'p_oidx'    => 'portCrossIndex',
-            # CISCO-STACK-MIB::PortCpbEntry
-            'p_speed_admin'  => 'portCpbSpeed',
-            'p_duplex_admin' => 'portCpbDuplex',
-           );
+%FUNCS = (

-%MUNGE   = (
-            'm_ports_status' => \&munge_port_status,
-            'p_duplex_admin' => \&SNMP::Info::munge_bits,
-           );
+    # CISCO-STACK-MIB::moduleEntry
+    #   These are blades in a catalyst device
+    'm_type'         => 'moduleType',
+    'm_model'        => 'moduleModel',
+    'm_serial'       => 'moduleSerialNumber',
+    'm_status'       => 'moduleStatus',
+    'm_name'         => 'moduleName',
+    'm_ports'        => 'moduleNumPorts',
+    'm_ports_status' => 'modulePortStatus',
+    'm_hwver'        => 'moduleHwVersion',
+    'm_fwver'        => 'moduleFwVersion',
+    'm_swver'        => 'moduleSwVersion',

-%PORTSTAT = (1 => 'other',
-             2 => 'ok',
-             3 => 'minorFault',
-             4 => 'majorFault');
+    # Router Blades :
+    'm_ip'   => 'moduleIPAddress',
+    'm_sub1' => 'moduleSubType',
+    'm_sub2' => 'moduleSubType2',
+
+    # CISCO-STACK-MIB::portEntry
+    'p_name'                  => 'portName',
+    'p_type'                  => 'portType',
+    'p_status'                => 'portOperStatus',
+    'p_status2'               => 'portAdditionalStatus',
+    'p_speed'                 => 'portAdminSpeed',
+    'p_duplex'                => 'portDuplex',
+    'p_port'                  => 'portIfIndex',
+    'p_rx_flow_control'       => 'portOperRxFlowControl',
+    'p_tx_flow_control'       => 'portOperTxFlowControl',
+    'p_rx_flow_control_admin' => 'portAdminRxFlowControl',
+    'p_tx_flow_control_admin' => 'portAdminTxFlowControl',
+    'p_oidx'                  => 'portCrossIndex',
+
+    # CISCO-STACK-MIB::PortCpbEntry
+    'p_speed_admin'  => 'portCpbSpeed',
+    'p_duplex_admin' => 'portCpbDuplex',
+);
+
+%MUNGE = (
+    'm_ports_status' => \&munge_port_status,
+    'p_duplex_admin' => \&SNMP::Info::munge_bits,
+);
+
+%PORTSTAT = (
+    1 => 'other',
+    2 => 'ok',
+    3 => 'minorFault',
+    4 => 'majorFault'
+);

 # Changes binary byte describing each port into ascii, and returns
 # an ascii list separated by spaces.
 sub munge_port_status {
    my $status = shift;
-    my @vals = map($PORTSTAT{$_},unpack('C*',$status));
-    return join(' ',@vals);
+    my @vals = map( $PORTSTAT{$_}, unpack( 'C*', $status ) );
+    return join( ' ', @vals );
 }

 sub serial {
-    my $stack = shift;
+    my $stack   = shift;
    my $serial1 = $stack->serial1();
    my $serial2 = $stack->serial2();

    return $serial1 if defined $serial1;
    return $serial2 if defined $serial2;
-    return undef;
+    return;
 }

 # Rules for older CatOS devices using CiscoStack
 #
 # You can configure Ethernet and Fast Ethernet interfaces to either full
-# duplex or half duplex. 
+# duplex or half duplex.
 #
 # You cannot configure the duplex mode on Gigabit Ethernet ports (they are
 # always in full-duplex mode).
 #
-# If you set the port speed to auto, duplex mode is automatically set to auto. 
+# If you set the port speed to auto, duplex mode is automatically set to auto.
 #
 # For operational duplex if portCpbDuplex is all zeros the port is a gigabit
 # port and duplex is always full.  If the port is not operational and auto
@@ -140,31 +145,33 @@ sub serial {
 # checked in the device class.

 sub i_duplex {
-    my $stack = shift;
+    my $stack   = shift;
    my $partial = shift;

-    my $p_port       = $stack->p_port()   || {};
-    my $p_duplex     = $stack->p_duplex() || {};
+    my $p_port       = $stack->p_port()         || {};
+    my $p_duplex     = $stack->p_duplex()       || {};
    my $p_duplex_cap = $stack->p_duplex_admin() || {};

    my $i_duplex = {};
-    foreach my $port (keys %$p_duplex) {
+    foreach my $port ( keys %$p_duplex ) {
        my $iid = $p_port->{$port};
        next unless defined $iid;
-        next if (defined $partial and $iid !~ /^$partial$/);
-        # Test for gigabit 
-        if ($p_duplex_cap->{$port} == 0) {
+        next if ( defined $partial and $iid !~ /^$partial$/ );
+
+        # Test for gigabit
+        if ( $p_duplex_cap->{$port} == 0 ) {
            $i_duplex->{$iid} = 'full';
        }
+
        # Auto is not a valid operational state
-        elsif ($p_duplex->{$port} eq 'auto') {
+        elsif ( $p_duplex->{$port} eq 'auto' ) {
            next;
        }
        else {
            $i_duplex->{$iid} = $p_duplex->{$port};
        }
    }
-    return $i_duplex; 
+    return $i_duplex;
 }

 # For administrative duplex if portCpbDuplex is all zeros the port is a gigabit
@@ -172,63 +179,68 @@ sub i_duplex {
 # duplex will be auto, otherwise use portDuplex.

 sub i_duplex_admin {
-    my $stack = shift;
+    my $stack   = shift;
    my $partial = shift;

-    my $p_port       = $stack->p_port()   || {};
-    my $p_duplex     = $stack->p_duplex() || {};
+    my $p_port       = $stack->p_port()         || {};
+    my $p_duplex     = $stack->p_duplex()       || {};
    my $p_duplex_cap = $stack->p_duplex_admin() || {};
-    my $p_speed      = $stack->p_speed() || {};
+    my $p_speed      = $stack->p_speed()        || {};

    my $i_duplex_admin = {};
-    foreach my $port (keys %$p_duplex) {
+    foreach my $port ( keys %$p_duplex ) {
        my $iid = $p_port->{$port};
        next unless defined $iid;
-        next if (defined $partial and $iid !~ /^$partial$/);
-        # Test for gigabit 
-        if ($p_duplex_cap->{$port} == 0) {
+        next if ( defined $partial and $iid !~ /^$partial$/ );
+
+        # Test for gigabit
+        if ( $p_duplex_cap->{$port} == 0 ) {
            $i_duplex_admin->{$iid} = 'full';
        }
+
        # Check admin speed for auto
-        elsif ($p_speed->{$port} =~ /auto/) {
+        elsif ( $p_speed->{$port} =~ /auto/ ) {
            $i_duplex_admin->{$iid} = 'auto';
        }
        else {
            $i_duplex_admin->{$iid} = $p_duplex->{$port};
        }
    }
-    return $i_duplex_admin; 
+    return $i_duplex_admin;
 }

 sub i_speed_admin {
-    my $stack = shift;
+    my $stack   = shift;
    my $partial = shift;

    my %i_speed_admin;
-    my $p_port  = $stack->p_port();
+    my $p_port  = $stack->p_port() || {};
    my %mapping = reverse %$p_port;
-    my $p_speed = $stack->p_speed($mapping{$partial});
+    my $p_speed = $stack->p_speed( $mapping{$partial} );

-    my %speeds = ('autoDetect'      => 'auto',
-                  'autoDetect10100' => 'auto',
-                  's10000000'       => '10 Mbps',
-                  's100000000'      => '100 Mbps',
-                  's1000000000'     => '1.0 Gbps',
-                  's10G'            => '10 Gbps',
-                 );
+    my %speeds = (
+        'autoDetect'      => 'auto',
+        'autoDetect10100' => 'auto',
+        's10000000'       => '10 Mbps',
+        's100000000'      => '100 Mbps',
+        's1000000000'     => '1.0 Gbps',
+        's10G'            => '10 Gbps',
+    );

-    %i_speed_admin = map { $p_port->{$_} => $speeds{$p_speed->{$_}} } keys %$p_port;
+    %i_speed_admin
+        = map { $p_port->{$_} => $speeds{ $p_speed->{$_} } } keys %$p_port;

    return \%i_speed_admin;
 }

 sub set_i_speed_admin {
+
    # map speeds to those the switch will understand
    my %speeds = qw/auto 1 10 10000000 100 100000000 1000 1000000000/;

    my $stack = shift;
-    my ($speed, $iid) = @_;
-    my $p_port  = $stack->p_port() || {};
+    my ( $speed, $iid ) = @_;
+    my $p_port = $stack->p_port() || {};
    my %reverse_p_port = reverse %$p_port;

    $speed = lc($speed);
@@ -237,24 +249,27 @@ sub set_i_speed_admin {

    $iid = $reverse_p_port{$iid};

-    return $stack->set_p_speed_admin($speeds{$speed}, $iid);
+    return $stack->set_p_speed( $speeds{$speed}, $iid );
 }

 sub set_i_duplex_admin {
+
    # map a textual duplex to an integer one the switch understands
    my %duplexes = qw/half 1 full 2 auto 4/;

    my $stack = shift;
-    my ($duplex, $iid) = @_;
-    if ($duplex eq 'auto') {
-        $stack->error_throw("Software doesn't support setting auto duplex with
+    my ( $duplex, $iid ) = @_;
+    if ( $duplex eq 'auto' ) {
+        $stack->error_throw(
+            "Software doesn't support setting auto duplex with
                            set_i_duplex_admin() you must use
                            set_i_speed_admin() and set both speed and duplex
-                            to auto");
+                            to auto"
+        );
        return 0;
    }

-    my $p_port  = $stack->p_port() || {};
+    my $p_port = $stack->p_port() || {};
    my %reverse_p_port = reverse %$p_port;

    $duplex = lc($duplex);
@@ -263,7 +278,7 @@ sub set_i_duplex_admin {

    $iid = $reverse_p_port{$iid};

-    return $stack->set_p_duplex($duplexes{$duplex}, $iid);
+    return $stack->set_p_duplex( $duplexes{$duplex}, $iid );
 }

 1;
@@ -272,8 +287,8 @@ __END__

 =head1 NAME

-SNMP::Info::CiscoStack - SNMP Inteface to data from CISCO-STACK-MIB and
-CISCO-PORT-SECURITY-MIB
+SNMP::Info::CiscoStack - SNMP Interface to data from F<CISCO-STACK-MIB> and
+F<CISCO-PORT-SECURITY-MIB>

 =head1 AUTHOR

@@ -285,7 +300,6 @@ Max Baker
 my $ciscostats = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -311,56 +325,53 @@ none.

 =over

-=item CISCO-STACK-MIB
+=item F<CISCO-STACK-MIB>

 =back

-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz or from
-Netdisco-mib package at netdisco.org. 
-
 =head1 GLOBALS

 =over

 =item $stack->broadcast()

-(B<sysBroadcast>)
+(C<sysBroadcast>)

 =item $stack->fan()

-(B<chassisFanStatus>)
+(C<chassisFanStatus>)

 =item $stack->model()

-(B<chassisModel>)
+(C<chassisModel>)

 =item $stack->netmask()

-(B<sysNetMask>)
+(C<sysNetMask>)

 =item $stack->ps1_type()

-(B<chassisPs1Type>)
+(C<chassisPs1Type>)

 =item $stack->ps2_type()

-(B<chassisPs2Type>)
+(C<chassisPs2Type>)

 =item $stack->ps1_status()

-(B<chassisPs1Status>)
+(C<chassisPs1Status>)

 =item $stack->ps2_status()

-(B<chassisPs2Status>)
+(C<chassisPs2Status>)

 =item $stack->serial()

-(B<chassisSerialNumberString>) or (B<chassisSerialNumber>)
+(C<chassisSerialNumberString>) or (C<chassisSerialNumber>)

 =item $stack->slots()

-(B<chassisNumSlots>)
+(C<chassisNumSlots>)

 =back

@@ -378,34 +389,40 @@ Returns a map to IID for ports that are physical ports, not vlans, etc.

 Crosses p_port() with p_type() and returns the results. 

-Overrides with ifType if p_type() isn't available.
+Overrides with C<ifType> if p_type() isn't available.

 =item $stack->i_duplex()

 Returns reference to hash of iid to current link duplex setting.

 First checks for fixed gigabit ports which are always full duplex.  Next, if
-the port is not operational and reported port duplex (B<portDuplex>) is auto
+the port is not operational and reported port duplex (C<portDuplex>) is auto
 then the operational duplex can not be determined.  Otherwise it uses the
-reported port duplex (B<portDuplex>).
+reported port duplex (C<portDuplex>).

 =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 (B<portAdminSpeed>) which if set to
+the port administrative speed (C<portAdminSpeed>) which if set to
 autonegotiate then the duplex will also autonegotiate, otherwise it uses the
-reported port duplex (B<portDuplex>).
+reported port duplex (C<portDuplex>).
+
+=item $stack->i_speed_admin()
+
+Returns reference to hash of iid to administrative speed setting.
+
+C<portAdminSpeed>

 =item $stack->set_i_speed_admin(speed, ifIndex)

-    Sets port speed, must be supplied with speed and port ifIndex
+    Sets port speed, must be supplied with speed and port C<ifIndex>

    Speed choices are 'auto', '10', '100', '1000'

    Crosses $stack->p_port() with $stack->p_duplex() to
-    utilize port ifIndex.
+    utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$stack->interfaces()};
@@ -414,12 +431,12 @@ reported port duplex (B<portDuplex>).

 =item $stack->set_i_duplex_admin(duplex, ifIndex)

-    Sets port duplex, must be supplied with duplex and port ifIndex
+    Sets port duplex, must be supplied with duplex and port C<ifIndex>

    Speed choices are 'auto', 'half', 'full'

    Crosses $stack->p_port() with $stack->p_duplex() to
-    utilize port ifIndex.
+    utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$stack->interfaces()};
@@ -437,27 +454,27 @@ the Catalyst device.

 =item $stack->m_type()

-(B<moduleType>)
+(C<moduleType>)

 =item $stack->m_model()

-(B<moduleModel>)
+(C<moduleModel>)

 =item $stack->m_serial()

-(B<moduleSerialNumber>)
+(C<moduleSerialNumber>)

 =item $stack->m_status()

-(B<moduleStatus>)
+(C<moduleStatus>)

 =item $stack->m_name()

-(B<moduleName>)
+(C<moduleName>)

 =item $stack->m_ports()

-(B<moduleNumPorts>)
+(C<moduleNumPorts>)

 =item $stack->m_ports_status()

@@ -468,31 +485,31 @@ To see the status of port 4 :
    @ports_status = split(' ', $stack->m_ports_status() );
    $port4 = $ports_status[3];

-(B<modulePortStatus>)
+(C<modulePortStatus>)

 =item $stack->m_ports_hwver()

-(B<moduleHwVersion>)
+(C<moduleHwVersion>)

 =item $stack->m_ports_fwver()

-(B<moduleFwVersion>)
+(C<moduleFwVersion>)

 =item $stack->m_ports_swver()

-(B<moduleSwVersion>)
+(C<moduleSwVersion>)

 =item $stack->m_ports_ip()

-(B<moduleIPAddress>)
+(C<moduleIPAddress>)

 =item $stack->m_ports_sub1()

-(B<moduleSubType>)
+(C<moduleSubType>)

 =item $stack->m_ports_sub2()

-(B<moduleSubType2>)
+(C<moduleSubType2>)

 =back

@@ -502,59 +519,59 @@ To see the status of port 4 :

 =item $stack->m_ip()

-(B<moduleIPAddress>)
+(C<moduleIPAddress>)

 =item $stack->m_sub1()

-(B<moduleSubType>)
+(C<moduleSubType>)

 =item $stack->m_sub2()

-(B<moduleSubType2>)
+(C<moduleSubType2>)

 =back

-=head2 Port Entry Table (CISCO-STACK-MIB::portTable)
+=head2 Port Entry Table (C<CISCO-STACK-MIB::portTable>)

 =over

 =item $stack->p_name()

-(B<portName>)
+(C<portName>)

 =item $stack->p_type()

-(B<portType>)
+(C<portType>)

 =item $stack->p_status()

-(B<portOperStatus>)
+(C<portOperStatus>)

 =item $stack->p_status2()

-(B<portAdditionalStatus>)
+(C<portAdditionalStatus>)

 =item $stack->p_speed()

-(B<portAdminSpeed>)
+(C<portAdminSpeed>)

 =item $stack->p_duplex()

-(B<portDuplex>)
+(C<portDuplex>)

 =item $stack->p_port()

-(B<portIfIndex>)
+(C<portIfIndex>)

 =item $stack->p_rx_flow_control()

 Can be either C<on> C<off> or C<disagree>

-"Indicates the receive flow control operational status of the port. If the port
-could not agree with the far end on a link protocol, its operational status
-will be disagree(3)."
+"Indicates the receive flow control operational status of the port. If the
+port could not agree with the far end on a link protocol, its operational
+status will be disagree(3)."

-B<portOperRxFlowControl>
+C<portOperRxFlowControl>

 =item $stack->p_tx_flow_control()

@@ -564,7 +581,7 @@ Can be either C<on> C<off> or C<disagree>
 port could not agree with the far end on a link protocol, its operational
 status will be disagree(3)."

-B<portOperTxFlowControl>
+C<portOperTxFlowControl>

 =item $stack->p_rx_flow_control_admin()

@@ -573,36 +590,47 @@ Can be either C<on> C<off> or C<desired>
 "Indicates the receive flow control administrative status set on the port. If
 the status is set to on(1), the port will require the far end to send flow
 control. If the status is set to off(2), the port will not allow far end to
-send flow control.  If the status is set to desired(3), the port will allow the
-far end to send the flow control."
+send flow control.  If the status is set to desired(3), the port will allow
+the far end to send the flow control."

-B<portAdminRxFlowControl>
+C<portAdminRxFlowControl>

 =item $stack->p_tx_flow_control_admin()

 Can be either C<on> C<off> or C<desired>

-"Indicates the transmit flow control administrative status set on the port.  If
-the status is set to on(1), the port will send flow control to the far end.  If
+"Indicates the transmit flow control administrative status set on the port.
+If the status is set to on(1), the port will send flow control to the far end.  If
 the status is set to off(2), the port will not send flow control to the far
-end. If the status is set to desired(3), the port will send flow control to the
-far end if the far end supports it."
+end. If the status is set to desired(3), the port will send flow control to
+the far end if the far end supports it."

-B<portAdminTxFlowControl>
+C<portAdminTxFlowControl>

 =back

-=head2 Port Capability Table (CISCO-STACK-MIB::portCpbTable)
+=head2 Port Capability Table (C<CISCO-STACK-MIB::portCpbTable>)

 =over

 =item $stack->p_speed_admin()

-(B<portCpbSpeed>)
+(C<portCpbSpeed>)

 =item $stack->p_duplex_admin()

-(B<portCpbDuplex>)
+(C<portCpbDuplex>)
+
+=back
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $stack->munge_port_status()
+
+Munges binary byte describing each port into ascii, and returns an ascii
+list separated by spaces.

 =back

--- a/Info/CiscoStats.pm
+++ b/Info/CiscoStats.pm
@@ -1,116 +1,222 @@
 # SNMP::Info::CiscoStats
-# Max Baker
+# $Id$
 #
-# Changes since Version 0.7 Copyright (c) 2004 Max Baker 
-# All rights reserved.  
+# 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
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::CiscoStats;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::CiscoStats::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoStats::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoStats::EXPORT_OK = qw//;

-%MIBS    = (
-            'SNMPv2-MIB'                       => 'sysDescr',
-            'CISCO-PROCESS-MIB'               => 'cpmCPUTotal5sec',
-            'CISCO-MEMORY-POOL-MIB'           => 'ciscoMemoryPoolUsed',
-            'OLD-CISCO-SYSTEM-MIB'            => 'writeMem',
-            'CISCO-PRODUCTS-MIB'              => 'sysName',
-            # some older catalysts live here
-            'CISCO-STACK-MIB'                 => 'wsc1900sysID',    
-            'CISCO-ENTITY-VENDORTYPE-OID-MIB' => 'cevChassis',
-            'CISCO-FLASH-MIB'                 => 'ciscoFlashDeviceSize',
-           );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    'SNMPv2-MIB'            => 'sysDescr',
+    'CISCO-PROCESS-MIB'     => 'cpmCPUTotal5sec',
+    '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',
+    'CISCO-ENTITY-VENDORTYPE-OID-MIB' => 'cevChassis',
+    'CISCO-FLASH-MIB'                 => 'ciscoFlashDeviceSize',
+);

 %GLOBALS = (
-            'description'  => 'sysDescr',
-            # We will use the numeric OID's so that we don't require people
-            # to install v1 MIBs, which can conflict.
-            # OLD-CISCO-CPU-MIB:avgBusyPer
-            'ios_cpu'      => '1.3.6.1.4.1.9.2.1.56.0',
-            'ios_cpu_1min' => '1.3.6.1.4.1.9.2.1.57.0',
-            'ios_cpu_5min' => '1.3.6.1.4.1.9.2.1.58.0',
-            # CISCO-PROCESS-MIB
-            'cat_cpu'      => 'cpmCPUTotal5sec.9',
-            'cat_cpu_1min' => 'cpmCPUTotal1min.9',
-            'cat_cpu_5min' => 'cpmCPUTotal5min.9',
-            # OLD-CISCO-SYSTEM-MIB
-            'write_mem'    => 'writeMem',
-           );
+    'description' => 'sysDescr',
+    'ent_physical_software_rev' => 'entPhysicalSoftwareRev.1',

-%FUNCS   = (
-            # CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolTable
-            'cisco_mem_free'    => 'ciscoMemoryPoolFree',
-            'cisco_mem_used'    => 'ciscoMemoryPoolUsed',
-            # CISCO-FLASH-MIB::ciscoFlashDeviceTable
-            'cisco_flash_size'  => 'ciscoFlashDeviceSize',
-           );
+    # We will use the numeric OID's so that we don't require people
+    # to install v1 MIBs, which can conflict.
+    # OLD-CISCO-CPU-MIB:avgBusyPer
+    'ios_cpu'      => '1.3.6.1.4.1.9.2.1.56.0',
+    'ios_cpu_1min' => '1.3.6.1.4.1.9.2.1.57.0',
+    'ios_cpu_5min' => '1.3.6.1.4.1.9.2.1.58.0',

-%MUNGE   = (
-           );
+    # CISCO-PROCESS-MIB
+    'cat_cpu'      => 'cpmCPUTotal5sec.9',
+    'cat_cpu_1min' => 'cpmCPUTotal1min.9',
+    'cat_cpu_5min' => 'cpmCPUTotal5min.9',
+
+    # OLD-CISCO-SYSTEM-MIB
+    'write_mem' => 'writeMem',
+    'rom_id'    => 'romId',
+);
+
+%FUNCS = (
+
+    # CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolTable
+    'cisco_mem_free' => 'ciscoMemoryPoolFree',
+    'cisco_mem_used' => 'ciscoMemoryPoolUsed',
+
+    # CISCO-FLASH-MIB::ciscoFlashDeviceTable
+    'cisco_flash_size' => 'ciscoFlashDeviceSize',
+);
+
+%MUNGE = ();
+
+sub vendor {
+    return 'cisco';
+}

 sub os {
    my $l2 = shift;
    my $descr = $l2->description() || '';

-    # order here matters - there are Catalysts that run IOS and have catalyst in their description field.
-    return 'ios'      if ($descr =~ /IOS/);
-    return 'catalyst' if ($descr =~ /catalyst/i);
-    return undef;
+    # order here matters - there are Catalysts that run IOS and have catalyst
+    # 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;
 }

 sub os_ver {
    my $l2    = shift;
    my $os    = $l2->os();
    my $descr = $l2->description();
-    
+
    # Older Catalysts
-    if (defined $os and $os eq 'catalyst' and defined $descr and $descr =~ m/V(\d{1}\.\d{2}\.\d{2})/){
+    if (    defined $os
+        and $os eq 'catalyst'
+        and defined $descr
+        and $descr =~ m/V(\d{1}\.\d{2}\.\d{2})/ )
+    {
        return $1;
    }
-    
-    # Newer Catalysts and IOS devices
-    if (defined $descr and $descr =~ m/Version (\d+\.\d+\([^)]+\)[^,\s]*)(,|\s)+/ ){
+
+    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;
-    } 
-    return undef;
+    }
+
+    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;
 }

 sub cpu {
-    my $self = shift;
+    my $self    = shift;
    my $ios_cpu = $self->ios_cpu();
    return $ios_cpu if defined $ios_cpu;
    my $cat_cpu = $self->cat_cpu();
@@ -118,7 +224,7 @@ sub cpu {
 }

 sub cpu_1min {
-    my $self = shift;
+    my $self         = shift;
    my $ios_cpu_1min = $self->ios_cpu_1min();
    return $ios_cpu_1min if defined $ios_cpu_1min;
    my $cat_cpu_1min = $self->cat_cpu_1min();
@@ -126,7 +232,7 @@ sub cpu_1min {
 }

 sub cpu_5min {
-    my $self = shift;
+    my $self         = shift;
    my $ios_cpu_5min = $self->ios_cpu_5min();
    return $ios_cpu_5min if defined $ios_cpu_5min;
    my $cat_cpu_5min = $self->cat_cpu_5min();
@@ -140,7 +246,7 @@ sub mem_free {

    my $cisco_mem_free = $self->cisco_mem_free() || {};

-    foreach my $mem_free_val (values %$cisco_mem_free) {
+    foreach my $mem_free_val ( values %$cisco_mem_free ) {
        $mem_free += $mem_free_val;
    }

@@ -153,8 +259,8 @@ sub mem_used {
    my $mem_used;

    my $cisco_mem_used = $self->cisco_mem_used() || {};
- 
-    foreach my $mem_used_val (values %$cisco_mem_used) {
+
+    foreach my $mem_used_val ( values %$cisco_mem_used ) {
        $mem_used += $mem_used_val;
    }

@@ -169,10 +275,10 @@ sub mem_total {
    my $cisco_mem_free = $self->cisco_mem_free() || {};
    my $cisco_mem_used = $self->cisco_mem_used() || {};

-    foreach my $mem_entry (keys %$cisco_mem_free){
+    foreach my $mem_entry ( keys %$cisco_mem_free ) {
        my $mem_free = $cisco_mem_free->{$mem_entry} || 0;
        my $mem_used = $cisco_mem_used->{$mem_entry} || 0;
-        $mem_total += ($mem_free + $mem_used);
+        $mem_total += ( $mem_free + $mem_used );
    }
    return $mem_total;
 }
@@ -184,7 +290,7 @@ sub flashmem_total {

    my $flash_sizes = $self->cisco_flash_size;

-    foreach my $flash_index (keys %$flash_sizes) {
+    foreach my $flash_index ( keys %$flash_sizes ) {
        $flashmem_total += $flash_sizes->{$flash_index};
    }

@@ -196,23 +302,24 @@ __END__

 =head1 NAME

-SNMP::Info::CiscoStats - Perl5 Interface to CPU and Memory stats for Cisco Devices
+SNMP::Info::CiscoStats - Perl5 Interface to CPU and Memory stats for Cisco
+Devices

 =head1 AUTHOR

-Max Baker
+Eric Miller, Max Baker, Sam Stickland

 =head1 SYNOPSIS

 # Let SNMP::Info determine the correct subclass for you. 
 my $ciscostats = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
-                        ) 
+                    AutoSpecify => 1,
+                    Debug       => 1,
+                    # These arguments are passed directly on to SNMP::Session
+                    DestHost    => 'myswitch',
+                    Community   => 'public',
+                    Version     => 2
+                    ) 
    or die "Can't connect to DestHost.\n";

 my $class      = $ciscostats->class();
@@ -220,8 +327,8 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info::CiscoStats is a subclass of SNMP::Info that provides cpu, memory, os and
-version information about Cisco Devices. 
+SNMP::Info::CiscoStats is a subclass of SNMP::Info that provides cpu, memory,
+os and version information about Cisco Devices. 

 Use or create in a subclass of SNMP::Info.  Do not use directly.

@@ -233,21 +340,23 @@ None.

 =over

-=item CISCO-PRODUCTS-MIB
+=item F<CISCO-PRODUCTS-MIB>

-=item CISCO-PROCESS-MIB
+=item F<CISCO-PROCESS-MIB>

-=item CISCO-MEMORY-POOL-MIB
+=item F<CISCO-MEMORY-POOL-MIB>

-=item SNMPv2-MIB
+=item F<SNMPv2-MIB>

-=item OLD-CISCO-SYSTEM-MIB
+=item F<OLD-CISCO-SYSTEM-MIB>

-=item CISCO-STACK-MIB
+=item F<CISCO-STACK-MIB>

-=item CISCO-ENTITY-VENDORTYPE-OID-MIB
+=item F<CISCO-ENTITY-VENDORTYPE-OID-MIB>

-=item CISCO-FLASH-MIB
+=item F<CISCO-FLASH-MIB>
+
+=item F<ENTITY-MIB>

 =back

@@ -275,78 +384,130 @@ Returns mem_free() + mem_used()

 =item $ciscostats->os()

-Trys to parse if device is running IOS or CatOS from description()
+Tries to parse if device is running IOS or CatOS from description()
+
+=item $ciscostats->vendor()
+
+ 'cisco'
+
+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()

-Trys to parse device operating system version from description()
+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.

-B<1.3.6.1.4.1.9.2.1.56.0> = 
-B<OLD-CISCO-CPU-MIB:avgBusyPer>
+C<1.3.6.1.4.1.9.2.1.56.0> = 
+C<OLD-CISCO-CPU-MIB:avgBusyPer>

 =item $ciscostats->ios_cpu_1min()

 Average CPU Usage in percent over the last minute.

-B<1.3.6.1.4.1.9.2.1.57.0>
+C<1.3.6.1.4.1.9.2.1.57.0>

 =item $ciscostats->ios_cpu_5min()

 Average CPU Usage in percent over the last 5 minutes.

-B<1.3.6.1.4.1.9.2.1.58.0>
+C<1.3.6.1.4.1.9.2.1.58.0>

 =item $ciscostats->cat_cpu()

 Current CPU usage in percent.

-B<CISCO-PROCESS-MIB::cpmCPUTotal5sec.9>
+C<CISCO-PROCESS-MIB::cpmCPUTotal5sec.9>

 =item $ciscostats->cat_cpu_1min()

 Average CPU Usage in percent over the last minute.

-B<CISCO-PROCESS-MIB::cpmCPUTotal1min.9>
+C<CISCO-PROCESS-MIB::cpmCPUTotal1min.9>

 =item $ciscostats->cat_cpu_5min()

 Average CPU Usage in percent over the last 5 minutes.

-B<CISCO-PROCESS-MIB::cpmCPUTotal5min.9>
+C<CISCO-PROCESS-MIB::cpmCPUTotal5min.9>

 =item $ciscostats->mem_free()

 Main DRAM free of the device in bytes.

-B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree>
+C<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree>

 =item $ciscostats->mem_used()

 Main DRAM used of the device in bytes.

-B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>
+C<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>

 =item $ciscostats->mem_total()

 Main DRAM of the device in bytes.

-B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree> + B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>
+C<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree> +
+C<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>

 =item $ciscostats->flashmem_total()

 Flash memory of the device in bytes.

-B<CISCO-FLASH-MIB::ciscoFlashDeviceSize>
+C<CISCO-FLASH-MIB::ciscoFlashDeviceSize>

 =back

 =head1 TABLE METHODS

-=head2 Cisco Memory Pool Table (B<ciscoMemoryPoolTable>)
+=head2 Cisco Memory Pool Table (C<ciscoMemoryPoolTable>)

 =over

@@ -355,18 +516,18 @@ B<CISCO-FLASH-MIB::ciscoFlashDeviceSize>
 The number of bytes from the memory pool that are currently unused on the
 managed device.

-(B<ciscoMemoryPoolFree>)
+(C<ciscoMemoryPoolFree>)

 =item $ciscostats->cisco_mem_used()

 The number of bytes from the memory pool that are currently in use by
 applications on the managed device.

-(B<ciscoMemoryPoolUsed>)
+(C<ciscoMemoryPoolUsed>)

 =back

-=head2 Cisco Flash Device Table (B<ciscoFlashDeviceTable>)
+=head2 Cisco Flash Device Table (C<ciscoFlashDeviceTable>)

 =over

@@ -375,6 +536,8 @@ applications on the managed device.
 Total size of the Flash device.  For a removable device, the size will be
 zero if the device has been removed.

-(B<ciscoFlashDeviceSize>)
+(C<ciscoFlashDeviceSize>)
+
+=back

 =cut
--- a/Info/CiscoStpExtensions.pm
+++ b/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.04';
+@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
--- a/Info/CiscoVTP.pm
+++ b/Info/CiscoVTP.pm
--- a/Info/Entity.pm
+++ b/Info/Entity.pm
@@ -1,104 +1,102 @@
 # SNMP::Info::Entity
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Entity;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::Entity::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::Entity::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Entity::EXPORT_OK = qw//;

-%MIBS    = ('ENTITY-MIB' => 'entPhysicalSerialNum');
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%GLOBALS = (
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-            'e_alias'   => 'entPhysicalAlias',
-            'e_class'   => 'entPhysicalClass',
-            'e_descr'   => 'entPhysicalDescr',
-            'e_fwver'   => 'entPhysicalFirmwareRev',
-            'e_fru'     => 'entPhysicalIsFRU',
-            'e_hwver'   => 'entPhysicalHardwareRev',
-            'e_id'      => 'entPhysicalAssetID',
-            'e_map'     => 'entAliasMappingIdentifier',
-            'e_model'   => 'entPhysicalModelName',
-            'e_name'    => 'entPhysicalName',
-            'e_parent'  => 'entPhysicalContainedIn',
-            'e_pos'     => 'entPhysicalParentRelPos',
-            'e_serial'  => 'entPhysicalSerialNum',
-            'e_swver'   => 'entPhysicalSoftwareRev',
-            'e_type'    => 'entPhysicalVendorType',
-            'e_vendor'  => 'entPhysicalMfgName',
-           );
+%MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );

-%MUNGE   = (
-            'e_type'    => \&munge_e_type,
-           );
+%GLOBALS = ();
+
+%FUNCS = (
+    'e_alias'  => 'entPhysicalAlias',
+    'e_class'  => 'entPhysicalClass',
+    'e_descr'  => 'entPhysicalDescr',
+    'e_fwver'  => 'entPhysicalFirmwareRev',
+    'e_fru'    => 'entPhysicalIsFRU',
+    'e_hwver'  => 'entPhysicalHardwareRev',
+    'e_id'     => 'entPhysicalAssetID',
+    'e_map'    => 'entAliasMappingIdentifier',
+    'e_model'  => 'entPhysicalModelName',
+    'e_name'   => 'entPhysicalName',
+    'e_parent' => 'entPhysicalContainedIn',
+    'e_pos'    => 'entPhysicalParentRelPos',
+    'e_serial' => 'entPhysicalSerialNum',
+    'e_swver'  => 'entPhysicalSoftwareRev',
+    'e_type'   => 'entPhysicalVendorType',
+    'e_vendor' => 'entPhysicalMfgName',
+);
+
+%MUNGE = ( 'e_type' => \&SNMP::Info::munge_e_type, );

 # entPhysicalIndex is not-accessible.  Create to facilitate emulation methods
 # in other classes

 sub e_index {
-    my $entity = shift;
+    my $entity  = shift;
    my $partial = shift;

    # Force use of MIB leaf to avoid inheritance issues in psuedo classes
-    my $e_descr  = $entity->entPhysicalDescr($partial);
+    my $e_descr = $entity->entPhysicalDescr($partial);
+
+    return unless ($e_descr);

-    return undef unless ($e_descr);
-    
    my %e_index;

-    foreach my $iid (keys %$e_descr) {
+    foreach my $iid ( keys %$e_descr ) {
        $e_index{$iid} = $iid;
    }
    return \%e_index;
 }

 sub e_port {
-    my $entity = shift;
+    my $entity  = shift;
    my $partial = shift;

-    my $e_map  = $entity->e_map($partial);
+    my $e_map = $entity->e_map($partial);

    my %e_port;

-    foreach my $e_id (keys %$e_map) {
+    foreach my $e_id ( keys %$e_map ) {
        my $id = $e_id;
        $id =~ s/\.0$//;

@@ -111,18 +109,13 @@ sub e_port {
    return \%e_port;
 }

-sub munge_e_type {
-    my $oid = shift;
-
-    my $name = &SNMP::translateObj($oid);
-    return $name if defined($name);
-    return $oid;
-}
 1;

+__END__
+
 =head1 NAME

-SNMP::Info::Entity - SNMP Interface to data stored in ENTITY-MIB. RFC 2737
+SNMP::Info::Entity - SNMP Interface to data stored in F<ENTITY-MIB>. RFC 2737

 =head1 AUTHOR

@@ -134,7 +127,6 @@ Max Baker
 my $entity = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -146,13 +138,15 @@ Max Baker

 =head1 DESCRIPTION

-ENTITY-MIB is used by Layer 2 devices from HP,Aironet,Foundry,Cisco and more.
+F<ENTITY-MIB> is used by Layer 2 devices from HP, Aironet, Foundry, Cisco,
+and more.

 See RFC 2737 for full details.

 Create or use a device subclass that inherit this class.  Do not use directly.

-For debugging purposes you can call this class directly as you would SNMP::Info
+For debugging purposes you can call this class directly as you would
+SNMP::Info

 my $entity = new SNMP::Info::Entity (...);

@@ -164,7 +158,7 @@ none.

 =over

-=item ENTITY-MIB
+=item F<ENTITY-MIB>

 =back

@@ -253,7 +247,7 @@ More computer friendly name of entity.  Parse me.

 =item $entity->e_port()

-Maps EntityTable entries to the Interface Table (IfTable) using
+Maps Entity Table entries to the Interface Table (C<IfTable>) using
 $entity->e_map()

 =item $entity->e_pos()
@@ -272,7 +266,8 @@ The relative position among all entities sharing the same parent.

 =item $entity->e_type()

-This is an OID.
+This is an OID, which gets munged into the object name if the right
+MIB is loaded.

 (C<entPhysicalVendorType>)

--- a/Info/EtherLike.pm
+++ b/Info/EtherLike.pm
@@ -1,80 +1,78 @@
 # SNMP::Info::EtherLike
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::EtherLike;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::EtherLike::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::EtherLike::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::EtherLike::EXPORT_OK = qw//;

-%MIBS = (
-         'ETHERLIKE-MIB' => 'etherMIB'
-         );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = ( 'EtherLike-MIB' => 'etherMIB' );

 %GLOBALS = ();

 %FUNCS = (
-          # EtherLike StatsTable
-          'el_chipset'         => 'dot3StatsEtherChipSet',
-          'el_coll_excess'     => 'dot3StatsExcessiveCollisions',
-          'el_coll_late'       => 'dot3StatsLateCollisions',
-          'el_coll_mult'       => 'dot3StatsMultipleCollisionFrames',
-          'el_coll_single'     => 'dot3StatsSingleCollisionFrames',
-          'el_duplex'          => 'dot3StatsDuplexStatus',
-          'el_error_alignment' => 'dot3StatsAlignmentErrors',
-          'el_error_fcs'       => 'dot3StatsFCSErrors',
-          'el_error_cs'        => 'dot3StatsCarrierSenseErrors',
-          'el_error_frame'     => 'dot3StatsFrameTooLongs',
-          'el_error_mac_rec'   => 'dot3StatsInternalMacReceiveErrors',
-          'el_error_mac_xmit'  => 'dot3StatsInternalMacTransmitErrors',
-          'el_error_sqe'       => 'dot3StatsSQETestErrors',
-          'el_error_symbol'    => 'dot3StatsSymbolErrors',
-          'el_index'           => 'dot3StatsIndex',
-          'el_xmit_defer'      => 'dot3StatsDeferredTransmissions',
-          # Ethernet-like Collision Statistics Group
-          'el_coll_count'      => 'dot3CollCount',
-          'el_coll_freq'       => 'dot3CollFrequencies'
-          );

-%MUNGE = (
-          %SNMP::Info::MUNGE,
-          'el_duplex' => \&munge_el_duplex,
-         );
+    # EtherLike StatsTable
+    'el_chipset'         => 'dot3StatsEtherChipSet',
+    'el_coll_excess'     => 'dot3StatsExcessiveCollisions',
+    'el_coll_late'       => 'dot3StatsLateCollisions',
+    'el_coll_mult'       => 'dot3StatsMultipleCollisionFrames',
+    'el_coll_single'     => 'dot3StatsSingleCollisionFrames',
+    'el_duplex'          => 'dot3StatsDuplexStatus',
+    'el_error_alignment' => 'dot3StatsAlignmentErrors',
+    'el_error_fcs'       => 'dot3StatsFCSErrors',
+    'el_error_cs'        => 'dot3StatsCarrierSenseErrors',
+    'el_error_frame'     => 'dot3StatsFrameTooLongs',
+    'el_error_mac_rec'   => 'dot3StatsInternalMacReceiveErrors',
+    'el_error_mac_xmit'  => 'dot3StatsInternalMacTransmitErrors',
+    'el_error_sqe'       => 'dot3StatsSQETestErrors',
+    'el_error_symbol'    => 'dot3StatsSymbolErrors',
+    'el_index'           => 'dot3StatsIndex',
+    'el_xmit_defer'      => 'dot3StatsDeferredTransmissions',
+
+    # Ethernet-like Collision Statistics Group
+    'el_coll_count' => 'dot3CollCount',
+    'el_coll_freq'  => 'dot3CollFrequencies'
+);
+
+%MUNGE = ( %SNMP::Info::MUNGE, 'el_duplex' => \&munge_el_duplex, );

 sub munge_el_duplex {
    my $duplex = shift;
@@ -84,14 +82,13 @@ sub munge_el_duplex {
    return $duplex;
 }

-
 1;
 __END__


 =head1 NAME

-SNMP::Info::EtherLike - SNMP Interface to SNMP ETHERLIKE-MIB RFC 1398
+SNMP::Info::EtherLike - SNMP Interface to SNMP F<ETHERLIKE-MIB> RFC 1398

 =head1 AUTHOR

@@ -110,7 +107,8 @@ Max Baker
 my $class = $cdp->class();
 print " Using device sub class : $class\n";

- # Find the duplex setting for a port on a device that implements ETHERLIKE-MIB
+ # Find the duplex setting for a port on a device that implements
+ # ETHERLIKE-MIB
 my $interfaces = $el->interfaces();
 my $el_index   = $el->el_index();
 my $el_duplex  = $el->el_duplex(); 
@@ -126,11 +124,13 @@ Max Baker
 =head1 DESCRIPTION

 SNMP::Info::EtherLike is a subclass of SNMP::Info that supplies 
-access to the ETHERLIKE-MIB used by some Layer 3 Devices such as Cisco routers.
+access to the F<ETHERLIKE-MIB> used by some Layer 3 Devices such as
+Cisco routers.

 See RFC 1398 for more details.

-Use or create a subclass of SNMP::Info that inherits this one.  Do not use directly.
+Use or create a subclass of SNMP::Info that inherits this one.  Do not use
+directly.

 =head2 Inherited Classes

@@ -140,7 +140,7 @@ None.

 =over

-=item ETHERLIKE-MIB
+=item F<ETHERLIKE-MIB>

 =back

@@ -161,7 +161,7 @@ These are methods that return scalar values from SNMP
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 ETHERLIKE STATS TABLE (dot3StatsTable)
+=head2 ETHERLIKE STATS TABLE (C<dot3StatsTable>)

 =over

@@ -169,77 +169,87 @@ to a hash.

 Returns reference to hash. Indexes Stats Table to the interface index (iid).

-(B<dot3StatsIndex>)
+(C<dot3StatsIndex>)

 =item $el->el_duplex()

 Returns reference to hash.  Indexes Stats Table to Duplex Status of port.

-(B<dot3StatsDuplexStatus>)
+(C<dot3StatsDuplexStatus>)

 =item $el->el_chipset()

-(B<dot3StatsEtherChipSet>)
+(C<dot3StatsEtherChipSet>)

 =item $el->el_coll_excess()

-(B<dot3StatsExcessiveCollisions>)
+(C<dot3StatsExcessiveCollisions>)

 =item $el->el_coll_late()

-(B<dot3StatsLateCollisions>)
+(C<dot3StatsLateCollisions>)

 =item $el->el_coll_mult()

-(B<dot3StatsMultipleCollisionFrames>)
+(C<dot3StatsMultipleCollisionFrames>)

 =item $el->el_coll_single()

-(B<dot3StatsSingleCollisionFrames>)
+(C<dot3StatsSingleCollisionFrames>)

 =item $el->el_error_alignment()

-(B<dot3StatsAlignmentErrors>)
+(C<dot3StatsAlignmentErrors>)

 =item $el->el_error_fcs()

-(B<dot3StatsFCSErrors>)
+(C<dot3StatsFCSErrors>)

 =item $el->el_error_cs()

-(B<dot3StatsCarrierSenseErrors>)
+(C<dot3StatsCarrierSenseErrors>)

 =item $el->el_error_frame()

-(B<dot3StatsFrameTooLongs>)
+(C<dot3StatsFrameTooLongs>)

 =item $el->el_error_mac_rec()

-(B<dot3StatsInternalMacReceiveErrors>)
+(C<dot3StatsInternalMacReceiveErrors>)

 =item $el->el_error_mac_xmit()

-(B<dot3StatsInternalMacTransmitErrors>)
+(C<dot3StatsInternalMacTransmitErrors>)

 =item $el->el_error_sqe()

-(B<dot3StatsSQETestErrors>)
+(C<dot3StatsSQETestErrors>)

 =item $el->el_error_symbol()

-(B<dot3StatsSymbolErrors>)
+(C<dot3StatsSymbolErrors>)

 =item $el->el_xmit_defer()

-(B<dot3StatsDeferredTransmissions>)
+(C<dot3StatsDeferredTransmissions>)

 =item $el->el_coll_count()

-(B<dot3CollCount>)
+(C<dot3CollCount>)

 =item $el->el_coll_freq()

-(B<dot3CollFrequencies>)
+(C<dot3CollFrequencies>)
+
+=back
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $el->munge_el_duplex()
+
+Removes 'Duplex' from the end of a string.

 =back

--- a/Info/FDP.pm
+++ b/Info/FDP.pm
@@ -1,95 +1,86 @@
 # SNMP::Info::FDP
-# Bruce Rodger
 # $Id$
 #
-# (c) 2004 Bruce Rodger, Max Baker 
-# All rights reserved.  
+# Copyright (c) 2008 Bruce Rodger, Max Baker
+# All rights reserved.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::FDP;

 use strict;
-
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::FDP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::FDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::FDP::EXPORT_OK = qw//;

-use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
-$VERSION = '1.07';
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS 	= (
-           'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun'
-           );
+$VERSION = '2.04';
+
+%MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );

 %GLOBALS = (
-            # CDP-Compatibility
-            'cdp_interval' => 'snFdpGlobalMessageInterval',
-            'cdp_holdtime' => 'snFdpGlobalHoldTime',
-            'cdp_id'       => 'snFdpGlobalDeviceId',
-            #
-            'fdp_run'      => 'snFdpGlobalRun',
-            'fdp_interval' => 'snFdpGlobalMessageInterval',
-            'fdp_holdtime' => 'snFdpGlobalHoldTime',
-            'fdp_id'       => 'snFdpGlobalDeviceId',
-           );

-%FUNCS  = (
-            'c_index'        => 'snFdpCacheIfIndex',
-            'c_proto'        => 'snFdpCacheAddressType',
-            'c_ip'           => 'snFdpCacheAddress',
-            'c_ver'          => 'snFdpCacheVersion',
-            'c_id'           => 'snFdpCacheDeviceId',
-            'c_port'         => 'snFdpCacheDevicePort',
-            'c_platform'     => 'snFdpCachePlatform',
-            'c_capabilities' => 'snFdpCacheCapabilities',
-            'c_domain'       => 'snFdpCacheVTPMgmtDomain',
-            'c_vlan'         => 'snFdpCacheNativeVLAN',
-            'c_duplex'       => 'snFdpCacheDuplex',
-          );
+    # CDP-Compatibility
+    'cdp_interval' => 'snFdpGlobalMessageInterval',
+    'cdp_holdtime' => 'snFdpGlobalHoldTime',
+    'cdp_id'       => 'snFdpGlobalDeviceId',
+
+    #
+    'fdp_run'      => 'snFdpGlobalRun',
+    'fdp_interval' => 'snFdpGlobalMessageInterval',
+    'fdp_holdtime' => 'snFdpGlobalHoldTime',
+    'fdp_id'       => 'snFdpGlobalDeviceId',
+);
+
+%FUNCS = (
+    'c_index'        => 'snFdpCacheIfIndex',
+    'c_proto'        => 'snFdpCacheAddressType',
+    'c_ip'           => 'snFdpCacheAddress',
+    'c_ver'          => 'snFdpCacheVersion',
+    'c_id'           => 'snFdpCacheDeviceId',
+    'c_port'         => 'snFdpCacheDevicePort',
+    'c_platform'     => 'snFdpCachePlatform',
+    'c_capabilities' => 'snFdpCacheCapabilities',
+    'c_domain'       => 'snFdpCacheVTPMgmtDomain',
+    'c_vlan'         => 'snFdpCacheNativeVLAN',
+    'c_duplex'       => 'snFdpCacheDuplex',
+);

 %MUNGE = (
-          'c_capabilities' => \&munge_caps,
-          'c_ip'           => \&SNMP::Info::munge_ip
-         );
-
-
-sub munge_caps {
-    my $caps = shift;
-    return undef unless defined $caps;
-
-    my $bits = substr(unpack("B*",$caps),-7);
-    return $bits;
-}
+    'c_capabilities' => \&SNMP::Info::munge_caps,
+    'c_ip'           => \&SNMP::Info::munge_ip
+);

 sub cdp_run {
-    my $fdp = shift;
+    my $fdp     = shift;
    my $fdp_run = $fdp->fdp_run();

    # if fdp_run isn't implemented on device, assume FDP is on
@@ -101,40 +92,45 @@ sub hasFDP {
    my $fdp = shift;

    my $ver = $fdp->{_version};
+
    #my $ver = $fdp->fdp_ver;

    # SNMP v1 clients dont have the globals
-    if (defined $ver and $ver == 1){
+    if ( defined $ver and $ver == 1 ) {
        my $fdp_ip = $fdp->fdp_ip();
+
        # See if anything in fdp cache, if so we have fdp
-        return 1 if (defined $fdp_ip and scalar(keys %$fdp_ip)) ;
-        return undef;
+        return 1 if ( defined $fdp_ip and scalar( keys %$fdp_ip ) );
+        return;
    }
-    
+
    return $fdp->fdp_run();
 }

 sub c_if {
-    my $fdp  = shift;
+    my $fdp = shift;

    # See if by some miracle Cisco implemented the fdpCacheIfIndex entry
-    my $fdp_index     = $fdp->fdp_index();
+    my $fdp_index = $fdp->fdp_index();
    return $fdp_index if defined $fdp_index;

    # Nope, didn't think so. Now we fake it.
    my $fdp_ip = $fdp->c_ip();
-    unless (defined $fdp_ip){
-        $fdp->error_throw("SNMP::Info::FDP:fdp_if() - Device doesn't have fdp_ip() data.  Can't fake fdp_index()");
-        return undef;
+    unless ( defined $fdp_ip ) {
+        $fdp->error_throw(
+            "SNMP::Info::FDP:fdp_if() - Device doesn't have fdp_ip() data.  Can't fake fdp_index()"
+        );
+        return;
    }

    my %fdp_if;
-    foreach my $key (keys %$fdp_ip){
-      next unless defined $key;
-      my $iid = $key;
-      # Truncate .1 from fdp cache entry
-      $iid =~ s/\.\d+$//;
-      $fdp_if{$key} = $iid;
+    foreach my $key ( keys %$fdp_ip ) {
+        next unless defined $key;
+        my $iid = $key;
+
+        # Truncate .1 from fdp cache entry
+        $iid =~ s/\.\d+$//;
+        $fdp_if{$key} = $iid;
    }

    return \%fdp_if;
@@ -145,7 +141,8 @@ __END__

 =head1 NAME

-SNMP::Info::FDP - SNMP Interface to Foundry Discovery Protocol (FDP) using SNMP
+SNMP::Info::FDP - SNMP Interface to Foundry Discovery Protocol (FDP) using
+SNMP

 =head1 AUTHOR

@@ -191,7 +188,8 @@ similar functionality to Cisco's CDP, and the SNMP interface is
 virtually identical.  FDP is implemented in Foundry devices, including
 the Bigiron and Fastiron range.

-Create or use a device subclass that inherits this class.  Do not use directly.
+Create or use a device subclass that inherits this class.  Do not use
+directly.

 Each device implements a subset of the global and cache entries. 
 Check the return value to see if that data is held by the device.
@@ -204,17 +202,13 @@ None.

 =over

-=item FOUNDRY-SN-SWITCH-GROUP-MIB
+=item F<FOUNDRY-SN-SWITCH-GROUP-MIB>

 Needs a reasonably recent MIB. Works OK with B2R07604A.mib, but doesn't
 work with B2R07600C. 

-
 =back

-MIBs are normally distributed with each code update. Contact your vendor,
-or trawl through google...
-
 =head1 GLOBAL METHODS

 These are methods that return scalar values from SNMP
@@ -231,27 +225,61 @@ Accounts for SNMP version 1 devices which may have FDP but not fdp_run()

 Is FDP enabled on this device?  

-(B<fdpGlobalRun>)
+(C<fdpGlobalRun>)

 =item $fdp->fdp_interval()

 Interval in seconds at which FDP messages are generated.

-(B<fdpGlobalMessageInterval>)
+(C<fdpGlobalMessageInterval>)

 =item $fdp->fdp_holdtime()

 Time in seconds that FDP messages are kept. 

-(B<fdpGlobalHoldTime>)
+(C<fdpGlobalHoldTime>)

 =item  $fdp->fdp_id() 

 Returns FDP device ID.  

-This is the device id broadcast via FDP to other devices, and is what is retrieved from remote devices with $fdp->id().
+This is the device id broadcast via FDP to other devices, and is what is
+retrieved from remote devices with $fdp->id().

-(B<fdpGlobalDeviceId>)
+(C<fdpGlobalDeviceId>)
+
+=back
+
+=head2 Overrides
+
+CDP compatibility
+
+=over
+
+=item $fdp->c_interval()
+
+Interval in seconds at which FDP messages are generated.
+
+(C<fdpGlobalMessageInterval>)
+
+=item $fdp->c_holdtime()
+
+Time in seconds that FDP messages are kept. 
+
+(C<fdpGlobalHoldTime>)
+
+=item  $fdp->c_id() 
+
+Returns FDP device ID.  
+
+This is the device id broadcast via FDP to other devices, and is what is
+retrieved from remote devices with $fdp->id().
+
+(C<fdpGlobalDeviceId>)
+
+=item $cdp->cdp_run()
+
+Is FDP enabled on this device?

 =back

@@ -260,11 +288,13 @@ This is the device id broadcast via FDP to other devices, and is what is retriev
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 FDP CACHE ENTRIES
+=head2 Overrides
+
+CDP compatibility

 =over

-=item $fdp->fdp_capabilities()
+=item $fdp->c_capabilities()

 Returns Device Functional Capabilities.  Results are munged into an ascii
 binary string, 7 digits long, MSB.  Each digit represents a bit from the
@@ -278,51 +308,59 @@ From L<http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm#1884

 =item (0x40) - Provides level 1 functionality.

-=item (0x20) - The bridge or switch does not forward IGMP Report packets on nonrouter ports.
+=item (0x20) - The bridge or switch does not forward IGMP Report packets on
+non router ports.

-=item (0x10) - Sends and receives packets for at least one network layer protocol. If the device is routing the protocol, this bit should not be set.
+=item (0x10) - Sends and receives packets for at least one network layer
+protocol. If the device is routing the protocol, this bit should not be set.

-=item (0x08) - Performs level 2 switching. The difference between this bit and bit 0x02 is that a switch does not run the Spanning-Tree Protocol. This device is assumed to be deployed in a physical loop-free topology.
+=item (0x08) - Performs level 2 switching. The difference between this bit
+and bit 0x02 is that a switch does not run the Spanning-Tree Protocol. This
+device is assumed to be deployed in a physical loop-free topology.

-=item (0x04) - Performs level 2 source-route bridging. A source-route bridge would set both this bit and bit 0x02.
+=item (0x04) - Performs level 2 source-route bridging. A source-route bridge
+would set both this bit and bit 0x02.

 =item (0x02) - Performs level 2 transparent bridging.

-=item (0x01) - Performs level 3 routing for at least one network layer protocol.
+=item (0x01) - Performs level 3 routing for at least one network layer
+protocol.

 =back

-Thanks to Martin Lorensen C<martin -at- lorensen.dk> for a pointer to this information.
+Thanks to Martin Lorensen C<martin -at- lorensen.dk> for a pointer to
+this information.

-(B<fdpCacheCapabilities>)
+(C<fdpCacheCapabilities>)

-=item $fdp->fdp_domain()
+=item $fdp->c_domain()

-The CDP version of this returns remote VTP Management Domain as defined in CISCO-VTP-MIB::managementDomainName
+The CDP version of this returns remote VTP Management Domain as defined
+in C<CISCO-VTP-MIB::managementDomainName>

-(B<fdpCacheVTPMgmtDomain>)
+(C<fdpCacheVTPMgmtDomain>)

-=item $fdp->fdp_duplex() 
+=item $fdp->c_duplex() 

 Returns the port duplex status from remote devices.

-(B<fdpCacheDuplex>)
+(C<fdpCacheDuplex>)

-=item $fdp->fdp_id()
+=item $fdp->c_id()

 Returns remote device id string

-(B<fdpCacheDeviceId>)
+(C<fdpCacheDeviceId>)

-=item $fdp->fdp_if()
+=item $fdp->c_if()

 Returns the mapping to the SNMP Interface Table.

-Note that a lot devices don't implement $fdp->fdp_index(),  So if it isn't around,
-we fake it. 
+Note that a lot devices don't implement $fdp->fdp_index(),  So if it isn't
+around, we fake it. 

-In order to map the fdp table entry back to the interfaces() entry, we truncate the last number
-off of it :
+In order to map the fdp table entry back to the interfaces() entry, we
+truncate the last number off of it :

  # it exists, yay.
  my $fdp_index     = $device->fdp_index();
@@ -342,51 +380,52 @@ off of it :
  return \%fdp_if;


-=item $fdp->fdp_index()
+=item $fdp->c_index()

 Returns the mapping to the SNMP2 Interface table for FDP Cache Entries. 

-Most devices don't implement this, so you probably want to use $fdp->fdp_if() instead.
+Most devices don't implement this, so you probably want to use $fdp->fdp_if()
+instead.

 See fdp_if() entry.

-(B<fdpCacheIfIndex>)
+(C<fdpCacheIfIndex>)

-=item  $fdp->fdp_ip()
+=item  $fdp->c_ip()

 Returns remote IP address

-(B<fdpCacheAddress>)
+(C<fdpCacheAddress>)

-=item $fdp->fdp_platform() 
+=item $fdp->c_platform() 

 Returns remote platform id 

-(B<fdpCachePlatform>)
+(C<fdpCachePlatform>)

-=item $fdp->fdp_port()
+=item $fdp->c_port()

 Returns remote port ID

-(B<fdpDevicePort>)
+(C<fdpDevicePort>)

-=item  $fdp->fdp_proto()
+=item  $fdp->c_proto()

 Returns remote address type received.  Usually IP.

-(B<fdpCacheAddressType>)
+(C<fdpCacheAddressType>)

-=item $fdp->fdp_ver() 
+=item $fdp->c_ver() 

 Returns remote hardware version

-(B<fdpCacheVersion>)
+(C<fdpCacheVersion>)

-=item $fdp->fdp_vlan()
+=item $fdp->c_vlan()

 Returns the remote interface native VLAN.

-(B<fdpCacheNativeVLAN>)
+(C<fdpCacheNativeVLAN>)

 =back

--- a/Info/IEEE802dot11.pm
+++ b/Info/IEEE802dot11.pm
@@ -1,129 +1,135 @@
 # SNMP::Info::IEEE802dot11
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2006 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::IEEE802dot11;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;

-@SNMP::Info::IEEE802dot11::ISA = qw/Exporter/;
+@SNMP::Info::IEEE802dot11::ISA       = qw/Exporter/;
@SNMP::Info::IEEE802dot11::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            'IEEE802dot11-MIB'     => 'dot11DesiredSSID',
-            );
+$VERSION = '2.04';

-%GLOBALS = (
-            );
+%MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );

-%FUNCS   = (
-            # dot11PhyOFDMTable
-            'dot11_cur_freq'  => 'dot11CurrentFrequency',
-            # dot11PhyDSSSTable
-            'dot11_cur_ch'    => 'dot11CurrentChannel',
-            # dot11PhyOperationTable
-            'dot11_phy_type'  => 'dot11PHYType',
-            'dot11_reg_dom'   => 'dot11CurrentRegDomain',
-            # dot11ResourceInfoTable
-            'dot11_prod_ver'  => 'dot11manufacturerProductVersion',
-            'dot11_prod_name' => 'dot11manufacturerProductName',
-            'dot11_man_name'  => 'dot11manufacturerName',
-            # dot11OperationTable
-            'dot11_mac'       => 'dot11MACAddress',
-            # dot11StationConfigTable
-            'dot11_bss_type'  => 'dot11DesiredBSSType',
-            'i_ssidlist'      => 'dot11DesiredSSID',
-            'dot11_pwr_mode'  => 'dot11PowerManagementMode',
-            'dot11_sta_id'    => 'dot11StationID',
-            # dot11PhyTxPowerTable
-            'dot11_cur_tx_pwr'     => 'dot11CurrentTxPowerLevel',
-            'dot11_tx_pwr_level_1' => 'dot11TxPowerLevel1',
-            'dot11_tx_pwr_level_2' => 'dot11TxPowerLevel2',
-            'dot11_tx_pwr_level_3' => 'dot11TxPowerLevel3',
-            'dot11_tx_pwr_level_4' => 'dot11TxPowerLevel4',
-            'dot11_tx_pwr_level_5' => 'dot11TxPowerLevel5',
-            'dot11_tx_pwr_level_6' => 'dot11TxPowerLevel6',
-            'dot11_tx_pwr_level_7' => 'dot11TxPowerLevel7',
-            'dot11_tx_pwr_level_8' => 'dot11TxPowerLevel8',
-            );
+%GLOBALS = ();

-%MUNGE   = (
-            'dot11_mac'    => \&SNMP::Info::munge_mac,
-            'dot11_sta_id' => \&SNMP::Info::munge_mac,
-            );
+%FUNCS = (
+
+    # dot11PhyOFDMTable
+    'dot11_cur_freq' => 'dot11CurrentFrequency',
+
+    # dot11PhyDSSSTable
+    'dot11_cur_ch' => 'dot11CurrentChannel',
+
+    # dot11PhyOperationTable
+    'dot11_phy_type' => 'dot11PHYType',
+    'dot11_reg_dom'  => 'dot11CurrentRegDomain',
+
+    # dot11ResourceInfoTable
+    'dot11_prod_ver'  => 'dot11manufacturerProductVersion',
+    'dot11_prod_name' => 'dot11manufacturerProductName',
+    'dot11_man_name'  => 'dot11manufacturerName',
+
+    # dot11OperationTable
+    'dot11_mac' => 'dot11MACAddress',
+
+    # dot11StationConfigTable
+    'dot11_bss_type' => 'dot11DesiredBSSType',
+    'i_ssidlist'     => 'dot11DesiredSSID',
+    'dot11_pwr_mode' => 'dot11PowerManagementMode',
+    'dot11_sta_id'   => 'dot11StationID',
+
+    # dot11PhyTxPowerTable
+    'dot11_cur_tx_pwr'     => 'dot11CurrentTxPowerLevel',
+    'dot11_tx_pwr_level_1' => 'dot11TxPowerLevel1',
+    'dot11_tx_pwr_level_2' => 'dot11TxPowerLevel2',
+    'dot11_tx_pwr_level_3' => 'dot11TxPowerLevel3',
+    'dot11_tx_pwr_level_4' => 'dot11TxPowerLevel4',
+    'dot11_tx_pwr_level_5' => 'dot11TxPowerLevel5',
+    'dot11_tx_pwr_level_6' => 'dot11TxPowerLevel6',
+    'dot11_tx_pwr_level_7' => 'dot11TxPowerLevel7',
+    'dot11_tx_pwr_level_8' => 'dot11TxPowerLevel8',
+);
+
+%MUNGE = (
+    'dot11_mac'    => \&SNMP::Info::munge_mac,
+    'dot11_sta_id' => \&SNMP::Info::munge_mac,
+);

 sub vendor {
    my $dot11 = shift;

    my $names = $dot11->dot11_man_name();
-    
-    foreach my $iid (keys %$names){
+
+    foreach my $iid ( keys %$names ) {
        my $vendor = $names->{$iid};
        next unless defined $vendor;
        if ( $vendor =~ /^(\S+)/ ) {
            return lc($1);
        }
    }
-    
-    return undef;
+
+    return;
 }

 sub model {
    my $dot11 = shift;

    my $names = $dot11->dot11_prod_name();
-    
-    foreach my $iid (keys %$names){
+
+    foreach my $iid ( keys %$names ) {
        my $prod = $names->{$iid};
        next unless defined $prod;
        return lc($prod);
-        }
-    return undef;
+    }
+    return;
 }

 sub os_ver {
    my $dot11 = shift;

    my $versions = $dot11->dot11_prod_ver();
-    
-    foreach my $iid (keys %$versions){
+
+    foreach my $iid ( keys %$versions ) {
        my $ver = $versions->{$iid};
        next unless defined $ver;
        if ( $ver =~ /([\d\.]+)/ ) {
            return $1;
        }
    }
-    
-    return undef;
+
+    return;
 }

 sub i_80211channel {
@@ -131,18 +137,18 @@ sub i_80211channel {

    my $phy_type = $dot11->dot11_phy_type() || {};
    my $cur_freq = $dot11->dot11_cur_freq() || {};
-    my $cur_ch   = $dot11->dot11_cur_ch() || {};
+    my $cur_ch   = $dot11->dot11_cur_ch()   || {};

    my %i_80211channel;
-    foreach my $iid (keys %$phy_type){
+    foreach my $iid ( keys %$phy_type ) {
        my $type = $phy_type->{$iid};
        next unless defined $type;
-        if ($type =~ /dsss/) {
+        if ( $type =~ /dsss/ ) {
            my $ch = $cur_ch->{$iid};
            next unless defined $ch;
            $i_80211channel{$iid} = $ch;
        }
-        elsif ($type =~ /ofdm/) {
+        elsif ( $type =~ /ofdm/ ) {
            my $ch = $cur_freq->{$iid};
            next unless defined $ch;
            $i_80211channel{$iid} = $ch;
@@ -156,16 +162,20 @@ sub i_80211channel {
 }

 sub dot11_cur_tx_pwr_mw {
-    my $dot11 = shift;
-    my $partial = shift;
-    my $cur = $dot11->dot11_cur_tx_pwr($partial);
+    my $dot11               = shift;
+    my $partial             = shift;
+    my $cur                 = $dot11->dot11_cur_tx_pwr($partial);
    my $dot11_cur_tx_pwr_mw = {};
-    foreach my $idx (keys %$cur) {
+    foreach my $idx ( keys %$cur ) {
        my $pwr = $cur->{$idx};
-        if ($pwr >= 1 && $pwr <= 8) {
-            my $mw = eval "\$dot11->dot11_tx_pwr_level_$pwr(\$idx)";
+        if ( $pwr >= 1 && $pwr <= 8 ) {
+
+            # ToDo - Look at string eval
+            my $mw
+                = eval "\$dot11->dot11_tx_pwr_level_$pwr(\$idx)"; ## no critic
            $dot11_cur_tx_pwr_mw->{$idx} = $mw->{$idx};
-        } else {
+        }
+        else {
            next;
        }
    }
@@ -178,7 +188,7 @@ __END__

 =head1 NAME

-SNMP::Info::IEEE802dot11 - SNMP Interface to data from IEEE802dot11-MIB
+SNMP::Info::IEEE802dot11 - SNMP Interface to data from F<IEEE802dot11-MIB>

 =head1 AUTHOR

@@ -201,9 +211,9 @@ Eric Miller

 =head1 DESCRIPTION

-SNMP::Info::IEEE802dot11 is a subclass of SNMP::Info that provides an interface
-to C<IEEE802dot11-MIB>.  This MIB is used in standards based 802.11 wireless
-devices.
+SNMP::Info::IEEE802dot11 is a subclass of SNMP::Info that provides an
+interface to F<IEEE802dot11-MIB>.  This MIB is used in standards based
+802.11 wireless devices.

 Use or create a subclass of SNMP::Info that inherits this one.
 Do not use directly.
@@ -220,7 +230,7 @@ None.

 =over

-=item IEEE802dot11-MIB
+=item F<IEEE802dot11-MIB>

 =back

@@ -232,17 +242,17 @@ These are methods that return scalar value from SNMP

 =item $dot11->vendor()

-Trys to discover the vendor from dot11_man_name() - returns lower case
+Tries to discover the vendor from dot11_man_name() - returns lower case
 of the first word in the first instance found.

 =item $dot11->model()

-Trys to discover the model from dot11_prod_name() - returns lower case
+Tries to discover the model from dot11_prod_name() - returns lower case
 of the first instance found.

 =item $dot11->os_ver()

-Trys to discover the operating system version from dot11_prod_ver() - returns
+Tries to discover the operating system version from dot11_prod_ver() - returns
 string of numeric and decimals in the first instance found.

 =back
@@ -258,7 +268,7 @@ to a hash.

 Returns reference to hash.  SSID's recognized by the radio interface.

-(B<dot11DesiredSSID>)
+(C<dot11DesiredSSID>)

 =item $dot11->i_80211channel()

@@ -267,130 +277,130 @@ interface.

 =item $dot11->dot11_cur_tx_pwr_mw()

-Returns reference to hash.  Current transmit power, in milliwats, of the radio
-interface.
+Returns reference to hash.  Current transmit power, in milliwatts, of the
+radio interface.

 =back

-=head2 Dot11 Phy OFDM Table  (B<dot11PhyOFDMTable>)
+=head2 Dot11 Phy OFDM Table  (C<dot11PhyOFDMTable>)

 =over

 =item $dot11->dot11_cur_freq()

-(B<dot11CurrentFrequency>)
+(C<dot11CurrentFrequency>)

 =back

-=head2 Dot11 Phy DSSS Table  (B<dot11PhyDSSSTable>)
+=head2 Dot11 Phy DSSS Table  (C<dot11PhyDSSSTable>)

 =over

 =item $dot11->dot11_cur_ch()

-(B<dot11CurrentChannel>)
+(C<dot11CurrentChannel>)

 =back

-=head2 Dot11 Phy Operation Table  (B<dot11PhyOperationTable>)
+=head2 Dot11 Phy Operation Table  (C<dot11PhyOperationTable>)

 =over

 =item $dot11->dot11_phy_type()

-(B<dot11PHYType>)
+(C<dot11PHYType>)

 =item $dot11->dot11_reg_dom()

-(B<dot11CurrentRegDomain>)
+(C<dot11CurrentRegDomain>)

 =back

-=head2 Dot11 Resource Information Table  (B<dot11ResourceInfoTable>)
+=head2 Dot11 Resource Information Table  (C<dot11ResourceInfoTable>)

 =over

 =item $dot11->dot11_prod_ver()

-(B<dot11manufacturerProductVersion>)
+(C<dot11manufacturerProductVersion>)

 =item $dot11->dot11_prod_name()

-(B<dot11manufacturerProductName>)
+(C<dot11manufacturerProductName>)

 =item $dot11->dot11_man_name()

-(B<dot11manufacturerName>)
+(C<dot11manufacturerName>)

 =back

-=head2 Dot11 Operation Table  (B<dot11OperationTable>)
+=head2 Dot11 Operation Table  (C<dot11OperationTable>)

 =over

 =item $dot11->dot11_mac()

-(B<dot11MACAddress>)
+(C<dot11MACAddress>)

 =back

-=head2 Dot11 Station Configuration Table  (B<dot11StationConfigTable>)
+=head2 Dot11 Station Configuration Table  (C<dot11StationConfigTable>)

 =over

 =item $dot11->dot11_bss_type()

-(B<dot11DesiredBSSType>)
+(C<dot11DesiredBSSType>)

 =item $dot11->dot11_pwr_mode()

-(B<dot11PowerManagementMode>)
+(C<dot11PowerManagementMode>)

 =item $dot11->dot11_sta_id()

-(B<dot11StationID>)
+(C<dot11StationID>)

 =back

-=head2 Dot11 Transmission Power Table  (B<dot11PhyTxPowerTable>)
+=head2 Dot11 Transmission Power Table  (C<dot11PhyTxPowerTable>)

 =over

 =item $dot11->dot11_cur_tx_pwr()

-(B<dot11CurrentTxPowerLevel>)
+(C<dot11CurrentTxPowerLevel>)

 =item $dot11->dot11_tx_pwr_level_1()

-(B<dot11TxPowerLevel1>)
+(C<dot11TxPowerLevel1>)

 =item $dot11->dot11_tx_pwr_level_2()

-(B<dot11TxPowerLevel2>)
+(C<dot11TxPowerLevel2>)

 =item $dot11->dot11_tx_pwr_level_3()

-(B<dot11TxPowerLevel3>)
+(C<dot11TxPowerLevel3>)

 =item $dot11->dot11_tx_pwr_level_4()

-(B<dot11TxPowerLevel4>)
+(C<dot11TxPowerLevel4>)

 =item $dot11->dot11_tx_pwr_level_5()

-(B<dot11TxPowerLevel5>)
+(C<dot11TxPowerLevel5>)

 =item $dot11->dot11_tx_pwr_level_6()

-(B<dot11TxPowerLevel6>)
+(C<dot11TxPowerLevel6>)

 =item $dot11->dot11_tx_pwr_level_7()

-(B<dot11TxPowerLevel7>)
+(C<dot11TxPowerLevel7>)

 =item $dot11->dot11_tx_pwr_level_8()

-(B<dot11TxPowerLevel8>)
+(C<dot11TxPowerLevel8>)

 =back

--- a/Info/IPv6.pm
+++ b/Info/IPv6.pm
@@ -0,0 +1,475 @@
+# 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.04';
+
+
+
+%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) { # 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));
+                $v6addr = join(':', map { sprintf("%04x", $_) } unpack("n*", $v6_packed) );
+                $return->{$row} = $v6addr;
+            }
+        }
+    }
+    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
--- a/Info/LLDP.pm
+++ b/Info/LLDP.pm
@@ -1,8 +1,7 @@
 # SNMP::Info::LLDP
+# $Id$
 #
-# Eric Miller
-#
-# Copyright (c) 2007 Eric Miller
+# Copyright (c) 2008 Eric Miller
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -10,88 +9,78 @@
 #
 #     * 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.
+#     * 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.
+# 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::LLDP;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;
- 
-@SNMP::Info::LLDP::ISA = qw/SNMP::Info Exporter/;
+
+@SNMP::Info::LLDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::LLDP::EXPORT_OK = qw//;

-use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            'LLDP-MIB'          => 'lldpLocSysCapEnabled',
-            'LLDP-EXT-DOT1-MIB' => 'lldpXdot1MIB',
-            'LLDP-EXT-DOT3-MIB' => 'lldpXdot3MIB',            
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    'LLDP-MIB'          => 'lldpLocSysCapEnabled',
+    'LLDP-EXT-DOT1-MIB' => 'lldpXdot1MIB',
+    'LLDP-EXT-DOT3-MIB' => 'lldpXdot3MIB',
+);

 %GLOBALS = (
-            'lldp_sysname'   => 'lldpLocSysName',
-            'lldp_sysdesc'   => 'lldpLocSysDesc',
-            'lldp_sys_cap'   => 'lldpLocSysCapEnabled',
-           );
+    'lldp_sysname' => 'lldpLocSysName',
+    'lldp_sysdesc' => 'lldpLocSysDesc',
+    'lldp_sys_cap' => 'lldpLocSysCapEnabled',
+);

-%FUNCS  = (
-           # LLDP-MIB::lldpLocManAddrTable
-           'lldp_lman_addr'     => 'lldpLocManAddrIfId',
-           # LLDP-MIB::lldpRemTable
-           'lldp_rem_id_type'   => 'lldpRemChassisIdSubtype',
-           'lldp_rem_id'        => 'lldpRemChassisId',
-           'lldp_rem_pid_type'  => 'lldpRemPortIdSubtype',
-           'lldp_rem_pid'       => 'lldpRemPortId',
-           'lldp_rem_desc'      => 'lldpRemPortDesc',
-           'lldp_rem_sysname'   => 'lldpRemSysName',
-           'lldp_rem_sysdesc'   => 'lldpRemSysDesc',
-           'lldp_rem_sys_cap'   => 'lldpRemSysCapEnabled',
-           # LLDP-MIB::lldpRemManAddrTable
-           'lldp_rman_addr'     => 'lldpRemManAddrIfSubtype',
-          );
+%FUNCS = (

+    # LLDP-MIB::lldpLocManAddrTable
+    'lldp_lman_addr' => 'lldpLocManAddrIfId',
+
+    # LLDP-MIB::lldpRemTable
+    'lldp_rem_id_type'  => 'lldpRemChassisIdSubtype',
+    'lldp_rem_id'       => 'lldpRemChassisId',
+    'lldp_rem_pid_type' => 'lldpRemPortIdSubtype',
+    'lldp_rem_pid'      => 'lldpRemPortId',
+    'lldp_rem_desc'     => 'lldpRemPortDesc',
+    'lldp_rem_sysname'  => 'lldpRemSysName',
+    'lldp_rem_sysdesc'  => 'lldpRemSysDesc',
+    'lldp_rem_sys_cap'  => 'lldpRemSysCapEnabled',
+
+    # LLDP-MIB::lldpRemManAddrTable
+    'lldp_rman_addr' => 'lldpRemManAddrIfSubtype',
+);

 %MUNGE = (
-          'lldp_sysdesc'        => \&munge_null,
-          'lldp_sysname'        => \&munge_null,
-          'lldp_rem_sysname'    => \&munge_null,
-          'lldp_rem_sysdesc'    => \&munge_null,
-          'lldp_rem_port_desc'  => \&munge_null,
-          'lldp_sys_cap'        => \&munge_caps,
-          'lldp_rem_sys_cap'    => \&munge_caps,
-         );
-
-sub munge_null {
-    my $text = shift || return;
-    
-    $text =~ s/\0//g;
-    return $text;
-}
-
-sub munge_caps {
-    my $caps = shift;
-    return undef unless defined $caps;
-
-    my $bits = unpack("b*",$caps);
-    return $bits;
-}
+    'lldp_sysdesc'       => \&SNMP::Info::munge_null,
+    'lldp_sysname'       => \&SNMP::Info::munge_null,
+    'lldp_rem_sysname'   => \&SNMP::Info::munge_null,
+    'lldp_rem_sysdesc'   => \&SNMP::Info::munge_null,
+    'lldp_rem_port_desc' => \&SNMP::Info::munge_null,
+    'lldp_sys_cap'       => \&SNMP::Info::munge_bits,
+    'lldp_rem_sys_cap'   => \&SNMP::Info::munge_bits,
+);

 sub hasLLDP {
    my $lldp = shift;
@@ -101,7 +90,7 @@ sub hasLLDP {
    my $lldp_cap = $lldp->lldp_sys_cap();

    return 1 if defined $lldp_cap;
-    return undef;
+    return;
 }

 sub lldp_if {
@@ -109,25 +98,25 @@ sub lldp_if {
    my $partial = shift;

    my $addr = $lldp->lldp_rem_pid($partial) || {};
-    
+
    my %lldp_if;
-    foreach my $key (keys %$addr) {
-        my @aOID = split ('\.',$key);
-	my $port = $aOID[1];
-	$lldp_if{$key} = $port;
+    foreach my $key ( keys %$addr ) {
+        my @aOID = split( '\.', $key );
+        my $port = $aOID[1];
+        $lldp_if{$key} = $port;
    }
    return \%lldp_if;
 }

 sub lldp_ip {
-    my $lldp = shift;
+    my $lldp    = shift;
    my $partial = shift;

    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
-    
-    my %lldp_ip;    
-    foreach my $key (keys %$rman_addr) {
-        my($index, $proto, $addr) = _lldp_addr_index($key);
+
+    my %lldp_ip;
+    foreach my $key ( keys %$rman_addr ) {
+        my ( $index, $proto, $addr ) = _lldp_addr_index($key);
        next unless defined $index;
        next unless $proto == 1;
        $lldp_ip{$index} = $addr;
@@ -136,14 +125,14 @@ sub lldp_ip {
 }

 sub lldp_addr {
-    my $lldp = shift;
+    my $lldp    = shift;
    my $partial = shift;

    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
-    
-    my %lldp_ip;    
-    foreach my $key (keys %$rman_addr) {
-        my($index, $proto, $addr) = _lldp_addr_index($key);
+
+    my %lldp_ip;
+    foreach my $key ( keys %$rman_addr ) {
+        my ( $index, $proto, $addr ) = _lldp_addr_index($key);
        next unless defined $index;
        $lldp_ip{$index} = $addr;
    }
@@ -151,29 +140,31 @@ sub lldp_addr {
 }

 sub lldp_port {
-    my $lldp = shift;
+    my $lldp    = shift;
    my $partial = shift;

-    my $pdesc  = $lldp->lldp_rem_desc($partial) || {};
-    my $pid    = $lldp->lldp_rem_pid($partial) || {};
-    my $ptype  = $lldp->lldp_rem_pid_type($partial) || {};
+    my $pdesc = $lldp->lldp_rem_desc($partial)     || {};
+    my $pid   = $lldp->lldp_rem_pid($partial)      || {};
+    my $ptype = $lldp->lldp_rem_pid_type($partial) || {};

-    my %lldp_port;    
-    foreach my $key (sort keys %$pid) {
+    my %lldp_port;
+    foreach my $key ( sort keys %$pid ) {
        my $port = $pdesc->{$key};
-	unless ($port) {
+        unless ($port) {
            $port = $pid->{$key};
            next unless $port;
-	    my $type = $ptype->{$key};
+            my $type = $ptype->{$key};
            next unless $type;
-            # May need to format other types in the future, i.e. Network address
-            if ($type =~ /mac/) {
-                $port = join(':',map { sprintf "%02x",$_ } unpack('C*',$port));
+
+          # May need to format other types in the future, i.e. Network address
+            if ( $type =~ /mac/ ) {
+                $port = join( ':',
+                    map { sprintf "%02x", $_ } unpack( 'C*', $port ) );
            }
        }

        # Nortel lldpRemPortDesc doesn't match ifDescr, but we can still
-        # figure out slot.port based upon lldpRemPortDesc 
+        # figure out slot.port based upon lldpRemPortDesc
        if ( $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ ) {
            $port = defined $1 ? "$2.$3" : "$3";
        }
@@ -184,22 +175,29 @@ sub lldp_port {
 }

 sub lldp_id {
-    my $lldp = shift;
+    my $lldp    = shift;
    my $partial = shift;
-    
-    my $ch_type = $lldp->lldp_rem_id_type($partial) || {};
-    my $ch = $lldp->lldp_rem_id($partial) || {};

-    my %lldp_id;    
-    foreach my $key (keys %$ch) {
-	my $id = $ch->{$key};
+    my $ch_type = $lldp->lldp_rem_id_type($partial) || {};
+    my $ch      = $lldp->lldp_rem_id($partial)      || {};
+
+    my %lldp_id;
+    foreach my $key ( keys %$ch ) {
+        my $id = $ch->{$key};
        next unless $id;
-	my $type = $ch_type->{$key};
+        my $type = $ch_type->{$key};
        next unless $type;
+
        # May need to format other types in the future
-        if ($type =~ /mac/) {
-            $id = join(':',map { sprintf "%02x",$_ } unpack('C*',$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;
@@ -220,28 +218,32 @@ sub lldp_id {
 #            return $addr if (defined $addr and $lldp->snmp_connect_ip($addr));
 #        }
 #    }
-#    return undef;
+#    return;
 #}

 # Break up the lldpRemManAddrTable INDEX into common index, protocol,
 # and address.
 sub _lldp_addr_index {
-    my $idx = shift;
-    my @oids   = split(/\./, $idx);
-    my $index  = join('.', splice(@oids, 0, 3));
+    my $idx    = shift;
+    my @oids   = split( /\./, $idx );
+    my $index  = join( '.', splice( @oids, 0, 3 ) );
    my $proto  = shift(@oids);
    my $length = shift(@oids);
+
    # IPv4
-    if ($proto == 1) {
-        return ($index, $proto, join('.',@oids));
+    if ( $proto == 1 ) {
+        return ( $index, $proto, join( '.', @oids ) );
    }
+
    # MAC
-    elsif ($proto == 6) {
-        return ($index, $proto, join(':',map { sprintf "%02x",$_ } @oids));
+    elsif ( $proto == 6 ) {
+        return ( $index, $proto,
+            join( ':', map { sprintf "%02x", $_ } @oids ) );
    }
+
    # TODO - Need to handle other protocols, i.e. IPv6
    else {
-        return undef;
+        return;
    }
 }

@@ -294,7 +296,8 @@ LLDP is a Layer 2 protocol that allows a network device to advertise its
 identity and capabilities on the local network providing topology information.
 The protocol is defined in the IEEE standard 802.1AB.

-Create or use a device subclass that inherits this class.  Do not use directly.
+Create or use a device subclass that inherits this class.  Do not use
+directly.

 =head2 Inherited Classes

@@ -304,11 +307,11 @@ None.

 =over

-=item LLDP-MIB
+=item F<LLDP-MIB>

-=item LLDP-EXT-DOT1-MIB
+=item F<LLDP-EXT-DOT1-MIB>

-=item LLDP-EXT-DOT3-MIB  
+=item F<LLDP-EXT-DOT3-MIB>

 =back

@@ -322,28 +325,28 @@ These are methods that return scalar values from SNMP

 Is LLDP is active in this device?  

-Note:  LLDP may be active, but nothing in B<lldpRemoteSystemsData> Tables so
+Note:  LLDP may be active, but nothing in C<lldpRemoteSystemsData> Tables so
 the device would not return any useful topology information.

 =item $lldp->lldp_sysname()

 The string value used to identify the system name of the local system.  If the
-local agent supports IETF RFC 3418, B<lldpLocSysName> object should have the
-same value of B<sysName> object.
+local agent supports IETF RFC 3418, C<lldpLocSysName> object should have the
+same value of C<sysName> object.

 Nulls are removed before the value is returned. 

-(B<lldpLocSysName>)
+(C<lldpLocSysName>)

 =item $lldp->lldp_sysdesc()

 The string value used to identify the system description of the local system.
-If the local agent supports IETF RFC 3418, B<lldpLocSysDesc> object should have
-the same value of B<sysDesc> object.
+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.

-(B<lldpLocSysDesc>)
+(C<lldpLocSysDesc>)

 =item  $lldp->lldp_sys_cap() 

@@ -375,7 +378,7 @@ capability and nothing else."

 =back

-(B<lldpLocSysCapEnabled>)
+(C<lldpLocSysCapEnabled>)

 =back

@@ -391,7 +394,7 @@ to a hash.
 Returns the string value used to identify the chassis component	associated
 with the remote system.

-(B<lldpRemChassisId>)
+(C<lldpRemChassisId>)

 =item $lldp->lldp_if()

@@ -399,13 +402,13 @@ Returns the mapping to the SNMP Interface Table.

 =item  $lldp->lldp_ip()

-Returns remote IPv4 address.  Returns undef for all other address types, use
+Returns remote IPv4 address.  Returns for all other address types, use
 lldp_addr if you want any return address type.

 =item  $lldp->lldp_addr()

-Returns remote address.  Type may be any IANA Address Family Number.  Currently
-only returns IPv4 or MAC addresses.
+Returns remote address.  Type may be any IANA Address Family Number.
+Currently only returns IPv4 or MAC addresses.

 =item $lldp->lldp_port()

@@ -413,7 +416,7 @@ Returns remote port ID

 =back

-=head2 LLDP Remote Table (B<lldpRemTable>)
+=head2 LLDP Remote Table (C<lldpRemTable>)

 =over

@@ -422,28 +425,28 @@ Returns remote port ID
 Returns the type of encoding used to identify the chassis associated with
 the remote system.

-(B<lldpRemChassisIdSubtype>)
+(C<lldpRemChassisIdSubtype>)

 =item $lldp->lldp_rem_id()

 Returns the string value used to identify the chassis component	associated
 with the remote system.

-(B<lldpRemChassisId>)
+(C<lldpRemChassisId>)

 =item $lldp->lldp_rem_pid_type()

 Returns the type of port identifier encoding used in the associated
-B<lldpRemPortId> object.
+C<lldpRemPortId> object.

-(B<lldpRemPortIdSubtype>)
+(C<lldpRemPortIdSubtype>)

 =item $lldp->lldp_rem_pid()

 Returns the string value used to identify the port component associated with
 the remote system.

-(B<lldpRemPortId>)
+(C<lldpRemPortId>)

 =item $lldp->lldp_rem_desc()

@@ -452,15 +455,16 @@ associated with the remote system.

 Nulls are removed before the value is returned. 

-(B<lldpRemPortDesc>)
+(C<lldpRemPortDesc>)

 =item $lldp->lldp_rem_sysname()

-Returns the string value used to identify the system name of the remote system.
+Returns the string value used to identify the system name of the remote
+system.

 Nulls are removed before the value is returned. 

-(B<lldpRemSysName>)
+(C<lldpRemSysName>)

 =item $lldp->lldp_rem_sysdesc()

@@ -469,7 +473,7 @@ remote system.

 Nulls are removed before the value is returned. 

-(B<lldpRemSysDesc>)
+(C<lldpRemSysDesc>)

 =item  $lldp->lldp_rem_sys_cap() 

@@ -501,7 +505,7 @@ capability and nothing else."

 =back

-(B<lldpRemSysCapEnabled>)
+(C<lldpRemSysCapEnabled>)

 =back

--- a/Info/Layer1.pm
+++ b/Info/Layer1.pm
@@ -1,74 +1,73 @@
-# SNMP::Info::Layer1 - SNMP Interface to Layer1 Devices 
-# Max Baker
+# SNMP::Info::Layer1 - SNMP Interface to Layer1 Devices
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Layer1;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
-
-@SNMP::Info::Layer1::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::Layer1::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Layer1::EXPORT_OK = qw//;

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

 %GLOBALS = (
-            %SNMP::Info::GLOBALS,
-            'ports_managed'  => 'ifNumber',
-            'rptr_slots'     => 'rptrGroupCapacity',
-            'slots'          => 'rptrGroupCapacity'
-            );
+    %SNMP::Info::GLOBALS,
+    'ports_managed' => 'ifNumber',
+    'rptr_slots'    => 'rptrGroupCapacity',
+    'slots'         => 'rptrGroupCapacity'
+);

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            'rptr_ports'    => 'rptrGroupPortCapacity',
-            'rptr_port'     => 'rptrPortIndex',
-            'rptr_slot'     => 'rptrPortGroupIndex',
-            'rptr_up_admin' => 'rptrPortAdminStatus',
-            'rptr_up'       => 'rptrPortOperStatus',
-            'rptr_last_src' => 'rptrAddrTrackNewLastSrcAddress',
-           );
+%FUNCS = (
+    %SNMP::Info::FUNCS,
+    'rptr_ports'    => 'rptrGroupPortCapacity',
+    'rptr_port'     => 'rptrPortIndex',
+    'rptr_slot'     => 'rptrPortGroupIndex',
+    'rptr_up_admin' => 'rptrPortAdminStatus',
+    'rptr_up'       => 'rptrPortOperStatus',
+    'rptr_last_src' => 'rptrAddrTrackNewLastSrcAddress',
+);

 %MUNGE = (
-            # Inherit all the built in munging
-            %SNMP::Info::MUNGE,
-            'rptr_last_src'=> \&SNMP::Info::munge_mac,
-         );
+
+    # Inherit all the built in munging
+    %SNMP::Info::MUNGE,
+    'rptr_last_src' => \&SNMP::Info::munge_mac,
+);

 # Method OverRides

@@ -76,23 +75,23 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 sub ports {
    my $l1 = shift;

-    my $ports         = $l1->ports_managed();
-    my $rptr_ports    = $l1->rptr_ports();
+    my $ports      = $l1->ports_managed();
+    my $rptr_ports = $l1->rptr_ports();

-    foreach my $group (keys %$rptr_ports){
-        $ports += $rptr_ports->{$group}; 
+    foreach my $group ( keys %$rptr_ports ) {
+        $ports += $rptr_ports->{$group};
    }

    return $ports;
 }

 # $l1->model() - Looks at sysObjectID which gives the oid of the system
-#       name, contained in a propriatry MIB. 
+#       name, contained in a propriatry MIB.
 sub model {
-    my $l1 = shift;
-    my $id = $l1->id();
+    my $l1    = shift;
+    my $id    = $l1->id();
    my $model = &SNMP::translateObj($id);
-    
+
    # HP
    $model =~ s/^hpswitch//i;

@@ -103,56 +102,58 @@ sub model {
 }

 sub vendor {
-    my $l1 = shift;
+    my $l1    = shift;
    my $descr = $l1->description();

-    return 'hp' if ($descr =~ /hp/i);
-    return 'cisco' if ($descr =~ /(catalyst|cisco|ios)/i);
-    return 'allied' if ($descr =~ /allied/i);
-    return 'asante' if ($descr =~ /asante/i);
+    return 'hp'     if ( $descr =~ /hp/i );
+    return 'cisco'  if ( $descr =~ /(catalyst|cisco|ios)/i );
+    return 'allied' if ( $descr =~ /allied/i );
+    return 'asante' if ( $descr =~ /asante/i );
+
+    return 'unknown';

 }

 # By Default we'll use the description field
 sub interfaces {
-    my $l1 = shift;
+    my $l1      = shift;
    my $partial = shift;

-    my $interfaces = $l1->i_index($partial) || {};
+    my $interfaces = $l1->i_index($partial)   || {};
    my $rptr_port  = $l1->rptr_port($partial) || {};

-    foreach my $port (keys %$rptr_port){
+    foreach my $port ( keys %$rptr_port ) {
        $interfaces->{$port} = $port;
    }
    return $interfaces;
 }

 sub i_up_admin {
-    my $l1 = shift;
+    my $l1      = shift;
    my $partial = shift;

-    my $i_up_admin = $l1->SUPER::i_up_admin($partial) || {};
-    my $rptr_up_admin = $l1->rptr_up_admin($partial) || {};
+    my $i_up_admin    = $l1->SUPER::i_up_admin($partial) || {};
+    my $rptr_up_admin = $l1->rptr_up_admin($partial)     || {};

-    foreach my $key (keys %$rptr_up_admin){
+    foreach my $key ( keys %$rptr_up_admin ) {
        my $up = $rptr_up_admin->{$key};
-        $i_up_admin->{$key} = 'up' if $up =~ /enabled/; 
-        $i_up_admin->{$key} = 'down' if $up =~ /disabled/; 
+        $i_up_admin->{$key} = 'up'   if $up =~ /enabled/;
+        $i_up_admin->{$key} = 'down' if $up =~ /disabled/;
    }

    return $i_up_admin;
 }

 sub i_up {
-    my $l1 = shift;
+    my $l1      = shift;
    my $partial = shift;

-    my $i_up = $l1->SUPER::i_up($partial) || {};
-    my $rptr_up = $l1->rptr_up($partial) || {};
+    my $i_up    = $l1->SUPER::i_up($partial) || {};
+    my $rptr_up = $l1->rptr_up($partial)     || {};

-    foreach my $key (keys %$rptr_up){
+    foreach my $key ( keys %$rptr_up ) {
        my $up = $rptr_up->{$key};
-        $i_up->{$key} = 'up' if $up =~ /operational/; 
+        $i_up->{$key} = 'up' if $up =~ /operational/;
    }

    return $i_up;
@@ -175,7 +176,6 @@ Max Baker
 my $l1 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -223,7 +223,7 @@ after determining a more specific class using the method above.

 =over

-=item SNMP-REPEATER-MIB
+=item F<SNMP-REPEATER-MIB>

 =back

@@ -231,7 +231,7 @@ MIBs required for L<SNMP::Info/"Required MIBs">

 See L<SNMP::Info/"Required MIBs"> for its MIB requirements.

-SNMP-REPEATER-MIB needs to be extracted from
+F<SNMP-REPEATER-MIB> needs to be extracted from
 ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz

 =head1 GLOBALS
@@ -244,7 +244,7 @@ These are methods that return scalar value from SNMP

 Gets the number of ports under the interface mib 

-(B<ifNumber>)
+(C<ifNumber>)

 =back

@@ -252,9 +252,17 @@ Gets the number of ports under the interface mib

 =over

+=item $l1->model()
+
+Cross references $l1->id() with product IDs.
+
+For HP devices, removes C<'hpswitch'> from the name
+
+For Cisco devices, removes C<'sysid'> from the name
+
 =item $l1->vendor()

-Trys to discover the vendor from $l1->model() and $l1->vendor()
+Tries to discover the vendor from $l1->model() and $l1->vendor()

 =item $l1->ports()

@@ -264,7 +272,7 @@ Adds the values from rptr_ports() and ports_managed()

 Number of 'groups' in the Repeater MIB

-(B<rptrGroupCapacity>)
+(C<rptrGroupCapacity>)

 =back

@@ -283,10 +291,16 @@ to a hash.

 =item $l1->interfaces()

+Returns reference to the map between IID and physical Port.
+
 =item $l1->i_up()

+Returns reference to map of IIDs to link status.
+
 =item $l1->i_up_admin()

+Returns reference to map of IIDs to administrative link status.
+
 =back

 =head2 Repeater MIB
@@ -297,31 +311,31 @@ to a hash.

 Number of ports in each group.

-(B<rptrGroupPortCapacity>)
+(C<rptrGroupPortCapacity>)

 =item $l1->rptr_port()

 Port number in Group

-(B<rptrPortIndex>)
+(C<rptrPortIndex>)

 =item $l1->rptr_slot()

 Group (slot) Number for given port.

-(B<rptrPortGroupIndex>)
+(C<rptrPortGroupIndex>)

 =item $l1->rptr_up_admin()

-(B<rptrPortAdminStatus>)
+(C<rptrPortAdminStatus>)

 =item $l1->rptr_up()

-(B<rptrPortOperStatus>)
+(C<rptrPortOperStatus>)

 =item $l1->rptr_last_src()

-(B<rptrAddrTrackNewLastSrcAddress>)
+(C<rptrAddrTrackNewLastSrcAddress>)

 =back

--- a/Info/Layer1/Allied.pm
+++ b/Info/Layer1/Allied.pm
@@ -1,65 +1,60 @@
 # SNMP::Info::Layer1::Allied
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Layer1::Allied;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer1;

-@SNMP::Info::Layer1::Allied::ISA = qw/SNMP::Info::Layer1 Exporter/;
+@SNMP::Info::Layer1::Allied::ISA       = qw/SNMP::Info::Layer1 Exporter/;
@SNMP::Info::Layer1::Allied::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 # Set for No CDP
-%GLOBALS = (
-            %SNMP::Info::Layer1::GLOBALS,
-            'root_ip'   => 'actualIPAddr',
-            );
+%GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );

-%FUNCS   = (%SNMP::Info::Layer1::FUNCS,
-            'ati_p_name' => 'portName',
-            'ati_up'     => 'linkTestLED',
-            );
+%FUNCS = (
+    %SNMP::Info::Layer1::FUNCS,
+    'ati_p_name' => 'portName',
+    'ati_up'     => 'linkTestLED',
+);

-%MIBS    = (
-            %SNMP::Info::Layer1::MIBS,
-            'ATI-MIB' => 'atiPortGroupIndex'
-            );
+%MIBS = ( %SNMP::Info::Layer1::MIBS, 'ATI-MIB' => 'atiPortGroupIndex' );

-%MUNGE   = (%SNMP::Info::Layer1::MUNGE,
-            );
+%MUNGE = ( %SNMP::Info::Layer1::MUNGE, );

 sub vendor {
    return 'allied';
@@ -71,9 +66,9 @@ sub os {

 sub os_ver {
    my $allied = shift;
-    my $descr = $allied->description();
-    
-    if ($descr =~ m/version (\d+\.\d+)/){
+    my $descr  = $allied->description();
+
+    if ( $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
 }
@@ -83,40 +78,40 @@ sub model {

    my $desc = $allied->description();

-    if ($desc =~ /(AT-\d{4}\S{1}?)/){
+    if ( $desc =~ /(AT-\d{4}\S{1}?)/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

-sub i_name{
-    my $allied = shift;
+sub i_name {
+    my $allied  = shift;
    my $partial = shift;

-    my $i_name = $allied->orig_i_name($partial) || {};
-    my $ati_p_name = $allied->ati_p_name($partial) || {};
+    my $i_name     = $allied->orig_i_name($partial) || {};
+    my $ati_p_name = $allied->ati_p_name($partial)  || {};

-    foreach my $port (keys %$ati_p_name){
+    foreach my $port ( keys %$ati_p_name ) {
        my $name = $ati_p_name->{$port};
-        $i_name->{$port} = $name if (defined $name and $name !~ /^\s*$/);
+        $i_name->{$port} = $name if ( defined $name and $name !~ /^\s*$/ );
    }
-    
+
    return $i_name;
 }

 sub i_up {
-    my $allied = shift;
+    my $allied  = shift;
    my $partial = shift;

-    my $i_up = SNMP::Info::Layer1::i_up($allied, $partial);
+    my $i_up = SNMP::Info::Layer1::i_up( $allied, $partial );
    my $ati_up = $allied->ati_up($partial) || {};

-    foreach my $port (keys %$ati_up){
+    foreach my $port ( keys %$ati_up ) {
        my $up = $ati_up->{$port};
        $i_up->{$port} = 'down' if $up eq 'linktesterror';
-        $i_up->{$port} = 'up' if $up eq 'nolinktesterror';
+        $i_up->{$port} = 'up'   if $up eq 'nolinktesterror';
    }
-    
+
    return $i_up;
 }
 1;
@@ -136,7 +131,6 @@ Max Baker
 my $allied = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
@@ -164,9 +158,7 @@ inherited methods.

 =over

-=item ATI-MIB 
-
-Download for your device from http://www.allied-telesyn.com/allied/support/
+=item F<ATI-MIB>

 =back

@@ -198,11 +190,11 @@ Culls Version from description()

 Returns IP Address of Managed Hub.

-(B<actualIpAddr>)
+(C<actualIpAddr>)

 =item $allied->model()

-Trys to cull out AT-nnnnX out of the description field.
+Tries to cull out C<AT-nnnnX> out of the description field.

 =back

@@ -233,11 +225,11 @@ the values of ati_up() to 'up' and 'down'.

 =item $allied->ati_p_name()

-(B<portName>)
+(C<portName>)

 =item $allied->ati_up()

-(B<linkTestLED>)
+(C<linkTestLED>)

 =back

--- a/Info/Layer1/Asante.pm
+++ b/Info/Layer1/Asante.pm
@@ -1,77 +1,72 @@
 # SNMP::Info::Layer1::Asante
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Layer1::Asante;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer1;

-@SNMP::Info::Layer1::Asante::ISA = qw/SNMP::Info::Layer1 Exporter/;
+@SNMP::Info::Layer1::Asante::ISA       = qw/SNMP::Info::Layer1 Exporter/;
@SNMP::Info::Layer1::Asante::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 # Set for No CDP
-%GLOBALS = (
-            %SNMP::Info::Layer1::GLOBALS,
-            );
+%GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );

-%FUNCS   = (%SNMP::Info::Layer1::FUNCS,
-            'asante_port'  => 'ePortIndex',
-            'asante_group' => 'ePortGrpIndex',
-            'i_type'       => 'ePortStateType',
-            'asante_up'    => 'ePortStateLinkStatus',
-            );
+%FUNCS = (
+    %SNMP::Info::Layer1::FUNCS,
+    'asante_port'  => 'ePortIndex',
+    'asante_group' => 'ePortGrpIndex',
+    'i_type'       => 'ePortStateType',
+    'asante_up'    => 'ePortStateLinkStatus',
+);

-%MIBS    = (
-            %SNMP::Info::Layer1::MIBS,
-            'ASANTE-HUB1012-MIB' => 'asante'
-            );
+%MIBS = ( %SNMP::Info::Layer1::MIBS, 'ASANTE-HUB1012-MIB' => 'asante' );

-%MUNGE   = (
-            %SNMP::Info::Layer1::MUNGE,
-            );
+%MUNGE = ( %SNMP::Info::Layer1::MUNGE, );

 sub interfaces {
-    my $asante = shift;
+    my $asante  = shift;
    my $partial = shift;

    my $rptr_port = $asante->rptr_port($partial) || {};

    my %interfaces;

-    foreach my $port (keys %$rptr_port){
+    foreach my $port ( keys %$rptr_port ) {
        $interfaces{$port} = $port;
    }

@@ -84,13 +79,13 @@ sub os {

 sub os_ver {
    my $asante = shift;
-    my $descr = $asante->description();
-    
-    if ($descr =~ /software v(\d+\.\d+)/){
+    my $descr  = $asante->description();
+
+    if ( $descr =~ /software v(\d+\.\d+)/ ) {
        return $1;
    }
 }
-    
+
 sub vendor {
    return 'asante';
 }
@@ -98,30 +93,30 @@ sub vendor {
 sub model {
    my $asante = shift;

-    my $id = $asante->id();
+    my $id    = $asante->id();
    my $model = &SNMP::translateObj($id);

    return $model;
 }

 sub i_up {
-    my $asante = shift;
+    my $asante  = shift;
    my $partial = shift;

    my $asante_up = $asante->asante_up($partial) || {};

    my $i_up = {};
-    foreach my $port (keys %$asante_up){
+    foreach my $port ( keys %$asante_up ) {
        my $up = $asante_up->{$port};
        $i_up->{$port} = 'down' if $up =~ /on/;
-        $i_up->{$port} = 'up' if $up =~ /off/;
+        $i_up->{$port} = 'up'   if $up =~ /off/;
    }
-    
+
    return $i_up;
 }

 sub i_speed {
-    my $asante = shift;
+    my $asante  = shift;
    my $partial = shift;

    my $i_speed = $asante->orig_i_speed($partial) || {};
@@ -134,7 +129,7 @@ sub i_speed {
 }

 sub i_mac {
-    my $asante = shift;
+    my $asante  = shift;
    my $partial = shift;

    my $i_mac = $asante->orig_i_mac($partial) || {};
@@ -147,11 +142,11 @@ sub i_mac {
 }

 sub i_description {
-    return undef;
+    return;
 }

 sub i_name {
-    my $asante = shift;
+    my $asante  = shift;
    my $partial = shift;

    my $i_name = $asante->orig_i_descr($partial) || {};
@@ -162,7 +157,9 @@ sub i_name {

    return \%i_name;
 }
+
 1;
+
 __END__

 =head1 NAME
@@ -179,7 +176,6 @@ Max Baker
 my $asante = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -206,9 +202,7 @@ Asante device through SNMP.

 =over

-=item ASANTE-HUB1012-MIB
-
-Download from http://www.mibdepot.com
+=item F<ASANTE-HUB1012-MIB>

 =back

@@ -236,7 +230,7 @@ Returns 'asante' :)

 =item $asante->model()

-Cross references $asante->id() to the ASANTE-HUB1012-MIB and returns
+Cross references $asante->id() to the F<ASANTE-HUB1012-MIB> and returns
 the results.

 =back
@@ -251,6 +245,19 @@ See L<SNMP::Info::Layer1/"GLOBALS"> for details.

 =over

+=item $asante->interfaces()
+
+Returns reference to the map between IID and physical Port.
+
+=item $asante->i_description() 
+
+Description of the interface.
+
+=item $asante->i_mac()
+
+MAC address of the interface.  Note this is just the MAC of the port, not
+anything connected to it.
+
 =item $asante->i_name()

 Returns reference to map of IIDs to human-set port name.
@@ -260,6 +267,10 @@ Returns reference to map of IIDs to human-set port name.
 Returns reference to map of IIDs to link status.  Changes
 the values of asante_up() to 'up' and 'down'.

+=item $asante->i_speed()
+
+Speed of the link, human format.
+
 =back

 =head2 Asante MIB
@@ -268,11 +279,11 @@ the values of asante_up() to 'up' and 'down'.

 =item $asante->ati_p_name()

-(B<portName>)
+(C<portName>)

 =item $asante->ati_up()

-(B<linkTestLED>)
+(C<linkTestLED>)

 =back

--- a/Info/Layer1/Bayhub.pm
+++ b/Info/Layer1/Bayhub.pm
@@ -1,84 +1,88 @@
 # SNMP::Info::Layer1::Bayhub
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller, Max Baker
+# Copyright (c) 2008 Eric Miller, Max Baker
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Layer1::Bayhub;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::NortelStack;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer1::Bayhub::ISA = qw/SNMP::Info::SONMP SNMP::Info::NortelStack  SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer1::Bayhub::ISA
+    = qw/SNMP::Info::SONMP SNMP::Info::NortelStack  SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer1::Bayhub::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::NortelStack::MIBS,            
-            %SNMP::Info::SONMP::MIBS,
-            'S5-ETHERNET-COMMON-MIB'     => 's5EnPortTable',
-            'S5-COMMON-STATS-MIB'        => 's5CmStat',
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::NortelStack::MIBS,
+    %SNMP::Info::SONMP::MIBS,
+    'S5-ETHERNET-COMMON-MIB' => 's5EnPortTable',
+    'S5-COMMON-STATS-MIB'    => 's5CmStat',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::NortelStack::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-            );
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::NortelStack::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS,
+);

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::NortelStack::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-            # S5-ETHERNET-COMMON-MIB::s5EnPortTable
-            'bayhub_pb_index'        => 's5EnPortBrdIndx',
-            'bayhub_pp_index'        => 's5EnPortIndx',
-            'bayhub_up_admin'        => 's5EnPortPartStatus',
-            'bayhub_up'              => 's5EnPortLinkStatus',
-            # S5-ETHERNET-COMMON-MIB::s5EnPortExtTable
-            'bayhub_p_speed'        => 's5EnPortExtActiveSpeed',
-            'bayhub_p_cap'          => 's5EnPortExtHwCapability',
-            'bayhub_p_adv'          => 's5EnPortExtAutoNegAdv',
-            # S5-COMMON-STATS-MIB::s5CmSNodeTable
-            'bayhub_nb_index'        => 's5CmSNodeBrdIndx',
-            'bayhub_np_index'        => 's5CmSNodePortIndx',
-            'fw_mac'                 => 's5CmSNodeMacAddr',
-            );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::NortelStack::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::NortelStack::MUNGE,
-            %SNMP::Info::SONMP::MUNGE,
-            );
+    # S5-ETHERNET-COMMON-MIB::s5EnPortTable
+    'bayhub_pb_index' => 's5EnPortBrdIndx',
+    'bayhub_pp_index' => 's5EnPortIndx',
+    'bayhub_up_admin' => 's5EnPortPartStatus',
+    'bayhub_up'       => 's5EnPortLinkStatus',
+
+    # S5-ETHERNET-COMMON-MIB::s5EnPortExtTable
+    'bayhub_p_speed' => 's5EnPortExtActiveSpeed',
+    'bayhub_p_cap'   => 's5EnPortExtHwCapability',
+    'bayhub_p_adv'   => 's5EnPortExtAutoNegAdv',
+
+    # S5-COMMON-STATS-MIB::s5CmSNodeTable
+    'bayhub_nb_index' => 's5CmSNodeBrdIndx',
+    'bayhub_np_index' => 's5CmSNodePortIndx',
+    'fw_mac'          => 's5CmSNodeMacAddr',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE, %SNMP::Info::NortelStack::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
+);

 sub layers {
    return '00000011';
@@ -94,15 +98,15 @@ sub vendor {

 sub model {
    my $bayhub = shift;
-    my $id = $bayhub->id();
-    return undef unless defined $id;
+    my $id     = $bayhub->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;
    $model =~ s/^sreg-//i;

-    return 'Baystack Hub' if ($model =~ /BayStack/);
-    return '5000' if ($model =~ /5000/);
-    return '5005' if ($model =~ /5005/);
+    return 'Baystack Hub' if ( $model =~ /BayStack/ );
+    return '5000'         if ( $model =~ /5000/ );
+    return '5005'         if ( $model =~ /5005/ );
    return $model;
 }

@@ -110,33 +114,35 @@ sub model {
 # and port status

 sub i_index {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

    my $b_index = $bayhub->bayhub_pb_index($partial) || {};
    my $p_index = $bayhub->bayhub_pp_index($partial) || {};
-    my $model = $bayhub->model() || 'Baystack Hub';
+    my $model   = $bayhub->model()                   || 'Baystack Hub';

    my %i_index;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
+        my $port = $p_index->{$iid} || 0;

-        if ($model eq 'Baystack Hub') {
+        if ( $model eq 'Baystack Hub' ) {
            my $comidx = $board;
-               if (! ($comidx % 5)) {
-                  $board = ($board / 5);
-               } elsif ($comidx =~ /[16]$/) {
-                  $board = int($board/5);
-                  $port = 25;          
-               } elsif ($comidx =~ /[27]$/) {
-                  $board = int($board/5);
-                  $port = 26;          
-               }
-          }
+            if ( !( $comidx % 5 ) ) {
+                $board = ( $board / 5 );
+            }
+            elsif ( $comidx =~ /[16]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 25;
+            }
+            elsif ( $comidx =~ /[27]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 26;
+            }
+        }

-        my $index = ($board*256)+$port;
+        my $index = ( $board * 256 ) + $port;

        $i_index{$iid} = $index;
    }
@@ -147,23 +153,23 @@ sub i_index {
 # for consistency

 sub interfaces {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

    my $i_index = $bayhub->i_index() || {};

    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

        # Index numbers are deterministic slot * 256 + port
        my $port = $index % 256;
-        my $slot = int($index / 256);
+        my $slot = int( $index / 256 );

        my $slotport = "$slot.$port";
-    
+
        $if{$index} = $slotport;
    }

@@ -171,113 +177,114 @@ sub interfaces {
 }

 sub i_duplex {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

-    my $port_index  = $bayhub->i_index() || {};
+    my $port_index = $bayhub->i_index() || {};

    my %i_duplex;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
-    
+        next if ( defined $partial and $index !~ /^$partial$/ );
+
        my $duplex = 'half';
-        $i_duplex{$index}=$duplex; 
+        $i_duplex{$index} = $duplex;
    }
    return \%i_duplex;
 }

 sub i_duplex_admin {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

-    my $port_index  = $bayhub->i_index() || {};
+    my $port_index = $bayhub->i_index() || {};

    my %i_duplex_admin;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
-    
+        next if ( defined $partial and $index !~ /^$partial$/ );
+
        my $duplex = 'half';
-        $i_duplex_admin{$index}=$duplex; 
+        $i_duplex_admin{$index} = $duplex;
    }
    return \%i_duplex_admin;
 }

 sub i_speed {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

-    my $port_index  = $bayhub->i_index() || {};
-    my $port_speed  = $bayhub->bayhub_p_speed() || {};
+    my $port_index = $bayhub->i_index()        || {};
+    my $port_speed = $bayhub->bayhub_p_speed() || {};

    my %i_speed;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $speed = $port_speed->{$iid} || '10 Mbps';

-        $speed = '10 Mbps' if $speed =~ /bps10M/i;
+        $speed = '10 Mbps'  if $speed =~ /bps10M/i;
        $speed = '100 Mbps' if $speed =~ /bps100M/i;
-        $i_speed{$index}=$speed; 
+        $i_speed{$index} = $speed;
    }
    return \%i_speed;
 }

 sub i_up {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

-    my $port_index = $bayhub->i_index() || {};
-    my $link_stat = $bayhub->bayhub_up() || {};
-   
+    my $port_index = $bayhub->i_index()   || {};
+    my $link_stat  = $bayhub->bayhub_up() || {};
+
    my %i_up;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $link_stat = $link_stat->{$iid};
        next unless defined $link_stat;
-        
-        $link_stat = 'up' if $link_stat =~ /on/i;
+
+        $link_stat = 'up'   if $link_stat =~ /on/i;
        $link_stat = 'down' if $link_stat =~ /off/i;
-             
-        $i_up{$index}=$link_stat; 
+
+        $i_up{$index} = $link_stat;
    }
    return \%i_up;
 }

 sub i_up_admin {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

-    my $i_index = $bayhub->i_index() || {};
+    my $i_index   = $bayhub->i_index()         || {};
    my $link_stat = $bayhub->bayhub_up_admin() || {};
- 
+
    my %i_up_admin;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $link_stat = $link_stat->{$iid};
        next unless defined $link_stat;
- 
-        $i_up_admin{$index}=$link_stat; 
+
+        $i_up_admin{$index} = $link_stat;
    }
    return \%i_up_admin;
 }

 sub set_i_up_admin {
+
    # map setting to those the hub will understand
    my %setting = qw/up 2 down 3/;

    my $bayhub = shift;
-    my ($setting, $iid) = @_;
+    my ( $setting, $iid ) = @_;

-    my $i_index  = $bayhub->i_index();
+    my $i_index = $bayhub->i_index() || {};
    my %reverse_i_index = reverse %$i_index;

    $setting = lc($setting);
@@ -286,39 +293,41 @@ sub set_i_up_admin {

    $iid = $reverse_i_index{$iid};

-    return $bayhub->set_bayhub_up_admin($setting{$setting}, $iid);
+    return $bayhub->set_bayhub_up_admin( $setting{$setting}, $iid );
 }

 # Hubs do not support the standard Bridge MIB
 sub bp_index {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

    my $b_index = $bayhub->bayhub_nb_index() || {};
    my $p_index = $bayhub->bayhub_np_index() || {};
-    my $model = $bayhub->model() || 'Baystack Hub';
+    my $model   = $bayhub->model()           || 'Baystack Hub';

    my %bp_index;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
-                
-        if ($model eq 'Baystack Hub') {
-            my $comidx = $board;
-               if (! ($comidx % 5)) {
-                  $board = ($board / 5);
-               } elsif ($comidx =~ /[16]$/) {
-                  $board = int($board/5);
-                  $port = 25;          
-               } elsif ($comidx =~ /[27]$/) {
-                  $board = int($board/5);
-                  $port = 26;          
-               }
-          }
+        my $port = $p_index->{$iid} || 0;

-        my $index = ($board*256)+$port;
-        next if (defined $partial and $index !~ /^$partial$/);
+        if ( $model eq 'Baystack Hub' ) {
+            my $comidx = $board;
+            if ( !( $comidx % 5 ) ) {
+                $board = ( $board / 5 );
+            }
+            elsif ( $comidx =~ /[16]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 25;
+            }
+            elsif ( $comidx =~ /[27]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 26;
+            }
+        }
+
+        my $index = ( $board * 256 ) + $port;
+        next if ( defined $partial and $index !~ /^$partial$/ );

        $bp_index{$index} = $index;
    }
@@ -326,35 +335,37 @@ sub bp_index {
 }

 sub fw_port {
-    my $bayhub = shift;
+    my $bayhub  = shift;
    my $partial = shift;

    my $b_index = $bayhub->bayhub_nb_index($partial) || {};
    my $p_index = $bayhub->bayhub_np_index($partial) || {};
-    my $model = $bayhub->model() || 'Baystack Hub';
+    my $model   = $bayhub->model()                   || 'Baystack Hub';

    my %fw_port;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
+        my $port = $p_index->{$iid} || 0;

-      if ($model eq 'Baystack Hub') {
-          my $comidx = $board;
-             if (! ($comidx % 5)) {
-                $board = ($board / 5);
-             } elsif ($comidx =~ /[16]$/) {
-                $board = int($board/5);
-                $port = 25;          
-             } elsif ($comidx =~ /[27]$/) {
-                $board = int($board/5);
-                $port = 26;          
-             }
-       }
-        
-        my $index = ($board*256)+$port;
+        if ( $model eq 'Baystack Hub' ) {
+            my $comidx = $board;
+            if ( !( $comidx % 5 ) ) {
+                $board = ( $board / 5 );
+            }
+            elsif ( $comidx =~ /[16]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 25;
+            }
+            elsif ( $comidx =~ /[27]$/ ) {
+                $board = int( $board / 5 );
+                $port  = 26;
+            }
+        }

-      $fw_port{$iid} = $index;
+        my $index = ( $board * 256 ) + $port;
+
+        $fw_port{$iid} = $index;
    }
    return \%fw_port;
 }
@@ -367,7 +378,6 @@ sub slot_offset {
    return 0;
 }

-
 # Devices do not support ENTITY-MIB use proprietary methods.

 sub e_index {
@@ -472,7 +482,6 @@ Eric Miller
    my $bayhub = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -486,10 +495,11 @@ Eric Miller
 =head1 DESCRIPTION

 Provides abstraction to the configuration information obtainable from a 
-Bayhub device through SNMP.  Also provides device MAC to port mapping through the proprietary MIB. 
+Bay hub device through SNMP.  Also provides device MAC to port mapping through
+the proprietary MIB. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $bayhub = new SNMP::Info::Layer1::Bayhub(...);

@@ -509,9 +519,9 @@ my $bayhub = new SNMP::Info::Layer1::Bayhub(...);

 =over

-=item S5-ETHERNET-COMMON-MIB
+=item F<S5-ETHERNET-COMMON-MIB>

-=item S5-COMMON-STATS-MIB
+=item F<S5-COMMON-STATS-MIB>

 =back

@@ -539,7 +549,7 @@ Returns 'bay_hub'

 =item $bayhub->model()

-Cross references $bayhub->id() to the SYNOPTICS-MIB and returns
+Cross references $bayhub->id() to the F<SYNOPTICS-MIB> and returns
 the results.

 Removes either Baystack Hub, 5000, or 5005 depending on the model.
@@ -552,7 +562,8 @@ Removes either Baystack Hub, 5000, or 5005 depending on the model.

 =item $bayhub->layers()

-Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary
+MIBs.

 =item  $bayhub->index_factor()

@@ -591,7 +602,7 @@ to a hash.

 Returns reference to map of IIDs to Interface index. 

-Since hubs do not support ifIndex, the interface index is created using the
+Since hubs do not support C<ifIndex>, the interface index is created using the
 formula (board * 256 + port).

 =item $bayhub->interfaces()
@@ -612,17 +623,17 @@ Returns interface speed.

 =item $bayhub->i_up()

-Returns (B<s5EnPortLinkStatus>) for each port.  Translates on/off to up/down.
+Returns (C<s5EnPortLinkStatus>) for each port.  Translates on/off to up/down.

 =item $bayhub->i_up_admin()

-Returns (B<s5EnPortPartStatus>) for each port.
+Returns (C<s5EnPortPartStatus>) for each port.

 =item $bayhub->set_i_up_admin(state, ifIndex)

-Sets port state, must be supplied with state and port ifIndex
+Sets port state, must be supplied with state and port C<ifIndex>

-State choices are 'up'or 'down'
+State choices are 'up' or 'down'

 Example:
  my %if_map = reverse %{$bayhub->interfaces()};
@@ -636,20 +647,20 @@ both the keys and values.

 =item $bayhub->fw_port()

-Returns reference to map of IIDs of the S5-COMMON-STATS-MIB::s5CmSNodeTable
+Returns reference to map of IIDs of the C<S5-COMMON-STATS-MIB::s5CmSNodeTable>
 to the Interface index.

 =item $bayhub->fw_mac()

-(B<s5CmSNodeMacAddr>)
+(C<s5CmSNodeMacAddr>)

 =back

-=head2 Pseudo ENTITY-MIB Information
+=head2 Pseudo F<ENTITY-MIB> Information

-These devices do not support ENTITY-MIB.  These methods emulate Physical Table
-methods using S5-CHASSIS-MIB.  See L<SNMP::Info::NortelStack/"TABLE METHODS">
-for details.
+These devices do not support F<ENTITY-MIB>.  These methods emulate Physical
+Table methods using F<S5-CHASSIS-MIB>.  See
+L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.

 =over

@@ -665,6 +676,10 @@ Returns ns_e_class().

 Returns ns_e_descr().

+=item $bayhub->e_name() 
+
+Returns ns_e_name().
+
 =item $bayhub->e_fwver() 

 Returns ns_e_fwver().
--- a/Info/Layer1/Cyclades.pm
+++ b/Info/Layer1/Cyclades.pm
@@ -1,76 +1,79 @@
 # SNMP::Info::Layer1::Cyclades
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2006 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Layer1::Cyclades;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer1;

-@SNMP::Info::Layer1::Cyclades::ISA = qw/SNMP::Info::Layer1 Exporter/;
+@SNMP::Info::Layer1::Cyclades::ISA       = qw/SNMP::Info::Layer1 Exporter/;
@SNMP::Info::Layer1::Cyclades::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;

-%MIBS    = (
-            %SNMP::Info::Layer1::MIBS,
-            'CYCLADES-ACS-SYS-MIB'   => 'cyACSversion',
-            'CYCLADES-ACS-CONF-MIB'  => 'cyEthIPaddr',
-            'CYCLADES-ACS-INFO-MIB'  => 'cyISPortTty',
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer1::MIBS,
+    'CYCLADES-ACS-SYS-MIB'  => 'cyACSversion',
+    'CYCLADES-ACS-CONF-MIB' => 'cyEthIPaddr',
+    'CYCLADES-ACS-INFO-MIB' => 'cyISPortTty',
+);

 %GLOBALS = (
-            # CYCLADES-ACS-SYS-MIB
-            %SNMP::Info::Layer1::GLOBALS,
-            'os_ver'     => 'cyACSversion',
-            'cy_model'   => 'cyACSpname',
-            'serial'     => 'cyACSDevId',
-            'root_ip'    => 'cyEthIPaddr',
-            'ps1_status' => 'cyACSPw1',
-            'ps2_status' => 'cyACSPw2',
-            );

-%FUNCS   = (
-            %SNMP::Info::Layer1::FUNCS,
-            # CYCLADES-ACS-INFO-MIB::cyInfoSerialTable
-            'cy_port_tty'    => 'cyISPortTty',
-            'cy_port_name'   => 'cyISPortName',
-            'cy_port_speed'  => 'cyISPortSpeed',
-            'cy_port_cd'     => 'cyISPortSigCD',
-            # CYCLADES-ACS-CONF-MIB::cySerialPortTable
-            'cy_port_socket' => 'cySPortSocketPort',
-            );
+    # CYCLADES-ACS-SYS-MIB
+    %SNMP::Info::Layer1::GLOBALS,
+    'os_ver'     => 'cyACSversion',
+    'cy_model'   => 'cyACSpname',
+    'serial'     => 'cyACSDevId',
+    'root_ip'    => 'cyEthIPaddr',
+    'ps1_status' => 'cyACSPw1',
+    'ps2_status' => 'cyACSPw2',
+);

-%MUNGE   = (
-            %SNMP::Info::Layer1::MUNGE,
-            );
+%FUNCS = (
+    %SNMP::Info::Layer1::FUNCS,
+
+    # CYCLADES-ACS-INFO-MIB::cyInfoSerialTable
+    'cy_port_tty'   => 'cyISPortTty',
+    'cy_port_name'  => 'cyISPortName',
+    'cy_port_speed' => 'cyISPortSpeed',
+    'cy_port_cd'    => 'cyISPortSigCD',
+
+    # CYCLADES-ACS-CONF-MIB::cySerialPortTable
+    'cy_port_socket' => 'cySPortSocketPort',
+);
+
+%MUNGE = ( %SNMP::Info::Layer1::MUNGE, );

 # These devices don't have a FDB and we probably don't want to poll for ARP
 # cache so turn off reported L2/L3.
@@ -91,7 +94,7 @@ sub model {

    my $model = $cyclades->cy_model();

-    return undef unless defined $model;
+    return unless defined $model;

    return lc($model);
 }
@@ -106,10 +109,10 @@ sub i_index {
    my $partial  = shift;

    my $orig_index = $cyclades->orig_i_index($partial) || {};
-    my $cy_index   = $cyclades->cy_port_socket() || {};
+    my $cy_index   = $cyclades->cy_port_socket()       || {};

    my %i_index;
-    foreach my $iid (keys %$orig_index){
+    foreach my $iid ( keys %$orig_index ) {
        my $index = $orig_index->{$iid};
        next unless defined $index;

@@ -118,14 +121,14 @@ sub i_index {

    # Use alternative labeling system for the serial port, listening socket
    # to avoid conflicts with ifIndex.
-    foreach my $iid (keys %$cy_index){
+    foreach my $iid ( keys %$cy_index ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

        $i_index{$index} = $index;
    }
-    
+
    return \%i_index;
 }

@@ -133,25 +136,25 @@ sub interfaces {
    my $cyclades = shift;
    my $partial  = shift;

-    my $i_descr   = $cyclades->orig_i_description($partial) || {};
-    my $cy_index  = $cyclades->cy_port_socket() || {};
-    my $cy_p_tty  = $cyclades->cy_port_tty() || {};
+    my $i_descr  = $cyclades->orig_i_description($partial) || {};
+    my $cy_index = $cyclades->cy_port_socket()             || {};
+    my $cy_p_tty = $cyclades->cy_port_tty()                || {};

    my %if;
-    foreach my $iid (keys %$i_descr){
+    foreach my $iid ( keys %$i_descr ) {
        my $descr = $i_descr->{$iid};
        next unless defined $descr;
-    
+
        $if{$iid} = $descr;
    }

-    foreach my $iid (keys %$cy_p_tty){
+    foreach my $iid ( keys %$cy_p_tty ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);        
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $name = $cy_p_tty->{$iid};
        next unless defined $name;
-    
+
        $if{$index} = $name;
    }

@@ -162,25 +165,25 @@ sub i_speed {
    my $cyclades = shift;
    my $partial  = shift;

-    my $i_speed     = $cyclades->orig_i_speed($partial) || {};
-    my $cy_index    = $cyclades->cy_port_socket() || {};
-    my $cy_p_speed  = $cyclades->cy_port_speed() || {};
+    my $i_speed    = $cyclades->orig_i_speed($partial) || {};
+    my $cy_index   = $cyclades->cy_port_socket()       || {};
+    my $cy_p_speed = $cyclades->cy_port_speed()        || {};

    my %i_speed;
-    foreach my $iid (keys %$i_speed){
+    foreach my $iid ( keys %$i_speed ) {
        my $speed = $i_speed->{$iid};
        next unless defined $speed;
-    
+
        $i_speed{$iid} = $speed;
    }

-    foreach my $iid (keys %$cy_p_speed){
+    foreach my $iid ( keys %$cy_p_speed ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);        
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $speed = $cy_p_speed->{$iid};
        next unless defined $speed;
-    
+
        $i_speed{$index} = $speed;
    }

@@ -192,24 +195,24 @@ sub i_up {
    my $partial  = shift;

    my $i_up     = $cyclades->orig_i_up($partial) || {};
-    my $cy_index = $cyclades->cy_port_socket() || {};
-    my $cy_p_up  = $cyclades->cy_port_cd() || {};
+    my $cy_index = $cyclades->cy_port_socket()    || {};
+    my $cy_p_up  = $cyclades->cy_port_cd()        || {};

    my %i_up;
-    foreach my $iid (keys %$i_up){
+    foreach my $iid ( keys %$i_up ) {
        my $up = $i_up->{$iid};
        next unless defined $up;
-    
+
        $i_up{$iid} = $up;
    }

-    foreach my $iid (keys %$cy_p_up){
+    foreach my $iid ( keys %$cy_p_up ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);        
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $up = $cy_p_up->{$iid};
        next unless defined $up;
-    
+
        $i_up{$index} = $up;
    }

@@ -221,24 +224,24 @@ sub i_description {
    my $partial  = shift;

    my $i_desc    = $cyclades->orig_i_description($partial) || {};
-    my $cy_index  = $cyclades->cy_port_socket() || {};
-    my $cy_p_desc = $cyclades->cy_port_name() || {};
+    my $cy_index  = $cyclades->cy_port_socket()             || {};
+    my $cy_p_desc = $cyclades->cy_port_name()               || {};

    my %descr;
-    foreach my $iid (keys %$i_desc){
+    foreach my $iid ( keys %$i_desc ) {
        my $desc = $i_desc->{$iid};
        next unless defined $desc;
-    
+
        $descr{$iid} = $desc;
    }

-    foreach my $iid (keys %$cy_p_desc){
+    foreach my $iid ( keys %$cy_p_desc ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);        
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $desc = $cy_p_desc->{$iid};
        next unless defined $desc;
-    
+
        $descr{$index} = $desc;
    }

@@ -250,24 +253,24 @@ sub i_name {
    my $partial  = shift;

    my $i_name    = $cyclades->orig_i_name($partial) || {};
-    my $cy_index  = $cyclades->cy_port_socket() || {};
-    my $cy_p_desc = $cyclades->cy_port_name() || {};
+    my $cy_index  = $cyclades->cy_port_socket()      || {};
+    my $cy_p_desc = $cyclades->cy_port_name()        || {};

    my %i_name;
-    foreach my $iid (keys %$i_name){
+    foreach my $iid ( keys %$i_name ) {
        my $name = $i_name->{$iid};
        next unless defined $name;
-    
+
        $i_name{$iid} = $name;
    }

-    foreach my $iid (keys %$cy_p_desc){
+    foreach my $iid ( keys %$cy_p_desc ) {
        my $index = $cy_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);        
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $name = $cy_p_desc->{$iid};
        next unless defined $name;
-    
+
        $i_name{$index} = $name;
    }

@@ -325,11 +328,11 @@ my $cyclades = new SNMP::Info::Layer1::Cyclades(...);

 =over

-=item CYCLADES-ACS-SYS-MIB
+=item F<CYCLADES-ACS-SYS-MIB>

-=item CYCLADES-ACS-CONF-MIB
+=item F<CYCLADES-ACS-CONF-MIB>

-=item CYCLADES-ACS-INFO-MIB
+=item F<CYCLADES-ACS-INFO-MIB>

 =back

@@ -345,23 +348,23 @@ These are methods that return scalar value from SNMP

 =item $cyclades->os_ver()

-(B<cyACSversion>)
+(C<cyACSversion>)

 =item $cyclades->serial()

-(B<cyACSDevId>)
+(C<cyACSDevId>)

 =item $cyclades->root_ip()

-(B<cyEthIPaddr>)
+(C<cyEthIPaddr>)

 =item $cyclades->ps1_status()

-(B<cyACSPw1>)
+(C<cyACSPw1>)

 =item $cyclades->ps2_status()

-(B<cyACSPw2>)
+(C<cyACSPw2>)

 =back

@@ -371,8 +374,8 @@ These are methods that return scalar value from SNMP

 =item $cyclades->layers()

-Returns 01000001.  These devices don't have a FDB and we probably don't want to
-poll for an ARP cache so turn off reported Layer 2 and Layer 3.
+Returns 01000001.  These devices don't have a FDB and we probably don't want
+to poll for an ARP cache so turn off reported Layer 2 and Layer 3.

 =item $cyclades->vendor()

@@ -384,7 +387,7 @@ Returns 'cyclades'

 =item $cyclades->model()

-Returns lower case (B<cyACSpname>)
+Returns lower case (C<cyACSpname>)

 =back

@@ -407,30 +410,30 @@ Returns reference to map of IIDs to Interface index.

 Extended to include serial ports.  Serial ports are indexed with the
 alternative labeling system for the serial port, the listening socket port
-B<cySPortSocketPort> to avoid conflicts with B<ifIndex>.  
+C<cySPortSocketPort> to avoid conflicts with C<ifIndex>.  

 =item $cyclades->interfaces()

 Returns reference to map of IIDs to physical ports.  Extended to include
-serial ports, B<cyISPortTty>.
+serial ports, C<cyISPortTty>.

 =item $cyclades->i_speed()

-Returns interface speed.  Extended to include serial ports, B<cyISPortSpeed>. 
+Returns interface speed.  Extended to include serial ports, C<cyISPortSpeed>. 

 =item $cyclades->i_up()

 Returns link status for each port.  Extended to include serial ports,
-B<cyISPortSigCD>.
+C<cyISPortSigCD>.

 =item $cyclades->i_description()

 Returns description of each port.  Extended to include serial ports,
-B<cyISPortName>.
+C<cyISPortName>.

 =item $cyclades->i_name()

-Returns name of each port.  Extended to include serial ports, B<cyISPortName>.
+Returns name of each port.  Extended to include serial ports, C<cyISPortName>.

 =back

--- a/Info/Layer1/S3000.pm
+++ b/Info/Layer1/S3000.pm
@@ -1,79 +1,84 @@
 # SNMP::Info::Layer1::S3000
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2006 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Layer1::S3000;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer1::S3000::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer1::S3000::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer1::S3000::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            'SYNOPTICS-ETHERNET-MIB'     => 's3EnetPortTable',
-            'SYNOPTICS-COMMON-MIB'       => 's3AgentType',
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'SYNOPTICS-ETHERNET-MIB' => 's3EnetPortTable',
+    'SYNOPTICS-COMMON-MIB'   => 's3AgentType',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            # From SYNOPTICS-COMMON-MIB
-            'os_bin'            => 's3AgentFwVer',
-            's3000_major_ver'   => 's3AgentSwMajorVer',
-            's3000_minor_ver'   => 's3AgentSwMinorVer',
-            's3000_maint_ver'   => 's3AgentSwMaintVer',
-            );
+    %SNMP::Info::Layer2::GLOBALS,

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            # SYNOPTICS-ETHERNET-MIB::s3EnetPortTable
-            's3000_pb_index'        => 's3EnetPortBoardIndex',
-            's3000_pp_index'        => 's3EnetPortIndex',
-            's3000_up_admin'        => 's3EnetPortPartStatus',
-            's3000_up'              => 's3EnetPortLinkStatus',
-            # SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable
-            's3000_nb_index'        => 's3EnetShowNodesSlotIndex',
-            's3000_np_index'        => 's3EnetShowNodesPortIndex',
-            'fw_mac'                => 's3EnetShowNodesMacAddress',
-            # SYNOPTICS-ETHERNET-MIB::s3EnetTopNmmTable
-            's3000_topo_port'       => 's3EnetTopNmmPort',
-            's3000_topo_mac'        => 's3EnetTopNmmMacAddr',
-            );
+    # From SYNOPTICS-COMMON-MIB
+    'os_bin'          => 's3AgentFwVer',
+    's3000_major_ver' => 's3AgentSwMajorVer',
+    's3000_minor_ver' => 's3AgentSwMinorVer',
+    's3000_maint_ver' => 's3AgentSwMaintVer',
+);

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-            's3000_topo_mac'        => \&SNMP::Info::munge_mac
-            );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+
+    # SYNOPTICS-ETHERNET-MIB::s3EnetPortTable
+    's3000_pb_index' => 's3EnetPortBoardIndex',
+    's3000_pp_index' => 's3EnetPortIndex',
+    's3000_up_admin' => 's3EnetPortPartStatus',
+    's3000_up'       => 's3EnetPortLinkStatus',
+
+    # SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable
+    's3000_nb_index' => 's3EnetShowNodesSlotIndex',
+    's3000_np_index' => 's3EnetShowNodesPortIndex',
+    'fw_mac'         => 's3EnetShowNodesMacAddress',
+
+    # SYNOPTICS-ETHERNET-MIB::s3EnetTopNmmTable
+    's3000_topo_port' => 's3EnetTopNmmPort',
+    's3000_topo_mac'  => 's3EnetTopNmmMacAddr',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE, 's3000_topo_mac' => \&SNMP::Info::munge_mac
+);

 sub layers {
    return '00000011';
@@ -89,59 +94,60 @@ sub vendor {

 sub model {
    my $s3000 = shift;
-    my $id = $s3000->id();
-    return undef unless defined $id;
+    my $id    = $s3000->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;
    $model =~ s/^s3reg-//i;

-    return $1 if ($model =~ /((\d+){3}[\dX])/);
+    return $1 if ( $model =~ /((\d+){3}[\dX])/ );
    return $model;
 }

 sub os_ver {
-    my $s3000 = shift;
+    my $s3000     = shift;
    my $major_ver = $s3000->s3000_major_ver() || 0;
    my $minor_ver = $s3000->s3000_minor_ver() || 0;
    my $maint_ver = $s3000->s3000_maint_ver() || 0;

-   my $ver = "$major_ver.$minor_ver.$maint_ver"; 
-   return $ver;
+    my $ver = "$major_ver.$minor_ver.$maint_ver";
+    return $ver;
 }

 sub mac {
-    my $s3000 = shift;
+    my $s3000     = shift;
    my $topo_port = $s3000->s3000_topo_port();
-    my $topo_mac = $s3000->s3000_topo_mac();
-    
-    foreach my $entry (keys %$topo_port){
+    my $topo_mac  = $s3000->s3000_topo_mac();
+
+    foreach my $entry ( keys %$topo_port ) {
        my $port = $topo_port->{$entry};
        next unless $port == 0;
        my $mac = $topo_mac->{$entry};
        return $mac;
    }
+
    # Topology turned off, not supported.
-    return undef;
+    return;
 }

 # Hubs do not support ifMIB requirements for get MAC
 # and port status

 sub i_index {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

    my $b_index = $s3000->s3000_pb_index($partial) || {};
    my $p_index = $s3000->s3000_pp_index($partial) || {};

    my %i_index;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
+        my $port = $p_index->{$iid} || 0;

        # We need to make up an index for multiple board instances.
-        my $index = ($board*256)+$port;
+        my $index = ( $board * 256 ) + $port;

        $i_index{$iid} = $index;
    }
@@ -152,23 +158,23 @@ sub i_index {
 # for consistency

 sub interfaces {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

    my $i_index = $s3000->i_index() || {};

    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

        # Index numbers are deterministic slot * 256 + port - see i_index()
        my $port = $index % 256;
-        my $slot = int($index / 256);
+        my $slot = int( $index / 256 );

        my $slotport = "$slot.$port";
-    
+
        $if{$index} = $slotport;
    }

@@ -176,113 +182,114 @@ sub interfaces {
 }

 sub i_duplex {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

-    my $port_index  = $s3000->i_index() || {};
+    my $port_index = $s3000->i_index() || {};

    my %i_duplex;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

        # Hubs only function half duplex
        my $duplex = 'half';
-        $i_duplex{$index}=$duplex; 
+        $i_duplex{$index} = $duplex;
    }
    return \%i_duplex;
 }

 sub i_duplex_admin {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

-    my $port_index  = $s3000->i_index() || {};
+    my $port_index = $s3000->i_index() || {};

    my %i_duplex_admin;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

-        # Hubs only function half duplex    
+        # Hubs only function half duplex
        my $duplex = 'half';
-        $i_duplex_admin{$index}=$duplex; 
+        $i_duplex_admin{$index} = $duplex;
    }
    return \%i_duplex_admin;
 }

 sub i_speed {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

-    my $port_index  = $s3000->i_index() || {};
+    my $port_index = $s3000->i_index() || {};

    my %i_speed;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );

-        # These hubs only support 10Mbs      
+        # These hubs only support 10 Mbs
        my $speed = '10000000';
-        $i_speed{$index}=$speed; 
+        $i_speed{$index} = $speed;
    }
    return \%i_speed;
 }

 sub i_up {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

-    my $port_index = $s3000->i_index() || {};
-    my $link_stat = $s3000->s3000_up() || {};
-   
+    my $port_index = $s3000->i_index()  || {};
+    my $link_stat  = $s3000->s3000_up() || {};
+
    my %i_up;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $link_stat = $link_stat->{$iid};
        next unless defined $link_stat;
-        
-        $link_stat = 'up' if $link_stat =~ /on/i;
+
+        $link_stat = 'up'   if $link_stat =~ /on/i;
        $link_stat = 'down' if $link_stat =~ /off/i;
-             
-        $i_up{$index}=$link_stat; 
+
+        $i_up{$index} = $link_stat;
    }
    return \%i_up;
 }

 sub i_up_admin {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

-    my $i_index = $s3000->i_index() || {};
+    my $i_index   = $s3000->i_index()        || {};
    my $link_stat = $s3000->s3000_up_admin() || {};
- 
+
    my %i_up_admin;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
-        next if (defined $partial and $index !~ /^$partial$/);
+        next if ( defined $partial and $index !~ /^$partial$/ );
        my $link_stat = $link_stat->{$iid};
        next unless defined $link_stat;
- 
-        $i_up_admin{$index}=$link_stat; 
+
+        $i_up_admin{$index} = $link_stat;
    }
    return \%i_up_admin;
 }

 sub set_i_up_admin {
+
    # map setting to those the hub will understand
    my %setting = qw/up 2 down 3/;

    my $s3000 = shift;
-    my ($setting, $iid) = @_;
+    my ( $setting, $iid ) = @_;

-    my $i_index  = $s3000->i_index() || {};
+    my $i_index = $s3000->i_index() || {};
    my %reverse_i_index = reverse %$i_index;

    $setting = lc($setting);
@@ -291,26 +298,26 @@ sub set_i_up_admin {

    $iid = $reverse_i_index{$iid};

-    return $s3000->set_s3000_up_admin($setting{$setting}, $iid);
+    return $s3000->set_s3000_up_admin( $setting{$setting}, $iid );
 }

 # Hubs do not support the standard Bridge MIB
 sub bp_index {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

    my $b_index = $s3000->s3000_nb_index() || {};
    my $p_index = $s3000->s3000_np_index() || {};
-    my $model = $s3000->model();
+    my $model   = $s3000->model();

    my %bp_index;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
-                
-        my $index = ($board*256)+$port;
-        next if (defined $partial and $index !~ /^$partial$/);
+        my $port = $p_index->{$iid} || 0;
+
+        my $index = ( $board * 256 ) + $port;
+        next if ( defined $partial and $index !~ /^$partial$/ );

        $bp_index{$index} = $index;
    }
@@ -318,22 +325,22 @@ sub bp_index {
 }

 sub fw_port {
-    my $s3000 = shift;
+    my $s3000   = shift;
    my $partial = shift;

    my $b_index = $s3000->s3000_nb_index($partial) || {};
    my $p_index = $s3000->s3000_np_index($partial) || {};
-    my $model = $s3000->model();
+    my $model   = $s3000->model();

    my %fw_port;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $board = $b_index->{$iid};
        next unless defined $board;
-        my $port = $p_index->{$iid}||0;
+        my $port = $p_index->{$iid} || 0;

-        my $index = ($board*256)+$port;
+        my $index = ( $board * 256 ) + $port;

-      $fw_port{$iid} = $index;
+        $fw_port{$iid} = $index;
    }
    return \%fw_port;
 }
@@ -356,7 +363,6 @@ Eric Miller
    my $s3000 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -370,10 +376,11 @@ Eric Miller
 =head1 DESCRIPTION

 Provides abstraction to the configuration information obtainable from a 
-Bayhub device through SNMP.  Also provides device MAC to port mapping through the proprietary MIB.
+Bay hub device through SNMP.  Also provides device MAC to port mapping through
+the proprietary MIB.

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $s3000 = new SNMP::Info::Layer1::S3000(...);

@@ -389,9 +396,9 @@ my $s3000 = new SNMP::Info::Layer1::S3000(...);

 =over

-=item SYNOPTICS-COMMON-MIB
+=item F<SYNOPTICS-COMMON-MIB>

-=item SYNOPTICS-ETHERNET-MIB
+=item F<SYNOPTICS-ETHERNET-MIB>

 =back

@@ -415,20 +422,21 @@ Returns 'synoptics'

 =item $s3000->model()

-Cross references $s3000->id() to the SYNOPTICS-MIB and returns
+Cross references $s3000->id() to the F<SYNOPTICS-MIB> and returns
 the results.

-Removes sreg- from the model name and returns only the numeric model identifier.
+Removes C<sreg-> from the model name and returns only the numeric model
+identifier.

 =item $stack->os_ver()

 Returns the software version specified as major.minor.maint.

-(B<s3AgentSwMajorVer>).(B<s3AgentSwMinorVer>).(B<s3AgentSwMaintVer>)
+(C<s3AgentSwMajorVer>).(C<s3AgentSwMinorVer>).(C<s3AgentSwMaintVer>)

 =item $stack->os_bin()

-Returns the firmware version. (B<s3AgentFwVer>)
+Returns the firmware version. (C<s3AgentFwVer>)

 =item $s3000->mac()

@@ -442,7 +450,8 @@ Returns MAC of the advertised IP address of the device.

 =item $s3000->layers()

-Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary
+MIBs.

 =back

@@ -463,8 +472,9 @@ to a hash.

 Returns reference to map of IIDs to Interface index. 

-Since hubs do not support ifIndex, the interface index is created using the
-formula (board * 256 + port).  This is required to support devices with more than one module.
+Since hubs do not support C<ifIndex>, the interface index is created using the
+formula (board * 256 + port).  This is required to support devices with more
+than one module.

 =item $s3000->interfaces()

@@ -480,21 +490,22 @@ Returns half, hubs do not support full duplex.

 =item $s3000->i_speed()

-Returns 10000000.  The hubs only support 10Mbs Ethernet.
+Returns 10000000.  The hubs only support 10 Mbs Ethernet.

 =item $s3000->i_up()

-Returns (B<s3EnetPortLinkStatus>) for each port.  Translates on/off to up/down.
+Returns (C<s3EnetPortLinkStatus>) for each port.  Translates on/off to
+up/down.

 =item $s3000->i_up_admin()

-Returns (B<s3EnetPortPartStatus>) for each port.
+Returns (C<s3EnetPortPartStatus>) for each port.

 =item $s3000->set_i_up_admin(state, ifIndex)

-Sets port state, must be supplied with state and port ifIndex
+Sets port state, must be supplied with state and port C<ifIndex>

-State choices are 'up'or 'down'
+State choices are 'up' or 'down'

 Example:
  my %if_map = reverse %{$s3000->interfaces()};
@@ -508,22 +519,23 @@ both the keys and values.

 =item $s3000->fw_port()

-Returns reference to map of IIDs of the SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable
-to the Interface index.
+Returns reference to map of IIDs of the
+C<SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable> to the Interface index.

 =item $s3000->fw_mac()

-(B<s3EnetShowNodesMacAddress>)
+(C<s3EnetShowNodesMacAddress>)

 =item $s3000->s3000_topo_port()

-Returns reference to hash.  Key: Table entry, Value:Port Number (interface iid)
+Returns reference to hash.  Key: Table entry, Value:Port Number
+(interface iid)

-(B<s3EnetTopNmmPort>)
+(C<s3EnetTopNmmPort>)

 =item $s3000->s3000_topo_mac()

-(B<s3EnetTopNmmMacAddr>)
+(C<s3EnetTopNmmMacAddr>)

 Returns reference to hash.  Key: Table entry, Value:Remote MAC address

--- a/Info/Layer2.pm
+++ b/Info/Layer2.pm
@@ -1,89 +1,89 @@
-# SNMP::Info::Layer2 - SNMP Interface to Layer2 Devices 
-# Max Baker
+# SNMP::Info::Layer2 - SNMP Interface to Layer2 Devices
+# $Id$
 #
-# Copyright (c) 2004,2005 Max Baker -- All changes from Version 0.7 on
+# Copyright (c) 2008 Max Baker -- All changes from Version 0.7 on
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE $INIT/;
-
-@SNMP::Info::Layer2::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet Exporter/;
+@SNMP::Info::Layer2::ISA
+    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet Exporter/;
@SNMP::Info::Layer2::EXPORT_OK = qw//;

-%MIBS = (   %SNMP::Info::MIBS, 
-            %SNMP::Info::Bridge::MIBS,
-            %SNMP::Info::Entity::MIBS,
-            %SNMP::Info::PowerEthernet::MIBS,
-        );
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
+    %SNMP::Info::Entity::MIBS, %SNMP::Info::PowerEthernet::MIBS,
+);

 %GLOBALS = (
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::Entity::GLOBALS,
-            %SNMP::Info::PowerEthernet::GLOBALS,
-            'serial1'   => '.1.3.6.1.4.1.9.3.6.3.0', # OLD-CISCO-CHASSIS-MIB::chassisId.0
-            );
+    %SNMP::Info::GLOBALS,
+    %SNMP::Info::Bridge::GLOBALS,
+    %SNMP::Info::Entity::GLOBALS,
+    %SNMP::Info::PowerEthernet::GLOBALS,
+    'serial1' =>
+        '.1.3.6.1.4.1.9.3.6.3.0',    # OLD-CISCO-CHASSIS-MIB::chassisId.0
+);

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::Entity::FUNCS,
-            %SNMP::Info::PowerEthernet::FUNCS,
-           );
+%FUNCS = (
+    %SNMP::Info::FUNCS,         %SNMP::Info::Bridge::FUNCS,
+    %SNMP::Info::Entity::FUNCS, %SNMP::Info::PowerEthernet::FUNCS,
+);

 %MUNGE = (
-            # Inherit all the built in munging
-            %SNMP::Info::MUNGE,
-            %SNMP::Info::Bridge::MUNGE,
-            %SNMP::Info::Entity::MUNGE,
-            %SNMP::Info::PowerEthernet::MUNGE,
-         );
+
+    # Inherit all the built in munging
+    %SNMP::Info::MUNGE,
+    %SNMP::Info::Bridge::MUNGE,
+    %SNMP::Info::Entity::MUNGE,
+    %SNMP::Info::PowerEthernet::MUNGE,
+);

 # Method OverRides

 # $l2->model() - Looks at sysObjectID which gives the oid of the system
-#       name, contained in a propriatry MIB. 
+#       name, contained in a propriatry MIB.
 sub model {
-    my $l2 = shift;
-    my $id = $l2->id();
+    my $l2    = shift;
+    my $id    = $l2->id();
    my $model = &SNMP::translateObj($id) || $id || '';
-   
+
    # HP
    $model =~ s/^hpswitch//i;

@@ -96,15 +96,15 @@ sub model {
 }

 sub vendor {
-    my $l2 = shift;
+    my $l2    = shift;
    my $model = $l2->model();
    my $descr = $l2->description();

-    if ($model =~ /hp/i or $descr =~ /\bhp\b/i) {
+    if ( $model =~ /hp/i or $descr =~ /\bhp\b/i ) {
        return 'hp';
    }

-    if ($model =~ /catalyst/i or $descr =~ /(catalyst|cisco)/i) {
+    if ( $model =~ /catalyst/i or $descr =~ /(catalyst|cisco)/i ) {
        return 'cisco';
    }

@@ -112,49 +112,50 @@ sub vendor {

 sub serial {
    my $l2 = shift;
-    
-    my $serial1   = $l2->serial1();
-    my $e_descr   = $l2->e_descr()  || {};
-    my $e_serial  = $l2->e_serial() || {};
-    
-    my $serial2   = $e_serial->{1}  || undef;
-    my $chassis   = $e_descr->{1}   || undef;
+
+    my $serial1  = $l2->serial1();
+    my $e_descr  = $l2->e_descr() || {};
+    my $e_serial = $l2->e_serial() || {};
+
+    my $serial2 = $e_serial->{1} || undef;
+    my $chassis = $e_descr->{1}  || undef;

    # precedence
    #   serial2,chassis parse,serial1
-    return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
-    return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
-    return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
+    return $serial2 if ( defined $serial2 and $serial2 !~ /^\s*$/ );
+    return $1
+        if ( defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i );
+    return $serial1 if ( defined $serial1 and $serial1 !~ /^\s*$/ );

-    return undef;
+    return;
 }

 sub i_ignore {
-    my $l2 = shift;
+    my $l2      = shift;
    my $partial = shift;

    my $i_type = $l2->i_type($partial) || {};

    my %i_ignore = ();

-    foreach my $if (keys %$i_type){
+    foreach my $if ( keys %$i_type ) {
        my $type = $i_type->{$if};
-        $i_ignore{$if}++ 
+        $i_ignore{$if}++
            if $type =~ /(loopback|other|cpu)/i;
    }

    return \%i_ignore;
-}    
+}

 sub interfaces {
-    my $l2 = shift;
+    my $l2      = shift;
    my $partial = shift;

-    my $interfaces = $l2->i_index($partial) || {};
+    my $interfaces = $l2->i_index($partial)       || {};
    my $i_descr    = $l2->i_description($partial) || {};

    # Replace the Index with the ifDescr field.
-    foreach my $iid (keys %$i_descr){
+    foreach my $iid ( keys %$i_descr ) {
        my $port = $i_descr->{$iid};
        next unless defined $port;
        $interfaces->{$iid} = $port;
@@ -179,7 +180,6 @@ Max Baker
 my $l2 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -251,13 +251,17 @@ These are methods that return scalar value from SNMP
 Cross references $l2->id() with product IDs in the 
 Cisco MIBs.

-For HP devices, removes 'hpswitch' from the name
+For HP devices, removes C<'hpswitch'> from the name

-For Cisco devices, removes 'sysid' from the name
+For Cisco devices, removes c<'sysid'> from the name

 =item $l2->vendor()

-Trys to discover the vendor from $l2->model() and $l2->description()
+Tries to discover the vendor from $l2->model() and $l2->description()
+
+=item $l2->serial()
+
+Returns serial number if available through SNMP

 =back

@@ -284,15 +288,16 @@ to a hash.

 =item $l2->interfaces()

-Creates a map between the interface identifier (iid) and the physical port name.
+Creates a map between the interface identifier (iid) and the physical port
+name.

-Defaults to B<ifDescr> but checks and overrides with B<ifName>
+Defaults to C<ifDescr> but checks and overrides with C<ifName>

 =item $l2->i_ignore()

 Returns reference to hash.  Increments value of IID if port is to be ignored.

-Ignores ports with B<ifType> of loopback,propvirtual,other, and cpu
+Ignores ports with C<ifType> of loopback, propvirtual, other, and cpu

 =back

--- a/Info/Layer2/Airespace.pm
+++ b/Info/Layer2/Airespace.pm
@@ -1,73 +1,84 @@
 # SNMP::Info::Layer2::Airespace
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2007 Eric Miller
+# Copyright (c) 2008 Eric Miller
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Airespace;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Bridge;
 use SNMP::Info::CDP;
 use SNMP::Info::Airespace;

-@SNMP::Info::Layer2::Airespace::ISA = qw/SNMP::Info::Airespace SNMP::Info::CDP SNMP::Info::Bridge Exporter/;
+@SNMP::Info::Layer2::Airespace::ISA
+    = qw/SNMP::Info::Airespace SNMP::Info::CDP SNMP::Info::Bridge Exporter/;
@SNMP::Info::Layer2::Airespace::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::MIBS,
-            %SNMP::Info::Bridge::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::Airespace::MIBS,
-            );
+$VERSION = '2.04';
+
+%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 = (
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::Airespace::GLOBALS,
-            );
+    %SNMP::Info::GLOBALS,      %SNMP::Info::Bridge::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS, %SNMP::Info::Airespace::GLOBALS,
+);

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::Airespace::FUNCS,
-            );
+%FUNCS = (
+    %SNMP::Info::FUNCS,      %SNMP::Info::Bridge::FUNCS,
+    %SNMP::Info::CDP::FUNCS, %SNMP::Info::Airespace::FUNCS,

-%MUNGE   = (
-          %SNMP::Info::MUNGE,
-          %SNMP::Info::Bridge::MUNGE,
-          %SNMP::Info::CDP::MUNGE,
-          %SNMP::Info::Airespace::MUNGE,
-            );
+    # 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 {
    return 'cisco';
@@ -79,12 +90,48 @@ sub vendor {

 sub model {
    my $airespace = shift;
-    my $model = $airespace->airespace_model();
-    return undef unless defined $model;
+    my $model     = $airespace->airespace_model();
+    return unless defined $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__

@@ -104,7 +151,6 @@ Eric Miller
    my $airespace = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -120,8 +166,8 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from 
 Cisco (Airespace) Wireless Controllers through SNMP.

-For speed or debugging purposes you can call the subclass directly, but not after
-determining a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $airespace = new SNMP::Info::Layer2::Airespace(...);

@@ -167,7 +213,7 @@ Returns 'cisco'

 =item $airespace->model()

-(B<agentInventoryMachineModel>)
+(C<agentInventoryMachineModel>)

 =back

@@ -188,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.
@@ -208,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
--- a/Info/Layer2/Aironet.pm
+++ b/Info/Layer2/Aironet.pm
@@ -1,95 +1,123 @@
 # SNMP::Info::Layer2::Aironet
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 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.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Aironet;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
 use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoVTP;
+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::CiscoVTP SNMP::Info::CDP Exporter/;
+@SNMP::Info::Layer2::Aironet::ISA
+    = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike
+    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 $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::Entity::GLOBALS,
-            %SNMP::Info::EtherLike::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            'serial' => 'entPhysicalSerialNum.1',
-            'descr'  => 'sysDescr'
-            );
+    %SNMP::Info::IEEE802dot11::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS,
+    %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'
+);

-%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::Entity::FUNCS,
-            %SNMP::Info::EtherLike::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            'i_ssidlist' => 'cd11IfAuxSsid',
-            'i_ssidbcast' => 'cd11IfAuxSsidBroadcastSsid',
-            'i_80211channel' => 'cd11IfPhyDsssCurrentChannel',
-            );
+%FUNCS = (
+    %SNMP::Info::IEEE802dot11::FUNCS,
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::Entity::FUNCS,
+    %SNMP::Info::EtherLike::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    'i_80211channel'   => 'cd11IfPhyDsssCurrentChannel',
+    'c_dot11subif'     => 'cDot11ClientSubIfIndex',
+    'cd11_rateset'     => 'cDot11ClientDataRateSet',
+    'cd11_txrate'      => 'cDot11ClientCurrentTxRateSet',
+    'cd11_uptime'      => 'cDot11ClientUpTime',
+    'cd11_sigstrength' => 'cDot11ClientSignalStrength',
+    'cd11_sigqual'     => 'cDot11ClientSigQuality',
+    'cd11_rxpkt'       => 'cDot11ClientPacketsReceived',
+    'cd11_txpkt'       => 'cDot11ClientPacketsSent',
+    'cd11_rxbyte'      => 'cDot11ClientBytesReceived',
+    'cd11_txbyte'      => 'cDot11ClientBytesSent',
+    'mbss_mac_addr'    => 'cdot11MbssidIfMacAddress',
+);

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::Entity::MIBS,
-            %SNMP::Info::EtherLike::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            'CISCO-DOT11-IF-MIB' => 'cd11IfAuxSsid',
-            );
+%MIBS = (
+    %SNMP::Info::IEEE802dot11::MIBS,
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::Entity::MIBS,
+    %SNMP::Info::EtherLike::MIBS,
+    %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CDP::MIBS,
+    'CISCO-DOT11-IF-MIB'                  => 'cd11IfAuxSsid',
+    'CISCO-DOT11-ASSOCIATION-MIB'         => 'cDot11ClientSubIfIndex',
+    'CISCO-DOT11-SSID-SECURITY-MIB'       => 'cdot11SecVlanNameId',
+    'CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB' => 'cviRoutedVlanIfIndex',
+);

-%MUNGE   = (%SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::Entity::MUNGE,
-            %SNMP::Info::EtherLike::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            );
+%MUNGE = (
+    %SNMP::Info::IEEE802dot11::MUNGE,
+    %SNMP::Info::Layer2::MUNGE,
+    %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,
+);

+# Use 802.11 power level without putting IEEE802dot11 in @ISA
+*SNMP::Info::Layer2::Aironet::dot11_cur_tx_pwr_mw
+    = \&SNMP::Info::IEEE802dot11::dot11_cur_tx_pwr_mw;

 sub vendor {
+
    # Sorry, but it's true.
    return 'cisco';
 }
@@ -106,7 +134,7 @@ sub interfaces {
 # Tag on e_descr.1
 sub description {
    my $aironet = shift;
-    my $descr = $aironet->descr();
+    my $descr   = $aironet->descr();
    my $e_descr = $aironet->e_descr();

    $descr = "$e_descr->{1}  $descr" if defined $e_descr->{1};
@@ -122,7 +150,7 @@ sub i_duplex {
    my $el_duplex = $aironet->el_duplex($partial);

    my %i_duplex;
-    foreach my $d (keys %$el_duplex){
+    foreach my $d ( keys %$el_duplex ) {
        my $val = $el_duplex->{$d};
        next unless defined $val;
        $i_duplex{$d} = 'full' if $val =~ /full/i;
@@ -132,12 +160,290 @@ sub i_duplex {
    return \%i_duplex;
 }

+#
+# IOS 12.3 introduces the cDot11ClientSubIfIndex in the
+# cDot11ClientConfigInfoTable, which supplies the ifIndex
+# of the VLAN Subinterface if one exists, or of the primary
+# interface if there are not subinterfaces.  12.2 used the
+# Q-BRIDGE-MIB dot1qTpFdbTable but that was removed in 12.3.
+sub _aironet_special {
+    my $aironet = shift;
+    my $os_ver  = $aironet->os_ver();
+    if (   defined($os_ver)
+        && $os_ver =~ /^(\d+)\.(\d+)(\D|$)/
+        && ( ( $1 == 12 && $2 >= 3 ) || $1 > 12 ) )
+    {
+        return 1;
+    }
+}
+
+#
+# INDEX      { ifIndex, cd11IfAuxSsid, cDot11ClientAddress }
+sub _aironet_breakout_dot11idx {
+    my $oid = shift;
+
+    my @parts   = split( /\./, $oid );
+    my $ifindex = shift(@parts);
+    my $ssidlen = shift(@parts);
+    my $ssid    = pack( "C*", splice( @parts, 0, $ssidlen ) );
+    my $mac     = join( ":", map { sprintf "%02x", $_ } @parts );
+    return ( $ifindex, $ssid, $mac );
+}
+
+sub fw_mac {
+    my $aironet = shift;
+
+    return qb_fw_mac($aironet) unless _aironet_special($aironet);
+    my $c_dot11subif = $aironet->c_dot11subif();
+    my $fw_mac       = {};
+
+    foreach my $i ( keys %$c_dot11subif ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($i);
+        $fw_mac->{$i} = $mac;
+    }
+    return $fw_mac;
+}
+
+sub fw_port {
+    my $aironet = shift;
+
+    return $aironet->qb_fw_port() unless _aironet_special($aironet);
+    my $c_dot11subif = $aironet->c_dot11subif();
+    my $fw_port      = {};
+
+    foreach my $i ( keys %$c_dot11subif ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($i);
+        $fw_port->{$i} = $c_dot11subif->{$i} || $ifindex;
+    }
+    return $fw_port;
+}
+
+sub bp_index {
+    my $aironet = shift;
+
+    return $aironet->orig_bp_index() unless _aironet_special($aironet);
+    my $c_dot11subif = $aironet->c_dot11subif();
+    my $bp_index     = {};
+
+    foreach my $i ( keys %$c_dot11subif ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($i);
+        my ($i) = $c_dot11subif->{$i} || $ifindex;
+        $bp_index->{$i} = $i;
+    }
+    return $bp_index;
+}
+
+###
+#
+# VLAN support
+#
+sub v_name {
+    my $aironet = shift;
+
+    my $v_name      = {};
+    my $vlan_nameid = $aironet->cdot11SecVlanNameId();
+    foreach my $i ( keys %$vlan_nameid ) {
+        my @parts = split( /\./, $i );
+        my $namelen = shift(@parts);
+
+        my $name = pack( "C*", @parts );
+        $v_name->{$i} = $name;
+    }
+    return $v_name;
+}
+
+sub v_index {
+    my $aironet = shift;
+
+    return $aironet->cdot11SecVlanNameId();
+}
+
+sub i_vlan {
+    my $aironet = shift;
+
+    my $i_vlan = {};
+    my $idxmap = $aironet->cviRoutedVlanIfIndex();
+    foreach my $i ( keys %$idxmap ) {
+        my @parts = split( /\./, $i );
+        $i_vlan->{ $idxmap->{$i} } = $parts[0];
+    }
+    return $i_vlan;
+}
+
+# The MIB reports in units of half a megabit, e.g.,
+# 5.5Mbps is reported as 11.
+sub munge_cd11_txrate {
+    my $txrates = shift;
+    my @units   = unpack( "C*", $txrates );
+    my @rates   = map {
+        my $unit = $_;
+        $unit *= 0.5;
+    } @units;
+
+    return \@rates;
+}
+
+# cd11 INDEX
+sub cd11_port {
+    my $aironet          = shift;
+    my $cd11_sigstrength = $aironet->cd11_sigstrength();
+    my $interfaces       = $aironet->interfaces();
+    my %ret;
+    foreach ( keys %$cd11_sigstrength ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($_);
+        $ret{$_} = $interfaces->{$ifindex};
+    }
+    return \%ret;
+}
+
+sub cd11_ssid {
+    my $aironet          = shift;
+    my $cd11_sigstrength = $aironet->cd11_sigstrength();
+    my %ret;
+    foreach ( keys %$cd11_sigstrength ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($_);
+        $ret{$_} = $ssid;
+    }
+    return \%ret;
+}
+
+sub cd11_mac {
+    my $aironet          = shift;
+    my $cd11_sigstrength = $aironet->cd11_sigstrength();
+    my %ret;
+    foreach ( keys %$cd11_sigstrength ) {
+        my ( $ifindex, $ssid, $mac ) = _aironet_breakout_dot11idx($_);
+        $ret{$_} = $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.
+# This convoluted path seems to be necessary
+# to get the right overrides.
+sub i_mac {
+    my $aironet = shift;
+
+    # no partial is possible due to the levels
+    # of indirection.
+
+    # Start with the ifPhysAddress, and override
+    my $mbss_mac = $aironet->orig_i_mac();
+
+    my $mbss_mac_addr = $aironet->mbss_mac_addr();
+    my $ssid_vlan     = $aironet->cdot11SecAuxSsidVlan();
+    my $vlan_map      = $aironet->cviRoutedVlanIfIndex();
+    my $ifstack       = $aironet->ifStackStatus();
+
+    my $vlan_list = {};
+    foreach my $idx ( keys %$vlan_map ) {
+        my ( $vlan, $num ) = split( /\./, $idx );
+        push( @{ $vlan_list->{$vlan} }, $vlan_map->{$idx} );
+    }
+
+    my $stack = {};
+    foreach my $idx ( keys %$ifstack ) {
+        my ( $upper, $lower ) = split( /\./, $idx );
+        $stack->{$upper}->{$lower} = $ifstack->{$idx};
+    }
+
+    # mbss_mac_addr index is (radio, ssid).
+    # ssid_vlan maps ssid->vlan.
+    # vlan_map maps vlan->[list of interfaces]
+    # ifstack allows us to pick the right interface
+    foreach my $idx ( keys %$mbss_mac_addr ) {
+        my ( $interface, @ssid ) = split( /\./, $idx );
+        my $vlan = $ssid_vlan->{ join( ".", scalar(@ssid), @ssid ) };
+        next unless defined($vlan);
+        foreach my $vlanif ( @{ $vlan_list->{$vlan} } ) {
+            if ( defined( $stack->{$vlanif}->{$interface} ) ) {
+                $mbss_mac->{$vlanif} = $mbss_mac_addr->{$idx};
+            }
+        }
+    }
+
+    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;
+}
+
 1;
 __END__

 =head1 NAME

-SNMP::Info::Layer2::Aironet - SNMP Interface to Cisco Aironet devices running IOS.
+SNMP::Info::Layer2::Aironet - SNMP Interface to Cisco Aironet devices running
+IOS.

 =head1 AUTHOR

@@ -149,7 +455,6 @@ Max Baker
 my $aironet = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -161,7 +466,8 @@ Max Baker

 =head1 DESCRIPTION

-Provides interface to SNMP Data available on newer Aironet devices running Cisco IOS.
+Provides interface to SNMP Data available on newer Aironet devices running
+Cisco IOS.

 Note there are two classes for Aironet devices :

@@ -177,8 +483,8 @@ This class is for devices running Cisco IOS software (newer)

 =back

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $aironet = new SNMP::Info::Layer2::Aironet(...);

@@ -192,7 +498,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

@@ -218,7 +526,11 @@ Adds info from method e_descr() from SNMP::Info::Entity

 =item $aironet->vendor()

-    Returns 'cisco' :)
+Returns 'cisco'
+
+=item $aironet->description()
+
+System description

 =back

@@ -236,6 +548,26 @@ See documentation in L<SNMP::Info::EtherLike/"GLOBALS"> for details.

 =head1 TABLE METHODS

+=over
+
+=item $aironet->cd11_port()
+
+Returns radio interfaces.
+
+=item $aironet->cd11_mac()
+
+Returns radio interface MAC addresses.
+
+=item $aironet->cd11_ssid()
+
+Returns radio interface ssid.
+
+=item $aironet->dot11_cur_tx_pwr_mw()
+
+Current transmit power, in milliwatts, of the radio interface.
+
+=back
+
 =head2 Overrides

 =over
@@ -244,9 +576,52 @@ See documentation in L<SNMP::Info::EtherLike/"GLOBALS"> for details.

 Uses the i_description() field.

+=item $aironet->i_mac()
+
+MAC address of the interface. Note this is just the MAC of the port, not
+anything connected to it.
+
 =item $aironet->i_duplex()

-Crosses information from SNMP::Info::EtherLike to get duplex info for interfaces.
+Crosses information from SNMP::Info::EtherLike to get duplex info for
+interfaces.
+
+=item $aironet->bp_index()
+
+Returns reference to hash of bridge port table entries map back to interface
+identifier (iid)
+
+=item $aironet->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses
+
+=item $aironet->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+=item $aironet->i_vlan()
+
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.
+
+=item $aironet->v_index()
+
+Returns VLAN IDs
+
+=item $aironet->v_name()
+
+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.

 =back

@@ -262,4 +637,14 @@ See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.

 See documentation in L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.

+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $aironet->munge_cd11_txrate()
+
+Converts units of half a megabit to human readable string.
+
+=back
+
 =cut
--- a/Info/Layer2/Allied.pm
+++ b/Info/Layer2/Allied.pm
@@ -1,65 +1,62 @@
 # SNMP::Info::Layer2::Allied
-# Max Baker, Dmitry Sergienko <dmitry@trifle.net>
+# $Id$
 #
-# Copyright (c) 2004 Max Baker
+# Copyright (c) 2008 Max Baker
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 Netdisco nor the 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::Allied;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Layer1;

-@SNMP::Info::Layer2::Allied::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Allied::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Allied::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            'ip_adresses'=> 'atNetAddress',
-            'ip_mac'     => 'atPhysAddress',
-           );
+%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            'AtiSwitch-MIB'    => 'atiswitchProductType',
-            'AtiStackInfo-MIB' => 'atiswitchEnhancedStacking',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    'ip_adresses' => 'atNetAddress',
+    'ip_mac'      => 'atPhysAddress',
+);

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-           );
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'AtiSwitch-MIB'    => 'atiswitchProductType',
+    'AtiStackInfo-MIB' => 'atiswitchEnhancedStacking',
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );

 sub vendor {
    return 'allied';
@@ -71,9 +68,9 @@ sub os {

 sub os_ver {
    my $allied = shift;
-    my $descr = $allied->description();
-    
-    if ($descr =~ m/version (\d+\.\d+)/){
+    my $descr  = $allied->description();
+
+    if ( $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
 }
@@ -83,50 +80,48 @@ sub model {

    my $desc = $allied->description();

-    if ($desc =~ /(AT-80\d{2}\S*)/){
+    if ( $desc =~ /(AT-80\d{2}\S*)/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub root_ip {
-    my $allied = shift;
+    my $allied  = shift;
    my $ip_hash = $allied->ip_addresses();
-    my $ip;
    my $found_ip;
-    
-    foreach $ip (values %{$ip_hash}) {
-        my $found_ip = SNMP::Info::munge_ip($ip) if (defined $ip);
-        last; # this is only one IP address
+
+    foreach my $ip ( values %{$ip_hash} ) {
+        $found_ip = SNMP::Info::munge_ip($ip) if ( defined $ip );
+        last;    # this is only one IP address
    }
    return $found_ip;
 }

-sub mac{
-    my $allied = shift;
+sub mac {
+    my $allied   = shift;
    my $mac_hash = $allied->ip_mac();
-    my $mac;
    my $found_mac;
-    
-    foreach $mac (values %{$mac_hash}) {
+
+    foreach my $mac ( values %{$mac_hash} ) {
        $found_mac = SNMP::Info::munge_mac($mac);
-        last; # this is only one MAC address
+        last;    # this is only one MAC address
    }
    return $found_mac;
 }

 sub i_up {
-    my $allied = shift;
+    my $allied  = shift;
    my $partial = shift;

-    my $i_up  = SNMP::Info::Layer1::i_up($allied, $partial);
+    my $i_up = SNMP::Info::Layer1::i_up( $allied, $partial );

-    foreach my $port (keys %$i_up){
+    foreach my $port ( keys %$i_up ) {
        my $up = $i_up->{$port};
        $i_up->{$port} = 'down' if $up eq 'linktesterror';
-        $i_up->{$port} = 'up' if $up eq 'nolinktesterror';
+        $i_up->{$port} = 'up'   if $up eq 'nolinktesterror';
    }
-    
+
    return $i_up;
 }
 1;
@@ -146,7 +141,6 @@ Max Baker, Dmitry Sergienko <dmitry@trifle.net>
 my $allied = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
@@ -174,9 +168,9 @@ inherited methods.

 =over

-=item AtiSwitch-MIB
+=item F<AtiSwitch-MIB>

-=item AtiStackInfo-MIB
+=item F<AtiStackInfo-MIB>

 Download for your device from ftp://ftp.allied-telesyn.com/pub/switches/mibs/

@@ -210,11 +204,15 @@ Culls Version from description()

 Returns IP Address of Managed Device.

-(B<actualIpAddr>)
+(C<actualIpAddr>)

 =item $allied->model()

-Trys to cull out AT-nnnnX out of the description field.
+Tries to cull out C<AT-nnnnX> out of the description field.
+
+=item $allied->mac()
+
+Returns device MAC. 

 =back

--- a/Info/Layer2/Aruba.pm
+++ b/Info/Layer2/Aruba.pm
@@ -1,108 +1,130 @@
 # SNMP::Info::Layer2::Aruba
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2005 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Aruba;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer2::Aruba::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Aruba::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Aruba::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,           
-            'WLSX-SWITCH-MIB'  => 'wlsxHostname',
-            'WLSR-AP-MIB'      => 'wlsrHideSSID',
-            );
+$VERSION = '2.04';

-%GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            );
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'WLSX-SWITCH-MIB'         => 'wlsxHostname',
+    'WLSX-WLAN-MIB'           => 'wlanAPFQLN',
+    'WLSR-AP-MIB'             => 'wlsrHideSSID',
+    #'ALCATEL-IND1-TP-DEVICES' => 'familyOmniAccessWireless',
+);

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            # WLSX-SWITCH-MIB::wlsxSwitchAccessPointTable
-            # Table index leafs do not return information
-            # therefore unable to use apBSSID.  We extract
-            # the information from the IID instead.
-            'aruba_ap_name'      => 'apLocation',
-            'aruba_ap_ip'        => 'apIpAddress',
-            'aruba_ap_essid'     => 'apESSID',
-            'aruba_ap_ssidbcast' => 'wlsrHideSSID',
-            # WLSR-AP-MIB::wlsrConfigTable
-            'aruba_ap_channel'   => 'apCurrentChannel',
-            # WLSX-SWITCH-MIB::wlsxSwitchStationMgmtTable
-            # Table index leafs do not return information
-            # therefore unable to use staAccessPointBSSID
-            # or staPhyAddress.  We extract the information from
-            # the IID instead.
-            #'fw_port'             => 'staAccessPointBSSID',
-            #'fw_mac'              => 'staPhyAddress',
-            'fw_user'             => 'staUserName',
-            );
+%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, );

-%MUNGE   = (
-           %SNMP::Info::Layer2::MUNGE,
-            );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+
+    # WLSX-SWITCH-MIB::wlsxSwitchAccessPointTable
+    # Table index leafs do not return information
+    # therefore unable to use apBSSID.  We extract
+    # the information from the IID instead.
+    'aruba_ap_name'      => 'apLocation',
+    'aruba_ap_ip'        => 'apIpAddress',
+    'aruba_ap_essid'     => 'apESSID',
+    'aruba_ap_ssidbcast' => 'wlsrHideSSID',
+
+    # WLSX-WLAN-MIB::wlsxWlanAPTable
+    'aruba_perap_fqln'   => 'wlanAPFQLN',
+
+    # WLSR-AP-MIB::wlsrConfigTable
+    'aruba_ap_channel' => 'apCurrentChannel',
+
+    # WLSX-SWITCH-MIB::wlsxSwitchStationMgmtTable
+    # Table index leafs do not return information
+    # therefore unable to use staAccessPointBSSID
+    # or staPhyAddress.  We extract the information from
+    # the IID instead.
+    #'fw_port'             => 'staAccessPointBSSID',
+    #'fw_mac'              => 'staPhyAddress',
+    'fw_user' => 'staUserName',
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );

 sub layers {
    return '00000011';
 }

 sub os {
-    return 'airos';
+    my $aruba = shift;
+    my %osmap = (
+        'alcatel-lucent' => 'aos-w',
+                );
+    return $osmap{$aruba->vendor()} || 'airos';
 }

 sub vendor {
-    return 'aruba';
+    my $aruba = shift;
+    my $id     = $aruba->id() || 'undef';
+    my %oidmap = (
+                  6486 => 'alcatel-lucent',
+                );
+    $id = $1 if (defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/);
+
+    if (defined($id) and exists($oidmap{$id})) {
+        return $oidmap{$id};
+    }
+    else {
+        return 'aruba';
+    }
 }

 sub os_ver {
    my $aruba = shift;
    my $descr = $aruba->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    if ($descr =~ m/Version\s+(\d+\.\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/Version\s+(\d+\.\d+\.\d+\.\d+)/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 sub model {
    my $aruba = shift;
-    my $id = $aruba->id();
-    return undef unless defined $id;
+    my $id    = $aruba->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;

@@ -110,16 +132,18 @@ sub model {
 }

 # Thin APs do not support ifMIB requirement
+#
+# We return all BSSIDs as pseudo-ports on the controller.

 sub i_index {
-    my $aruba = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index   = $aruba->orig_i_index($partial) || {};
-    my $ap_index  = $aruba->aruba_ap_name($partial) || {};
-    
+    my $i_index  = $aruba->orig_i_index($partial)  || {};
+    my $ap_index = $aruba->aruba_ap_name($partial) || {};
+
    my %if_index;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

@@ -127,9 +151,11 @@ sub i_index {
    }

    # Get Attached APs as Interfaces
-    foreach my $ap_id (keys %$ap_index){
+    foreach my $ap_id ( keys %$ap_index ) {
+
        # Convert the 0.254.123.456 index entry to a MAC address.
-        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$ap_id));
+        my $mac = join( ':',
+            map { sprintf( "%02x", $_ ) } split( /\./, $ap_id ) );

        $if_index{$ap_id} = $mac;
    }
@@ -137,27 +163,28 @@ sub i_index {
 }

 sub interfaces {
-    my $aruba  = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index    = $aruba->i_index($partial) || {};
-    my $i_descr    = $aruba->i_description($partial) || {};
+    my $i_index = $aruba->i_index($partial)       || {};
+    my $i_descr = $aruba->i_description($partial) || {};

    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

-        if ($index =~ /^\d+$/ ) {
-        # Replace the Index with the ifDescr field.
-          my $port = $i_descr->{$iid};
-          next unless defined $port;
-          $if{$iid} = $port;
+        if ( $index =~ /^\d+$/ ) {
+
+            # Replace the Index with the ifDescr field.
+            my $port = $i_descr->{$iid};
+            next unless defined $port;
+            $if{$iid} = $port;
        }

-        elsif ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
-          $if{$index} = $index;
-        }           
+        elsif ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            $if{$index} = $index;
+        }

        else {
            next;
@@ -166,121 +193,144 @@ sub interfaces {
    return \%if;
 }

-sub i_name {
+# Most items are indexed by BSSID.
+# aruba_perap_fqln is indexed by AP, so we use the
+# [haven't decided yet] index to figure out all of the
+# BSSIDs served by a given radio.
+sub aruba_ap_fqln {
    my $aruba  = shift;
+    # I don't think $partial is meaningful in this context
+
+    my $perap_fqln = $aruba->aruba_perap_fqln();
+    my $channel = $aruba->wlanAPBssidChannel();
+    my $aruba_ap_fqln = {};
+
+    # Channel index is: AP, radio, BSSID
+    foreach my $idx (keys %$channel) {
+	my @oid = split(/\./, $idx );
+	my $ap = join(".", @oid[0..5]);
+        my $bssid = join(".", @oid[7..12]);
+	$aruba_ap_fqln->{$bssid} = $perap_fqln->{$ap};
+    }
+
+    return $aruba_ap_fqln;
+}
+
+sub i_name {
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index    = $aruba->i_index($partial) || {};
-    my $i_name2    = $aruba->orig_i_name($partial) || {};
-    my $ap_name    = $aruba->aruba_ap_name($partial) || {};
-    
+    my $i_index = $aruba->i_index($partial)       || {};
+    my $i_name2 = $aruba->orig_i_name($partial)   || {};
+    my $ap_name = $aruba->aruba_ap_name($partial) || {};
+    my $ap_fqln = $aruba->aruba_ap_fqln($partial) || {};
+
    my %i_name;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

-        if ($index =~ /^\d+$/ ) {
-          my $name = $i_name2->{$iid};
-          next unless defined $name;
-          $i_name{$index} = $name;
+        if ( $index =~ /^\d+$/ ) {
+            my $name = $i_name2->{$iid};
+            next unless defined $name;
+            $i_name{$index} = $name;
        }

-        elsif ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
-          my $name = $ap_name->{$iid};
-          next unless defined $name;
-          $i_name{$index} = $name;
-        }           
+        elsif ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            my $name = $ap_fqln->{$iid} || $ap_name->{$iid};
+            next unless defined $name;
+            $i_name{$index} = $name;
+        }
        else {
            next;
        }
    }
-  return \%i_name;
+    return \%i_name;
 }

 sub i_ssidlist {
-    my $aruba  = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index    = $aruba->i_index($partial) || {};
-    my $ap_ssid    = $aruba->aruba_ap_essid($partial) || {};
-    
+    my $i_index = $aruba->i_index($partial)        || {};
+    my $ap_ssid = $aruba->aruba_ap_essid($partial) || {};
+
    my %i_ssid;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

-        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
-          my $ssid = $ap_ssid->{$iid};
-          next unless defined $ssid;
-          $i_ssid{$index} = $ssid;
-        }           
+        if ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            my $ssid = $ap_ssid->{$iid};
+            next unless defined $ssid;
+            $i_ssid{$index} = $ssid;
+        }
        else {
            next;
        }
    }
-  return \%i_ssid;
+    return \%i_ssid;
 }

 sub i_80211channel {
-    my $aruba  = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index  = $aruba->i_index($partial) || {};
-    my $ap_ch    = $aruba->aruba_ap_channel($partial) || {};
-    
+    my $i_index = $aruba->i_index($partial)          || {};
+    my $ap_ch   = $aruba->aruba_ap_channel($partial) || {};
+
    my %i_ch;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

-        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
-          my $ch = $ap_ch->{$iid};
-          next unless defined $ch;
-          $i_ch{$index} = $ch;
-        }           
+        if ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            my $ch = $ap_ch->{$iid};
+            next unless defined $ch;
+            $i_ch{$index} = $ch;
+        }
        else {
            next;
        }
    }
-  return \%i_ch;
+    return \%i_ch;
 }

 sub i_ssidbcast {
-    my $aruba  = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index  = $aruba->i_index($partial) || {};
-    my $ap_bc    = $aruba->aruba_ap_ssidbcast($partial) || {};
-    
+    my $i_index = $aruba->i_index($partial)            || {};
+    my $ap_bc   = $aruba->aruba_ap_ssidbcast($partial) || {};
+
    my %i_bc;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

-        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
-          my $bc = $ap_bc->{$iid};
-          next unless defined $bc;
-          $bc = ($bc ? 0 : 1);
-          $i_bc{$index} = $bc;
-        }           
+        if ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
+            my $bc = $ap_bc->{$iid};
+            next unless defined $bc;
+            $bc = ( $bc ? 0 : 1 );
+            $i_bc{$index} = $bc;
+        }
        else {
            next;
        }
    }
-  return \%i_bc;
+    return \%i_bc;
 }

-
 # Wireless switches do not support the standard Bridge MIB
 sub bp_index {
-    my $aruba = shift;
+    my $aruba   = shift;
    my $partial = shift;

-    my $i_index   = $aruba->orig_i_index($partial) || {};
-    my $ap_index  = $aruba->aruba_ap_name($partial) || {};
-    
+    my $i_index  = $aruba->orig_i_index($partial)  || {};
+    my $ap_index = $aruba->aruba_ap_name($partial) || {};
+
    my %bp_index;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

@@ -288,9 +338,11 @@ sub bp_index {
    }

    # Get Attached APs as Interfaces
-    foreach my $ap_id (keys %$ap_index){
+    foreach my $ap_id ( keys %$ap_index ) {
+
        # Convert the 0.254.123.456 index entry to a MAC address.
-        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$ap_id));
+        my $mac = join( ':',
+            map { sprintf( "%02x", $_ ) } split( /\./, $ap_id ) );

        $bp_index{$mac} = $mac;
    }
@@ -298,43 +350,71 @@ sub bp_index {
 }

 sub fw_port {
-    my $aruba = shift;
+    my $aruba   = shift;
    my $partial = shift;

    my $fw_idx = $aruba->fw_user($partial) || {};

    my %fw_port;
-    foreach my $iid (keys %$fw_idx){
-      if ($iid =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/) {
-        my $port = join(':',map {sprintf("%02x",$_)} split(/\./,$2));
-        $fw_port{$iid} = $port;
-      }
-      else {
-        next;
-      }
+    foreach my $iid ( keys %$fw_idx ) {
+        if ( $iid
+            =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/
+            )
+        {
+            my $port = join( ':',
+                map { sprintf( "%02x", $_ ) } split( /\./, $2 ) );
+            $fw_port{$iid} = $port;
+        }
+        else {
+            next;
+        }
    }
    return \%fw_port;
 }

 sub fw_mac {
-    my $aruba = shift;
+    my $aruba   = shift;
    my $partial = shift;

    my $fw_idx = $aruba->fw_user($partial) || {};

    my %fw_mac;
-    foreach my $iid (keys %$fw_idx){
-      if ($iid =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/) {
-        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$1));
-        $fw_mac{$iid} = $mac;
-      }
-      else {
-        next;
-      }
+    foreach my $iid ( keys %$fw_idx ) {
+        if ( $iid
+            =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/
+            )
+        {
+            my $mac = join( ':',
+                map { sprintf( "%02x", $_ ) } split( /\./, $1 ) );
+            $fw_mac{$iid} = $mac;
+        }
+        else {
+            next;
+        }
    }
    return \%fw_mac;
 }

+# Return the BSSID in i_mac.
+sub i_mac {
+    my $aruba = shift;
+    my $partial = shift;
+
+    # Start with the i_mac entries for the physical ports.
+    my $i_mac = $aruba->orig_i_mac($partial) || {};
+
+    # Add in all the BSSID entries.
+    my $i_index  = $aruba->i_index($partial) || {};
+    foreach my $iid (keys %$i_index) {
+        my $index = $i_index->{$iid};
+	if ($index =~ /:/) {
+	    $i_mac->{$index} = $index;
+	}
+    }
+
+    return $i_mac;
+}
+
 1;

 __END__
@@ -364,17 +444,17 @@ Eric Miller

 =head1 DESCRIPTION

-SNMP::Info::Layer2::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.
+SNMP::Info::Layer2::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.

 This class emulates bridge functionality for the wireless switch. This enables
 end station MAC addresses collection and correlation to the thin access point
 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. 
+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(...);

@@ -390,9 +470,9 @@ determining a more specific class using the method above.

 =over

-=item WLSX-SWITCH-MIB
+=item F<WLSX-SWITCH-MIB>

-=item WLSR-AP-MIB
+=item F<WLSR-AP-MIB>

 =back

@@ -421,7 +501,7 @@ Returns 'airos'

 =item $aruba->os_ver()

-Returns the software version extracted from B<sysDescr>
+Returns the software version extracted from C<sysDescr>

 =back

@@ -453,17 +533,22 @@ to a hash.

 Returns reference to map of IIDs to Interface index. 

-Extends ifIndex to support thin APs as device interfaces.
+Extends C<ifIndex> to support thin APs as device interfaces.

 =item $aruba->interfaces()

 Returns reference to map of IIDs to ports.  Thin APs are implemented as device 
-interfaces.  The thin AP MAC address is used as the port identifier.
+interfaces.  The thin AP BSSID is used as the port identifier.

 =item $aruba->i_name()

-Interface name.  Returns (B<ifName>) for Ethernet interfaces and (B<apLocation>)
-for thin AP interfaces.
+Interface name.  Returns (C<ifName>) for Ethernet interfaces and
+(C<wlanAPFQLN> or C<apLocation>) for thin AP interfaces.
+
+=item $aruba->i_mac()
+
+Interface MAC address.  Returns interface MAC address for Ethernet
+interfaces and BSSID for thin AP interfaces.

 =item $aruba->bp_index()

@@ -472,72 +557,87 @@ both the keys and values.

 =item $aruba->fw_port()

-(B<staAccessPointBSSID>) as extracted from the IID.
+(C<staAccessPointBSSID>) as extracted from the IID.

 =item $aruba->fw_mac()

-(B<staPhyAddress>) as extracted from the IID.
+(C<staPhyAddress>) as extracted from the IID.

 =item $aruba->i_ssidlist()

 Returns reference to hash.  SSID's recognized by the radio interface.

-(B<apESSID>)
+(C<apESSID>)

 =item $aruba->i_ssidbcast()

-Returns reference to hash.  Indicates whether the SSID is broadcast, true or false.
+Returns reference to hash.  Indicates whether the SSID is broadcast, true or
+false.

-(B<wlsrHideSSID>)
+(C<wlsrHideSSID>)

 =item $aruba->i_80211channel()

 Returns reference to hash.  Current operating frequency channel of the radio
 interface.

-(B<apCurrentChannel>)
+(C<apCurrentChannel>)
+
+=item $aruba->aruba_ap_fqln()
+
+Returns F<aruba_perap_fqln> indexed by BSSID instead of by AP.

 =back

-=head2 Aruba Switch AP Table  (B<wlsxSwitchAccessPointTable>)
+=head2 Aruba Switch AP Table  (C<wlsxSwitchAccessPointTable>)

 =over

 =item $aruba->aruba_ap_name()

-(B<apLocation>)
+(C<apLocation>)

 =item $aruba->aruba_ap_ip()

-(B<apIpAddress>)
+(C<apIpAddress>)

 =item $aruba->aruba_ap_essid()

-(B<apESSID>)
+(C<apESSID>)

 =item $aruba->aruba_ap_ssidbcast()

-(B<wlsrHideSSID>)
+(C<wlsrHideSSID>)

 =back

-=head2 Aruba Switch Station Management Table (B<wlsxSwitchStationMgmtTable>)
+=head2 Aruba AP Table (C<wlsxWlanAPTable>)
+
+=over
+
+=item $aruba->aruba_perap_fqln()
+
+(C<wlanAPFQLN>)
+
+=back
+
+=head2 Aruba Switch Station Management Table (C<wlsxSwitchStationMgmtTable>)

 =over

 =item $aruba->fw_user()

-(B<staUserName>)
+(C<staUserName>)

 =back

-=head2 Aruba Wireless AP Configuration Table (B<wlsrConfigTable>)
+=head2 Aruba Wireless AP Configuration Table (C<wlsrConfigTable>)

 =over

 =item $aruba->aruba_ap_channel()

-(B<apCurrentChannel>)
+(C<apCurrentChannel>)

 =back

--- a/Info/Layer2/Bay.pm
+++ b/Info/Layer2/Bay.pm
@@ -1,133 +1,137 @@
 # SNMP::Info::Layer2::Bay
-# Max Baker 
+# $Id$
 # This module depricated.  See Layer2::BayStack
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Bay;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer2::Bay::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Bay::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Bay::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 # Set for No CDP
-%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS,
-             'cdp_id'  => 's5EnMsTopIpAddr',
-             'cdp_run' => 's5EnMsTopStatus',
-           );
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    'cdp_id'  => 's5EnMsTopIpAddr',
+    'cdp_run' => 's5EnMsTopStatus',
+);

-%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
-            'imac2'      => 'ifPhysAddress',
-            # S5-ETH-MULTISEG-TOPOLOGY-MIB::s5EnMsTopNmmTable
-            'bay_topo_slot'     => 's5EnMsTopNmmSlot',
-            'bay_topo_port'     => 's5EnMsTopNmmPort',
-            'bay_topo_ip'       => 's5EnMsTopNmmIpAddr',
-            'bay_topo_seg'      => 's5EnMsTopNmmSegId',
-            'bay_topo_mac'      => 's5EnMsTopNmmMacAddr',
-            'bay_topo_platform' => 's5EnMsTopNmmChassisType',
-            'bay_topo_localseg' => 's5EnMsTopNmmLocalSeg',
-            );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    'imac2' => 'ifPhysAddress',

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            'SYNOPTICS-ROOT-MIB'           => 'synoptics',
-            'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop'
-           );
+    # S5-ETH-MULTISEG-TOPOLOGY-MIB::s5EnMsTopNmmTable
+    'bay_topo_slot'     => 's5EnMsTopNmmSlot',
+    'bay_topo_port'     => 's5EnMsTopNmmPort',
+    'bay_topo_ip'       => 's5EnMsTopNmmIpAddr',
+    'bay_topo_seg'      => 's5EnMsTopNmmSegId',
+    'bay_topo_mac'      => 's5EnMsTopNmmMacAddr',
+    'bay_topo_platform' => 's5EnMsTopNmmChassisType',
+    'bay_topo_localseg' => 's5EnMsTopNmmLocalSeg',
+);
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'SYNOPTICS-ROOT-MIB'           => 'synoptics',
+    'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop'
+);

 delete $MIBS{'CISCO-CDP-MIB'};
+
 # 450's report full duplex as speed = 20mbps?!
-$SNMP::Info::SPEED_MAP{20_000_000} = '10 Mbps';
+$SNMP::Info::SPEED_MAP{20_000_000}  = '10 Mbps';
 $SNMP::Info::SPEED_MAP{200_000_000} = '100 Mbps';

-%MUNGE   = (%SNMP::Info::Layer2::MUNGE,
-            'i_mac2' => \&SNMP::Info::munge_mac ,
-            );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, 'i_mac2' => \&SNMP::Info::munge_mac, );

 sub os {
    return 'bay';
 }

 sub os_ver {
-    my $bay = shift;
+    my $bay   = shift;
    my $descr = $bay->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

    # 303 / 304
-    if ($descr =~ m/Rev: \d+\.\d+\.\d+\.\d+-(\d+\.\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/Rev: \d+\.\d+\.\d+\.\d+-(\d+\.\d+\.\d+\.\d+)/ ) {
        return $1;
    }

    # 450
-    if ($descr =~ m/SW:v(\d+\.\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/SW:v(\d+\.\d+\.\d+\.\d+)/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub os_bin {
-    my $bay = shift;
+    my $bay   = shift;
    my $descr = $bay->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

    # 303 / 304
-    if ($descr =~ m/Rev: \d+\.(\d+\.\d+\.\d+)-\d+\.\d+\.\d+\.\d+/){
+    if ( $descr =~ m/Rev: \d+\.(\d+\.\d+\.\d+)-\d+\.\d+\.\d+\.\d+/ ) {
        return $1;
    }

    # 450
-    if ($descr =~ m/FW:v(\d+\.\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/FW:v(\d+\.\d+\.\d+\.\d+)/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub vendor {
+
    # or nortel, or synopsis?
    return 'bay';
 }

 sub i_ignore {
-    my $bay = shift;
+    my $bay   = shift;
    my $descr = $bay->description();

    my $i_type = $bay->i_type();

    my %i_ignore;
-    foreach my $if (keys %$i_type){
-        my $type = $i_type->{$if};  
+    foreach my $if ( keys %$i_type ) {
+        my $type = $i_type->{$if};
        $i_ignore{$if}++ if $type =~ /(loopback|propvirtual|cpu)/i;
    }

@@ -135,49 +139,48 @@ sub i_ignore {
 }

 sub interfaces {
-    my $bay = shift;
+    my $bay     = shift;
    my $i_index = $bay->i_index();

    return $i_index;
 }

-sub i_mac { 
-    my $bay = shift;
+sub i_mac {
+    my $bay   = shift;
    my $i_mac = $bay->i_mac2();

    # Bay 303's with a hw rev < 2.11.4.5 report the mac as all zeros
-    foreach my $iid (keys %$i_mac){
+    foreach my $iid ( keys %$i_mac ) {
        my $mac = $i_mac->{$iid};
        delete $i_mac->{$iid} if $mac eq '00:00:00:00:00:00';
    }
    return $i_mac;
 }

-
 sub model {
    my $bay = shift;
-    my $id = $bay->id();
-    return undef unless defined $id;
+    my $id  = $bay->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;
    $model =~ s/^sreg-//i;

    my $descr = $bay->description();

-    return '303' if ($descr =~ /\D303\D/);
-    return '304' if ($descr =~ /\D304\D/);
-    return '450' if ($model =~ /BayStack450/);
+    return '303' if ( $descr =~ /\D303\D/ );
+    return '304' if ( $descr =~ /\D304\D/ );
+    return '450' if ( $model =~ /BayStack450/ );
    return $model;
 }

 # Hack in some CDP type stuff

 sub c_if {
-    my $bay = shift;
+    my $bay           = shift;
    my $bay_topo_port = $bay->bay_topo_port();

    my %c_if;
-    foreach my $entry (keys %$bay_topo_port){
+    foreach my $entry ( keys %$bay_topo_port ) {
        my $port = $bay_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;
@@ -187,29 +190,30 @@ sub c_if {
 }

 sub c_ip {
-    my $bay = shift;
+    my $bay           = shift;
    my $bay_topo_ip   = $bay->bay_topo_ip();
    my $bay_topo_port = $bay->bay_topo_port();
-    my $ip = $bay->cdp_ip();
-    
+    my $ip            = $bay->cdp_ip();
+
    # Count the number of devices seen on each port.
    #   more than one device seen means connected to a non-bay
    #   device, but other bay devices are squawking further away.
    my %ip_port;
-    foreach my $entry (keys %$bay_topo_ip){
+    foreach my $entry ( keys %$bay_topo_ip ) {
        my $port = $bay_topo_port->{$entry};
        next unless defined $port;
-        next if ($port =~ /^[\d\.]+$/ and $port == 0);
-        my $ip   = $bay_topo_ip->{$entry};
-        push(@{$ip_port{$port}},$ip);
+        next if ( $port =~ /^[\d\.]+$/ and $port == 0 );
+        my $ip = $bay_topo_ip->{$entry};
+        push( @{ $ip_port{$port} }, $ip );
    }

    my %c_ip;
-    foreach my $port (keys %ip_port){
+    foreach my $port ( keys %ip_port ) {
        my $ips = $ip_port{$port};
-        if (scalar @$ips == 1) {
+        if ( scalar @$ips == 1 ) {
            $c_ip{"$port.1"} = $ips->[0];
-        } else {
+        }
+        else {
            $c_ip{"$port.1"} = $ips;
        }
    }
@@ -218,12 +222,12 @@ sub c_ip {
 }

 sub c_port {
-    my $bay = shift;
+    my $bay           = shift;
    my $bay_topo_port = $bay->bay_topo_port();
-    my $bay_topo_seg = $bay->bay_topo_seg();
+    my $bay_topo_seg  = $bay->bay_topo_seg();

    my %c_port;
-    foreach my $entry (keys %$bay_topo_seg){
+    foreach my $entry ( keys %$bay_topo_seg ) {
        my $port = $bay_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;
@@ -231,11 +235,11 @@ sub c_port {
        # For fake remotes (multiple IPs for a c_ip), use first found
        next if defined $c_port{"$port.1"};

-        my $seg  = $bay_topo_seg->{$entry};
+        my $seg = $bay_topo_seg->{$entry};

        # Segment id is (256 * remote slot_num) + (remote_port)
        my $remote_port = $seg % 256;
-    
+
        $c_port{"$port.1"} = $remote_port;
    }

@@ -243,20 +247,19 @@ sub c_port {
 }

 sub c_platform {
-    my $bay = shift;
+    my $bay               = shift;
    my $bay_topo_port     = $bay->bay_topo_port();
    my $bay_topo_platform = $bay->bay_topo_platform();

-
    my %c_platform;
-    foreach my $entry (keys %$bay_topo_platform){
+    foreach my $entry ( keys %$bay_topo_platform ) {
        my $port = $bay_topo_port->{$entry} || 0;
        next if $port == 0;

        # For fake remotes (multiple IPs for a c_ip), use first found
        next if defined $c_platform{"$port.1"};

-        my $platform  = $bay_topo_platform->{$entry};
+        my $platform = $bay_topo_platform->{$entry};

        $c_platform{"$port.1"} = $platform;
    }
@@ -277,15 +280,15 @@ Max Baker

 =head1 SYNOPSIS

-This module is Depricated.  Please use Layer2::BayStack instead.
+This module is Deprecated.  Please use Layer2::BayStack instead.

 =head1 DESCRIPTION

 Provides abstraction to the configuration information obtainable from a 
 Bay device through SNMP. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $bay = new SNMP::Info::Layer2::Bay(...);

@@ -301,9 +304,9 @@ a more specific class using the method above.

 =over

-=item SYNOPTICS-ROOT-MIB
+=item F<SYNOPTICS-ROOT-MIB>

-=item S5-ETH-MULTISEG-TOPOLOGY-MIB
+=item F<S5-ETH-MULTISEG-TOPOLOGY-MIB>

 =item Inherited classes

@@ -311,15 +314,6 @@ MIBs required by L<SNMP::Info::Layer2/"Required MIBs"> and its superclasses.

 =back

-Bay MIBs can be found on the CD that came with your product.
-
-Or, if you still have a service contract they can be downloaded at
-www.nortelnetworks.com
-
-They have also been seen at : http://www.inotech.com/mibs/vendor/baynetworks/synoptics/synoptics.asp
-
-Or http://www.oidview.com/mibs/detail.html under Synoptics.  Check also www.mibdepot.com
-
 =head1 GLOBALS

 These are methods that return scalar value from SNMP
@@ -332,23 +326,35 @@ Returns 'bay' :)

 =item $bay->model()

-Cross references $bay->id() to the SYNOPTICS-MIB and returns
+Cross references $bay->id() to the F<SYNOPTICS-MIB> and returns
 the results.  303s and 304s have the same ID, so we have a hack
 to return depending on which it is. 

-Removes sreg- from the model name
+Removes C<sreg-> from the model name
+
+=item $baystack->os()
+
+Returns 'bay'.
+
+=item $bay->os_ver()
+
+Returns the os version extracted from C<sysDescr>.
+
+=item $bay->os_bin()
+
+Returns the firmware version extracted from C<sysDescr>.

 =item $bay->cdp_id()

 Returns the IP that the device is sending out for its Nmm topology info.

-(B<s5EnMsTopIpAddr>)
+(C<s5EnMsTopIpAddr>)

 =item $bay->cdp_run()

-Returns if the S5-ETH-MULTISEG-TOPOLOGY info is on for this device. 
+Returns if the F<S5-ETH-MULTISEG-TOPOLOGY> info is on for this device. 

-(B<s5EnMsTopStatus>)
+(C<s5EnMsTopStatus>)

 =back

@@ -369,17 +375,17 @@ to a hash.

 Returns reference to map of IIDs to physical ports. 

-Currently simply returns the B<ifIndex>
+Currently simply returns the C<ifIndex>

 =item $bay->i_ignore()

 Returns reference to hash of IIDs to ignore.

-Simply calls the SNMP::Info::Layer2::i_ignore() fn for this.
+Simply calls the SNMP::Info::Layer2::i_ignore() for this.

 =item $bay->i_mac()

-Returns the B<ifPhysAddress> table entries. 
+Returns the C<ifPhysAddress> table entries. 

 Removes all entries matching '00:00:00:00:00:00' -- Certain 
 older revisions of Bay 303 and 304 firmware report all zeros
@@ -387,7 +393,7 @@ for each port mac.

 =back

-=head2 Psuedo CDP information
+=head2 Pseudo CDP information

 All entries with port=0 are local and ignored.

@@ -395,21 +401,31 @@ All entries with port=0 are local and ignored.

 =item $bay->c_if()

-Returns referenece to hash.  Key: port.1 Value: port (iid)
+Returns reference to hash.  Key: port.1 Value: port (iid)

 =item $bay->c_ip()

-Returns referenece to hash.  Key: port.1 
+Returns reference to hash.  Key: port.1 

 The value of each hash entry can either be a scalar or an array.
 A scalar value is most likely a direct neighbor to that port. 
-It is possible that there is a non-bay device in between this device and the remote device.
+It is possible that there is a non-bay device in between this device and the
+remote device.

-An array value represents a list of seen devices.  The only time you will get an array
-of nieghbors, is if there is a non-bay device in between two or more devices. 
+An array value represents a list of seen devices.  The only time you will get
+an array of neighbors, is if there is a non-bay device in between two or more
+devices. 

 Use the data from the Layer2 Topology Table below to dig deeper.

+=item $bay->c_port()
+
+Returns reference to hash. Key: IID, Value: Remote port (interfaces)
+
+=item $bay->c_platform()
+
+Returns reference to hash. Key: IID, Value: Remote device type
+
 =item $bay->port()

 Returns reference to hash. Key: port.1 Value: port
@@ -420,7 +436,7 @@ Returns reference to hash. Key: port.1 Value: Remote Device Type

 =back

-=head2 Layer2 Topology info (s5EnMsTopNmmTable)
+=head2 Layer2 Topology info (C<s5EnMsTopNmmTable>)

 =over

@@ -428,28 +444,29 @@ Returns reference to hash. Key: port.1 Value: Remote Device Type

 Returns reference to hash.  Key: Table entry, Value:slot number

-(B<s5EnMsTopNmmSlot>)
+(C<s5EnMsTopNmmSlot>)

 =item $bay->bay_topo_port()

-Returns reference to hash.  Key: Table entry, Value:Port Number (interface iid)
+Returns reference to hash.  Key: Table entry, Value:Port Number
+(interface iid)

-(B<s5EnMsTopNmmPort>)
+(C<s5EnMsTopNmmPort>)

 =item $bay->bay_topo_ip()

 Returns reference to hash.  Key: Table entry, Value:Remote IP address of entry

-(B<s5EnMsTopNmmIpAddr>)
+(C<s5EnMsTopNmmIpAddr>)

 =item $bay->bay_topo_seg()

 Returns reference to hash.  Key: Table entry, Value:Remote Segment ID

-(B<s5EnMsTopNmmSegId>)
+(C<s5EnMsTopNmmSegId>)

 =item $bay->bay_topo_mac
-(B<s5EnMsTopNmmMacAddr>)
+(C<s5EnMsTopNmmMacAddr>)

 Returns reference to hash.  Key: Table entry, Value:Remote MAC address

@@ -457,13 +474,14 @@ Returns reference to hash.  Key: Table entry, Value:Remote MAC address

 Returns reference to hash.  Key: Table entry, Value:Remote Device Type

-(B<s5EnMsTopNmmChassisType>)
+(C<s5EnMsTopNmmChassisType>)

 =item $bay->bay_topo_localseg

-Returns reference to hash.  Key: Table entry, Value:Boolean, if bay_topo_seg() is local
+Returns reference to hash.  Key: Table entry, Value:Boolean, if bay_topo_seg()
+is local

-(B<s5EnMsTopNmmLocalSeg>)
+(C<s5EnMsTopNmmLocalSeg>)

 =back

--- a/Info/Layer2/Baystack.pm
+++ b/Info/Layer2/Baystack.pm
@@ -1,38 +1,36 @@
 # SNMP::Info::Layer2::Baystack
-# Eric Miller
+# $Id$
 #
-# Copyright (c) 2004-6 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Baystack;
-$VERSION = '1.07';

-# $Id$
 use strict;
-
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::NortelStack;
@@ -40,83 +38,91 @@ use SNMP::Info::RapidCity;
 use SNMP::Info::LLDP;
 use SNMP::Info::Layer3;

-@SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info::SONMP SNMP::Info::NortelStack
-                                      SNMP::Info::RapidCity SNMP::Info::LLDP
-                                      SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer2::Baystack::ISA
+    = qw/SNMP::Info::SONMP SNMP::Info::NortelStack
+    SNMP::Info::RapidCity SNMP::Info::LLDP
+    SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer3::MIBS,
-            %SNMP::Info::LLDP::MIBS,
-            %SNMP::Info::RapidCity::MIBS,
-            %SNMP::Info::NortelStack::MIBS,
-            %SNMP::Info::SONMP::MIBS,
-           );
+$VERSION = '2.04';

-%GLOBALS = ( 
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::LLDP::GLOBALS,
-            %SNMP::Info::RapidCity::GLOBALS,
-            %SNMP::Info::NortelStack::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-           );
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::RapidCity::MIBS, %SNMP::Info::NortelStack::MIBS,
+    %SNMP::Info::SONMP::MIBS,
+);

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::LLDP::FUNCS,
-            %SNMP::Info::RapidCity::FUNCS,
-            %SNMP::Info::NortelStack::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-            );
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::RapidCity::GLOBALS, %SNMP::Info::NortelStack::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::RapidCity::FUNCS, %SNMP::Info::NortelStack::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,
+);

 # 450's report full duplex as speed = 20mbps?!
-$SNMP::Info::SPEED_MAP{20_000_000} = '10 Mbps';
-$SNMP::Info::SPEED_MAP{200_000_000} = '100 Mbps';
+$SNMP::Info::SPEED_MAP{20_000_000}    = '10 Mbps';
+$SNMP::Info::SPEED_MAP{200_000_000}   = '100 Mbps';
 $SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps';

-%MUNGE   = (
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::LLDP::MUNGE,
-            %SNMP::Info::RapidCity::MUNGE,
-            %SNMP::Info::NortelStack::MUNGE,
-            %SNMP::Info::SONMP::MUNGE,
-            );
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,    %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::RapidCity::MUNGE, %SNMP::Info::NortelStack::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
+);

 sub os {
    my $baystack = shift;
-    my $descr = $baystack->description();
-    my $model = $baystack->model();
+    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';
    }
-    if ((defined $descr and $descr =~ /Business Ethernet Switch.*SW:v/i)) {
-       return 'bes';
+    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 'baystack';
+
+    return 'boss';
 }

 sub os_bin {
    my $baystack = shift;
-    my $descr = $baystack->description();
-    return undef unless defined $descr;
+    my $descr    = $baystack->description();
+    return unless defined $descr;

    # 303 / 304
-    if ($descr =~ m/Rev: \d+\.(\d+\.\d+\.\d+)-\d+\.\d+\.\d+\.\d+/){
+    if ( $descr =~ m/Rev: \d+\.(\d+\.\d+\.\d+)-\d+\.\d+\.\d+\.\d+/ ) {
        return $1;
    }

    # 450
-    if ($descr =~ m/FW:V(\d+\.\d+)/){
+    if ( $descr =~ m/FW:V(\d+\.\d+)/ ) {
        return $1;
    }

-    if ($descr =~ m/FW:(\d+\.\d+\.\d+\.\d+)/i){
+    if ( $descr =~ m/FW:(\d+\.\d+\.\d+\.\d+)/i ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub vendor {
@@ -125,38 +131,41 @@ sub vendor {

 sub model {
    my $baystack = shift;
-    my $id = $baystack->id();
-    return undef unless defined $id;
+    my $id       = $baystack->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;

    my $descr = $baystack->description();

-    return '303' if (defined $descr and $descr =~ /\D303\D/);
-    return '304' if (defined $descr and $descr =~ /\D304\D/);
-    return 'BPS' if ($model =~ /BPS2000/i);
-    return $2 if ($model =~ /(ES|ERS|BayStack|EthernetRoutingSwitch|EthernetSwitch)-?(\d+)/);
-    
+    return '303' if ( defined $descr and $descr =~ /\D303\D/ );
+    return '304' if ( defined $descr and $descr =~ /\D304\D/ );
+    return 'BPS' if ( $model =~ /BPS2000/i );
+    return $2
+        if ( $model
+        =~ /(ES|ERS|BayStack|EthernetRoutingSwitch|EthernetSwitch)-?(\d+)/ );
+
    return $model;
 }

 sub interfaces {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $i_index = $baystack->i_index($partial) || {};
+    my $i_index      = $baystack->i_index($partial) || {};
    my $index_factor = $baystack->index_factor();
-    my $slot_offset = $baystack->slot_offset();
-    
+    my $slot_offset  = $baystack->slot_offset();
+
    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
+
        # Ignore cascade ports
        next if $index > 513;

-        my $port = ($index % $index_factor);
-        my $slot = (int($index / $index_factor)) + $slot_offset;
+        my $port = ( $index % $index_factor );
+        my $slot = ( int( $index / $index_factor ) ) + $slot_offset;

        my $slotport = "$slot.$port";
        $if{$iid} = $slotport;
@@ -164,54 +173,67 @@ sub interfaces {
    return \%if;
 }

-sub i_mac { 
+sub i_mac {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

    my $i_mac = $baystack->orig_i_mac($partial) || {};

    my %i_mac;
+
    # Baystack 303's with a hw rev < 2.11.4.5 report the mac as all zeros
-    foreach my $iid (keys %$i_mac){
+    foreach my $iid ( keys %$i_mac ) {
        my $mac = $i_mac->{$iid};
        next unless defined $mac;
        next if $mac eq '00:00:00:00:00:00';
-        $i_mac{$iid}=$mac;
+        $i_mac{$iid} = $mac;
    }
    return \%i_mac;
 }

 sub i_name {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $i_index = $baystack->i_index($partial) || {};
-    my $i_alias = $baystack->i_alias($partial) || {};
-    my $i_name2  = $baystack->orig_i_name($partial) || {};
+    my $i_index = $baystack->i_index($partial)     || {};
+    my $i_alias = $baystack->i_alias($partial)     || {};
+    my $i_name2 = $baystack->orig_i_name($partial) || {};

    my %i_name;
-    foreach my $iid (keys %$i_name2){
-        my $name = $i_name2->{$iid};
+    foreach my $iid ( keys %$i_name2 ) {
+        my $name  = $i_name2->{$iid};
        my $alias = $i_alias->{$iid};
-        $i_name{$iid} = (defined $alias and $alias !~ /^\s*$/) ?
-                        $alias : 
-                        $name;
+        $i_name{$iid}
+            = ( defined $alias and $alias !~ /^\s*$/ )
+            ? $alias
+            : $name;
    }

    return \%i_name;
 }

 sub index_factor {
-    my $baystack   = shift;
-    my $model   = $baystack->model();
-    my $os      = $baystack->os();
-    my $op_mode = $baystack->ns_op_mode();
-    
+    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 = 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;
 }

@@ -225,20 +247,20 @@ sub hasCDP {

 sub c_ip {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

    my $cdp  = $baystack->SUPER::c_ip($partial) || {};
-    my $lldp = $baystack->lldp_ip($partial) || {};
+    my $lldp = $baystack->lldp_ip($partial)     || {};

    my %c_ip;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $ip = $cdp->{$iid};
        next unless defined $ip;

        $c_ip{$iid} = $ip;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $ip = $lldp->{$iid};
        next unless defined $ip;

@@ -249,20 +271,20 @@ sub c_ip {

 sub c_if {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $lldp = $baystack->lldp_if($partial) || {};;
+    my $lldp = $baystack->lldp_if($partial)     || {};
    my $cdp  = $baystack->SUPER::c_if($partial) || {};
-    
+
    my %c_if;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $if = $cdp->{$iid};
        next unless defined $if;

        $c_if{$iid} = $if;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $if = $lldp->{$iid};
        next unless defined $if;

@@ -273,20 +295,20 @@ sub c_if {

 sub c_port {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $lldp = $baystack->lldp_port($partial) || {};
+    my $lldp = $baystack->lldp_port($partial)     || {};
    my $cdp  = $baystack->SUPER::c_port($partial) || {};
-    
+
    my %c_port;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $port = $cdp->{$iid};
        next unless defined $port;

        $c_port{$iid} = $port;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $port = $lldp->{$iid};
        next unless defined $port;

@@ -297,20 +319,20 @@ sub c_port {

 sub c_id {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $lldp = $baystack->lldp_id($partial) || {};
+    my $lldp = $baystack->lldp_id($partial)     || {};
    my $cdp  = $baystack->SUPER::c_id($partial) || {};

    my %c_id;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $id = $cdp->{$iid};
        next unless defined $id;

        $c_id{$iid} = $id;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $id = $lldp->{$iid};
        next unless defined $id;

@@ -321,20 +343,20 @@ sub c_id {

 sub c_platform {
    my $baystack = shift;
-    my $partial = shift;
+    my $partial  = shift;

-    my $lldp = $baystack->lldp_rem_sysdesc($partial) || {};
+    my $lldp = $baystack->lldp_rem_sysdesc($partial)  || {};
    my $cdp  = $baystack->SUPER::c_platform($partial) || {};

    my %c_platform;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $platform = $cdp->{$iid};
        next unless defined $platform;

        $c_platform{$iid} = $platform;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $platform = $lldp->{$iid};
        next unless defined $platform;

@@ -436,7 +458,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer2::Baystack - SNMP Interface to Nortel Ethernet (Baystack) Switches
+SNMP::Info::Layer2::Baystack - SNMP Interface to Nortel Ethernet (Baystack)
+Switches

 =head1 AUTHOR

@@ -448,7 +471,6 @@ Eric Miller
 my $baystack = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -463,8 +485,8 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a Nortel 
 Ethernet Switch (Baystack) through SNMP. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $baystack = new SNMP::Info::Layer2::Baystack(...);

@@ -514,14 +536,13 @@ Returns 'nortel'

 =item $baystack->model()

-Cross references $baystack->id() to the SYNOPTICS-MIB and returns
+Cross references $baystack->id() to the F<SYNOPTICS-MIB> and returns
 the results.  303s and 304s have the same ID, so we have a hack
 to return depending on which it is.

 Returns BPS for Business Policy Switch

-For BayStack, EthernetRoutingSwitch, or EthernetSwitch extracts and returns
-the switch numeric designation.
+For others extracts and returns the switch numeric designation.

 =item $baystack->os()

@@ -529,7 +550,7 @@ Returns 'baystack' or 'boss' depending on software version.

 =item $baystack->os_bin()

-Returns the firmware version extracted from B<sysDescr>.
+Returns the firmware version extracted from C<sysDescr>.

 =back

@@ -583,7 +604,8 @@ to a hash.

 Returns reference to the map between IID and physical Port.

-  Slot and port numbers on the Baystack switches are determined by the formula:
+  Slot and port numbers on the Baystack switches are determined by the
+  formula:
  
  port = (Interface index % Index factor)
  slot = (int(Interface index / Index factor)) + Slot offset
@@ -596,77 +618,82 @@ Returns reference to hash of IIDs to ignore.

 =item $baystack->i_mac()

-Returns the B<ifPhysAddress> table entries. 
+Returns the C<ifPhysAddress> table entries. 

 Removes all entries matching '00:00:00:00:00:00' -- Certain 
 revisions of Baystack firmware report all zeros for each port mac.

 =item $baystack->i_name()

-Crosses ifName with ifAlias and returns the human set port name if exists.
+Crosses C<ifName> with C<ifAlias> and returns the human set port name if
+exists.

 =back

-=head2 ENTITY-MIB Information
+=head2 F<ENTITY-MIB> Information

-For older devices which do not support ENTITY-MIB, these methods emulate
-Physical Table methods using S5-CHASSIS-MIB.  See
+For older devices which do not support F<ENTITY-MIB>, these methods emulate
+Physical Table methods using F<S5-CHASSIS-MIB>.  See
 L<SNMP::Info::NortelStack/"TABLE METHODS"> for details on ns_e_* methods.

 =over

 =item $baystack->e_index() 

-If the device doesn't support B<entPhysicalDescr>, this will try ns_e_index().
-Note that this is based on B<entPhysicalDescr> due to implementation
+If the device doesn't support C<entPhysicalDescr>, this will try ns_e_index().
+Note that this is based on C<entPhysicalDescr> due to implementation
 details of SNMP::Info::Entity::e_index().

 =item $baystack->e_class() 

-If the device doesn't support B<entPhysicalClass>, this will try ns_e_class().
+If the device doesn't support C<entPhysicalClass>, this will try ns_e_class().

 =item $baystack->e_descr() 

-If the device doesn't support B<entPhysicalDescr>, this will try ns_e_descr().
+If the device doesn't support C<entPhysicalDescr>, this will try ns_e_descr().
+
+=item $baystack->e_name() 
+
+If the device doesn't support C<entPhysicalName>, this will try ns_e_name().

 =item $baystack->e_fwver() 

-If the device doesn't support B<entPhysicalFirmwareRev>, this will try
+If the device doesn't support C<entPhysicalFirmwareRev>, this will try
 ns_e_fwver().

 =item $baystack->e_hwver() 

-If the device doesn't support B<entPhysicalHardwareRev>, this will try
+If the device doesn't support C<entPhysicalHardwareRev>, this will try
 ns_e_hwver().

 =item $baystack->e_parent() 

-If the device doesn't support B<entPhysicalContainedIn>, this will try
+If the device doesn't support C<entPhysicalContainedIn>, this will try
 ns_e_parent().

 =item $baystack->e_pos() 

-If the device doesn't support B<entPhysicalParentRelPos>, this will try
+If the device doesn't support C<entPhysicalParentRelPos>, this will try
 ns_e_pos().

 =item $baystack->e_serial() 

-If the device doesn't support B<entPhysicalSerialNum>, this will try
+If the device doesn't support C<entPhysicalSerialNum>, this will try
 ns_e_serial().

 =item $baystack->e_swver() 

-If the device doesn't support B<entPhysicalSoftwareRev>, this will try
+If the device doesn't support C<entPhysicalSoftwareRev>, this will try
 ns_e_swver().

 =item $baystack->e_type() 

-If the device doesn't support B<entPhysicalVendorType>, this will try
+If the device doesn't support C<entPhysicalVendorType>, this will try
 ns_e_type().

 =item $baystack->e_vendor() 

-If the device doesn't support B<entPhysicalMfgName>, this will try
+If the device doesn't support C<entPhysicalMfgName>, this will try
 ns_e_vendor().

 =back
@@ -678,7 +705,8 @@ Management Protocol (SONMP) and Link Layer Discovery Protocol (LLDP). 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 de-duplicate if necessary.
+responsibility to identify any duplicate entries and remove duplicates if
+necessary.

 =over

@@ -697,8 +725,8 @@ 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-SONMP/LLDP device in between two or
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-SONMP/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.
--- a/Info/Layer2/C1900.pm
+++ b/Info/Layer2/C1900.pm
@@ -1,7 +1,7 @@
 # SNMP::Info::Layer2::C1900
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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.
@@ -11,30 +11,28 @@
 #
 #     * 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.
+#     * 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.
+# 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::C1900;
-$VERSION = '1.07';

-# $Id$
 use strict;
-
 use Exporter;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
@@ -42,54 +40,56 @@ use SNMP::Info::CiscoConfig;
 use SNMP::Info::Layer2;

@SNMP::Info::Layer2::C1900::ISA = qw/SNMP::Info::CDP SNMP::Info::CiscoStats
-                                    SNMP::Info::CiscoConfig SNMP::Info::Layer2
-                                    Exporter/;
+    SNMP::Info::CiscoConfig SNMP::Info::Layer2
+    Exporter/;
@SNMP::Info::Layer2::C1900::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 %GLOBALS = (
-             %SNMP::Info::Layer2::GLOBALS,
-             %SNMP::Info::CiscoConfig::GLOBALS,
-             %SNMP::Info::CiscoStats::GLOBALS,
-             %SNMP::Info::CDP::GLOBALS,
-             'c1900_flash_status' => 'upgradeFlashBankStatus',
-           );
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    'c1900_flash_status' => 'upgradeFlashBankStatus',
+);

 %FUNCS = (
-           %SNMP::Info::Layer2::FUNCS,
-           %SNMP::Info::CiscoConfig::FUNCS,
-           %SNMP::Info::CiscoStats::FUNCS,
-           %SNMP::Info::CDP::FUNCS,
-           # ESSWITCH-MIB
-           'c1900_p_index'        => 'swPortIndex',
-           'c1900_p_ifindex'      => 'swPortIfIndex',
-           'c1900_p_duplex'       => 'swPortDuplexStatus',
-           'c1900_p_duplex_admin' => 'swPortFullDuplex',
-           'c1900_p_name'         => 'swPortName',
-           'c1900_p_up_admin'     => 'swPortAdminStatus',
-           'c1900_p_type'         => 'swPortMediaCapability',
-           'c1900_p_media'        => 'swPortConnectorType',
-         );
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+
+    # ESSWITCH-MIB
+    'c1900_p_index'        => 'swPortIndex',
+    'c1900_p_ifindex'      => 'swPortIfIndex',
+    'c1900_p_duplex'       => 'swPortDuplexStatus',
+    'c1900_p_duplex_admin' => 'swPortFullDuplex',
+    'c1900_p_name'         => 'swPortName',
+    'c1900_p_up_admin'     => 'swPortAdminStatus',
+    'c1900_p_type'         => 'swPortMediaCapability',
+    'c1900_p_media'        => 'swPortConnectorType',
+);

 %MIBS = (
-          %SNMP::Info::Layer2::MIBS,
-          %SNMP::Info::CiscoConfig::MIBS,
-          %SNMP::Info::CiscoStats::MIBS,
-          %SNMP::Info::CDP::MIBS,
-          # Also known as the ESSWITCH-MIB
-          'STAND-ALONE-ETHERNET-SWITCH-MIB' => 'series2000'
-        );
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,
+
+    # Also known as the ESSWITCH-MIB
+    'STAND-ALONE-ETHERNET-SWITCH-MIB' => 'series2000'
+);

 %MUNGE = (
-           %SNMP::Info::Layer2::MUNGE,
-           %SNMP::Info::CiscoConfig::MUNGE,
-           %SNMP::Info::CiscoStats::MUNGE,
-           %SNMP::Info::CDP::MUNGE,
-         );
+    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
+);

-sub bulkwalk_no         { 1; }
-sub cisco_comm_indexing { 1; }
+sub bulkwalk_no         { return 1; }
+sub cisco_comm_indexing { return 1; }

 sub vendor {
    return 'cisco';
@@ -107,12 +107,12 @@ sub os_ver {
    return $os_ver if defined $os_ver;

    my $c1900_flash_status = $c1900->c1900_flash_status();
-    return undef unless defined $c1900_flash_status;
+    return unless defined $c1900_flash_status;

    if ( $c1900_flash_status =~ m/V(\d+\.\d+(\.\d+)?)/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub interfaces {
@@ -199,63 +199,76 @@ sub set_i_duplex_admin {
 }

 sub i_vlan {
-    my $c1900 = shift;
-    my $partial = shift;    
+    my $c1900   = shift;
+    my $partial = shift;

-    # Overlap allows more than one VLAN per port.  Unable to determine default    
-    my $overlap = $c1900->bridgeGroupAllowMembershipOverlap() ||
-                  $c1900->vlanAllowMembershipOverlap() || 'disabled';
-    
-    if ($overlap eq 'enabled') {
-        return undef;
+    # Overlap allows more than one VLAN per port.  Unable to determine default
+    my $overlap = $c1900->bridgeGroupAllowMembershipOverlap()
+        || $c1900->vlanAllowMembershipOverlap()
+        || 'disabled';
+
+    if ( $overlap eq 'enabled' ) {
+        return;
    }

-    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup() ||
-                    $c1900->vlanMemberPortOfVlan();
+    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup()
+        || $c1900->vlanMemberPortOfVlan();

    my $i_pvid = {};
-    foreach my $idx (keys %$member_of) {
-        my @values = split(/\./, $idx);
-        my ($vlan, $port) = @values;
+    foreach my $idx ( keys %$member_of ) {
+        my @values = split( /\./, $idx );
+        my ( $vlan, $port ) = @values;
        next unless $vlan;
        next unless $port;
-        next if (defined $partial and $port !~ /^$partial$/);
+        next if ( defined $partial and $port !~ /^$partial$/ );
        my $value = $member_of->{$idx};
-        next if ($value eq 'false');
-        
+        next if ( $value eq 'false' );
+
        $i_pvid->{$port} = $vlan;
    }
    return $i_pvid;
 }

 sub i_vlan_membership {
-    my $c1900 = shift;
+    my $c1900   = shift;
    my $partial = shift;

-    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup() ||
-                    $c1900->vlanMemberPortOfVlan();
+    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup()
+        || $c1900->vlanMemberPortOfVlan();

    my $i_vlan_membership = {};
-    foreach my $idx (keys %$member_of) {
-        my @values = split(/\./, $idx);
-        my ($vlan, $port) = @values;
+    foreach my $idx ( keys %$member_of ) {
+        my @values = split( /\./, $idx );
+        my ( $vlan, $port ) = @values;
        next unless $vlan;
        next unless $port;
-        next if (defined $partial and $port !~ /^$partial$/);
+        next if ( defined $partial and $port !~ /^$partial$/ );
        my $value = $member_of->{$idx};
-        next if ($value eq 'false');
+        next if ( $value eq 'false' );

-        push(@{$i_vlan_membership->{$port}}, $vlan);
+        push( @{ $i_vlan_membership->{$port} }, $vlan );
    }
    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__

 =head1 NAME

-SNMP::Info::Layer2::C1900 - SNMP Interface to data from Cisco Catlyst 1900
+SNMP::Info::Layer2::C1900 - SNMP Interface to data from Cisco Catalyst 1900
 Network Switches running CatOS

 =head1 AUTHOR
@@ -268,7 +281,6 @@ Max Baker
 my $c1900 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -308,9 +320,9 @@ after determining a more specific class using the method above.

 =over

-=item STAND-ALONE-ETHERNET-SWITCH-MIB (ESSWITCH-MIB)
+=item F<STAND-ALONE-ETHERNET-SWITCH-MIB (ESSWITCH-MIB)>

-ESSWITCH-MIB is included in the Version 1 MIBS from Cisco.
+F<ESSWITCH-MIB> is included in the Version 1 MIBs from Cisco.

 They can be found at ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz

@@ -337,7 +349,7 @@ These are methods that return scalar value from SNMP
 Usually contains the version of the software loaded in flash.
 Used by os_ver()

-B<STAND-ALONE-ETHERNET-SWITCH-MIB::upgradeFlashBankStatus>
+C<STAND-ALONE-ETHERNET-SWITCH-MIB::upgradeFlashBankStatus>

 =item $c1900->os()

@@ -360,6 +372,10 @@ Returns 'cisco' :)

 =over

+=item $c1900->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
 =item $c1900->bulkwalk_no

 Return C<1>.  Bulkwalk is turned off for this class.
@@ -391,6 +407,10 @@ to a hash.

 =over

+=item $c1900->interfaces()
+
+Returns reference to the map between IID and physical Port.
+
 =item $c1900->i_duplex()

 Returns reference to map of IIDs to current link duplex
@@ -401,8 +421,8 @@ Returns reference to hash of IIDs to admin duplex setting

 =item $c1900->i_name()

-Crosses ifName with $c1900->c1900_p_name() and returns the human set port name
-if exists.
+Crosses C<ifName> with $c1900->c1900_p_name() and returns the human set port
+name if exists.

 =item $c1900->i_vlan()

@@ -424,9 +444,16 @@ 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 STAND-ALONE-ETHERNET-SWITCH-MIB Switch Port Table Entries:
+=head2 F<STAND-ALONE-ETHERNET-SWITCH-MIB> Switch Port Table Entries:

 =over

@@ -434,43 +461,43 @@ bridge group IDs.

 Maps the Switch Port Table to the IID

-B<swPortIfIndex>
+C<swPortIfIndex>

 =item $c1900->c1900_p_duplex()

 Gives Port Duplex Info

-(B<swPortDuplexStatus>)
+(C<swPortDuplexStatus>)

 =item $c1900->c1900_p_duplex_admin()

 Gives admin setting for Duplex Info

-(B<swPortFullDuplex>)
+(C<swPortFullDuplex>)

 =item $c1900->c1900_p_name()

 Gives human set name for port 

-(B<swPortName>)
+(C<swPortName>)

 =item $c1900->c1900_p_up_admin()

 Gives Admin status of port enabled.

-(B<swPortAdminStatus>)
+(C<swPortAdminStatus>)

 =item $c1900->c1900_p_type()

-Gives Type of port, ie. "general-ethernet"
+Gives Type of port, i.e. C<"general-ethernet">

-(B<swPortMediaCapability>)
+(C<swPortMediaCapability>)

 =item $c1900->c1900_p_media()

-Gives the media of the port , ie "fiber-sc"
+Gives the media of the port , i.e. "C<fiber-sc>"

-(B<swPortConnectorType>)
+(C<swPortConnectorType>)

 =back

@@ -492,20 +519,23 @@ See L<SNMP::Info::Layer2/"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. 
+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 $c1900->set_i_duplex_admin(duplex, ifIndex)

-Sets port duplex, must be supplied with duplex and port ifIndex.  Speed choices
-are 'auto', 'half', 'full'.
+Sets port duplex, must be supplied with duplex and port C<ifIndex>.  Speed
+choices are 'auto', 'half', 'full'.

  Example:
  my %if_map = reverse %{$c1900->interfaces()};
  $c1900->set_i_duplex_admin('auto', $if_map{'1'}) 
    or die "Couldn't change port duplex. ",$c1900->error(1);

+=back
+
 =cut
--- a/Info/Layer2/C2900.pm
+++ b/Info/Layer2/C2900.pm
@@ -1,39 +1,38 @@
 # SNMP::Info::Layer2::C2900
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::C2900;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
@@ -42,168 +41,164 @@ use SNMP::Info::CiscoConfig;
 use SNMP::Info::Layer2;

@SNMP::Info::Layer2::C2900::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-                                    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig
-                                    SNMP::Info::Layer2 Exporter/;
+    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig
+    SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::C2900::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::CiscoConfig::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-            );
+    %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS, %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS,
+);

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::CiscoConfig::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-            'i_name'               => 'ifAlias',
-            # C2900PortEntry
-            'c2900_p_index'        => 'c2900PortIfIndex',
-            'c2900_p_duplex'       => 'c2900PortDuplexStatus',
-            'c2900_p_duplex_admin' => 'c2900PortDuplexState',
-            'c2900_p_speed_admin'  => 'c2900PortAdminSpeed',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::CiscoVTP::FUNCS,
+    'i_name' => 'ifAlias',

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::CiscoConfig::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-            'CISCO-C2900-MIB' => 'ciscoC2900MIB',
-           );
+    # C2900PortEntry
+    'c2900_p_index'        => 'c2900PortIfIndex',
+    'c2900_p_duplex'       => 'c2900PortDuplexStatus',
+    'c2900_p_duplex_admin' => 'c2900PortDuplexState',
+    'c2900_p_speed_admin'  => 'c2900PortAdminSpeed',
+);

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::CiscoConfig::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-           );
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoStats::MIBS, %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::CiscoVTP::MIBS, 'CISCO-C2900-MIB' => 'ciscoC2900MIB',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoVTP::MUNGE,
+);

 sub vendor {
    return 'cisco';
 }

 sub cisco_comm_indexing {
-    1;
+    return 1;
 }

 sub i_duplex {
-    my $c2900 = shift;
+    my $c2900   = shift;
    my $partial = shift;
-    
+
    my $interfaces     = $c2900->interfaces($partial);
-    my $c2900_p_index  = $c2900->c2900_p_index();
+    my $c2900_p_index  = $c2900->c2900_p_index() || {};
    my $c2900_p_duplex = $c2900->c2900_p_duplex();

    my %reverse_2900 = reverse %$c2900_p_index;

    my %i_duplex;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $port_2900 = $reverse_2900{$if};
        next unless defined $port_2900;
        my $duplex = $c2900_p_duplex->{$port_2900};
-        next unless defined $duplex; 
-    
+        next unless defined $duplex;
+
        $duplex = 'half' if $duplex =~ /half/i;
        $duplex = 'full' if $duplex =~ /full/i;
-        $i_duplex{$if}=$duplex; 
+        $i_duplex{$if} = $duplex;
    }
    return \%i_duplex;
 }

 sub i_duplex_admin {
-    my $c2900 = shift;
+    my $c2900   = shift;
    my $partial = shift;
-    
-    my $interfaces     = $c2900->interfaces($partial);
-    my $c2900_p_index  = $c2900->c2900_p_index();
+
+    my $interfaces    = $c2900->interfaces($partial);
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
    my $c2900_p_admin = $c2900->c2900_p_duplex_admin();

    my %reverse_2900 = reverse %$c2900_p_index;

    my %i_duplex_admin;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $port_2900 = $reverse_2900{$if};
        next unless defined $port_2900;
        my $duplex = $c2900_p_admin->{$port_2900};
-        next unless defined $duplex; 
-    
+        next unless defined $duplex;
+
        $duplex = 'half' if $duplex =~ /half/i;
        $duplex = 'full' if $duplex =~ /full/i;
        $duplex = 'auto' if $duplex =~ /auto/i;
-        $i_duplex_admin{$if}=$duplex; 
+        $i_duplex_admin{$if} = $duplex;
    }
    return \%i_duplex_admin;
 }

 sub set_i_speed_admin {
    my $c2900 = shift;
-    my ($speed, $iid) = @_;
-    
+    my ( $speed, $iid ) = @_;
+
    # map speeds to those the switch will understand
    my %speeds = qw/auto 1 10 10000000 100 100000000/;

-    my $c2900_p_index  = $c2900->c2900_p_index();
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
    my %reverse_2900 = reverse %$c2900_p_index;

    $speed = lc($speed);

-    return undef unless defined $speeds{$speed};
+    return unless defined $speeds{$speed};

    # account for weirdness of c2900 mib
    $iid = $reverse_2900{$iid};

-    return $c2900->set_c2900_p_speed_admin($speeds{$speed}, $iid);
+    return $c2900->set_c2900_p_speed_admin( $speeds{$speed}, $iid );
 }

 sub set_i_duplex_admin {
    my $c2900 = shift;
-    my ($duplex, $iid) = @_;
+    my ( $duplex, $iid ) = @_;

    # map a textual duplex to an integer one the switch understands
    my %duplexes = qw/full 1 half 2 auto 3/;

-    my $c2900_p_index  = $c2900->c2900_p_index();
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
    my %reverse_2900 = reverse %$c2900_p_index;

    $duplex = lc($duplex);

-    return undef unless defined $duplexes{$duplex};
+    return unless defined $duplexes{$duplex};

    # account for weirdness of c2900 mib
    $iid = $reverse_2900{$iid};

-    return $c2900->set_c2900_p_duplex_admin($duplexes{$duplex}, $iid);
+    return $c2900->set_c2900_p_duplex_admin( $duplexes{$duplex}, $iid );
 }

 # Use i_descritption for port key, cuz i_name can be manually entered.
 sub interfaces {
-    my $c2900 = shift;
+    my $c2900   = shift;
    my $partial = shift;

-    my $interfaces = $c2900->i_index($partial) || {};
-    my $i_descr    = $c2900->i_description($partial) || {}; 
+    my $interfaces = $c2900->i_index($partial)       || {};
+    my $i_descr    = $c2900->i_description($partial) || {};

    my %if;
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $port = $i_descr->{$iid};
        next unless defined $port;

-        $port =~ s/\./\//g if( $port =~ /\d+\.\d+$/);
+        $port =~ s/\./\//g if ( $port =~ /\d+\.\d+$/ );
        $port =~ s/[^\d\/,()\w]+//gi;
-    
+
        $if{$iid} = $port;
    }

-    return \%if
+    return \%if;
 }

 1;
@@ -211,7 +206,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer2::C2900 - SNMP Interface to Cisco Catalyst 2900 Switches running IOS
+SNMP::Info::Layer2::C2900 - SNMP Interface to Cisco Catalyst 2900 Switches
+running IOS

 =head1 AUTHOR

@@ -263,7 +259,7 @@ after determining a more specific class using the method above.

 =over

-=item CISCO-C2900-MIB
+=item F<CISCO-C2900-MIB>

 Part of the v2 MIBs from Cisco.

@@ -293,6 +289,10 @@ These are methods that return scalar value from SNMP

 Returns 'cisco' :)

+=item $c2900->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
 =back

 =head2 Globals imported from SNMP::Info::CiscoVTP
@@ -328,10 +328,11 @@ to a hash.

 Returns reference to the map between IID and physical Port.

-On the 2900 devices i_name isn't reliable, so we override to just the description.
+On the 2900 devices i_name isn't reliable, so we override to just the
+description.

 Next all dots are changed for forward slashes so that the physical port name 
-is the same as the broadcasted CDP port name. 
+is the same as the broad-casted CDP port name. 
    (Ethernet0.1 -> Ethernet0/1)

 Also, any weird characters are removed, as I saw a few pop up.
@@ -350,7 +351,7 @@ Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin()

 =back

-=head2 C2900-MIB Port Entry Table 
+=head2 F<C2900-MIB> Port Entry Table 

 =over

@@ -358,25 +359,25 @@ Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin()

 Maps the Switch Port Table to the IID

-(B<c2900PortIfIndex>)
+(C<c2900PortIfIndex>)

 =item $c2900->c2900_p_duplex()

 Gives Port Duplex Info

-(B<c2900PortDuplexStatus>)
+(C<c2900PortDuplexStatus>)

 =item $c2900->c2900_p_duplex_admin()

 Gives admin setting for Duplex Info

-(B<c2900PortDuplexState>)
+(C<c2900PortDuplexState>)

 =item $c2900->c2900_p_speed_admin()

 Gives Admin speed of port 

-(B<c2900PortAdminSpeed>)
+(C<c2900PortAdminSpeed>)

 =back

@@ -402,20 +403,21 @@ See L<SNMP::Info::Layer2/"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. 
+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 $c2900->set_i_speed_admin(speed, ifIndex)

-Sets port speed, must be supplied with speed and port ifIndex
+Sets port speed, must be supplied with speed and port C<ifIndex>

 Speed choices are 'auto', '10', '100'

 Crosses $c2900->c2900_p_index() with $c2900->c2900_p_speed_admin() to utilize
-port ifIndex.
+port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c2900->interfaces()};
@@ -424,16 +426,18 @@ port ifIndex.

 =item $c2900->set_i_duplex_admin(duplex, ifIndex)

-Sets port duplex, must be supplied with duplex and port ifIndex
+Sets port duplex, must be supplied with duplex and port C<ifIndex>

 Speed choices are 'auto', 'half', 'full'

 Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin() to utilize
-port ifIndex.
+port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c2900->interfaces()};
    $c2900->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
        or die "Couldn't change port duplex. ",$c2900->error(1);

+=back
+
 =cut
--- a/Info/Layer2/Catalyst.pm
+++ b/Info/Layer2/Catalyst.pm
@@ -1,39 +1,37 @@
 # SNMP::Info::Layer2::Catalyst
-# Max Baker
+# $Id$
 #
 # Copyright (c) 2002,2003 Regents of the University of California
-# Copyright (c) 2003,2004 Max Baker changes from version 0.8 and beyond
+# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Catalyst;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::CiscoVTP;
@@ -42,48 +40,43 @@ use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::Layer2;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-@SNMP::Info::Layer2::Catalyst::ISA = qw/SNMP::Info::CiscoStack SNMP::Info::CiscoVTP 
-                                        SNMP::Info::CDP SNMP::Info::CiscoStats
-                                        SNMP::Info::CiscoPortSecurity
-                                        SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Catalyst::ISA
+    = qw/SNMP::Info::CiscoStack SNMP::Info::CiscoVTP
+    SNMP::Info::CDP SNMP::Info::CiscoStats
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Catalyst::EXPORT_OK = qw//;

-%MIBS =    (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::CiscoPortSecurity::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-            %SNMP::Info::CiscoStack::MIBS,
-            );
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoStats::MIBS, %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::CiscoVTP::MIBS,   %SNMP::Info::CiscoStack::MIBS,
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::CiscoPortSecurity::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-            %SNMP::Info::CiscoStack::GLOBALS,
-            );
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::CiscoPortSecurity::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS,
+    %SNMP::Info::CiscoStack::GLOBALS,
+);

-%FUNCS =   (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::CiscoPortSecurity::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-            %SNMP::Info::CiscoStack::FUNCS,
-           );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,     %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS, %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::CiscoVTP::FUNCS,   %SNMP::Info::CiscoStack::FUNCS,
+);

-%MUNGE =   (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::CiscoPortSecurity::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-            %SNMP::Info::CiscoStack::MUNGE,
-            );
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoVTP::MUNGE,   %SNMP::Info::CiscoStack::MUNGE,
+);

 # Overidden Methods

@@ -94,9 +87,9 @@ sub i_physical {
    my $p_port = $cat->p_port();

    my %i_physical;
-    foreach my $port (keys %$p_port) {
+    foreach my $port ( keys %$p_port ) {
        my $iid = $p_port->{$port};
-        $i_physical{$iid} = 1;  
+        $i_physical{$iid} = 1;
    }
    return \%i_physical;
 }
@@ -110,29 +103,29 @@ sub os {
 }

 sub os_ver {
-    my $cat = shift;
+    my $cat    = shift;
    my $os_ver = $cat->SUPER::os_ver();
    return $os_ver if defined $os_ver;

    my $m_swver = $cat->m_swver();
-    return undef unless defined $m_swver;
+    return unless defined $m_swver;

    # assume .1 entry is the chassis and the sw version we want.
    return $m_swver->{1} if defined $m_swver->{1};
-    return undef;
+    return;
 }

 # Workaround for incomplete bp_index
 sub bp_index {
-    my $cat = shift;
+    my $cat     = shift;
    my $p_index = $cat->p_port();
    my $b_index = $cat->p_oidx();

    my %bp_index;
-    foreach my $iid (keys %$p_index){
+    foreach my $iid ( keys %$p_index ) {
        my $ifidx = $p_index->{$iid};
        next unless defined $ifidx;
-        my $bpidx = $b_index->{$iid}||0;
+        my $bpidx = $b_index->{$iid} || 0;

        $bp_index{$bpidx} = $ifidx;
    }
@@ -140,19 +133,19 @@ sub bp_index {
 }

 sub cisco_comm_indexing {
-    1;
+    return 1;
 }

 sub interfaces {
-    my $cat = shift;
+    my $cat     = shift;
    my $partial = shift;

-    my $i_index    = $cat->i_index($partial);
-    my $portnames  = $cat->p_port() || {};
-    my %portmap    = reverse %$portnames;
+    my $i_index   = $cat->i_index($partial);
+    my $portnames = $cat->p_port() || {};
+    my %portmap   = reverse %$portnames;

    my %interfaces = ();
-    foreach my $iid (keys %$i_index) {
+    foreach my $iid ( keys %$i_index ) {
        next unless defined $iid;
        my $if   = $i_index->{$iid};
        my $port = $portmap{$iid};
@@ -162,20 +155,20 @@ sub interfaces {
 }

 sub i_name {
-    my $cat = shift; 	 
+    my $cat     = shift;
    my $partial = shift;

    my $p_port = $cat->p_port() || {};
    my $p_name = $cat->p_name() || {};

    my %i_name;
-    foreach my $port (keys %$p_name) {
+    foreach my $port ( keys %$p_name ) {
        my $iid = $p_port->{$port};
        next unless defined $iid;
-        next if (defined $partial and $iid !~ /^$partial$/);
+        next if ( defined $partial and $iid !~ /^$partial$/ );
        $i_name{$iid} = $p_name->{$port};
    }
-    return \%i_name; 
+    return \%i_name;
 }

 1;
@@ -196,7 +189,6 @@ Max Baker
 my $cat = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -211,7 +203,8 @@ Max Baker
 SNMP::Info subclass to provide information for Cisco Catalyst series switches
 running CatOS.

-This class includes the Catalyst 2920, 4000, 5000, 6000 (hybrid mode) families.
+This class includes the Catalyst 2920, 4000, 5000, 6000 (hybrid mode)
+families.

 This subclass is not for all devices that have the name Catalyst.  Note that
 some Catalyst switches run IOS, like the 2900 and 3550 families.  Cisco
@@ -261,7 +254,8 @@ See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.

 See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.

-See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
+requirements.

 See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.

@@ -288,6 +282,10 @@ it grabs $cat->m_swver()->{1} and uses that.

 Returns 'cisco'

+=item $cat->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
 =back

 =head2 Global Methods imported from SNMP::Info::CiscoStack
@@ -325,21 +323,26 @@ to a hash.

 =item $cat->interfaces()

-Returns the map between SNMP Interface Identifier (iid) and physical port name. 
+Returns the map between SNMP Interface Identifier (iid) and physical port
+name. 

 =item $cat->i_name()

 Returns reference to hash of iid to human set name. 

-B<portName>
+C<portName>
+
+=item $cat->i_physical()
+
+Returns a map to IID for ports that are physical ports, not vlans, etc.

 =item $cat->bp_index()

 Returns reference to hash of bridge port table entries map back to interface
 identifier (iid)

-Crosses (B<portCrossIndex>) to (B<portIfIndex>) since some devices seem to have
-problems with BRIDGE-MIB
+Crosses (C<portCrossIndex>) to (C<portIfIndex>) since some devices seem to
+have problems with F<BRIDGE-MIB>

 =back

--- a/Info/Layer2/Centillion.pm
+++ b/Info/Layer2/Centillion.pm
@@ -1,96 +1,102 @@
 # SNMP::Info::Layer2::Centillion
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Centillion;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::NortelStack;
 use SNMP::Info::SONMP;

-@SNMP::Info::Layer2::Centillion::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::NortelStack SNMP::Info::SONMP Exporter/;
+@SNMP::Info::Layer2::Centillion::ISA
+    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::NortelStack SNMP::Info::SONMP Exporter/;
@SNMP::Info::Layer2::Centillion::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::MIBS,
-            %SNMP::Info::Bridge::MIBS,
-            %SNMP::Info::NortelStack::MIBS,
-            %SNMP::Info::SONMP::MIBS,
-            'CENTILLION-DOT3-EXTENSIONS-MIB' => 'cnDot3ExtnTable',
-            'S5-COMMON-STATS-MIB'            => 's5CmStat',
-            'CENTILLION-VLAN-MIB'            => 'cnVlanENETMgt',
-            'CENTILLION-CONFIG-MIB'          => 'sysTFTPStart',
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::MIBS,
+    %SNMP::Info::Bridge::MIBS,
+    %SNMP::Info::NortelStack::MIBS,
+    %SNMP::Info::SONMP::MIBS,
+    'CENTILLION-DOT3-EXTENSIONS-MIB' => 'cnDot3ExtnTable',
+    'S5-COMMON-STATS-MIB'            => 's5CmStat',
+    'CENTILLION-VLAN-MIB'            => 'cnVlanENETMgt',
+    'CENTILLION-CONFIG-MIB'          => 'sysTFTPStart',
+);

 %GLOBALS = (
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::NortelStack::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-            'tftp_action'  => 'sysTFTPStart',
-            'tftp_host'    => 'sysTFTPIpAddress',
-            'tftp_file'    => 'sysTFTPFileName',
-            'tftp_type'    => 'sysTFTPFileType',
-            'tftp_result'  => 'sysTFTPResult',
-            );
+    %SNMP::Info::GLOBALS,
+    %SNMP::Info::Bridge::GLOBALS,
+    %SNMP::Info::NortelStack::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS,
+    'tftp_action' => 'sysTFTPStart',
+    'tftp_host'   => 'sysTFTPIpAddress',
+    'tftp_file'   => 'sysTFTPFileName',
+    'tftp_type'   => 'sysTFTPFileType',
+    'tftp_result' => 'sysTFTPResult',
+);

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::NortelStack::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-        # CENTILLION-DOT3-EXTENSIONS-MIB::cnDot3ExtnTable
-            'centillion_p_index'        => 'cnDot3ExtnIfIndex',
-            'centillion_p_duplex'       => 'cnDot3ExtnIfOperConnectionType',
-            'centillion_p_duplex_admin' => 'cnDot3ExtnIfAdminConnectionType',
-        # S5-COMMON-STATS-MIB::s5CmSNodeTable
-            'fw_mac'     => 's5CmSNodeMacAddr',
-            'fw_port'    => 's5CmSNodeIfIndx',
-        # CENTILLION-VLAN-MIB::cnVlanPortMemberTable
-            'centillion_i_vlan_index'    => 'cnVlanPortMemberIfIndex',
-            'centillion_i_vlan'        => 'cnVlanPortMemberVID',
-            'centillion_i_vlan_type'    => 'cnVlanPortMemberIngressType',        
-            );
+%FUNCS = (
+    %SNMP::Info::FUNCS,
+    %SNMP::Info::Bridge::FUNCS,
+    %SNMP::Info::NortelStack::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,

-%MUNGE   = (
-            # Inherit all the built in munging
-            %SNMP::Info::MUNGE,
-            %SNMP::Info::Bridge::MUNGE,
-            %SNMP::Info::NortelStack::MUNGE,
-            %SNMP::Info::SONMP::MUNGE,
-            );
+    # CENTILLION-DOT3-EXTENSIONS-MIB::cnDot3ExtnTable
+    'centillion_p_index'        => 'cnDot3ExtnIfIndex',
+    'centillion_p_duplex'       => 'cnDot3ExtnIfOperConnectionType',
+    'centillion_p_duplex_admin' => 'cnDot3ExtnIfAdminConnectionType',
+
+    # S5-COMMON-STATS-MIB::s5CmSNodeTable
+    'fw_mac'  => 's5CmSNodeMacAddr',
+    'fw_port' => 's5CmSNodeIfIndx',
+
+    # CENTILLION-VLAN-MIB::cnVlanPortMemberTable
+    'centillion_i_vlan_index' => 'cnVlanPortMemberIfIndex',
+    'centillion_i_vlan'       => 'cnVlanPortMemberVID',
+    'centillion_i_vlan_type'  => 'cnVlanPortMemberIngressType',
+);
+
+%MUNGE = (
+
+    # Inherit all the built in munging
+    %SNMP::Info::MUNGE,
+    %SNMP::Info::Bridge::MUNGE,
+    %SNMP::Info::NortelStack::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
+);

 sub os {
    return 'centillion';
@@ -102,12 +108,13 @@ sub vendor {

 sub i_ignore {
    my $centillion = shift;
-    my $descr = $centillion->i_description();
+    my $descr      = $centillion->i_description();

    my %i_ignore;
-    foreach my $if (keys %$descr){
+    foreach my $if ( keys %$descr ) {
        my $type = $descr->{$if};
-      # Skip virtual interfaces  
+
+        # Skip virtual interfaces
        $i_ignore{$if}++ if $type =~ /(VE|VID|vc|lp)/i;
    }
    return \%i_ignore;
@@ -115,24 +122,25 @@ sub i_ignore {

 sub interfaces {
    my $centillion = shift;
-    my $i_index = $centillion->i_index();
-    my $i_descr = $centillion->i_description();
+    my $i_index    = $centillion->i_index();
+    my $i_descr    = $centillion->i_description();

    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;
-      my $descr = $i_descr->{$iid};
-      # Skip ATM and virtual interfaces
-      next if $descr =~ /(VE|VID|vc|lp)/i;
+        my $descr = $i_descr->{$iid};

-      # Index numbers are deterministic slot * 256 + port
-    my $port = $index % 256;
-        my $slot = int($index / 256);
+        # Skip ATM and virtual interfaces
+        next if $descr =~ /(VE|VID|vc|lp)/i;
+
+        # Index numbers are deterministic slot * 256 + port
+        my $port     = $index % 256;
+        my $slot     = int( $index / 256 );
        my $slotport = "$slot.$port";

-    $slotport = "$descr" if $descr =~ /(mcp)/i;
-    
+        $slotport = "$descr" if $descr =~ /(mcp)/i;
+
        $if{$index} = $slotport;
    }

@@ -141,89 +149,89 @@ sub interfaces {

 sub i_duplex {
    my $centillion = shift;
-    
+
    my $port_index  = $centillion->centillion_p_index();
    my $port_duplex = $centillion->centillion_p_duplex();

    my %i_duplex;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
        my $duplex = $port_duplex->{$iid};
-        next unless defined $duplex; 
-    
+        next unless defined $duplex;
+
        $duplex = 'half' if $duplex =~ /half/i;
        $duplex = 'full' if $duplex =~ /full/i;
-        $i_duplex{$index}=$duplex; 
+        $i_duplex{$index} = $duplex;
    }
    return \%i_duplex;
 }

 sub i_duplex_admin {
    my $centillion = shift;
-    
+
    my $port_index = $centillion->centillion_p_index();
    my $port_admin = $centillion->centillion_p_duplex_admin();

    my %i_duplex_admin;
-    foreach my $iid (keys %$port_index){
+    foreach my $iid ( keys %$port_index ) {
        my $index = $port_index->{$iid};
        next unless defined $index;
        my $duplex = $port_admin->{$iid};
-        next unless defined $duplex; 
-    
+        next unless defined $duplex;
+
        $duplex = 'half' if $duplex =~ /half/i;
        $duplex = 'full' if $duplex =~ /full/i;
        $duplex = 'auto' if $duplex =~ /auto/i;
-        $i_duplex_admin{$index}=$duplex; 
+        $i_duplex_admin{$index} = $duplex;
    }
    return \%i_duplex_admin;
 }

 sub i_vlan {
    my $centillion = shift;
-    
+
    my $cn_vlan_index = $centillion->centillion_i_vlan_index();
-    my $cn_vlan = $centillion->centillion_i_vlan();
+    my $cn_vlan       = $centillion->centillion_i_vlan();

    my %i_vlan;
-    foreach my $iid (keys %$cn_vlan_index){
+    foreach my $iid ( keys %$cn_vlan_index ) {
        my $index = $cn_vlan_index->{$iid};
        next unless defined $index;
        my $vlan = $cn_vlan->{$iid};
-        next unless defined $vlan; 
-    
-        $i_vlan{$index}=$vlan; 
+        next unless defined $vlan;
+
+        $i_vlan{$index} = $vlan;
    }
    return \%i_vlan;
 }

 sub model {
    my $centillion = shift;
-    my $id = $centillion->id();
-    return undef unless defined $id;
+    my $id         = $centillion->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;
    $model =~ s/^sreg-//i;

-    return '5000BH' if ($model =~ /5000BH/);
-    return '5005BH' if ($model =~ /5005BH/);
-    return 'C100' if ($model =~ /Centillion100/);
-    return 'C50N' if ($model =~ /Centillion50N/);
-    return 'C50T' if ($model =~ /Centillion50T/);
+    return '5000BH' if ( $model =~ /5000BH/ );
+    return '5005BH' if ( $model =~ /5005BH/ );
+    return 'C100'   if ( $model =~ /Centillion100/ );
+    return 'C50N'   if ( $model =~ /Centillion50N/ );
+    return 'C50T'   if ( $model =~ /Centillion50T/ );
    return $model;
 }

 sub bp_index {
    my $centillion = shift;
-    my $index = $centillion->fw_port();
+    my $index      = $centillion->fw_port();

    my %bp_index;
-    foreach my $iid (keys %$index){
+    foreach my $iid ( keys %$index ) {
        my $b_index = $index->{$iid};
        next unless defined $b_index;

-    #Index value is the same as ifIndex    
+        #Index value is the same as ifIndex
        $bp_index{$b_index} = $b_index;
    }

@@ -238,13 +246,13 @@ sub slot_offset {
    return 0;
 }

-
 1;
 __END__

 =head1 NAME

-SNMP::Info::Layer2::Centillion - SNMP Interface to Nortel Centillion based ATM Switches
+SNMP::Info::Layer2::Centillion - SNMP Interface to Nortel Centillion based
+ATM Switches

 =head1 AUTHOR

@@ -256,7 +264,6 @@ Eric Miller
 my $centillion = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -271,8 +278,8 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a 
 Centillion device through SNMP. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $centillion = new SNMP::Info::Layer2::centillion(...);
 
@@ -297,13 +304,13 @@ than bridge group based.

 =over

-=item CENTILLION-DOT3-EXTENSIONS-MIB
+=item F<CENTILLION-DOT3-EXTENSIONS-MIB>

-=item S5-COMMON-STATS-MIB
+=item F<S5-COMMON-STATS-MIB>

-=item CENTILLION-VLAN-MIB
+=item F<CENTILLION-VLAN-MIB>

-=item CENTILLION-CONFIG-MIB
+=item F<CENTILLION-CONFIG-MIB>

 =item Inherited Classes' MIBs

@@ -317,15 +324,6 @@ See L<SNMP::Info::SONMP/"Required MIBs"> for its own MIB requirements.

 =back

-MIBs can be found on the CD that came with your product.
-
-Or, they can be downloaded directly from Nortel Networks regardless of support
-contract status.
-
-Go to http://www.nortelnetworks.com Techninal Support, Browse Technical Support,
-Select by Product Families, Centillion, Centillion C100-C50 ATM Speed Modules,
-Software.  Filter on mibs and download the latest version's archive.
-
 =head1 GLOBALS

 These are methods that return scalar value from SNMP
@@ -338,10 +336,10 @@ Returns 'Nortel'

 =item $centillion->model()

-Cross references $centillion->id() to the SYNOPTICS-MIB and returns
+Cross references $centillion->id() to the F<SYNOPTICS-MIB> and returns
 the results.

-Removes sreg- from the model name
+Removes C<sreg-> from the model name

 =item $centillion->os()

@@ -349,23 +347,23 @@ Returns 'Centillion'

 =item $centillion->tftp_action()

-(B<sysTFTPStart>)
+(C<sysTFTPStart>)

 =item $centillion->tftp_host()

-(B<sysTFTPIpAddress>)
+(C<sysTFTPIpAddress>)

 =item $centillion->tftp_file()

-(B<sysTFTPFileName>)
+(C<sysTFTPFileName>)

 =item $centillion->tftp_type()

-(B<sysTFTPFileType>)
+(C<sysTFTPFileType>)

 =item $centillion->tftp_result()

-(B<sysTFTPResult>)
+(C<sysTFTPResult>)

 =back

@@ -375,7 +373,8 @@ Returns 'Centillion'

 =item $centillion->layers()

-Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary
+MIBs.

 =item  $centillion->index_factor()

@@ -418,7 +417,8 @@ to a hash.

    Returns reference to the map between IID and physical Port.

-    Slot and port numbers on the Passport switches are determined by the formula:
+    Slot and port numbers on the Passport switches are determined by the
+    formula:
      port = index % 256
      slot = int(index / 256)
 
@@ -438,23 +438,23 @@ Returns reference to hash of IIDs to ignore.

 =item $centillion->fw_mac()

-(B<s5CmSNodeMacAddr>)
+(C<s5CmSNodeMacAddr>)

 =item $centillion->fw_port()

-(B<s5CmSNodeIfIndx>)
+(C<s5CmSNodeIfIndx>)

 =item $centillion->bp_index()

-Returns a mapping between ifIndex and the Bridge Table.
+Returns a mapping between C<ifIndex> and the Bridge Table.

 =item $centillion->i_vlan()

-Returns a mapping between ifIndex and the VLAN.
+Returns a mapping between C<ifIndex> and the VLAN.

 =back

-=head2 Centillion 802.3 Extension Table (B<cnDot3ExtnTable>)
+=head2 Centillion 802.3 Extension Table (C<cnDot3ExtnTable>)

 =over

@@ -462,23 +462,23 @@ Returns a mapping between ifIndex and the VLAN.

 Returns reference to hash.  Maps table IIDs to Interface IIDs 

-(B<cnDot3ExtnIfIndex>)
+(C<cnDot3ExtnIfIndex>)

 =item $centillion->centillion_p_duplex()

 Returns reference to hash.  Maps port operational duplexes to IIDs 

-(B<cnDot3ExtnIfOperConnectionType>)
+(C<cnDot3ExtnIfOperConnectionType>)

 =item $centillion->rc_centillion_p_duplex_admin()

 Returns reference to hash.  Maps port admin duplexes to IIDs

-(B<cnDot3ExtnIfAdminConnectionType>)
+(C<cnDot3ExtnIfAdminConnectionType>)

 =back

-=head2 Centillion VLAN Table (B<cnVlanPortMemberTable>)
+=head2 Centillion VLAN Table (C<cnVlanPortMemberTable>)

 =over

@@ -486,19 +486,19 @@ Returns reference to hash.  Maps port admin duplexes to IIDs

 Returns reference to hash.  Key: Table entry, Value: Index 

-(B<cnVlanPortMemberIfIndex>)
+(C<cnVlanPortMemberIfIndex>)

 =item $centillion->centillion_i_vlan()

 Returns reference to hash.  Key: Table entry, Value: VLAN ID 

-(B<cnVlanPortMemberVID>)
+(C<cnVlanPortMemberVID>)

 =item $centillion->centillion_i_vlan_type()

 Returns reference to hash.  Key: Table entry, Value: VLAN Type 

-(B<cnVlanPortMemberIngressType>)
+(C<cnVlanPortMemberIngressType>)

 =back

--- a/Info/Layer2/Cisco.pm
+++ b/Info/Layer2/Cisco.pm
@@ -1,36 +1,36 @@
 # SNMP::Info::Layer2::Cisco
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2006 Max Baker
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 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 the University of California, Santa Cruz nor the 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::Cisco;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
@@ -41,58 +41,44 @@ use SNMP::Info::CiscoQOS;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::Layer2;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
-@SNMP::Info::Layer2::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP  
-                                     SNMP::Info::CiscoStats SNMP::Info::CiscoImage 
-                                     SNMP::Info::CiscoRTT SNMP::Info::CiscoQOS 
-                                     SNMP::Info::CiscoConfig SNMP::Info::Layer2
-                                     Exporter/;
+@SNMP::Info::Layer2::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
+    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoRTT SNMP::Info::CiscoQOS
+    SNMP::Info::CiscoConfig SNMP::Info::Layer2
+    Exporter/;
@SNMP::Info::Layer2::Cisco::EXPORT_OK = qw//;

+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-            %SNMP::Info::Layer2::MIBS,  
-            %SNMP::Info::CiscoConfig::MIBS,
-            %SNMP::Info::CiscoQOS::MIBS,
-            %SNMP::Info::CiscoRTT::MIBS,
-            %SNMP::Info::CiscoImage::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-        );
+    %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoQOS::MIBS,   %SNMP::Info::CiscoRTT::MIBS,
+    %SNMP::Info::CiscoImage::MIBS, %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,        %SNMP::Info::CiscoVTP::MIBS,
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,  
-            %SNMP::Info::CiscoConfig::GLOBALS,
-            %SNMP::Info::CiscoQOS::GLOBALS,
-            %SNMP::Info::CiscoRTT::GLOBALS,
-            %SNMP::Info::CiscoImage::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-           );
+    %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoQOS::GLOBALS,   %SNMP::Info::CiscoRTT::GLOBALS,
+    %SNMP::Info::CiscoImage::GLOBALS, %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,        %SNMP::Info::CiscoVTP::GLOBALS,
+);

 %FUNCS = (
-            %SNMP::Info::Layer2::FUNCS,  
-            %SNMP::Info::CiscoConfig::FUNCS,
-            %SNMP::Info::CiscoQOS::FUNCS,
-            %SNMP::Info::CiscoRTT::FUNCS,
-            %SNMP::Info::CiscoImage::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-         );
+    %SNMP::Info::Layer2::FUNCS,     %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoQOS::FUNCS,   %SNMP::Info::CiscoRTT::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS, %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,        %SNMP::Info::CiscoVTP::FUNCS,
+);

 %MUNGE = (
-            %SNMP::Info::Layer2::MUNGE,  
-            %SNMP::Info::CiscoConfig::MUNGE,
-            %SNMP::Info::CiscoQOS::MUNGE,
-            %SNMP::Info::CiscoRTT::MUNGE,
-            %SNMP::Info::CiscoImage::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-         );
+    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoQOS::MUNGE,   %SNMP::Info::CiscoRTT::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE, %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,        %SNMP::Info::CiscoVTP::MUNGE,
+);

 1;
 __END__
--- a/Info/Layer2/Foundry.pm
+++ b/Info/Layer2/Foundry.pm
@@ -1,85 +1,81 @@
 # SNMP::Info::Layer2::Foundry - SNMP Interface to Foundry Switches
+# $Id$
 #
-# Copyright (c) 2005 Max Baker
+# Copyright (c) 2008 Max Baker
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Foundry;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::FDP;
 use SNMP::Info::EtherLike;
 use SNMP::Info::MAU;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-@SNMP::Info::Layer2::Foundry::ISA = qw/SNMP::Info::Layer2 SNMP::Info::FDP SNMP::Info::EtherLike
-                                       SNMP::Info::MAU    Exporter/;
+@SNMP::Info::Layer2::Foundry::ISA
+    = qw/SNMP::Info::Layer2 SNMP::Info::FDP SNMP::Info::EtherLike
+    SNMP::Info::MAU    Exporter/;
@SNMP::Info::Layer2::Foundry::EXPORT_OK = qw//;

-%MIBS =    ( %SNMP::Info::Layer2::MIBS,
-             %SNMP::Info::FDP::MIBS,
-             %SNMP::Info::EtherLike::MIBS,
-             %SNMP::Info::MAU::MIBS,
-             'FOUNDRY-SN-ROOT-MIB' => 'foundry',
-           );
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,    %SNMP::Info::FDP::MIBS,
+    %SNMP::Info::EtherLike::MIBS, %SNMP::Info::MAU::MIBS,
+    'FOUNDRY-SN-ROOT-MIB' => 'foundry',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::FDP::GLOBALS,
-            %SNMP::Info::EtherLike::GLOBALS,
-            %SNMP::Info::MAU::GLOBALS,
-           );
+    %SNMP::Info::Layer2::GLOBALS,    %SNMP::Info::FDP::GLOBALS,
+    %SNMP::Info::EtherLike::GLOBALS, %SNMP::Info::MAU::GLOBALS,
+);

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::FDP::FUNCS,
-            %SNMP::Info::EtherLike::FUNCS,
-            %SNMP::Info::MAU::FUNCS,
-            'test'    => 'dot1dStpPortState',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,    %SNMP::Info::FDP::FUNCS,
+    %SNMP::Info::EtherLike::FUNCS, %SNMP::Info::MAU::FUNCS,
+    'test' => 'dot1dStpPortState',
+);

 %MUNGE = (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::FDP::MUNGE,
-            %SNMP::Info::EtherLike::MUNGE,
-            %SNMP::Info::MAU::MUNGE,
-         );
-
+    %SNMP::Info::Layer2::MUNGE,    %SNMP::Info::FDP::MUNGE,
+    %SNMP::Info::EtherLike::MUNGE, %SNMP::Info::MAU::MUNGE,
+);

 # Method OverRides

 #sub bulkwalk_no { 1;}

-*SNMP::Info::Layer2::Foundry::i_duplex       = \&SNMP::Info::MAU::mau_i_duplex;
-*SNMP::Info::Layer2::Foundry::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
-*SNMP::Info::Layer2::Foundry::i_vlan         = \&SNMP::Info::Bridge::qb_i_vlan_t;
+*SNMP::Info::Layer2::Foundry::i_duplex = \&SNMP::Info::MAU::mau_i_duplex;
+*SNMP::Info::Layer2::Foundry::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer2::Foundry::i_vlan = \&SNMP::Info::Bridge::qb_i_vlan_t;

 # todo doc these

@@ -90,19 +86,19 @@ sub os_ver {

    # find entity table entry for "stackmanaget.1"
    my $unit_iid = undef;
-    foreach my $e (keys %$e_name){
+    foreach my $e ( keys %$e_name ) {
        my $name = $e_name->{$e} || '';
        $unit_iid = $e if $name eq 'stackmanaget.1';
    }
-    
+
    # Default to OID method if no dice.
-    unless (defined $unit_iid){
+    unless ( defined $unit_iid ) {
        return $foundry->SUPER::model();
    }

    # Find Model Name
    my $e_fwver = $foundry->e_fwver();
-    if (defined $e_fwver->{$unit_iid}){
+    if ( defined $e_fwver->{$unit_iid} ) {
        return $e_fwver->{$unit_iid};
    }

@@ -117,25 +113,25 @@ sub model {

    # find entity table entry for "unit.1"
    my $unit_iid = undef;
-    foreach my $e (keys %$e_name){
+    foreach my $e ( keys %$e_name ) {
        my $name = $e_name->{$e} || '';
        $unit_iid = $e if $name eq 'unit.1';
    }
-    
+
    # Default to OID method if no dice.
-    unless (defined $unit_iid){
+    unless ( defined $unit_iid ) {
        return $foundry->SUPER::model();
    }

    # Find Model Name
    my $e_model = $foundry->e_model();
-    if (defined $e_model->{$unit_iid}){
+    if ( defined $e_model->{$unit_iid} ) {
        return $e_model->{$unit_iid};
    }

    # Not found in ENTITY-MIB, go up a level.
    return $foundry->SUPER::model();
-    
+
 }

 sub serial {
@@ -145,11 +141,11 @@ sub serial {

    # find entity table entry for "unit.1"
    my $unit_iid = undef;
-    foreach my $e (keys %$e_name){
+    foreach my $e ( keys %$e_name ) {
        my $name = $e_name->{$e} || '';
        $unit_iid = $e if $name eq 'unit.1';
    }
-    return undef unless defined $unit_iid;
+    return unless defined $unit_iid;

    # Look up serial of found entry.
    my $e_serial = $foundry->e_serial();
@@ -163,13 +159,13 @@ sub interfaces {
    my $i_descr = $foundry->i_description;
    my $i_name  = $foundry->i_name;

-    # use ifName only if it is in portn 
+    # use ifName only if it is in portn
    #   format.  For EdgeIrons
    # else use ifDescr
-    foreach my $iid (keys %$i_name){
+    foreach my $iid ( keys %$i_name ) {
        my $name = $i_name->{$iid};
        next unless defined $name;
-        $i_descr->{$iid} = $name 
+        $i_descr->{$iid} = $name
            if $name =~ /^port\d+/i;
    }

@@ -178,21 +174,21 @@ sub interfaces {

 sub i_ignore {
    my $foundry = shift;
-    my $i_type = $foundry->i_type();
+    my $i_type  = $foundry->i_type();

    my %i_ignore = ();

-    foreach my $iid (keys %$i_type){
+    foreach my $iid ( keys %$i_type ) {
        my $type = $i_type->{$iid} || '';
-        $i_ignore{$iid}++ 
+        $i_ignore{$iid}++
+
            # 33 is the console port
            if $type =~ /(loopback|propvirtual|other|cpu|33)/i;
    }
    return \%i_ignore;
 }

-
-sub os { 
+sub os {
    return 'foundry';
 }

@@ -202,14 +198,15 @@ sub vendor {

 # this hangs on a edgeiron24g
 # TODO: check by devicetype and deferr to SUPER if not bad device
-sub stp_p_state { undef; }
+sub stp_p_state { return; }

 1;
 __END__

 =head1 NAME

-SNMP::Info::Layer2::Foundry - SNMP Interface to Foundry FastIron Network Devices
+SNMP::Info::Layer2::Foundry - SNMP Interface to Foundry FastIron Network
+Devices

 =head1 AUTHOR

@@ -219,8 +216,24 @@ Max Baker

 This module is Deprecated.  Please use Layer3::Foundry instead.

+ # Let SNMP::Info determine the correct subclass for you. 
+ my $foundry = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $foundry->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
 =head1 DESCRIPTION

+This module is Deprecated.  Please use Layer3::Foundry instead.
+
 This module provides support for Foundry EdgeIron Switches

 =head2 Inherited Classes
@@ -237,7 +250,7 @@ This module provides support for Foundry EdgeIron Switches

 =over

-=item FOUNDRY-SN-ROOT-MIB
+=item F<FOUNDRY-SN-ROOT-MIB>

 =item Inherited Classes' MIBs

@@ -251,7 +264,25 @@ These are methods that return scalar value from SNMP

 =over

-=item todo
+=item $foundry->model()
+
+Returns model type.
+
+=item $foundry->vendor()
+
+Returns 'foundry'
+
+=item $foundry->os()
+
+Returns 'foundry'
+
+=item $foundry->os_ver()
+
+Returns the software version
+
+=item $foundry->serial()
+
+Returns the serial number

 =back

@@ -272,7 +303,38 @@ to a hash.

 =over

-=item todo2
+=item $foundry->interfaces()
+
+Returns reference to hash of interface names to iids.
+
+=item $foundry->i_ignore()
+
+Returns reference to hash of interfaces to be ignored.
+
+Ignores interfaces with descriptions of  tunnel,loopback,null 
+
+=item $foundry->i_duplex()
+
+Returns reference to hash of interface link duplex status. 
+
+Crosses $foundry->sw_duplex() with $foundry->sw_index()
+
+=item $foundry->i_duplex_admin()
+
+Returns reference to hash of interface administrative duplex status. 
+
+=item $foundry->stp_p_state()
+
+"The port's current state as defined by application of the Spanning Tree
+Protocol.
+
+Skipped if device is an EdgeIron 24G due to reports of hangs.
+
+(C<dot1dStpPortState>)
+
+=item $foundry->i_vlan()
+
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.

 =back

--- a/Info/Layer2/HP.pm
+++ b/Info/Layer2/HP.pm
--- a/Info/Layer2/HP4000.pm
+++ b/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.04';
+
+%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
--- a/Info/Layer2/N2270.pm
+++ b/Info/Layer2/N2270.pm
@@ -1,74 +1,69 @@
 # SNMP::Info::Layer2::N2270
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2005 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::N2270;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::SONMP;
 use SNMP::Info::Airespace;

-@SNMP::Info::Layer2::N2270::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::Airespace Exporter/;
+@SNMP::Info::Layer2::N2270::ISA
+    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::Airespace Exporter/;
@SNMP::Info::Layer2::N2270::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;

-%MIBS    = (
-            %SNMP::Info::MIBS,
-            %SNMP::Info::Bridge::MIBS,
-            %SNMP::Info::SONMP::MIBS,
-            %SNMP::Info::Airespace::MIBS,
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,
+    %SNMP::Info::SONMP::MIBS, %SNMP::Info::Airespace::MIBS,
+);

 %GLOBALS = (
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-            %SNMP::Info::Airespace::GLOBALS,
-            );
+    %SNMP::Info::GLOBALS,        %SNMP::Info::Bridge::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS, %SNMP::Info::Airespace::GLOBALS,
+);

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-            %SNMP::Info::Airespace::FUNCS,
-            );
+%FUNCS = (
+    %SNMP::Info::FUNCS,        %SNMP::Info::Bridge::FUNCS,
+    %SNMP::Info::SONMP::FUNCS, %SNMP::Info::Airespace::FUNCS,
+);

-%MUNGE   = (
-          %SNMP::Info::MUNGE,
-          %SNMP::Info::Bridge::MUNGE,
-          %SNMP::Info::SONMP::MUNGE,
-          %SNMP::Info::Airespace::MUNGE,
-            );
+%MUNGE = (
+    %SNMP::Info::MUNGE,        %SNMP::Info::Bridge::MUNGE,
+    %SNMP::Info::SONMP::MUNGE, %SNMP::Info::Airespace::MUNGE,
+);

 sub os {
    return 'nortel';
@@ -80,8 +75,8 @@ sub vendor {

 sub model {
    my $n2270 = shift;
-    my $id = $n2270->id();
-    return undef unless defined $id;
+    my $id    = $n2270->id();
+    return unless defined $id;
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;
    $model =~ s/^sreg-WLANSecuritySwitch//i;
@@ -102,7 +97,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer2::N2270 - SNMP Interface to Nortel 2270 Series Wireless Switch
+SNMP::Info::Layer2::N2270 - SNMP Interface to Nortel 2270 Series Wireless
+Switch

 =head1 AUTHOR

@@ -115,7 +111,6 @@ Eric Miller
    my $n2270 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -131,8 +126,8 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a 
 Nortel 2270 Series Wireless Switch through SNMP.

-For speed or debugging purposes you can call the subclass directly, but not after
-determining a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $n2270 = new SNMP::Info::Layer2::N2270(...);

@@ -182,10 +177,10 @@ Returns 'nortel'

 =item $n2270->model()

-Cross references $bayhub->id() to the SYNOPTICS-ROOT-MIB and returns
+Cross references $bayhub->id() to the F<SYNOPTICS-ROOT-MIB> and returns
 the results.

-Removes sreg-WLANSecuritySwitch from the model name
+Removes C<sreg-WLANSecuritySwitch> from the model name

 =back

--- a/Info/Layer2/NAP222x.pm
+++ b/Info/Layer2/NAP222x.pm
@@ -1,92 +1,95 @@
 # SNMP::Info::Layer2::NAP222x
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::NAP222x;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::IEEE802dot11;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer2::NAP222x::ISA = qw/SNMP::Info::SONMP SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::NAP222x::ISA
+    = qw/SNMP::Info::SONMP SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::NAP222x::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::IEEE802dot11::MIBS,
-            %SNMP::Info::SONMP::MIBS,
-            'NORTEL-WLAN-AP-MIB' => 'ntWlanSwHardwareVer',
-           );
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
+    %SNMP::Info::SONMP::MIBS, 'NORTEL-WLAN-AP-MIB' => 'ntWlanSwHardwareVer',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::IEEE802dot11::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-            'nt_hw_ver'     => 'ntWlanSwHardwareVer',
-            'nt_fw_ver'     => 'ntWlanSwBootRomVer',
-            'nt_sw_ver'     => 'ntWlanSwOpCodeVer',
-            'nt_cc'         => 'ntWlanSwCountryCode',
-            'tftp_action'   => 'ntWlanTransferStart',
-            'tftp_host'     => 'ntWlanFileServer',
-            'tftp_file'     => 'ntWlanDestFile',
-            'tftp_type'     => 'ntWlanFileType',
-            'tftp_result'   => 'ntWlanFileTransferStatus',
-            'tftp_xtype'    => 'ntWlanTransferType',
-            'tftp_src_file' => 'ntWlanSrcFile',
-            'ftp_user'      => 'ntWlanUserName',
-            'ftp_pass'      => 'ntWlanPassword',
-           );
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::IEEE802dot11::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS,
+    'nt_hw_ver'     => 'ntWlanSwHardwareVer',
+    'nt_fw_ver'     => 'ntWlanSwBootRomVer',
+    'nt_sw_ver'     => 'ntWlanSwOpCodeVer',
+    'nt_cc'         => 'ntWlanSwCountryCode',
+    'tftp_action'   => 'ntWlanTransferStart',
+    'tftp_host'     => 'ntWlanFileServer',
+    'tftp_file'     => 'ntWlanDestFile',
+    'tftp_type'     => 'ntWlanFileType',
+    'tftp_result'   => 'ntWlanFileTransferStatus',
+    'tftp_xtype'    => 'ntWlanTransferType',
+    'tftp_src_file' => 'ntWlanSrcFile',
+    'ftp_user'      => 'ntWlanUserName',
+    'ftp_pass'      => 'ntWlanPassword',
+);

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::IEEE802dot11::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-            # From ntWlanPortTable
-            'nt_prt_name'    => 'ntWlanPortName',
-            'nt_dpx_admin'   => 'ntWlanPortCapabilities',
-            'nt_auto'        => 'ntWlanPortAutonegotiation',
-            'nt_dpx'         => 'ntWlanPortSpeedDpxStatus',
-            # From ntWlanDot11PhyOperationTable
-            'nt_i_broadcast' => 'ntWlanDot11ClosedSystem',
-            # From ntWlanApVlanTable
-            'nt_i_vlan'      => 'ntWlanApVlanDefaultVid',
-            );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::IEEE802dot11::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::IEEE802dot11::MUNGE,
-            %SNMP::Info::SONMP::MUNGE,
-            );
+    # From ntWlanPortTable
+    'nt_prt_name'  => 'ntWlanPortName',
+    'nt_dpx_admin' => 'ntWlanPortCapabilities',
+    'nt_auto'      => 'ntWlanPortAutonegotiation',
+    'nt_dpx'       => 'ntWlanPortSpeedDpxStatus',
+
+    # From ntWlanDot11PhyOperationTable
+    'nt_i_broadcast' => 'ntWlanDot11ClosedSystem',
+
+    # From ntWlanApVlanTable
+    'nt_i_vlan' => 'ntWlanApVlanDefaultVid',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE, %SNMP::Info::IEEE802dot11::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
+);

 sub os {
    return 'nortel';
@@ -94,60 +97,60 @@ sub os {

 sub os_bin {
    my $nap222x = shift;
-    my $bin = $nap222x->nt_fw_ver();
-    return undef unless defined $bin;
+    my $bin     = $nap222x->nt_fw_ver();
+    return unless defined $bin;

-    if ($bin =~ m/(\d+\.\d+\.\d+)/){
+    if ( $bin =~ m/(\d+\.\d+\.\d+)/ ) {
        return $1;
-        }
-    return undef;
+    }
+    return;
 }

 sub model {
    my $nap222x = shift;
-    my $descr = $nap222x->description();
-    return undef unless defined $descr;
+    my $descr   = $nap222x->description();
+    return unless defined $descr;

-    return 'AP-2220' if ($descr =~ /2220/);
-    return 'AP-2221' if ($descr =~ /2221/);
-    return undef;
+    return 'AP-2220' if ( $descr =~ /2220/ );
+    return 'AP-2221' if ( $descr =~ /2221/ );
+    return;
 }

 sub mac {
    my $nap222x = shift;
-    my $i_mac = $nap222x->i_mac();
+    my $i_mac   = $nap222x->i_mac();

-# Return Interface MAC   
-    foreach my $entry (keys %$i_mac){
+    # Return Interface MAC
+    foreach my $entry ( keys %$i_mac ) {
        my $sn = $i_mac->{$entry};
        next unless $sn;
        return $sn;
    }
-    return undef;
+    return;
 }

 sub serial {
    my $nap222x = shift;
-    my $i_mac = $nap222x->i_mac();
+    my $i_mac   = $nap222x->i_mac();

-# Return Interface MAC   
-    foreach my $entry (keys %$i_mac){
+    # Return Interface MAC
+    foreach my $entry ( keys %$i_mac ) {
        my $sn = $i_mac->{$entry};
        next unless $sn;
        return $sn;
    }
-    return undef;
+    return;
 }

 sub interfaces {
    my $nap222x = shift;
    my $partial = shift;

-    my $interfaces = $nap222x->i_index($partial) || {};
+    my $interfaces  = $nap222x->i_index($partial)       || {};
    my $description = $nap222x->i_description($partial) || {};

    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $description->{$iid};
        next unless defined $desc;
        next if $desc =~ /lo/i;
@@ -160,25 +163,25 @@ sub interfaces {
 sub i_duplex {
    my $nap222x = shift;
    my $partial = shift;
-    
-    my $mode = $nap222x->nt_dpx($partial) || {};
-    my $port_name = $nap222x->nt_prt_name($partial) || {};
-    my $interfaces = $nap222x->interfaces($partial) || {};
-    
+
+    my $mode       = $nap222x->nt_dpx($partial)      || {};
+    my $port_name  = $nap222x->nt_prt_name($partial) || {};
+    my $interfaces = $nap222x->interfaces($partial)  || {};
+
    my %i_duplex;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $port = $interfaces->{$if};
        next unless $port =~ /dp/i;
-        foreach my $idx (keys %$mode) {
-            my $name = $port_name->{$idx}||'unknown';
+        foreach my $idx ( keys %$mode ) {
+            my $name = $port_name->{$idx} || 'unknown';
            next unless $name eq $port;
            my $duplex = $mode->{$idx};
-            
+
            $duplex = 'other' unless defined $duplex;
            $duplex = 'half' if $duplex =~ /half/i;
            $duplex = 'full' if $duplex =~ /full/i;
-    
-            $i_duplex{$if}=$duplex;
+
+            $i_duplex{$if} = $duplex;
        }
    }
    return \%i_duplex;
@@ -188,27 +191,29 @@ sub i_duplex_admin {
    my $nap222x = shift;
    my $partial = shift;

-    my $dpx_admin = $nap222x->nt_dpx_admin($partial) || {};
-    my $nt_auto = $nap222x->nt_auto($partial) || {};
-    my $interfaces = $nap222x->interfaces($partial) || {};
-    my $port_name = $nap222x->nt_prt_name($partial) || {};
- 
+    my $dpx_admin  = $nap222x->nt_dpx_admin($partial) || {};
+    my $nt_auto    = $nap222x->nt_auto($partial)      || {};
+    my $interfaces = $nap222x->interfaces($partial)   || {};
+    my $port_name  = $nap222x->nt_prt_name($partial)  || {};
+
    my %i_duplex_admin;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $port = $interfaces->{$if};
        next unless $port =~ /dp/i;
-        foreach my $idx (keys %$dpx_admin) {
-            my $name = $port_name->{$idx}||'unknown';
+        foreach my $idx ( keys %$dpx_admin ) {
+            my $name = $port_name->{$idx} || 'unknown';
            next unless $name eq $port;
            my $duplex = $dpx_admin->{$idx};
-            my $auto = $nt_auto->{$idx};
-    
+            my $auto   = $nt_auto->{$idx};
+
            $duplex = 'other' unless defined $duplex;
-            $duplex = 'half' if ($duplex =~ /half/i and $auto =~ /disabled/i);
-            $duplex = 'full' if ($duplex =~ /full/i and $auto =~ /disabled/i);
+            $duplex = 'half'
+                if ( $duplex =~ /half/i and $auto =~ /disabled/i );
+            $duplex = 'full'
+                if ( $duplex =~ /full/i and $auto =~ /disabled/i );
            $duplex = 'auto' if $auto =~ /enabled/i;
-    
-            $i_duplex_admin{$if}=$duplex;
+
+            $i_duplex_admin{$if} = $duplex;
        }
    }
    return \%i_duplex_admin;
@@ -221,15 +226,15 @@ sub i_name {
    my $interfaces = $nap222x->interfaces($partial) || {};

    my %i_name;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $desc = $interfaces->{$if};
        next unless defined $desc;
-        
+
        my $name = 'unknown';
-        $name = 'Ethernet Interface' if $desc =~ /dp/i;
+        $name = 'Ethernet Interface'   if $desc =~ /dp/i;
        $name = 'Wireless Interface B' if $desc =~ /ndc/i;
        $name = 'Wireless Interface A' if $desc =~ /ar/i;
-        
+
        $i_name{$if} = $name;
    }
    return \%i_name;
@@ -243,15 +248,15 @@ sub bp_index {
    my $interfaces = $nap222x->interfaces($partial) || {};

    my %bp_index;
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $interfaces->{$iid};
        next unless defined $desc;
        next unless $desc =~ /(ndc|ar)/i;
-        
+
        my $port = 1;
        $port = 2 if $desc =~ /ndc/i;

-    $bp_index{$port} = $iid;
+        $bp_index{$port} = $iid;
    }
    return \%bp_index;
 }
@@ -263,20 +268,20 @@ sub i_ssidlist {
    my $partial = shift;

    # modify partial to match index
-    if (defined $partial) {
+    if ( defined $partial ) {
        $partial = $partial - 2;
    }
    my $ssids = $nap222x->orig_i_ssidlist($partial) || {};

    my %i_ssidlist;
-    foreach my $iid (keys %$ssids){
+    foreach my $iid ( keys %$ssids ) {
        my $port = $iid + 2;
        my $ssid = $ssids->{$iid};
        next unless defined $ssid;
-        
+
        $i_ssidlist{$port} = $ssid;
    }
-    return \%i_ssidlist;        
+    return \%i_ssidlist;
 }

 sub i_ssidbcast {
@@ -284,20 +289,20 @@ sub i_ssidbcast {
    my $partial = shift;

    # modify partial to match index
-    if (defined $partial) {
+    if ( defined $partial ) {
        $partial = $partial - 2;
    }
    my $bcast = $nap222x->nt_i_broadcast($partial) || {};

    my %i_ssidbcast;
-    foreach my $iid (keys %$bcast){
+    foreach my $iid ( keys %$bcast ) {
        my $port = $iid + 2;
        my $bc   = $bcast->{$iid};
        next unless defined $bc;
-        
+
        $i_ssidbcast{$port} = $bc;
    }
-    return \%i_ssidbcast;        
+    return \%i_ssidbcast;
 }

 sub i_80211channel {
@@ -305,24 +310,24 @@ sub i_80211channel {
    my $partial = shift;

    # modify partial to match index
-    if (defined $partial) {
+    if ( defined $partial ) {
        $partial = $partial - 2;
    }
    my $phy_type = $nap222x->dot11_phy_type($partial) || {};
-    my $cur_freq = $nap222x->dot11_cur_freq() || {};
-    my $cur_ch   = $nap222x->dot11_cur_ch() || {};
+    my $cur_freq = $nap222x->dot11_cur_freq()         || {};
+    my $cur_ch   = $nap222x->dot11_cur_ch()           || {};

    my %i_80211channel;
-    foreach my $iid (keys %$phy_type){
+    foreach my $iid ( keys %$phy_type ) {
        my $port = $iid + 2;
        my $type = $phy_type->{$iid};
        next unless defined $type;
-        if ($type =~ /dsss/) {
+        if ( $type =~ /dsss/ ) {
            my $ch = $cur_ch->{1};
            next unless defined $ch;
            $i_80211channel{$port} = $ch;
        }
-        elsif ($type =~ /ofdm/) {
+        elsif ( $type =~ /ofdm/ ) {
            my $ch = $cur_freq->{0};
            next unless defined $ch;
            $i_80211channel{$port} = $ch;
@@ -340,20 +345,20 @@ sub i_vlan {
    my $partial = shift;

    # modify partial to match index
-    if (defined $partial) {
+    if ( defined $partial ) {
        $partial = $partial - 2;
    }
    my $vlans = $nap222x->nt_i_vlan($partial) || {};

    my %i_vlan;
-    foreach my $iid (keys %$vlans){
+    foreach my $iid ( keys %$vlans ) {
        my $port = $iid + 2;
        my $vlan = $vlans->{$iid};
        next unless defined $vlan;
-        
+
        $i_vlan{$port} = $vlan;
    }
-    return \%i_vlan;        
+    return \%i_vlan;
 }

 1;
@@ -361,7 +366,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer2::NAP222x - SNMP Interface to Nortel 2220 Series Access Points
+SNMP::Info::Layer2::NAP222x - SNMP Interface to Nortel 2220 Series Access
+Points

 =head1 AUTHOR

@@ -373,7 +379,6 @@ Eric Miller
 my $nap222x = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -388,8 +393,8 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a Nortel
 2220 series wireless Access Points through SNMP. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $nap222x = new SNMP::Info::Layer2::NAP222x(...);

@@ -409,7 +414,7 @@ a more specific class using the method above.

 =over

-=item NORTEL-WLAN-AP-MIB
+=item F<NORTEL-WLAN-AP-MIB>

 =back

@@ -430,7 +435,7 @@ These are methods that return scalar value from SNMP

 =item $nap222x->model()

-Returns the model extracted from B<sysDescr>.
+Returns the model extracted from C<sysDescr>.

 =item $nap222x->os()

@@ -438,7 +443,7 @@ Returns 'nortel'

 =item $nap222x->os_bin()

-Returns the firmware version extracted from B<ntWlanSwBootRomVer>.
+Returns the firmware version extracted from C<ntWlanSwBootRomVer>.

 =item $nap222x->mac()

@@ -452,49 +457,49 @@ Returns the MAC address of the first Ethernet Interface.

 Returns the hardware version.

-(B<ntWlanSwHardwareVer>)
+(C<ntWlanSwHardwareVer>)

 =item $nap222x->nt_cc()

 Returns the country code of the AP.

-(B<ntWlanSwHardwareVer>)
+(C<ntWlanSwHardwareVer>)

 =item $nap222x->tftp_action()

-(B<ntWlanTransferStart>)
+(C<ntWlanTransferStart>)

 =item $nap222x->tftp_host()

-(B<ntWlanFileServer>)
+(C<ntWlanFileServer>)

 =item $nap222x->tftp_file()

-(B<ntWlanDestFile>)
+(C<ntWlanDestFile>)

 =item $nap222x->tftp_type()

-(B<ntWlanFileType>)
+(C<ntWlanFileType>)

 =item $nap222x->tftp_result()

-(B<ntWlanFileTransferStatus>)
+(C<ntWlanFileTransferStatus>)

 =item $nap222x->tftp_xtype()

-(B<ntWlanTransferType>)
+(C<ntWlanTransferType>)

 =item $nap222x->tftp_src_file()

-(B<ntWlanSrcFile>)
+(C<ntWlanSrcFile>)

 =item $nap222x->ftp_user()

-(B<ntWlanUserName>)
+(C<ntWlanUserName>)

 =item $nap222x->ftp_pass()

-(B<ntWlanPassword>)
+(C<ntWlanPassword>)

 =back

@@ -527,13 +532,13 @@ Returns reference to map of IIDs to physical ports.

 Returns reference to hash.  Maps port operational duplexes to IIDs.

-(B<ntWlanPortSpeedDpxStatus>)
+(C<ntWlanPortSpeedDpxStatus>)

 =item $nap222x->i_duplex_admin()

 Returns reference to hash.  Maps port admin duplexes to IIDs.

-(B<ntWlanPortCapabilities>)
+(C<ntWlanPortCapabilities>)

 =item $nap222x->i_name()

@@ -541,8 +546,9 @@ Returns a human name based upon port description.

 =item $nap222x->bp_index()

-Returns a mapping between ifIndex and the Bridge Table.  This does not exist in
-the MIB and bridge port index is not the same as ifIndex so it is created. 
+Returns a mapping between C<ifIndex> and the Bridge Table.  This does not
+exist in the MIB and bridge port index is not the same as C<ifIndex> so it is
+created. 

 =item $nap222x->i_ssidlist()

@@ -559,9 +565,9 @@ interface.

 =item $nap222x->i_vlan()

-The default VID of the radio interfaces.
+The default Vlan ID of the radio interfaces.

-(B<ntWlanApVlanDefaultVid>)
+(C<ntWlanApVlanDefaultVid>)

 =back

--- a/Info/Layer2/Netgear.pm
+++ b/Info/Layer2/Netgear.pm
@@ -1,60 +1,53 @@
 # SNMP::Info::Layer2::Netgear
-# Bill Fenner and Zoltan Erszenyi
+# $Id$
 #
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 Bill Fenner
+# 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 
+#     * 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.
+#
+# 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::Netgear;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer2;

-
-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/;
-
-$VERSION = '1.07';
-@SNMP::Info::Layer2::Netgear::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-           );
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-%GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-	    %SNMP::Info::Layer2::FUNCS,
-           );
+%MIBS = ( %SNMP::Info::Layer2::MIBS, );

-%MUNGE   = (
-	    %SNMP::Info::Layer2::MUNGE,
-           );
+%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, );
+
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );

 sub vendor {
    return 'netgear';
@@ -81,20 +74,20 @@ sub model {
 # return anything.
 sub fw_mac {
    my $netgear = shift;
-    my $ret = $netgear->qb_fw_mac();
-    $ret = $netgear->orig_fw_mac() if (!defined($ret));
+    my $ret     = $netgear->qb_fw_mac();
+    $ret = $netgear->orig_fw_mac() if ( !defined($ret) );
    return $ret;
 }

 sub fw_port {
    my $netgear = shift;
-    my $ret = $netgear->qb_fw_port();
-    $ret = $netgear->orig_fw_port() if (!defined($ret));
+    my $ret     = $netgear->qb_fw_port();
+    $ret = $netgear->orig_fw_port() if ( !defined($ret) );
    return $ret;
 }

 1;
-  
+
 __END__

 =head1 NAME
@@ -111,7 +104,6 @@ Bill Fenner and Zoltan Erszenyi
 my $netgear = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -141,7 +133,8 @@ inherited methods.

 =item Inherited Classes' MIBs

-MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and its inherited classes.
+MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and its inherited
+classes.

 =back

@@ -176,6 +169,29 @@ See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 These are methods that return tables of information in the form of
 a reference to a hash.

+=head2 Overrides
+
+=over
+
+=item $netgear->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses.
+
+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 $netgear->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+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.
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
--- a/Info/Layer2/Orinoco.pm
+++ b/Info/Layer2/Orinoco.pm
@@ -1,70 +1,70 @@
 # SNMP::Info::Layer2::Orinoco
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::Orinoco;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::IEEE802dot11;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer2::Orinoco::ISA = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Orinoco::ISA
+    = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Orinoco::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            %SNMP::Info::IEEE802dot11::MIBS,
-            #'ORiNOCO-MIB' => 'orinoco',
-           );
+$VERSION = '2.04';

-%GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            %SNMP::Info::IEEE802dot11::GLOBALS,
-           );
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::IEEE802dot11::MIBS,

-%FUNCS   = (
-            %SNMP::Info::Layer2::FUNCS,
-            %SNMP::Info::IEEE802dot11::FUNCS,
-            # ORiNOCO-MIB:oriWirelessIfPropertiesTable
-            #'ori_ssid'       => 'oriWirelessIfNetworkName',
-            #'ori_channel'    => 'oriWirelessIfChannel',
-            #'ori_closed_sys' => 'oriWirelessIfClosedSystem',
-            # ORiNOCO-MIB:oriSystemInvMgmtComponentTable
-             );
+    #'ORiNOCO-MIB' => 'orinoco',
+);

-%MUNGE   = (
-            %SNMP::Info::Layer2::MUNGE,
-            %SNMP::Info::IEEE802dot11::MUNGE,
-            );
+%GLOBALS
+    = ( %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::IEEE802dot11::GLOBALS, );
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::IEEE802dot11::FUNCS,
+
+    # ORiNOCO-MIB:oriWirelessIfPropertiesTable
+    #'ori_ssid'       => 'oriWirelessIfNetworkName',
+    #'ori_channel'    => 'oriWirelessIfChannel',
+    #'ori_closed_sys' => 'oriWirelessIfClosedSystem',
+    # ORiNOCO-MIB:oriSystemInvMgmtComponentTable
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::IEEE802dot11::MUNGE, );

 sub os {
    return 'orinoco';
@@ -74,32 +74,32 @@ sub os_ver {
    my $orinoco = shift;

    my $descr = $orinoco->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    if ($descr =~ m/V(\d+\.\d+)/){
+    if ( $descr =~ m/V(\d+\.\d+)/ ) {
        return $1;
    }
-    if ($descr =~ m/v(\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/v(\d+\.\d+\.\d+)/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 sub os_bin {
    my $orinoco = shift;

    my $descr = $orinoco->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    if ($descr =~ m/V(\d+\.\d+)$/){
+    if ( $descr =~ m/V(\d+\.\d+)$/ ) {
        return $1;
    }
-    if ($descr =~ m/v(\d+\.\d+\.\d+)$/){
+    if ( $descr =~ m/v(\d+\.\d+\.\d+)$/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 sub vendor {
@@ -110,20 +110,22 @@ sub model {
    my $orinoco = shift;

    my $descr = $orinoco->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    return $1 if ($descr =~ /(AP-\d+)/);
-    return 'WavePOINT-II' if ($descr =~ /WavePOINT-II/);
-    return undef;
+    return $1             if ( $descr =~ /(AP-\d+)/ );
+    return 'WavePOINT-II' if ( $descr =~ /WavePOINT-II/ );
+    return 'Outdoor Router' if ( $descr =~ /Wireless Router/ );
+
+    return;
 }

 sub serial {
    my $orinoco = shift;

    my $descr = $orinoco->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    $descr  = $1 if $descr =~ /SN-(\S+)/;
+    $descr = $1 if $descr =~ /SN-(\S+)/;
    return $descr;
 }

@@ -134,9 +136,10 @@ sub i_ignore {
    my $descr = $orinoco->i_description($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$descr){
+    foreach my $if ( keys %$descr ) {
        my $type = $descr->{$if};
-	  # Skip virtual interfaces  
+
+        # Skip virtual interfaces
        $i_ignore{$if}++ if $type =~ /(lo|empty|PCMCIA)/i;
    }
    return \%i_ignore;
@@ -146,16 +149,16 @@ sub interfaces {
    my $orinoco = shift;
    my $partial = shift;

-    my $interfaces = $orinoco->i_index($partial) || {};
+    my $interfaces   = $orinoco->i_index($partial)       || {};
    my $descriptions = $orinoco->i_description($partial) || {};

    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $descriptions->{$iid};
        next unless defined $desc;
        next if $desc =~ /(lo|empty|PCMCIA)/i;

-	$desc  = 'AMD' if $desc =~ /AMD/;
+        $desc = 'AMD' if $desc =~ /AMD/;

        $interfaces{$iid} = $desc;
    }
@@ -175,7 +178,7 @@ sub interfaces {
 #
 #        $i_ssidbcast{$iid} = $bc;
 #    }
-#    return \%i_ssidbcast;        
+#    return \%i_ssidbcast;
 #}

 1;
@@ -195,7 +198,6 @@ Eric Miller
 my $orinoco = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -207,12 +209,12 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a Orinoco
-Access Point through SNMP.  Orinoco devices have been maufactured by Proxim,
-Agere, and Lucent.
+Provides abstraction to the configuration information obtainable from
+Orinoco Access Point through SNMP.  Orinoco devices have been manufactured
+by Proxim, Agere, and Lucent.

-For speed or debugging purposes you can call the subclass directly, but not after
-determining a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $orinoco = new SNMP::Info::Layer2::Orinoco(...);

@@ -252,7 +254,7 @@ Returns 'proxim'

 =item $orinoco->model()

-Returns the model extracted from B<sysDescr>.
+Returns the model extracted from C<sysDescr>.

 =item $orinoco->os()

@@ -260,15 +262,15 @@ Returns 'Orinoco'

 =item $orinoco->os_ver()

-Returns the software version extracted from B<sysDescr>.
+Returns the software version extracted from C<sysDescr>.

 =item $orinoco->os_bin()

-Returns the firmware version extracted from B<sysDescr>.
+Returns the firmware version extracted from C<sysDescr>.

 =item $orinoco->serial()

-Returns the serial number extracted from B<sysDescr>.
+Returns the serial number extracted from C<sysDescr>.

 =back

--- a/Info/Layer2/ZyXEL_DSLAM.pm
+++ b/Info/Layer2/ZyXEL_DSLAM.pm
@@ -1,67 +1,63 @@
 # SNMP::Info::Layer2::ZyXEL_DSLAM
-# Dmitry Sergienko <dmitry@trifle.net>
+# $Id$
 #
-# Copyright (c) 2004 Max Baker
+# Copyright (c) 2008 Max Baker
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 Netdisco nor the 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::ZyXEL_DSLAM;
-$VERSION = '1.07';
-# $Id$
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer2;

-@SNMP::Info::Layer2::ZyXEL_DSLAM::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::ZyXEL_DSLAM::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::ZyXEL_DSLAM::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '2.04';

 # Set for No CDP
-%GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS
-            );
+%GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

-%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
-            'ip_adresses' => 'ipAdEntAddr',
-            'i_name'	  => 'ifDescr',
-            'i_description' => 'adslLineConfProfile',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    'ip_adresses'   => 'ipAdEntAddr',
+    'i_name'        => 'ifDescr',
+    'i_description' => 'adslLineConfProfile',
+);

-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            'ADSL-LINE-MIB' => 'adslLineConfProfile'
-           );
-
-%MUNGE   = (%SNMP::Info::Layer2::MUNGE
-           );
+%MIBS
+    = ( %SNMP::Info::Layer2::MIBS, 'ADSL-LINE-MIB' => 'adslLineConfProfile' );

+%MUNGE = ( %SNMP::Info::Layer2::MUNGE );

 sub layers {
-    my $zyxel = shift;
+    my $zyxel  = shift;
    my $layers = $zyxel->layers();
    return $layers if defined $layers;

@@ -80,11 +76,11 @@ sub os {
 sub os_ver {
    my $zyxel = shift;
    my $descr = $zyxel->description();
-    
-    if ($descr =~ m/version (\S+) /){
+
+    if ( $descr =~ m/version (\S+) / ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub model {
@@ -92,23 +88,26 @@ sub model {

    my $desc = $zyxel->description();

-    if ($desc =~ /8-port ADSL Module\(Annex A\)/){
+    if ( $desc =~ /8-port ADSL Module\(Annex A\)/ ) {
        return "AAM1008-61";
-    } elsif ($desc =~ /8-port ADSL Module\(Annex B\)/){
+    }
+    elsif ( $desc =~ /8-port ADSL Module\(Annex B\)/ ) {
        return "AAM1008-63";
    }
-    return undef;
+    return;
 }

-sub ip{
-    my $zyxel = shift;
+sub ip {
+    my $zyxel   = shift;
    my $ip_hash = $zyxel->ip_addresses();
-    my $ip;
-    
-    foreach $ip (keys %{$ip_hash}) {
-        my $found_ip = $ip if (defined $ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/);
+    my $found_ip;
+
+    foreach my $ip ( keys %{$ip_hash} ) {
+        $found_ip = $ip
+            if ( defined $ip
+            and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ );
    }
-    return $ip;
+    return $found_ip;
 }
 1;
 __END__
@@ -127,7 +126,6 @@ Dmitry Sergienko (C<dmitry@trifle.net>)
 my $zyxel = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
@@ -155,13 +153,12 @@ inherited methods.

 =over

-=item ADSL-LINE-MIB
-
-This MIB assumedly obtainable through ZyXEL or possibly included with your device.
+=item F<ADSL-LINE-MIB>

 =item Inherited Classes

-MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and their inherited classes.
+MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and their inherited
+classes.

 =back

@@ -189,11 +186,15 @@ Culls Version from description()

 Returns IP Address of DSLAM.

-(B<ipAdEntAddr>)
+(C<ipAdEntAddr>)

 =item $zyxel->model()

-Trys to cull out model out of the description field.
+Tries to cull out model out of the description field.
+
+=item $zyxel->layers()
+
+Returns 00000011.

 =back

@@ -209,7 +210,7 @@ See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.

 =item $zyxel->i_name()

-Returns reference to map of IIDs to port name (B<ifDescr>).
+Returns reference to map of IIDs to port name (C<ifDescr>).

 =item $zyxel->i_description()

--- a/Info/Layer3.pm
+++ b/Info/Layer3.pm
@@ -1,142 +1,165 @@
 # SNMP::Info::Layer3 - SNMP Interface to Layer3 devices
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker -- All changes from Version 0.7 on
+# Copyright (c) 2008 Max Baker -- All changes from Version 0.7 on
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::EtherLike;
 use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;
+use SNMP::Info::IPv6;
+
+@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::Layer3::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;

-@SNMP::Info::Layer3::ISA = qw/SNMP::Info::PowerEthernet
-                              SNMP::Info::Entity SNMP::Info::EtherLike 
-                              SNMP::Info::Bridge SNMP::Info Exporter/;
-@SNMP::Info::Layer3::EXPORT_OK = qw//;
+$VERSION = '2.04';

-%MIBS = ( %SNMP::Info::MIBS,
-          %SNMP::Info::Bridge::MIBS,
-          %SNMP::Info::EtherLike::MIBS,
-          %SNMP::Info::Entity::MIBS,
-          %SNMP::Info::PowerEthernet::MIBS,
-          'IP-MIB'      => 'ipNetToMediaIfIndex',
-          'OSPF-MIB'    => 'ospfRouterId',
-          'BGP4-MIB'    => 'bgpIdentifier',
-        );
+%MIBS = (
+    %SNMP::Info::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',
+);

 %GLOBALS = (
-            # Inherit the super class ones
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::EtherLike::GLOBALS,
-            %SNMP::Info::Entity::GLOBALS,
-            %SNMP::Info::PowerEthernet::GLOBALS,
-            'mac'          => 'ifPhysAddress.1',
-            'serial1'      => '.1.3.6.1.4.1.9.3.6.3.0', # OLD-CISCO-CHASSIS-MIB::chassisId.0
-            'router_ip'    => 'ospfRouterId.0',
-            'bgp_id'       => 'bgpIdentifier.0',
-            'bgp_local_as' => 'bgpLocalAs.0',
-           );

-%FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::EtherLike::FUNCS,
-            %SNMP::Info::Entity::FUNCS,
-            %SNMP::Info::PowerEthernet::FUNCS,
-            # Obsolete Address Translation Table (ARP Cache)
-            'old_at_index'   => 'atIfIndex',
-            'old_at_paddr'   => 'atPhysAddress',
-            'old_at_netaddr' => 'atNetAddress',
-            # IP-MIB IP Net to Media Table (ARP Cache)
-            'at_index'    => 'ipNetToMediaIfIndex',
-            'at_paddr'    => 'ipNetToMediaPhysAddress',
-            'at_netaddr'  => 'ipNetToMediaNetAddress',
-            # OSPF-MIB::ospfIfTable
-            'ospf_if_ip'    => 'ospfIfIpAddress',
-            'ospf_if_area'  => 'ospfIfAreaId',
-            'ospf_if_type'  => 'ospfIfType',
-            'ospf_if_hello' => 'ospfIfHelloInterval',
-            'ospf_if_dead'  => 'ospfIfRtrDeadInterval',
-            'ospf_if_admin' => 'ospfIfAdminStat',
-            'ospf_if_state' => 'ospfIfState',
-            # OSPF-MIB::ospfNbrTable
-            'ospf_ip'         => 'ospfHostIpAddress',
-            'ospf_peers'      => 'ospfNbrIpAddr',
-            'ospf_peer_id'    => 'ospfNbrRtrId',
-            'ospf_peer_state' => 'ospfNbrState',
-            # BGP4-MIB::bgpPeerTable
-            'bgp_peers'               => 'bgpPeerLocalAddr',
-            'bgp_peer_id'             => 'bgpPeerIdentifier',
-            'bgp_peer_state'          => 'bgpPeerState',
-            'bgp_peer_as'             => 'bgpPeerRemoteAs',
-            'bgp_peer_addr'           => 'bgpPeerRemoteAddr',
-            'bgp_peer_fsm_est_trans'  => 'bgpPeerFsmEstablishedTransitions',
-            'bgp_peer_in_tot_msgs'    => 'bgpPeerInTotalMessages',
-            'bgp_peer_in_upd_el_time' => 'bgpPeerInUpdateElapsedTime',
-            'bgp_peer_in_upd'         => 'bgpPeerInUpdates', 
-            'bgp_peer_out_tot_msgs'   => 'bgpPeerOutTotalMessages',
-            'bgp_peer_out_upd'        => 'bgpPeerOutUpdates',
-           );
+    # Inherit the super class ones
+    %SNMP::Info::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
+    'router_ip'    => 'ospfRouterId.0',
+    'bgp_id'       => 'bgpIdentifier.0',
+    'bgp_local_as' => 'bgpLocalAs.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::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',
+    'old_at_paddr'   => 'atPhysAddress',
+    'old_at_netaddr' => 'atNetAddress',
+
+    # IP-MIB IP Net to Media Table (ARP Cache)
+    'at_index'   => 'ipNetToMediaIfIndex',
+    'at_paddr'   => 'ipNetToMediaPhysAddress',
+    'at_netaddr' => 'ipNetToMediaNetAddress',
+
+    # OSPF-MIB::ospfIfTable
+    'ospf_if_ip'    => 'ospfIfIpAddress',
+    'ospf_if_area'  => 'ospfIfAreaId',
+    'ospf_if_type'  => 'ospfIfType',
+    'ospf_if_hello' => 'ospfIfHelloInterval',
+    'ospf_if_dead'  => 'ospfIfRtrDeadInterval',
+    'ospf_if_admin' => 'ospfIfAdminStat',
+    'ospf_if_state' => 'ospfIfState',
+
+    # OSPF-MIB::ospfNbrTable
+    'ospf_ip'         => 'ospfHostIpAddress',
+    'ospf_peers'      => 'ospfNbrIpAddr',
+    'ospf_peer_id'    => 'ospfNbrRtrId',
+    'ospf_peer_state' => 'ospfNbrState',
+
+    # BGP4-MIB::bgpPeerTable
+    'bgp_peers'               => 'bgpPeerLocalAddr',
+    'bgp_peer_id'             => 'bgpPeerIdentifier',
+    'bgp_peer_state'          => 'bgpPeerState',
+    'bgp_peer_as'             => 'bgpPeerRemoteAs',
+    'bgp_peer_addr'           => 'bgpPeerRemoteAddr',
+    'bgp_peer_fsm_est_trans'  => 'bgpPeerFsmEstablishedTransitions',
+    'bgp_peer_in_tot_msgs'    => 'bgpPeerInTotalMessages',
+    'bgp_peer_in_upd_el_time' => 'bgpPeerInUpdateElapsedTime',
+    '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::Bridge::MUNGE,
-            %SNMP::Info::EtherLike::MUNGE,
-            %SNMP::Info::Entity::MUNGE,
-            %SNMP::Info::PowerEthernet::MUNGE,
-            'old_at_paddr' => \&SNMP::Info::munge_mac,
-            'at_paddr'     => \&SNMP::Info::munge_mac,
-         );

+    # Inherit all the built in munging
+    %SNMP::Info::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

 sub root_ip {
    my $l3 = shift;

-    my $router_ip  = $l3->router_ip();
-    my $ospf_ip    = $l3->ospf_ip();
+    my $router_ip = $l3->router_ip();
+    my $ospf_ip   = $l3->ospf_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){
+    if ( defined $ospf_ip and scalar( keys %$ospf_ip ) ) {
+        foreach my $key ( keys %$ospf_ip ) {
            my $ip = $ospf_ip->{$key};
            next if $ip eq '0.0.0.0';
            next unless $l3->snmp_connect_ip($ip);
@@ -145,20 +168,24 @@ 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 undef;
+    return $router_ip
+        if (( defined $router_ip )
+        and ( $router_ip ne '0.0.0.0' )
+        and ( $l3->snmp_connect_ip($router_ip) ) );
+    return;
 }

 sub i_ignore {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;
-    
+
    my $interfaces = $l3->interfaces($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$interfaces) {
+    foreach my $if ( keys %$interfaces ) {
+
        # lo -> cisco aironet 350 loopback
-        if ($interfaces->{$if} =~ /(tunnel|loopback|\blo\b|null)/i){
+        if ( $interfaces->{$if} =~ /(tunnel|loopback|\blo\b|null)/i ) {
            $i_ignore{$if}++;
        }
    }
@@ -167,34 +194,37 @@ sub i_ignore {

 sub serial {
    my $l3 = shift;
-    
-    my $serial1     = $l3->serial1();
-    my $e_descr     = $l3->e_descr()  || {};
-    my $e_serial    = $l3->e_serial() || {};
-    
-    my $serial2     = $e_serial->{1}  || undef;
-    my $chassis     = $e_descr->{1}   || undef;
-    
+
+    my $serial1  = $l3->serial1();
+    my $e_descr  = $l3->e_descr() || {};
+    my $e_serial = $l3->e_serial() || {};
+
+    my $serial2 = $e_serial->{1} || undef;
+    my $chassis = $e_descr->{1}  || undef;
+
    # precedence
    #   serial2,chassis parse,serial1
-    return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
-    return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
-    return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
+    return $serial2 if ( defined $serial2 and $serial2 !~ /^\s*$/ );
+    return $1
+        if ( defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i );
+    return $serial1 if ( defined $serial1 and $serial1 !~ /^\s*$/ );

-    return undef;
+    return;
 }

-# $l3->model() - the sysObjectID returns an IID to an entry in 
+# $l3->model() - the sysObjectID returns an IID to an entry in
 #       the CISCO-PRODUCT-MIB.  Look it up and return it.
 sub model {
    my $l3 = shift;
    my $id = $l3->id();
-    
-    unless (defined $id){
-        print " SNMP::Info::Layer3::model() - Device does not support sysObjectID\n" if $l3->debug(); 
-        return undef;
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::model() - Device does not support sysObjectID\n"
+            if $l3->debug();
+        return;
    }
-    
+
    my $model = &SNMP::translateObj($id);

    return $id unless defined $model;
@@ -206,34 +236,35 @@ sub model {
 }

 sub i_name {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;
-    
+
    my $i_index = $l3->i_index($partial);
    my $i_alias = $l3->i_alias($partial);
-    my $i_name2  = $l3->orig_i_name($partial);
+    my $i_name2 = $l3->orig_i_name($partial);

    my %i_name;
-    foreach my $iid (keys %$i_name2){
-        my $name = $i_name2->{$iid};
+    foreach my $iid ( keys %$i_name2 ) {
+        my $name  = $i_name2->{$iid};
        my $alias = $i_alias->{$iid};
-        $i_name{$iid} = (defined $alias and $alias !~ /^\s*$/) ?
-                        $alias : 
-                        $name;
+        $i_name{$iid}
+            = ( defined $alias and $alias !~ /^\s*$/ )
+            ? $alias
+            : $name;
    }

    return \%i_name;
 }

 sub i_duplex {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;
-    
-    my $el_index = $l3->el_index($partial);
+
+    my $el_index  = $l3->el_index($partial);
    my $el_duplex = $l3->el_duplex($partial);
-    
+
    my %i_index;
-    foreach my $el_port (keys %$el_duplex){
+    foreach my $el_port ( keys %$el_duplex ) {
        my $iid = $el_index->{$el_port};
        next unless defined $iid;
        my $duplex = $el_duplex->{$el_port};
@@ -249,20 +280,20 @@ sub i_duplex {

 # $l3->interfaces() - Map the Interfaces to their physical names
 sub interfaces {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

-    my $interfaces = $l3->i_index($partial);
+    my $interfaces   = $l3->i_index($partial);
    my $descriptions = $l3->i_description($partial);

    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $descriptions->{$iid};
        next unless defined $desc;

        $interfaces{$iid} = $desc;
    }
-    
+
    return \%interfaces;
 }

@@ -270,28 +301,35 @@ sub vendor {
    my $l3 = shift;

    my $descr = $l3->description();
+    my $id = $l3->id();

-    return 'cisco' if ($descr =~ /(cisco|\bios\b)/i);
-    return 'foundry' if ($descr =~ /foundry/i);
+    # .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 );
+
+    return 'unknown';

 }

 sub at_index {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

    return $l3->orig_at_index($partial) || $l3->old_at_index($partial);
 }

 sub at_paddr {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

    return $l3->orig_at_paddr($partial) || $l3->old_at_paddr($partial);
 }

 sub at_netaddr {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

    return $l3->orig_at_netaddr($partial) || $l3->old_at_netaddr($partial);
@@ -316,7 +354,6 @@ Max Baker
 my $l3 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -363,17 +400,21 @@ 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

 =over

-=item IP-MIB
+=item F<IP-MIB>

-=item OSPF-MIB
+=item F<OSPF-MIB>

-=item BGP4-MIB
+=item F<BGP4-MIB>

 =back

@@ -387,7 +428,9 @@ See L<SNMP::Info::EtherLike/"Required MIBs"> for its MIB requirements.

 See L<SNMP::Info::Entity/"Required MIBs"> for its MIB requirements.

-MIBs can be found in the netdisco-mibs package.
+See L<SNMP::Info::PowerEthernet/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::IPv6/"Required MIBs"> for its MIB requirements.

 =head1 GLOBALS

@@ -399,15 +442,15 @@ These are methods that return scalar value from SNMP

 Returns root port mac address

-(B<ifPhysAddress.1>)
+(C<ifPhysAddress.1>)

 =item $l3->router_ip()

-(B<ospfRouterId.0>)
+(C<ospfRouterId.0>)

 =item $l3->bgp_id()

-(B<bgpIdentifier.0>)
+(C<bgpIdentifier.0>)

 Returns the BGP identifier of the local system

@@ -415,7 +458,7 @@ Returns the BGP identifier of the local system

 Returns the local autonomous system number 

-(B<bgpLocalAs.0>)
+(C<bgpLocalAs.0>)

 =back

@@ -425,23 +468,24 @@ Returns the local autonomous system number

 =item $l3->model()

-Trys to reference $l3->id() to one of the product MIBs listed above
+Tries to reference $l3->id() to one of the product MIBs listed above

 Removes 'cisco'  from cisco devices for readability.

 =item $l3->serial()

-Trys to cull a serial number from ENTITY-MIB, description, and OLD-CISCO-... mib
+Tries to cull a serial number from F<ENTITY-MIB>, description, and
+F<OLD-CISCO->... MIB.

 =item $l3->vendor()

-Trys to cull a Vendor name from B<sysDescr>
+Tries to cull a Vendor name from C<sysDescr>

 =item $l3->root_ip()

 Returns the primary IP used to communicate with the device.  Returns the first
-found:  OSPF Router ID (B<ospfRouterId>) or any OSPF Host IP Address
-(B<ospfHostIpAddress>).
+found:  OSPF Router ID (C<ospfRouterId>) or any OSPF Host IP Address
+(C<ospfHostIpAddress>).

 =back

@@ -472,7 +516,8 @@ to a hash.

 =item $l3->interfaces()

-Returns the map between SNMP Interface Identifier (iid) and physical port name. 
+Returns the map between SNMP Interface Identifier (iid) and physical port
+name. 

 Only returns those iids that have a description listed in $l3->i_description()

@@ -486,7 +531,7 @@ Currently looks for tunnel,loopback,lo,null from $l3->interfaces()

 Returns reference to hash of iid to human set name. 

-Defaults to B<ifName>, but checks for an B<ifAlias>
+Defaults to C<ifName>, but checks for an C<ifAlias>

 =item $l3->i_duplex()

@@ -499,7 +544,7 @@ See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.

 =back

-=head2 IP-MIB Arp Cache Table (B<ipNetToMediaTable>)
+=head2 F<IP-MIB> Arp Cache Table (C<ipNetToMediaTable>)

 =over

@@ -507,35 +552,35 @@ See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.

 Returns reference to hash.  Maps ARP table entries to Interface IIDs 

-(B<ipNetToMediaIfIndex>)
+(C<ipNetToMediaIfIndex>)

-If the device doesn't support B<ipNetToMediaIfIndex>, this will try
-the deprecated B<atIfIndex>.
+If the device doesn't support C<ipNetToMediaIfIndex>, this will try
+the deprecated C<atIfIndex>.

 =item $l3->at_paddr()

 Returns reference to hash.  Maps ARP table entries to MAC addresses. 

-(B<ipNetToMediaPhysAddress>)
+(C<ipNetToMediaPhysAddress>)

-If the device doesn't support B<ipNetToMediaPhysAddress>, this will try
-the deprecated B<atPhysAddress>.
+If the device doesn't support C<ipNetToMediaPhysAddress>, this will try
+the deprecated C<atPhysAddress>.

 =item $l3->at_netaddr()

-Returns reference to hash.  Maps ARP table entries to IPs 
+Returns reference to hash.  Maps ARP table entries to IP addresses. 

-(B<ipNetToMediaNetAddress>)
+(C<ipNetToMediaNetAddress>)

-If the device doesn't support B<ipNetToMediaNetAddress>, this will try
-the deprecated B<atNetAddress>.
+If the device doesn't support C<ipNetToMediaNetAddress>, this will try
+the deprecated C<atNetAddress>.

 =back

 =head2 ARP Cache Entries

-The B<atTable> has been deprecated since 1991.  You should never need
-to use these methods.  See B<ipNetToMediaTable> above.
+The C<atTable> has been deprecated since 1991.  You should never need
+to use these methods.  See C<ipNetToMediaTable> above.

 =over

@@ -543,23 +588,23 @@ to use these methods.  See B<ipNetToMediaTable> above.

 Returns reference to map of IID to Arp Cache Entry

-(B<atIfIndex>)
+(C<atIfIndex>)

 =item $l3->old_at_paddr()

 Returns reference to hash of Arp Cache Entries to MAC address

-(B<atPhysAddress>)
+(C<atPhysAddress>)

 =item $l3->old_at_netaddr()

 Returns reference to hash of Arp Cache Entries to IP Address

-(B<atNetAddress>)
+(C<atNetAddress>)

 =back

-=head2 BGP Peer Table (B<bgpPeerTable>)
+=head2 BGP Peer Table (C<bgpPeerTable>)

 =over

@@ -567,77 +612,77 @@ Returns reference to hash of Arp Cache Entries to IP Address

 Returns reference to hash of BGP peer to local IP address

-(B<bgpPeerLocalAddr>)
+(C<bgpPeerLocalAddr>)

 =item $l3->bgp_peer_id()

 Returns reference to hash of BGP peer to BGP peer identifier

-(B<bgpPeerIdentifier>)
+(C<bgpPeerIdentifier>)

 =item $l3->bgp_peer_state()

 Returns reference to hash of BGP peer to BGP peer state

-(B<bgpPeerState>)
+(C<bgpPeerState>)

 =item $l3->bgp_peer_as()

 Returns reference to hash of BGP peer to BGP peer autonomous system number

-(B<bgpPeerRemoteAs>)
+(C<bgpPeerRemoteAs>)

 =item $l3->bgp_peer_addr()

 Returns reference to hash of BGP peer to BGP peer IP address

-(B<bgpPeerRemoteAddr>)
+(C<bgpPeerRemoteAddr>)

 =item $l3->bgp_peer_fsm_est_trans()

 Returns reference to hash of BGP peer to the total number of times the BGP FSM
 transitioned into the established state

-(B<bgpPeerFsmEstablishedTransitions>)
+(C<bgpPeerFsmEstablishedTransitions>)

 =item $l3->bgp_peer_in_tot_msgs()

 Returns reference to hash of BGP peer to the total number of messages received
 from the remote peer on this connection

-(B<bgpPeerInTotalMessages>)
+(C<bgpPeerInTotalMessages>)

 =item $l3->bgp_peer_in_upd_el_time()

 Returns reference to hash of BGP peer to the elapsed time in seconds since
 the last BGP UPDATE message was received from the peer.

-(B<bgpPeerInUpdateElapsedTime>)
+(C<bgpPeerInUpdateElapsedTime>)

 =item $l3->bgp_peer_in_upd()

 Returns reference to hash of BGP peer to the number of BGP UPDATE messages
 received on this connection

-(B<bgpPeerInUpdates>)
+(C<bgpPeerInUpdates>)

 =item $l3->bgp_peer_out_tot_msgs()

-Returns reference to hash of BGP peer to the total number of messages transmitted
-to the remote peer on this connection
+Returns reference to hash of BGP peer to the total number of messages
+transmitted to the remote peer on this connection

-(B<bgpPeerOutTotalMessages>)
+(C<bgpPeerOutTotalMessages>)

 =item $l3->bgp_peer_out_upd()

 Returns reference to hash of BGP peer to the number of BGP UPDATE messages
 transmitted on this connection

-(B<bgpPeerOutUpdates>)
+(C<bgpPeerOutUpdates>)

 =back

-=head2 OSPF Interface Table (B<ospfIfTable>)
+=head2 OSPF Interface Table (C<ospfIfTable>)

 =over

@@ -645,47 +690,47 @@ transmitted on this connection

 Returns reference to hash of OSPF interface IP addresses

-(B<ospfIfIpAddress>)
+(C<ospfIfIpAddress>)

 =item $l3->ospf_if_area()

 Returns reference to hash of the OSPF area to which the interfaces connect

-(B<ospfIfAreaId>)
+(C<ospfIfAreaId>)

 =item $l3->ospf_if_type()

 Returns reference to hash of the OSPF interfaces' type

-(B<ospfIfType>)
+(C<ospfIfType>)

 =item $l3->ospf_if_hello()

 Returns reference to hash of the OSPF interfaces' hello interval

-(B<ospfIfHelloInterval>)
+(C<ospfIfHelloInterval>)

 =item $l3->ospf_if_dead()

 Returns reference to hash of the OSPF interfaces' dead interval

-(B<ospfIfRtrDeadInterval>)
+(C<ospfIfRtrDeadInterval>)

 =item $l3->ospf_if_admin()

 Returns reference to hash of the OSPF interfaces' administrative status

-(B<ospfIfAdminStat>)
+(C<ospfIfAdminStat>)

 =item $l3->ospf_if_state()

 Returns reference to hash of the OSPF interfaces' state

-(B<ospfIfState>)
+(C<ospfIfState>)

 =back

-=head2 OSPF Neighbor Table (B<ospfNbrTable>)
+=head2 OSPF Neighbor Table (C<ospfNbrTable>)

 =over

@@ -694,20 +739,20 @@ Returns reference to hash of the OSPF interfaces' state
 Returns reference to hash of IP addresses the neighbor is using in its
 IP Source Addresses

-(B<ospfNbrIpAddr>)
+(C<ospfNbrIpAddr>)

 =item $l3->ospf_peer_id()

 Returns reference to hash of neighbor Router IDs

-(B<ospfNbrRtrId>)
+(C<ospfNbrRtrId>)

 =item $l3->ospf_peer_state()

 Returns reference to hash of state of the relationship with the neighbor
 routers

-(B<ospfNbrState>)
+(C<ospfNbrState>)

 =back

@@ -727,4 +772,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
--- a/Info/Layer3/Aironet.pm
+++ b/Info/Layer3/Aironet.pm
@@ -1,84 +1,89 @@
 # SNMP::Info::Layer3::Aironet
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Aironet;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::Layer3::Aironet::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Aironet::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Aironet::EXPORT_OK = qw//;

-%MIBS =    (
-            %SNMP::Info::Layer3::MIBS,
-            'AWCVX-MIB'        => 'awcIfTable',
-            'IEEE802dot11-MIB' => 'dot11StationID',
-           );
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    'AWCVX-MIB'        => 'awcIfTable',
+    'IEEE802dot11-MIB' => 'dot11StationID',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            'mac'               => 'dot11StationID.2',
-            # AWC Ethernet Table
-            'awc_duplex'        => 'awcEtherDuplex.0',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    'mac' => 'dot11StationID.2',

-%FUNCS = (  
-            %SNMP::Info::Layer3::FUNCS,
-            'i_mac2'    => 'ifPhysAddress',
-            'i_mtu2'    => 'ifMtu',
-            'i_ssid'    => 'dot11DesiredSSID',
-            # Bridge-mib overrides  
-            'fw_mac2'    => 'dot1dTpFdbAddress',
-            'fw_port2'   => 'dot1dTpFdbPort',
-            'bp_index2'  => 'dot1dBasePortIfIndex',
-            # AWC Interface Table (awcIfTable)
-            'awc_default_mac'   => 'awcIfDefaultPhyAddress',
-            'awc_mac'           => 'awcIfPhyAddress',
-            'awc_ip'            => 'awcIfIpAddress',
-            'awc_netmask'       => 'awcIfIpNetMask',
-            'awc_msdu'           => 'awcIfMSDUMaxLength',
-          );
+    # AWC Ethernet Table
+    'awc_duplex' => 'awcEtherDuplex.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    'i_mac2' => 'ifPhysAddress',
+    'i_mtu2' => 'ifMtu',
+    'i_ssid' => 'dot11DesiredSSID',
+
+    # Bridge-mib overrides
+    'fw_mac2'   => 'dot1dTpFdbAddress',
+    'fw_port2'  => 'dot1dTpFdbPort',
+    'bp_index2' => 'dot1dBasePortIfIndex',
+
+    # AWC Interface Table (awcIfTable)
+    'awc_default_mac' => 'awcIfDefaultPhyAddress',
+    'awc_mac'         => 'awcIfPhyAddress',
+    'awc_ip'          => 'awcIfIpAddress',
+    'awc_netmask'     => 'awcIfIpNetMask',
+    'awc_msdu'        => 'awcIfMSDUMaxLength',
+);

 %MUNGE = (
-          # Inherit all the built in munging
-          %SNMP::Info::Layer3::MUNGE,
-          'i_mac2'      => \&SNMP::Info::munge_mac,
-          'awc_mac'     => \&SNMP::Info::munge_mac,
-          'fw_mac2'     => \&SNMP::Info::munge_mac,
-         );
+
+    # Inherit all the built in munging
+    %SNMP::Info::Layer3::MUNGE,
+    'i_mac2'  => \&SNMP::Info::munge_mac,
+    'awc_mac' => \&SNMP::Info::munge_mac,
+    'fw_mac2' => \&SNMP::Info::munge_mac,
+);

 sub os {
    return 'aironet';
@@ -89,32 +94,32 @@ sub os_ver {
    my $descr = $aironet->description() || '';

    # CAP340 11.21, AP4800-E 11.21
-    if ($descr =~ /AP\d{3,4}(-\D+)?\s+(\d{2}\.\d{2})/){
+    if ( $descr =~ /AP\d{3,4}(-\D+)?\s+(\d{2}\.\d{2})/ ) {
        return $2;
    }
-    
-    if ($descr =~ /Series\s*AP\s+(\d{2}\.\d{2})/){
+
+    if ( $descr =~ /Series\s*AP\s+(\d{2}\.\d{2})/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 # Override wireless port with static info
 sub bp_index {
-    my $aironet = shift;
+    my $aironet    = shift;
    my $interfaces = $aironet->interfaces();
-    my $bp_index = $aironet->bp_index2();
-    
-    foreach my $iid (keys %$interfaces){
+    my $bp_index   = $aironet->bp_index2();
+
+    foreach my $iid ( keys %$interfaces ) {
        my $port = $interfaces->{$iid};

        # Hardwire the wireless port to the transparent bridge port
-        if ($port =~ /awc/){
-            $bp_index->{0}=$iid;
+        if ( $port =~ /awc/ ) {
+            $bp_index->{0} = $iid;
        }
    }
-    
+
    return $bp_index;
 }

@@ -123,16 +128,16 @@ sub fw_mac {
    my $aironet = shift;
    my $fw_mac  = $aironet->fw_mac2();
    my $fw_port = $aironet->fw_port2();
-    my $bs_mac  = $aironet->bs_mac();    
- 
+    my $bs_mac  = $aironet->bs_mac();
+
    # remove port 0 forwarding table entries, only port 0 static entries
-    foreach my $fw (keys %$fw_mac){
+    foreach my $fw ( keys %$fw_mac ) {
        my $port = $fw_port->{$fw};
        next unless defined $port;
        delete $fw_mac->{$fw} if $port == 0;
    }

-    foreach my $bs (keys %$bs_mac){
+    foreach my $bs ( keys %$bs_mac ) {
        my $entry = $bs;
        $entry =~ s/\.0$//;
        $fw_mac->{$entry} = $bs_mac->{$bs};
@@ -145,10 +150,9 @@ sub fw_mac {
 sub fw_port {
    my $aironet = shift;
    my $fw_port = $aironet->fw_port2();
-    my $bs_port = $aironet->bs_port();    
+    my $bs_port = $aironet->bs_port();

-
-    foreach my $bs (keys %$bs_port){
+    foreach my $bs ( keys %$bs_port ) {
        my $entry = $bs;
        $entry =~ s/\.0$//;
        $fw_port->{$entry} = $bs_port->{$bs};
@@ -157,18 +161,17 @@ sub fw_port {
    return $fw_port;
 }

-
 sub i_duplex {
-    my $aironet = shift;
+    my $aironet    = shift;
    my $interfaces = $aironet->interfaces();
    my $awc_duplex = $aironet->awc_duplex();
-    
+
    my %i_duplex;

-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $name = $interfaces->{$iid};

-        if ($name =~ /fec/){
+        if ( $name =~ /fec/ ) {
            $i_duplex{$iid} = $awc_duplex;
        }
    }
@@ -182,7 +185,7 @@ sub i_mac {
    my $i_mac   = $aironet->i_mac2();
    my $awc_mac = $aironet->awc_mac();

-    foreach my $iid (keys %$awc_mac){
+    foreach my $iid ( keys %$awc_mac ) {
        next unless defined $i_mac->{$iid};
        $i_mac->{$iid} = $awc_mac->{$iid};
    }
@@ -191,14 +194,14 @@ sub i_mac {
 }

 sub i_ignore {
-    my $aironet = shift;
+    my $aironet    = shift;
    my $interfaces = $aironet->interfaces();

    my %i_ignore;
-    foreach my $if (keys %$interfaces){
-        $i_ignore{$if}++ if ($interfaces->{$if} =~ /(rptr|lo)/);
+    foreach my $if ( keys %$interfaces ) {
+        $i_ignore{$if}++ if ( $interfaces->{$if} =~ /(rptr|lo)/ );
    }
-    
+
    return \%i_ignore;
 }

@@ -212,7 +215,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer3::Aironet - Perl5 Interface to Cisco Aironet Wireless Devices running Aironet software, not IOS
+SNMP::Info::Layer3::Aironet - Perl5 Interface to Cisco Aironet Wireless
+Devices running Aironet software, not IOS

 =head1 AUTHOR

@@ -224,7 +228,6 @@ Max Baker
 my $aironet = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -236,8 +239,8 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info subclass to provide access to SNMP data for an Aironet device running Aironet software,
-not cisco IOS.
+SNMP::Info subclass to provide access to SNMP data for an Aironet device
+running Aironet software, not cisco IOS.

 Note there are two classes for Aironet devices :

@@ -253,8 +256,8 @@ This class is for devices running Cisco IOS software (newer)

 =back

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $aironet = new SNMP::Info::Layer3::Aironet(...);

@@ -270,14 +273,14 @@ a more specific class using the method above.

 =over

-=item AWCVX-MIB
+=item F<AWCVX-MIB>

-=item IEEE802dot11-MIB
+=item F<IEEE802dot11-MIB>

 =back

-These MIBs are now included in the v2.tar.gz archive available from ftp.cisco.com.  Make sure you 
-have a current version. 
+These MIBs are now included in the v2.tar.gz archive available from
+ftp.cisco.com.  Make sure you have a current version. 

 =head1 GLOBALS

@@ -289,13 +292,13 @@ These are methods that return scalar value from SNMP

 Gives the admin duplex setting for the Ethernet Port.

-B<awcEtherDuplex.0>
+C<awcEtherDuplex.0>

 =item $aironet->mac()

 Gives the MAC Address of the wireless side 

-B<dot11StationID.2>
+C<dot11StationID.2>

 =item $aironet->os()

@@ -326,18 +329,18 @@ to a hash.

 =item $aironet->bp_index()

-Takes the bp_index() value from SNMP::Info::Bridge and overrides the wireless port 
-to be assigned to the transparent bridge port (port 0)
+Takes the bp_index() value from SNMP::Info::Bridge and overrides the wireless
+port to be assigned to the transparent bridge port (port 0)

 =item $aironet->fw_mac()

-Adds static table entries from bs_mac() to port 0 so that wireless MAC addresses will
-be reported.  Forwarding table entries for port 0 are removed.
+Adds static table entries from bs_mac() to port 0 so that wireless MAC
+addresses will be reported.  Forwarding table entries for port 0 are removed.

 =item $aironet->fw_port()

-Adds the static table port mappings to the forwarding table port mappings by adding 
-bs_port() to fw_port()
+Adds the static table port mappings to the forwarding table port mappings by
+adding bs_port() to fw_port()

 =item $aironet->i_duplex()

@@ -361,29 +364,29 @@ Ignores ports that are of type ``rptr'' and ``lo''.

 Gives the default MAC address of each interface.

-B<awcIfDefaultPhyAddress>
+C<awcIfDefaultPhyAddress>

 =item $aironet->awc_mac()

 Gives the actual MAC address of each interface.

-B<awcIfPhyAddress>
+C<awcIfPhyAddress>

 =item $aironet->awc_ip()

 Gives the IP Address assigned to each interface.

-B<awcIfIpAddress>
+C<awcIfIpAddress>

 =item $aironet->awc_netmask()

 Gives the NetMask for each interface.

-B<awcIfIpNetMask>
+C<awcIfIpNetMask>

 =item $aironet->awc_msdu()

-B<awcIfMSDUMaxLength>
+C<awcIfMSDUMaxLength>

 =back

--- a/Info/Layer3/AlcatelLucent.pm
+++ b/Info/Layer3/AlcatelLucent.pm
@@ -0,0 +1,552 @@
+# SNMP::Info::Layer3::AlcatelLucent
+# $Id$
+#
+# Copyright (c) 2008 Bill Fenner
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::AlcatelLucent;
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::AlcatelLucent::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::AlcatelLucent::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'ALCATEL-IND1-DEVICES'     => 'familyOmniSwitch7000',
+    'ALCATEL-IND1-CHASSIS-MIB' => 'chasEntPhysOperStatus',
+    'ALU-POWER-ETHERNET-MIB'   => 'pethPsePortDetectionStatus',
+);
+
+# Alcatel provides their own version of the POWER-ETHERNET-MIB,
+# off in vendor-space, without renaming any of the objects.
+# This means we have to *not* load the POWER-ETHERNET-MIB
+# but can then still use the standard PowerEthernet module,
+# but cannot try both so we hope Alcatel doesn't stop supporting
+# their private version even if they get around to supporting the
+# standard.
+delete $MIBS{'POWER-ETHERNET-MIB'};
+
+%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::AlcatelLucent::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::AlcatelLucent::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub model {
+    my $alu   = shift;
+    my $id    = $alu->id();
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^device//;
+
+    return $model;
+}
+
+sub os {
+    return 'AOS';
+}
+
+sub vendor {
+    return 'alcatel-lucent';
+}
+
+sub os_ver {
+    my $alu = shift;
+
+    my $descr = $alu->description();
+    if ( $descr =~ m/^(\S+)/ ) {
+        return $1;
+    }
+
+    # No clue what this will try but hey
+    return $alu->SUPER::os_ver();
+}
+
+# ps1_type, ps1_status, ps2_type, ps2_status:
+# Find the list of power supplies in the ENTITY-MIB
+# e_class = powerSupply
+# e_descr = ps_type
+# chasEntPhysOperStatus = ps_status
+sub _power_supplies {
+    my $alu = shift;
+
+    my $e_class  = $alu->e_class();
+    my @supplies = ();
+
+    foreach my $key ( sort { int($a) cmp int($b) } keys %$e_class ) {
+        if ( $e_class->{$key} eq 'powerSupply' ) {
+            push( @supplies, int($key) );
+        }
+    }
+    return @supplies;
+}
+
+sub _ps_type {
+    my $alu   = shift;
+    my $psnum = shift;
+    my @ps    = $alu->_power_supplies();
+
+    if ( $psnum > $#ps ) {
+        return "none";
+    }
+    my $supply = $ps[$psnum];
+    my $descr  = $alu->e_descr($supply);
+    return $descr->{$supply};
+}
+
+sub _ps_status {
+    my $alu   = shift;
+    my $psnum = shift;
+    my @ps    = $alu->_power_supplies();
+
+    if ( $psnum > $#ps ) {
+        return "not present";
+    }
+    my $supply = $ps[$psnum];
+    my $status = $alu->chasEntPhysOperStatus($supply);
+    return $status->{$supply};
+}
+
+sub ps1_type {
+    my $alu = shift;
+    return $alu->_ps_type(0);
+}
+
+sub ps2_type {
+    my $alu = shift;
+    return $alu->_ps_type(1);
+}
+
+sub ps1_status {
+    my $alu = shift;
+    return $alu->_ps_status(0);
+}
+
+sub ps2_status {
+    my $alu = shift;
+    return $alu->_ps_status(1);
+}
+
+# The interface description contains the software version, so
+# to avoid losing historical information through a software upgrade
+# we use interface name instead.
+sub interfaces {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->orig_i_name($partial);
+}
+
+# Use Q-BRIDGE-MIB
+sub fw_mac {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->qb_fw_port($partial);
+}
+
+# Work around buggy bp_index in 6.3.1.871.R01 and 6.3.1.975.R01
+sub bp_index {
+    my $alu     = shift;
+    my $partial = shift;
+
+    my $bp_index = $alu->SUPER::bp_index($partial);
+
+    #
+    # This device sometimes reports an ifIndex and sometimes reports
+    # dot1dBasePort for the dot1d port values - e.g.,
+    # in 6.3.1.871.R01 both dot1dTpFdbPort and dot1qTpFdbPort report
+    # the ifIndex; in 6.3.1.975.R01 dot1dTpFdbPort has been updated
+    # to report the dot1dBasePort but dot1qTpFdbPort still returns an
+    # ifIndex.  For this reason, we augment the dot1dBasePort
+    # mapping with ifIndex->ifIndex mappings -- we can do this because
+    # the ifIndex and dot1dBasePort spaces don't overlap, at least for
+    # the ports we care about.
+    my @keys = keys %$bp_index;
+    foreach my $idx (@keys) {
+        my $ifIndex = $bp_index->{$idx};
+        $bp_index->{$ifIndex} = $ifIndex;
+    }
+
+    #
+    # In addition, aggregates aren't reported at all in bp_index.
+    # We grab them from i_index.
+    my $i_index = $alu->i_index();
+    foreach my $idx ( keys %$i_index ) {
+        my $ifIndex = $i_index->{$idx};
+        if ( int($ifIndex) > 40000001 ) {
+            $bp_index->{$ifIndex} = $ifIndex;
+
+            # dot1dTpFdbPort seems to use 4098, 4099, 4100 for
+            # 40000001, 40000002, 40000003.  I guess this is
+            # 4096 + 1 + aggregate number.
+            my $tmp = sprintf( "%d", int($ifIndex) - 39995903 );
+            $bp_index->{$tmp} = $ifIndex;
+        }
+    }
+    return $bp_index;
+}
+
+# Workaround for unimplemented Q-BRIDGE-MIB::dot1qPvid
+# If there is only one VLAN on which a given port is output
+# untagged, then call that one the PVID.  This is a guess that
+# works in obvious configurations but may be wrong in
+# subtle cases (like there's one output VLAN but a different
+# input one - the only way to know that is via the dot1qPvid
+# object)
+#
+# Newer versions have implemented dot1qPvid (but wrong, but
+# that's just life)
+#sub i_vlan {
+#    my $alu = shift;
+#
+#    my $qb_v_untagged = $alu->qb_v_untagged();
+#    my $bp_index = $alu->bp_index();
+#    my $vlan_list = {};
+#    foreach my $vlan (keys %$qb_v_untagged) {
+#	my $portlist = $qb_v_untagged->{$vlan};
+#	my $port;
+#	for ($port = 0; $port <= $#$portlist; $port++) {
+#	    if ($portlist->[$port]) {
+#		my $ifindex = $bp_index->{$port + 1};
+#		if ($ifindex) {
+#		    push(@{$vlan_list->{$ifindex}}, int($vlan));
+#		}
+#	    }
+#	}
+#    }
+#
+#    my $i_vlan = {};
+#    foreach my $ifindex (keys %$vlan_list) {
+#	if ($#{$vlan_list->{$ifindex}} == 0) {
+#	    $i_vlan->{$ifindex} = ${$vlan_list->{$ifindex}}[0];
+#	}
+#    }
+#    return $i_vlan;
+#}
+
+# Use LLDP
+# (or at least try.  The versions I've seen have two problems:
+# 1. they report ifIndex values as 'local'; we don't support ifIndex
+#    but *could*
+# 2. They report 0.0.0.0 as the management address
+# )
+sub hasCDP {
+    my $alu = shift;
+
+    return $alu->hasLLDP();
+}
+
+sub c_ip {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_ip($partial);
+}
+
+sub c_if {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_if($partial);
+}
+
+sub c_port {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_port($partial);
+}
+
+sub c_id {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_id($partial);
+}
+
+sub c_platform {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_rem_sysdesc($partial);
+}
+
+# Power-Ethernet ifIndex mapping.  I've only seen this from a
+# fixed-config single-module system, so this is only a plausible
+# guess as to the mapping on a stack or modular system.
+sub peth_port_ifindex {
+    my $alu     = shift;
+    my $partial = shift;
+
+    my $peth_port_status  = $alu->peth_port_status($partial);
+    my $peth_port_ifindex = {};
+
+    foreach my $key ( keys %$peth_port_status ) {
+        my @oid = split( m/\./, $key );
+        $peth_port_ifindex->{$key} = int( $oid[0] ) * 1000 + int( $oid[1] );
+    }
+    return $peth_port_ifindex;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::AlcatelLucent - SNMP Interface to Alcatel-Lucent OmniSwitch
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $alu = 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      = $alu->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Alcatel-Lucent OmniSwitch devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<ALCATEL-IND1-DEVICES>
+
+=item F<ALCATEL-IND1-CHASSIS-MIB>
+
+=item F<ALU-POWER-ETHERNET-MIB>
+
+Note that Alcatel-Lucent distributes their own proprietary version of the
+F<POWER-ETHERNET-MIB>, but the MIB module name that they distribute is
+simply F<POWER-ETHERNET-MIB>.  This module must be hand-edited to change the
+module name to F<ALU-POWER-ETHERNET-MIB> so that it can be used simultaneously
+with the standard F<POWER-ETHERNET-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 value from SNMP
+
+=over
+
+=item $alu->vendor()
+
+    Returns 'alcatel-lucent'
+
+=item $alu->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $alu->model()
+
+Tries to reference $alu->id() to one of the product MIBs listed above
+
+Removes 'device' from the name for readability.
+
+=item $alu->os()
+
+Returns 'AOS'
+
+=item $alu->os_ver()
+
+Grabs the os version from C<sysDescr>
+
+=item $alu->ps1_type()
+
+Return the type of the first power supply from the F<ENTITY-MIB>
+
+=item $alu->ps2_type()
+
+Return the type of the second power supply from the F<ENTITY-MIB>
+
+=item $alu->ps1_status()
+
+Return the status of the first power supply from the F<ALCATEL-IND1-CHASSIS-MIB>
+
+=item $alu->ps2_status()
+
+Return the status of the second power supply from the F<ALCATEL-IND1-CHASSIS-MIB>
+
+=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 $alu->interfaces()
+
+Returns interface name from C<ifName>, since the default return value
+of C<ifDescr> includes the OS version.
+
+=item $alu->fw_mac()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $alu->fw_port()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $alu->bp_index()
+
+Work around various bugs in the F<BRIDGE-MIB> and
+F<Q-BRIDGE-MIB> implementations, by returning both
+C<ifIndex> and C<dot1dBasePort> mappings to C<ifIndex> values.
+
+=item $alu->c_id()
+
+Returns LLDP information.
+
+=item $alu->c_if()
+
+Returns LLDP information.
+
+=item $alu->c_ip()
+
+Returns LLDP information.
+
+=item $alu->c_platform()
+
+Returns LLDP information.
+
+=item $alu->c_port()
+
+Returns LLDP information.
+
+=item $alu->i_duplex_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $alu->i_speed_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $alu->peth_port_ifindex()
+
+Returns the C<ifIndex> value for power-ethernet ports
+using the OmniSwitch algorithm.
+
+=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
--- a/Info/Layer3/AlteonAD.pm
+++ b/Info/Layer3/AlteonAD.pm
@@ -1,106 +1,142 @@
 # SNMP::Info::Layer3::AlteonAD
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller
+# Copyright (c) 2008 Eric Miller
 # All Rights Reserved
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::AlteonAD;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
-use SNMP::Info;
 use SNMP::Info::Layer3;
-use SNMP::Info::Bridge;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE /;
-
-@SNMP::Info::Layer3::AlteonAD::ISA = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Bridge Exporter/;
+@SNMP::Info::Layer3::AlteonAD::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::AlteonAD::EXPORT_OK = qw//;

+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-          %SNMP::Info::MIBS,
-          %SNMP::Info::Layer3::MIBS,
-          %SNMP::Info::Bridge::MIBS,
-          'ALTEON-TIGON-SWITCH-MIB' => 'agSoftwareVersion',
-          'ALTEON-TS-PHYSICAL-MIB'  => 'agPortTableMaxEnt',
-          'ALTEON-TS-NETWORK-MIB'   => 'agPortTableMaxEnt',
-        );
+    %SNMP::Info::Layer3::MIBS,
+    'ALTEON-ROOT-MIB'            => 'aceswitch184',
+    'ALTEON-TIGON-SWITCH-MIB'    => 'hwPowerSupplyStatus',
+    'ALTEON-CHEETAH-SWITCH-MIB'  => 'hwFanStatus',
+    'ALTEON-TS-PHYSICAL-MIB'     => 'agPortTableMaxEnt',
+    'ALTEON-CS-PHYSICAL-MIB'     => 'vlanCurCfgLearn',
+    'ALTEON-TS-NETWORK-MIB'      => 'ripCurCfgSupply',
+    'ALTEON-CHEETAH-NETWORK-MIB' => 'ripCurCfgIntfSupply',
+);

 %GLOBALS = (
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
-            'sw_ver'           => 'agSoftwareVersion',
-            'tftp_action'  => 'agTftpAction',
-            'tftp_host'    => 'agTftpServer',
-            'tftp_file'    => 'agTftpCfgFileName',
-            'tftp_result'  => 'agTftpLastActionStatus',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    'old_sw_ver'      => 'ALTEON_TIGON_SWITCH_MIB__agSoftwareVersion',
+    'new_sw_ver'      => 'ALTEON_CHEETAH_SWITCH_MIB__agSoftwareVersion',
+    'old_tftp_action' => 'ALTEON_TIGON_SWITCH_MIB__agTftpAction',
+    'new_tftp_action' => 'ALTEON_CHEETAH_SWITCH_MIB__agTftpAction',
+    'old_tftp_host'   => 'ALTEON_TIGON_SWITCH_MIB__agTftpServer',
+    'new_tftp_host'   => 'ALTEON_CHEETAH_SWITCH_MIB__agTftpServer',
+    'old_tftp_file'   => 'ALTEON_TIGON_SWITCH_MIB__agTftpCfgFileName',
+    'new_tftp_file'   => 'ALTEON_CHEETAH_SWITCH_MIB__agTftpCfgFileName',
+    'old_tftp_result' => 'ALTEON_TIGON_SWITCH_MIB__agTftpLastActionStatus',
+    'new_tftp_result' => 'ALTEON_CHEETAH_SWITCH_MIB__agTftpLastActionStatus',
+    'old_ip_max'      => 'ALTEON_TS_NETWORK_MIB__ipInterfaceTableMax',
+    'new_ip_max'      => 'ALTEON_CHEETAH_NETWORK_MIB__ipInterfaceTableMax',
+);

 %FUNCS = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            # From agPortCurCfgTable
-            'ag_p_cfg_idx'        => 'agPortCurCfgIndx',
-            'ag_p_cfg_pref'       => 'agPortCurCfgPrefLink',
-            'ag_p_cfg_pvid'       => 'agPortCurCfgPVID',
-            'ag_p_cfg_fe_auto'    => 'agPortCurCfgFastEthAutoNeg',
-            'ag_p_cfg_fe_mode'    => 'agPortCurCfgFastEthMode',
-            'ag_p_cfg_ge_auto'    => 'agPortCurCfgGigEthAutoNeg',
-            'ag_p_cfg_name'       => 'agPortCurCfgPortName',
-            # From portInfoTable
-            'p_info_idx'     => 'portInfoIndx',
-            'p_info_mode'    => 'portInfoMode',
-            # From portInfoTable
-            'ip_cfg_vlan'     => 'ipCurCfgIntfVlan',
-         );
-         
-%MUNGE = (
-            %SNMP::Info::MUNGE,
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::Bridge::MUNGE,
-         );
+    %SNMP::Info::Layer3::FUNCS,
+
+    # From agPortCurCfgTable
+    'old_ag_p_cfg_idx'  => 'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgIndx',
+    'new_ag_p_cfg_idx'  => 'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgIndx',
+    'old_ag_p_cfg_pref' => 'agPortCurCfgPrefLink',
+    'new_ag_p_cfg_pref' => 'agPortCurCfgPreferred',
+    'old_ag_p_cfg_pvid' => 'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgPVID',
+    'new_ag_p_cfg_pvid' => 'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgPVID',
+    'old_ag_p_cfg_fe_auto' =>
+        'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgFastEthAutoNeg',
+    'new_ag_p_cfg_fe_auto' =>
+        'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgFastEthAutoNeg',
+    'old_ag_p_cfg_fe_mode' =>
+        'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgFastEthMode',
+    'new_ag_p_cfg_fe_mode' =>
+        'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgFastEthMode',
+    'old_ag_p_cfg_ge_auto' =>
+        'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgGigEthAutoNeg',
+    'new_ag_p_cfg_ge_auto' =>
+        'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgGigEthAutoNeg',
+    'old_ag_p_cfg_name' => 'ALTEON_TS_PHYSICAL_MIB__agPortCurCfgPortName',
+    'new_ag_p_cfg_name' => 'ALTEON_CHEETAH_SWITCH_MIB__agPortCurCfgPortName',
+
+    # From portInfoTable
+    'old_p_info_idx'  => 'ALTEON_TS_PHYSICAL_MIB__portInfoIndx',
+    'new_p_info_idx'  => 'ALTEON_CHEETAH_SWITCH_MIB__portInfoIndx',
+    'old_p_info_mode' => 'ALTEON_TS_PHYSICAL_MIB__portInfoMode',
+    'new_p_info_mode' => 'ALTEON_CHEETAH_SWITCH_MIB__portInfoMode',
+
+    # From ipCurCfgIntfTable
+    'old_ip_cfg_vlan' => 'ALTEON_TS_NETWORK_MIB__ipCurCfgIntfVlan',
+    'new_ip_cfg_vlan' => 'ALTEON_CHEETAH_NETWORK_MIB__ipCurCfgIntfVlan',
+
+    # From vlanCurCfgTable
+    'old_vlan_id'    => 'ALTEON_TS_PHYSICAL_MIB__vlanCurCfgVlanId',
+    'new_vlan_id'    => 'ALTEON_CS_PHYSICAL_MIB__vlanCurCfgVlanId',
+    'old_vlan_state' => 'ALTEON_TS_PHYSICAL_MIB__vlanCurCfgState',
+    'new_vlan_state' => 'ALTEON_CS_PHYSICAL_MIB__vlanCurCfgState',
+    'old_vlan_name'  => 'ALTEON_TS_PHYSICAL_MIB__vlanCurCfgVlanName',
+    'new_vlan_name'  => 'ALTEON_CS_PHYSICAL_MIB__vlanCurCfgVlanName',
+    'old_vlan_ports' => 'ALTEON_TS_PHYSICAL_MIB__vlanCurCfgPorts',
+    'new_vlan_ports' => 'ALTEON_CS_PHYSICAL_MIB__vlanCurCfgPorts',
+);
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 sub model {
    my $alteon = shift;
-    my $desc = $alteon->description();
-    return undef unless defined $desc;

-    return 'AD2' if ($desc =~ /AD2/);
-    return 'AD3' if ($desc =~ /AD3/);
-    return 'AD4' if ($desc =~ /AD4/);
-    return '180' if ($desc =~ /180/);
-    return '183' if ($desc =~ /183/);
-    return '184' if ($desc =~ /184/);
-    
-    return $desc;
+    my $id = $alteon->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::AlteonAD::model() - Device does not support sysObjectID\n"
+            if $alteon->debug();
+        return;
+    }
+
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^aceswitch//;
+    $model =~ s/^acedirector/AD/;
+    $model =~ s/^(copper|fiber)Module/BladeCenter GbESM/;
+
+    return $model;
 }

 sub vendor {
@@ -108,32 +144,36 @@ sub vendor {
 }

 sub os {
-    return 'webos';
+    return 'alteon';
 }

 sub os_ver {
    my $alteon = shift;
-    my $version = $alteon->sw_ver();
-    return undef unless defined $version;
+    my $version = $alteon->new_sw_ver() || $alteon->old_sw_ver();
+    return unless defined $version;

    return $version;
 }

 sub interfaces {
-    my $alteon = shift;
-    my $interfaces = $alteon->i_index();
+    my $alteon       = shift;
+    my $interfaces   = $alteon->i_index();
    my $descriptions = $alteon->i_description();
+    my $ip_max       = $alteon->new_ip_max() || $alteon->old_ip_max();

    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $descriptions->{$iid};
        next unless defined $desc;

-        if ($desc =~ /(^net\d+)/) {
-            $desc  = $1;
+        if ( $desc =~ /(^net\d+)/ ) {
+            $desc = $1;
        }
-        elsif (($iid > 256) and ($iid < 266)) {
-            $desc = ($iid % 256);
+
+        # IP interfaces are first followed by physical, number possible
+        # varies by switch model
+        elsif ( defined $ip_max and $iid > $ip_max ) {
+            $desc = ( $iid % $ip_max );
        }
        $interfaces{$iid} = $desc;
    }
@@ -142,20 +182,24 @@ sub interfaces {

 sub i_duplex {
    my $alteon = shift;
-    
-    my $p_mode = $alteon->p_info_mode();
-    
+
+    my $p_mode = $alteon->new_p_info_mode()
+        || $alteon->old_p_info_mode()
+        || {};
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();
+
    my %i_duplex;
-    foreach my $if (keys %$p_mode){
+    foreach my $if ( keys %$p_mode ) {
        my $duplex = $p_mode->{$if};
-        next unless defined $duplex; 
-    
+        next unless defined $duplex;
+
        $duplex = 'half' if $duplex =~ /half/i;
        $duplex = 'full' if $duplex =~ /full/i;
-        
-        my $idx = $if + 256;
-        
-        $i_duplex{$idx}=$duplex; 
+
+        my $idx;
+        $idx = $if + $ip_max if ( defined $ip_max );
+
+        $i_duplex{$idx} = $duplex;
    }
    return \%i_duplex;
 }
@@ -163,84 +207,153 @@ sub i_duplex {
 sub i_duplex_admin {
    my $alteon = shift;

-    my $ag_pref = $alteon->ag_p_cfg_pref();
-    my $ag_fe_auto = $alteon->ag_p_cfg_fe_auto();
-    my $ag_fe_mode = $alteon->ag_p_cfg_fe_mode();
-    my $ag_ge_auto = $alteon->ag_p_cfg_ge_auto();
- 
+    my $ag_pref = $alteon->new_ag_p_cfg_pref()
+        || $alteon->old_ag_p_cfg_pref()
+        || {};
+    my $ag_fe_auto = $alteon->new_ag_p_cfg_fe_auto()
+        || $alteon->old_ag_p_cfg_fe_auto()
+        || {};
+    my $ag_fe_mode = $alteon->new_ag_p_cfg_fe_mode()
+        || $alteon->old_ag_p_cfg_fe_mode()
+        || {};
+    my $ag_ge_auto = $alteon->new_ag_p_cfg_ge_auto()
+        || $alteon->old_ag_p_cfg_ge_auto()
+        || {};
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();
+
    my %i_duplex_admin;
-    foreach my $if (keys %$ag_pref){
+    foreach my $if ( keys %$ag_pref ) {
        my $pref = $ag_pref->{$if};
        next unless defined $pref;
-        
-        my $string = 'other';        
-        if ($pref =~ /gigabit/i) {
+
+        my $string = 'other';
+        if ( $pref =~ /gigabit/i ) {
            my $ge_auto = $ag_ge_auto->{$if};
-            $string = 'full' if ($ge_auto =~ /off/i);
-            $string = 'auto' if ($ge_auto =~ /on/i);
+            $string = 'full' if ( $ge_auto =~ /off/i );
+            $string = 'auto' if ( $ge_auto =~ /on/i );
        }
-        elsif ($pref =~ /fast/i) {
+        elsif ( $pref =~ /fast/i ) {
            my $fe_auto = $ag_fe_auto->{$if};
            my $fe_mode = $ag_fe_mode->{$if};
-            $string = 'half' if ($fe_mode =~ /half/i and $fe_auto =~ /off/i);
-            $string = 'full' if ($fe_mode =~ /full/i and $fe_auto =~ /off/i);
+            $string = 'half'
+                if ( $fe_mode =~ /half/i and $fe_auto =~ /off/i );
+            $string = 'full'
+                if ( $fe_mode =~ /full/i and $fe_auto =~ /off/i );
            $string = 'auto' if $fe_auto =~ /on/i;
        }
-        my $idx = $if + 256;
-        
-        $i_duplex_admin{$idx}=$string; 
+
+        my $idx;
+        $idx = $if + $ip_max if ( defined $ip_max );
+
+        $i_duplex_admin{$idx} = $string;
    }
    return \%i_duplex_admin;
 }

-sub i_vlan {
-    my $alteon = shift;
-
-    my $ag_vlans  = $alteon->ag_p_cfg_pvid();
-    my $ip_vlans  = $alteon->ip_cfg_vlan();
-
-
-    my %i_vlan;
-    foreach my $if (keys %$ip_vlans){
-        my $ip_vlanid = $ip_vlans->{$if};
-        next unless defined $ip_vlanid;
-        
-        $i_vlan{$if}=$ip_vlanid; 
-    }
-    foreach my $if (keys %$ag_vlans){
-        my $ag_vlanid = $ag_vlans->{$if};
-        next unless defined $ag_vlanid;
-        
-        my $idx = $if + 256;   
-        $i_vlan{$idx}=$ag_vlanid; 
-    }
-    return \%i_vlan;
-}
-
 sub i_name {
    my $alteon = shift;
-    my $p_name = $alteon->ag_p_cfg_name();
+
+    my $p_name = $alteon->new_ag_p_cfg_name()
+        || $alteon->old_ag_p_cfg_name()
+        || {};
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();

    my %i_name;
-    foreach my $iid (keys %$p_name){
+    foreach my $iid ( keys %$p_name ) {
        my $name = $p_name->{$iid};
        next unless defined $name;
-        my $idx = $iid + 256;
+        my $idx;
+        $idx = $iid + $ip_max if ( defined $ip_max );
        $i_name{$idx} = $name;
    }
    return \%i_name;
 }

-# Bridge MIB does not map Bridge Port to ifIndex correctly
+sub v_index {
+    my $alteon  = shift;
+    my $partial = shift;
+
+    return $alteon->new_vlan_id($partial) || $alteon->old_vlan_id($partial);
+}
+
+sub v_name {
+    my $alteon  = shift;
+    my $partial = shift;
+
+    return $alteon->new_vlan_name($partial)
+        || $alteon->old_vlan_name($partial);
+}
+
+sub i_vlan {
+    my $alteon = shift;
+
+    my $ag_vlans = $alteon->new_ag_p_cfg_pvid()
+        || $alteon->old_ag_p_cfg_pvid()
+        || {};
+    my $ip_vlans = $alteon->new_ip_cfg_vlan()
+        || $alteon->old_ip_cfg_vlan()
+        || {};
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();
+
+    my %i_vlan;
+    foreach my $if ( keys %$ip_vlans ) {
+        my $ip_vlanid = $ip_vlans->{$if};
+        next unless defined $ip_vlanid;
+
+        $i_vlan{$if} = $ip_vlanid;
+    }
+    foreach my $if ( keys %$ag_vlans ) {
+        my $ag_vlanid = $ag_vlans->{$if};
+        next unless defined $ag_vlanid;
+
+        my $idx;
+        $idx = $if + $ip_max if ( defined $ip_max );
+        $i_vlan{$idx} = $ag_vlanid;
+    }
+    return \%i_vlan;
+}
+
+sub i_vlan_membership {
+    my $alteon = shift;
+
+    my $v_ports = $alteon->old_vlan_ports()
+        || $alteon->new_vlan_ports()
+        || {};
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();
+
+    my $i_vlan_membership = {};
+    foreach my $vlan ( keys %$v_ports ) {
+        my $portlist = [ split( //, unpack( "B*", $v_ports->{$vlan} ) ) ];
+        my $ret = [];
+
+        # Convert portlist bit array to ifIndex array
+        for ( my $i = 0; $i <= scalar(@$portlist); $i++ ) {
+            my $idx;
+            $idx = $i + $ip_max if ( defined $ip_max );
+            push( @{$ret}, $idx ) if ( @$portlist[$i] );
+        }
+
+        #Create HoA ifIndex -> VLAN array
+        foreach my $port ( @{$ret} ) {
+            push( @{ $i_vlan_membership->{$port} }, $vlan );
+        }
+    }
+    return $i_vlan_membership;
+}
+
+# Bridge MIB does not map Bridge Port to ifIndex correctly on some code
+# versions
 sub bp_index {
    my $alteon = shift;
+
    my $b_index = $alteon->orig_bp_index();
+    my $ip_max = $alteon->new_ip_max() || $alteon->old_ip_max();

    my %bp_index;
-    foreach my $iid (keys %$b_index){
+    foreach my $iid ( keys %$b_index ) {
        my $port = $b_index->{$iid};
        next unless defined $port;
-        $port = $port + 256;
+        $port = $port + $ip_max if ( defined $ip_max and $iid == $ip_max );

        $bp_index{$iid} = $port;
    }
@@ -252,8 +365,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer3::AlteonAD - Perl5 Interface to Nortel Networks' Alteon Ace
-Director Series Layer 2-7 Switches.
+SNMP::Info::Layer3::AlteonAD - SNMP Interface to Nortel Alteon Layer 2-7
+Switches.

 =head1 AUTHOR

@@ -265,7 +378,6 @@ Eric Miller
 my $alteon = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -277,11 +389,11 @@ Eric Miller

 =head1 DESCRIPTION

-Abstraction subclass for Layer 2-7 load balancing switches running Nortel Networks'
-Alteon Web OS Traffic Control Software.
+Abstraction subclass for Nortel Alteon Series Layer 2-7 load balancing
+switches and Nortel BladeCenter Layer2-3 GbE Switch Modules.

-For speed or debugging purposes you can call the subclass directly, but not after
-determining a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $alteon = new SNMP::Info::Layer3::AlteonAD(...);

@@ -289,9 +401,7 @@ determining a more specific class using the method above.

 =over

-=item SNMP::Info
-
-=item SNMP::Info::Bridge
+=item SNMP::Info::Layer3

 =back

@@ -299,25 +409,23 @@ determining a more specific class using the method above.

 =over

-=item ALTEON-TIGON-SWITCH-MIB
+=item F<ALTEON-ROOT-MIB>

-=item ALTEON-TS-PHYSICAL-MIB
+=item F<ALTEON-TIGON-SWITCH-MIB>

-=item ALTEON-TS-NETWORK-MIB
+=item F<ALTEON-TS-PHYSICAL-MIB>

-MIBs can be found on the CD that came with your product.
+=item F<ALTEON-TS-NETWORK-MIB>

-Or, they can be downloaded directly from Nortel Networks regardless of support
-contract status.  Go to http://www.nortelnetworks.com Techninal Support,
-Browse Technical Support, Select by Product Families, Alteon,
-Alteon Web OS Traffic Control Software, Software.  Filter on mibs and download
-the latest version's archive.
+=item F<ALTEON-CS-PHYSICAL-MIB>
+
+=item F<ALTEON-CHEETAH-SWITCH-MIB>
+
+=item F<ALTEON-CHEETAH-NETWORK-MIB>

 =item Inherited Classes' MIBs

-See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
-
-See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.

 =back

@@ -329,7 +437,9 @@ These are methods that return scalar value from SNMP

 =item $alteon->model()

-Returns the model extracted from B<sysDescr>
+Returns model type.  Checks $alteon->id() against the F<ALTEON-ROOT-MIB> and
+then parses out C<aceswitch>, replaces C<acedirector> with AD, and replaces
+copperModule/fiberModule with BladeCenter GbESM.

 =item $alteon->vendor()

@@ -337,37 +447,33 @@ Returns 'nortel'

 =item $alteon->os()

-Returns 'webos'
+Returns 'alteon'

 =item $alteon->os_ver()

-Returns the software version reported by B<agSoftwareVersion>
+Returns the software version reported by C<agSoftwareVersion>

 =item $alteon->tftp_action()

-(B<agTftpAction>)
+(C<agTftpAction>)

 =item $alteon->tftp_host()

-(B<agTftpServer>)
+(C<agTftpServer>)

 =item $alteon->tftp_file()

-(B<agTftpCfgFileName>)
+(C<agTftpCfgFileName>)

 =item $alteon->tftp_result()

-(B<agTftpLastActionStatus>)
+(C<agTftpLastActionStatus>)

 =back

-=head2 Globals imported from SNMP::Info
+=head2 Globals imported from SNMP::Info::Layer3

-See documentation in L<SNMP::Info/"GLOBALS"> for details.
-
-=head2 Globals imported from SNMP::Info::Bridge
-
-See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.

 =head1 TABLE METHODS

@@ -383,7 +489,7 @@ to a hash.
 Returns reference to the map between IID and physical port.

 Utilizes description for network interfaces.  Ports are determined by
-formula (ifIndex mod 256).
+formula (C<ifIndex mod 256>).

 =item $alteon->i_duplex()

@@ -395,24 +501,44 @@ Returns reference to hash.  Maps port admin duplexes to IIDs.

 =item $alteon->i_vlan()

-Returns reference to hash.  Maps port VLAN ID to IIDs.
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.
+
+=item $alteon->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.
+
+  Example:
+  my $interfaces = $alteon->interfaces();
+  my $vlans      = $alteon->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 $alteon->v_index()
+
+Returns VLAN IDs
+
+=item $alteon->v_name()
+
+Human-entered name for vlans.

 =item $alteon->i_name()

-Maps (B<agPortCurCfgPortName>) to port and returns the human set port name if exists.
+Maps (C<agPortCurCfgPortName>) to port and returns the human set port name if
+exists.

 =item $alteon->bp_index()

-Returns a mapping between ifIndex and the Bridge Table.
+Returns a mapping between C<ifIndex> and the Bridge Table.

 =back

-=head2 Table Methods imported from SNMP::Info
+=head2 Table Methods imported from SNMP::Info::Layer3

-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
-
-=head2 Table Methods imported from SNMP::Info::Bridge
-
-See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.

 =cut
--- a/Info/Layer3/Altiga.pm
+++ b/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.04';
+
+%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
--- a/Info/Layer3/Arista.pm
+++ b/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.04';
+
+%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
--- a/Info/Layer3/BayRS.pm
+++ b/Info/Layer3/BayRS.pm
--- a/Info/Layer3/C3550.pm
+++ b/Info/Layer3/C3550.pm
@@ -1,103 +1,118 @@
 # SNMP::Info::Layer3::C3550
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
-# Copyright (c) 2003, Regents of the University of California
+# 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.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::C3550;
-$VERSION = '1.07';
-# $Id$

 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;
+use SNMP::Info::CiscoStpExtensions;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+# 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/;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-@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//;

-%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,
-           );
+$VERSION = '2.04';
+
+# 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::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::CiscoPortSecurity::GLOBALS,
-            %SNMP::Info::CiscoImage::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoStack::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-            'ports2'      => 'ifNumber',
-           );
+    %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,
+);

 %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::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::LLDP::MUNGE,               %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,         %SNMP::Info::CiscoStpExtensions::MUNGE, 
+    %SNMP::Info::CiscoVTP::MUNGE,
+);

 sub vendor {
    return 'cisco';
@@ -105,12 +120,12 @@ sub vendor {

 sub model {
    my $c3550 = shift;
-    my $id = $c3550->id();
+    my $id    = $c3550->id();
    my $model = &SNMP::translateObj($id) || $id;
    $model =~ s/^catalyst//;

    # turn 355048 into 3550-48
-    if ($model =~ /^(35\d\d)(\d\d(T|G)?)$/) {
+    if ( $model =~ /^(35\d\d)(\d\d(T|G)?)$/ ) {
        $model = "$1-$2";
    }
    return $model;
@@ -120,14 +135,14 @@ sub model {
 sub ports {
    my $c3550 = shift;

-    my $ports2 = $c3550->ports2();    
-
-    my $id = $c3550->id();
+    my $id    = $c3550->id();
    my $model = &SNMP::translateObj($id);
-    if ($model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/) {
+    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
@@ -135,15 +150,15 @@ sub ports {
 #  See http://www.ciscosystems.com/en/US/products/hw/switches/ps646/prod_release_note09186a00802a08ee.html

 sub i_duplex {
-    my $c3550 = shift;
+    my $c3550   = shift;
    my $partial = shift;

    my $el_duplex = $c3550->el_duplex($partial);

-    # Newer software     
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
+    # Newer software
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
        my %i_duplex;
-        foreach my $el_port (keys %$el_duplex){
+        foreach my $el_port ( keys %$el_duplex ) {
            my $duplex = $el_duplex->{$el_port};
            next unless defined $duplex;

@@ -152,6 +167,7 @@ sub i_duplex {
        }
        return \%i_duplex;
    }
+
    # Fall back to CiscoStack method
    else {
        return $c3550->SUPER::i_duplex($partial);
@@ -161,63 +177,200 @@ sub i_duplex {
 # Software >= 12.1(22)EA1a uses portDuplex as admin setting

 sub i_duplex_admin {
-    my $c3550 = shift;
+    my $c3550   = shift;
    my $partial = shift;

    my $el_duplex = $c3550->el_duplex($partial);

-    # Newer software     
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
+    # Newer software
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
        my $p_port   = $c3550->p_port()   || {};
        my $p_duplex = $c3550->p_duplex() || {};
-        
+
        my $i_duplex_admin = {};
-        foreach my $port (keys %$p_duplex) {
+        foreach my $port ( keys %$p_duplex ) {
            my $iid = $p_port->{$port};
            next unless defined $iid;
-            next if (defined $partial and $iid !~ /^$partial$/);
-            
+            next if ( defined $partial and $iid !~ /^$partial$/ );
+
            $i_duplex_admin->{$iid} = $p_duplex->{$port};
        }
        return $i_duplex_admin;
    }
+
    # Fall back to CiscoStack method
    else {
        return $c3550->SUPER::i_duplex_admin($partial);
-    }    
+    }
 }

 sub set_i_duplex_admin {
+
    # map a textual duplex to an integer one the switch understands
    my %duplexes = qw/half 1 full 2 auto 4/;

    my $c3550 = shift;
-    my ($duplex, $iid) = @_;
+    my ( $duplex, $iid ) = @_;

    my $el_duplex = $c3550->el_duplex($iid);

    # Auto duplex only supported on newer software
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
-        my $p_port  = $c3550->p_port() || {};
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
+        my $p_port = $c3550->p_port() || {};
        my %reverse_p_port = reverse %$p_port;

-       $duplex = lc($duplex);
+        $duplex = lc($duplex);

-       return 0 unless defined $duplexes{$duplex};
+        return 0 unless defined $duplexes{$duplex};

-       $iid = $reverse_p_port{$iid};
+        $iid = $reverse_p_port{$iid};

-       return $c3550->set_p_duplex($duplexes{$duplex}, $iid);
+        return $c3550->set_p_duplex( $duplexes{$duplex}, $iid );
    }
    else {
-        $c3550->SUPER::set_i_duplex_admin;
+        return $c3550->SUPER::set_i_duplex_admin;
    }
 }

 sub cisco_comm_indexing {
-    1;
+    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__

@@ -250,9 +403,9 @@ Max Baker

 Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches.  

-These devices run IOS but have some of the same charactersitics as the
+These devices run IOS but have some of the same characteristics as the
 Catalyst WS-C family (5xxx,6xxx).  For example, forwarding tables are held in
-VLANs, and extened interface information is gleened from CISCO-SWITCH-MIB.
+VLANs, and extended interface information is gleaned from F<CISCO-SWITCH-MIB>.

 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
@@ -265,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
@@ -275,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
@@ -289,9 +446,12 @@ 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 requirements.
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
+requirements.

 See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.

@@ -303,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
@@ -313,7 +475,7 @@ These are methods that return scalar value from SNMP

 =item $c3550->vendor()

-    Returns 'cisco'
+Returns 'cisco'

 =item $c3550->model()

@@ -324,7 +486,28 @@ Will take the translated model number and try to format it better.

 =item $c3550->ports()

-Trys to cull the number of ports from the model number.
+Tries to cull the number of ports from the model number.
+
+=item $c3550->cisco_comm_indexing()
+
+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

@@ -332,6 +515,10 @@ Trys to cull the number of ports from the model number.

 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.
@@ -352,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.
@@ -365,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
@@ -375,7 +600,7 @@ Returns reference to hash of iid to current link duplex setting.

 Software version 12.1(22)EA1a or greater returns duplex based upon the
 result of $c3550->el_duplex().  Otherwise it uses the result of
-the call to CiscoStack i_duplex().
+the call to CiscoStack::i_duplex().

 See L<SNMP::Info::Etherlike> for el_duplex() method and
 L<SNMP::Info::CiscoStack> for its i_duplex() method.
@@ -386,17 +611,17 @@ Returns reference to hash of iid to administrative duplex setting.

 Software version 12.1(22)EA1a or greater returns duplex based upon the
 result of $c3550->p_duplex().  Otherwise it uses the result of
-the call to CiscoStack i_duplex().
+the call to CiscoStack::i_duplex().

 See L<SNMP::Info::CiscoStack> for its i_duplex() and p_duplex() methods.

 =item $c3550->set_i_duplex_admin(duplex, ifIndex)

-Sets port duplex, must be supplied with duplex and port ifIndex.
+Sets port duplex, must be supplied with duplex and port C<ifIndex>.

 Speed choices are 'auto', 'half', 'full'.

-Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port ifIndex.
+Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c3550->interfaces()};
@@ -409,13 +634,18 @@ Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port 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.

 =head2 Table Methods imported from SNMP::Info::CiscoPortSecurity

-See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
+details.

 =head2 Table Methods imported from SNMP::Info::CiscoVTP

@@ -429,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.
--- a/Info/Layer3/C4000.pm
+++ b/Info/Layer3/C4000.pm
@@ -1,39 +1,37 @@
 # SNMP::Info::Layer3::C4000
-# Bill Fenner
+# $Id$
 #
-# Copyright (c) 2006 Bill Fenner
+# Copyright (c) 2008 Bill Fenner
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::C4000;
-# $Id$

 use strict;
-
 use Exporter;
-
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
@@ -43,86 +41,86 @@ use SNMP::Info::CiscoConfig;
 use SNMP::Info::MAU;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
@SNMP::Info::Layer3::C4000::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-                                    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
-                                    SNMP::Info::CiscoPortSecurity
-                                    SNMP::Info::CiscoConfig SNMP::Info::MAU 
-                                    SNMP::Info::Layer3 Exporter/;
+    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoConfig SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::C4000::EXPORT_OK = qw//;

-%MIBS =    ( 
-            %SNMP::Info::Layer3::MIBS,
-            %SNMP::Info::MAU::MIBS,
-            %SNMP::Info::CiscoConfig::MIBS,
-            %SNMP::Info::CiscoPortSecurity::MIBS,
-            %SNMP::Info::CiscoImage::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-            'CISCO-ENVMON-MIB' => 'ciscoEnvMonMIB',
-           );
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,
+    %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::CiscoVTP::MIBS,
+    'CISCO-ENVMON-MIB' => 'ciscoEnvMonMIB',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::MAU::GLOBALS,
-            %SNMP::Info::CiscoConfig::GLOBALS,
-            %SNMP::Info::CiscoPortSecurity::GLOBALS,
-            %SNMP::Info::CiscoImage::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-	    'ps1_type' => 'ciscoEnvMonSupplyStatusDescr.1',
-	    'ps1_status' => 'ciscoEnvMonSupplyState.1',
-	    'ps2_type' => 'ciscoEnvMonSupplyStatusDescr.2',
-	    'ps2_status' => 'ciscoEnvMonSupplyState.2',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoPortSecurity::GLOBALS,
+    %SNMP::Info::CiscoImage::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS,
+    'ps1_type'   => 'ciscoEnvMonSupplyStatusDescr.1',
+    'ps1_status' => 'ciscoEnvMonSupplyState.1',
+    'ps2_type'   => 'ciscoEnvMonSupplyStatusDescr.2',
+    'ps2_status' => 'ciscoEnvMonSupplyState.2',
+);

 %FUNCS = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::MAU::FUNCS,
-            %SNMP::Info::CiscoConfig::FUNCS,
-            %SNMP::Info::CiscoPortSecurity::FUNCS,
-            %SNMP::Info::CiscoImage::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-            'fan_state' => 'ciscoEnvMonFanState',
-            'fan_descr' => 'ciscoEnvMonFanStatusDescr',
-         );
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::CiscoVTP::FUNCS,
+    'fan_state' => 'ciscoEnvMonFanState',
+    'fan_descr' => 'ciscoEnvMonFanStatusDescr',
+);

 %MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::MAU::MUNGE,
-            %SNMP::Info::CiscoConfig::MUNGE,
-            %SNMP::Info::CiscoPortSecurity::MUNGE,
-            %SNMP::Info::CiscoImage::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-         );
+    %SNMP::Info::Layer3::MUNGE,      %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE, %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,  %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,         %SNMP::Info::CiscoVTP::MUNGE,
+);

 # Override Inheritance for these specific methods
 # use MAU-MIB for admin. duplex and admin. speed
-*SNMP::Info::Layer3::C4000::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
-*SNMP::Info::Layer3::C4000::i_speed_admin = \&SNMP::Info::MAU::mau_i_speed_admin;
+*SNMP::Info::Layer3::C4000::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::C4000::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;

 sub fan {
-    my $c4000 = shift;
+    my $c4000     = shift;
    my $fan_state = $c4000->fan_state();
    my $fan_descr = $c4000->fan_descr();
-    my $ret = "";
-    my $s = "";
-    foreach my $i (sort {$a <=> $b} keys %$fan_state) {
-	$ret .= $s . $fan_descr->{$i} . ": " . $fan_state->{$i};
-	$s = ", ";
+    my $ret       = "";
+    my $s         = "";
+    foreach my $i ( sort { $a <=> $b } keys %$fan_state ) {
+        $ret .= $s . $fan_descr->{$i} . ": " . $fan_state->{$i};
+        $s = ", ";
    }
-    return undef if ($s eq "");
-    $ret;
+    return if ( $s eq "" );
+    return $ret;
 }

-sub cisco_comm_indexing { 1; }
+sub cisco_comm_indexing { return 1; }

 1;
 __END__
@@ -197,7 +195,8 @@ See L<SNMP::Info::CiscoStats/"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::CiscoPortSecurity/"Required MIBs"> for its own MIB
+requirements.

 See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.

@@ -211,6 +210,20 @@ See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.

 These are methods that return scalar value from SNMP

+=head2 Overrides
+
+=over
+
+=item $c4000->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
+=item $c4000->fan()
+
+Returns fan status
+
+=back
+
 =head2 Global Methods imported from SNMP::Info::CiscoVTP

 See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
@@ -248,6 +261,28 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

+=head2 Overrides
+
+=over
+
+=item $c4000->i_duplex()
+
+Parses mau_index and mau_link to return the duplex information for
+interfaces.
+
+=item $c4000->i_duplex_admin()
+
+Parses C<mac_index>,C<mau_autostat>,C<mau_type_admin> in
+order to find the admin duplex setting for all the interfaces.
+
+Returns either (auto,full,half).
+
+=item $c4000->i_speed_admin()
+
+Returns administrative speed for interfaces.
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::CiscoVTP

 See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
@@ -266,7 +301,8 @@ 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.
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
+details.

 =head2 Table Methods imported from SNMP::Info::CiscoConfig

--- a/Info/Layer3/C6500.pm
+++ b/Info/Layer3/C6500.pm
@@ -1,39 +1,37 @@
 # SNMP::Info::Layer3::C6500
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2003,2004,2005 Max Baker
+# Copyright (c) 2008-2009 Max Baker
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::C6500;
-# $Id$

 use strict;
-
 use Exporter;
-use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
@@ -42,85 +40,94 @@ 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::C6500::ISA = qw/
+    SNMP::Info::CiscoVTP 
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::CiscoStack
+    SNMP::Info::CDP 
+    SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoConfig
+    SNMP::Info::CiscoPower
+    SNMP::Info::Layer3
+    Exporter
+/;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
-@SNMP::Info::Layer3::C6500::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CiscoStack 
-                                    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::C6500::EXPORT_OK = qw//;

-%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,
-           );
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+# 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::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::CDP::GLOBALS,
-            %SNMP::Info::CiscoStack::GLOBALS,
-            %SNMP::Info::CiscoVTP::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::CDP::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::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::CiscoStack::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoVTP::MUNGE,    
+);

 sub vendor {
    return 'cisco';
 }

-sub cisco_comm_indexing { 1; }
+sub cisco_comm_indexing { return 1; }

 #  Newer versions use the ETHERLIKE-MIB to report operational duplex.

 sub i_duplex {
-    my $c6500 = shift;
+    my $c6500   = shift;
    my $partial = shift;

    my $el_duplex = $c6500->el_duplex($partial);

-    # Newer software     
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
+    # Newer software
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
        my %i_duplex;
-        foreach my $el_port (keys %$el_duplex){
+        foreach my $el_port ( keys %$el_duplex ) {
            my $duplex = $el_duplex->{$el_port};
            next unless defined $duplex;

@@ -129,6 +136,7 @@ sub i_duplex {
        }
        return \%i_duplex;
    }
+
    # Fall back to CiscoStack method
    else {
        return $c6500->SUPER::i_duplex($partial);
@@ -138,59 +146,62 @@ sub i_duplex {
 # Newer software uses portDuplex as admin setting

 sub i_duplex_admin {
-    my $c6500 = shift;
+    my $c6500   = shift;
    my $partial = shift;

    my $el_duplex = $c6500->el_duplex($partial);

-    # Newer software     
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
+    # Newer software
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
        my $p_port   = $c6500->p_port()   || {};
        my $p_duplex = $c6500->p_duplex() || {};
-        
+
        my $i_duplex_admin = {};
-        foreach my $port (keys %$p_duplex) {
+        foreach my $port ( keys %$p_duplex ) {
            my $iid = $p_port->{$port};
            next unless defined $iid;
-            next if (defined $partial and $iid !~ /^$partial$/);
-            
+            next if ( defined $partial and $iid !~ /^$partial$/ );
+
            $i_duplex_admin->{$iid} = $p_duplex->{$port};
        }
        return $i_duplex_admin;
    }
+
    # Fall back to CiscoStack method
    else {
        return $c6500->SUPER::i_duplex_admin($partial);
-    }    
+    }
 }

 sub set_i_duplex_admin {
+
    # map a textual duplex to an integer one the switch understands
    my %duplexes = qw/half 1 full 2 auto 4/;

    my $c6500 = shift;
-    my ($duplex, $iid) = @_;
+    my ( $duplex, $iid ) = @_;

    my $el_duplex = $c6500->el_duplex($iid);

    # Auto duplex only supported on newer software
-    if (defined $el_duplex and scalar(keys %$el_duplex)){
-        my $p_port  = $c6500->p_port() || {};
+    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
+        my $p_port = $c6500->p_port() || {};
        my %reverse_p_port = reverse %$p_port;

-       $duplex = lc($duplex);
+        $duplex = lc($duplex);

-       return 0 unless defined $duplexes{$duplex};
+        return 0 unless defined $duplexes{$duplex};

-       $iid = $reverse_p_port{$iid};
+        $iid = $reverse_p_port{$iid};

-       return $c6500->set_p_duplex($duplexes{$duplex}, $iid);
+        return $c6500->set_p_duplex( $duplexes{$duplex}, $iid );
    }
    else {
-        $c6500->SUPER::set_i_duplex_admin;
+        return $c6500->SUPER::set_i_duplex_admin;
    }
 }

+
 1;
 __END__

@@ -223,9 +234,9 @@ Max Baker

 Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches.  

-These devices run IOS but have some of the same charactersitics as the Catalyst
-WS-C family (5xxx). For example, forwarding tables are held in VLANs, and
-extended interface information is gleened from CISCO-SWITCH-MIB.
+These devices run IOS but have some of the same characteristics as the
+Catalyst WS-C family (5xxx). For example, forwarding tables are held in
+VLANs, and extended interface information is gleaned from F<CISCO-SWITCH-MIB>.

 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
@@ -254,6 +265,8 @@ after determining a more specific class using the method above.

 =item SNMP::Info::Layer3

+=item SNMP::Info::CiscoStpExtensions
+
 =back

 =head2 Required MIBs
@@ -272,7 +285,8 @@ See L<SNMP::Info::CiscoStats/"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::CiscoPortSecurity/"Required MIBs"> for its own MIB
+requirements.

 See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.

@@ -280,6 +294,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
@@ -292,6 +308,10 @@ These are methods that return scalar value from SNMP

    Returns 'cisco'

+=item $c6500->cisco_comm_indexing()
+
+Returns 1.  Use vlan indexing.
+
 =back

 =head2 Global Methods imported from SNMP::Info::CiscoVTP
@@ -330,6 +350,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
@@ -345,7 +369,7 @@ Returns reference to hash of iid to current link duplex setting.

 Newer software versions return duplex based upon the result of
 $c6500->el_duplex().  Otherwise it uses the result of the call to
-CiscoStack i_duplex().
+CiscoStack::i_duplex().

 See L<SNMP::Info::Etherlike> for el_duplex() method and
 L<SNMP::Info::CiscoStack> for its i_duplex() method.
@@ -356,17 +380,17 @@ Returns reference to hash of iid to administrative duplex setting.

 Newer software versions return duplex based upon the result of
 $c6500->p_duplex().  Otherwise it uses the result of the call to
-CiscoStack i_duplex().
+CiscoStack::i_duplex().

 See L<SNMP::Info::CiscoStack> for its i_duplex() and p_duplex() methods.

 =item $c6500->set_i_duplex_admin(duplex, ifIndex)

-Sets port duplex, must be supplied with duplex and port ifIndex.
+Sets port duplex, must be supplied with duplex and port C<ifIndex>.

 Speed choices are 'auto', 'half', 'full'.

-Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port ifIndex.
+Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c6500->interfaces()};
@@ -397,7 +421,8 @@ 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.
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
+details.

 =head2 Table Methods imported from SNMP::Info::CiscoConfig

@@ -407,9 +432,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

--- a/Info/Layer3/Cisco.pm
+++ b/Info/Layer3/Cisco.pm
@@ -1,36 +1,36 @@
 # SNMP::Info::Layer3::Cisco
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004 Max Baker
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 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 the University of California, Santa Cruz nor the 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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.
+#
+# 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::Cisco;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
@@ -42,85 +42,83 @@ use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
@SNMP::Info::Layer3::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
-                                    SNMP::Info::CiscoStats SNMP::Info::CiscoImage 
-                                    SNMP::Info::CiscoRTT  SNMP::Info::CiscoQOS
-                                    SNMP::Info::CiscoConfig SNMP::Info::CiscoPower
-                                    SNMP::Info::Layer3
-                                    Exporter/;
+    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+    SNMP::Info::CiscoRTT  SNMP::Info::CiscoQOS
+    SNMP::Info::CiscoConfig SNMP::Info::CiscoPower
+    SNMP::Info::Layer3
+    Exporter/;
@SNMP::Info::Layer3::Cisco::EXPORT_OK = qw//;

+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-            %SNMP::Info::Layer3::MIBS,
-            %SNMP::Info::CiscoPower::MIBS,
-            %SNMP::Info::CiscoConfig::MIBS,
-            %SNMP::Info::CiscoQOS::MIBS,
-            %SNMP::Info::CiscoRTT::MIBS,
-            %SNMP::Info::CiscoImage::MIBS,
-            %SNMP::Info::CiscoStats::MIBS,
-            %SNMP::Info::CDP::MIBS,
-            %SNMP::Info::CiscoVTP::MIBS,
-            'CISCO-EIGRP-MIB' => 'cEigrpAsRouterId',
-        );
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoQOS::MIBS,
+    %SNMP::Info::CiscoRTT::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,
+    %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::CiscoVTP::MIBS,
+    'CISCO-EIGRP-MIB' => 'cEigrpAsRouterId',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::CiscoPower::GLOBALS,
-            %SNMP::Info::CiscoConfig::GLOBALS,
-            %SNMP::Info::CiscoQOS::GLOBALS,
-            %SNMP::Info::CiscoRTT::GLOBALS,
-            %SNMP::Info::CiscoImage::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoVTP::GLOBALS,
-            'eigrp_id'     => 'cEigrpAsRouterId',
-           );
+    %SNMP::Info::Layer3::GLOBALS,      %SNMP::Info::CiscoPower::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS, %SNMP::Info::CiscoQOS::GLOBALS,
+    %SNMP::Info::CiscoRTT::GLOBALS,    %SNMP::Info::CiscoImage::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS,  %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS, 'eigrp_id' => 'cEigrpAsRouterId',
+);

 %FUNCS = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::CiscoPower::FUNCS,
-            %SNMP::Info::CiscoConfig::FUNCS,
-            %SNMP::Info::CiscoQOS::FUNCS,
-            %SNMP::Info::CiscoRTT::FUNCS,
-            %SNMP::Info::CiscoImage::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoVTP::FUNCS,
-            # EIGRP
-            'eigrp_peers' => 'cEigrpPeerAddr',
-         );
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoQOS::FUNCS,
+    %SNMP::Info::CiscoRTT::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::CiscoVTP::FUNCS,
+
+    # EIGRP
+    'eigrp_peers' => 'cEigrpPeerAddr',
+);

 %MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::CiscoPower::MUNGE,
-            %SNMP::Info::CiscoConfig::MUNGE,
-            %SNMP::Info::CiscoQOS::MUNGE,
-            %SNMP::Info::CiscoRTT::MUNGE,
-            %SNMP::Info::CiscoImage::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoVTP::MUNGE,
-            'eigrp_peers' => \&SNMP::Info::munge_ip,
-         );
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoQOS::MUNGE,
+    %SNMP::Info::CiscoRTT::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoVTP::MUNGE,
+    'eigrp_peers' => \&SNMP::Info::munge_ip,
+);

 sub i_vlan {
-	my ($cisco) = shift;
-	my ($partial) = shift;
+    my ($cisco)   = shift;
+    my ($partial) = shift;

-	my ($i_type) = $cisco->i_type($partial);
-	my ($i_descr) = $cisco->i_description($partial);
-	my %i_vlan;
+    my ($i_type)  = $cisco->i_type($partial);
+    my ($i_descr) = $cisco->i_description($partial);
+    my %i_vlan;

-	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;
-			}
-		}
-	}
-	\%i_vlan;
+    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 \%i_vlan;
 }

 1;
@@ -183,7 +181,7 @@ Subclass for Generic Cisco Routers running IOS

 =over

-=item CISCO-EIGRP-MIB
+=item F<CISCO-EIGRP-MIB>

 =item Inherited Classes' MIBs

@@ -219,7 +217,7 @@ These are methods that return scalar value from SNMP

 =item $cisco->eigrp_id()

-(B<cEigrpAsRouterId>)
+(C<cEigrpAsRouterId>)

 =back

@@ -270,7 +268,11 @@ to a hash.

 Returns EIGRP peer IP addresses

-(B<cEigrpPeerAddr>)
+(C<cEigrpPeerAddr>)
+
+=item $cisco->i_vlan()
+
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.

 =back

--- a/Info/Layer3/CiscoFWSM.pm
+++ b/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.04';
+
+%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
--- a/Info/Layer3/Contivity.pm
+++ b/Info/Layer3/Contivity.pm
@@ -1,71 +1,67 @@
 # SNMP::Info::Layer3::Contivity
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller, Max Baker
+# Copyright (c) 2010 Eric Miller
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Contivity;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Layer3;
 use SNMP::Info::Entity;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-@SNMP::Info::Layer3::Contivity::ISA = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Entity Exporter/;
+@SNMP::Info::Layer3::Contivity::ISA
+    = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Entity Exporter/;
@SNMP::Info::Layer3::Contivity::EXPORT_OK = qw//;

+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-         %SNMP::Info::MIBS,
-         %SNMP::Info::Layer3::MIBS,
-         %SNMP::Info::Entity::MIBS,
-        );
+    %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,
+);

 %GLOBALS = (
-           %SNMP::Info::GLOBALS,
-           %SNMP::Info::Layer3::GLOBALS,
-           %SNMP::Info::Entity::GLOBALS,
-           );
+    %SNMP::Info::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::Entity::GLOBALS,
+);

 %FUNCS = (
-          %SNMP::Info::FUNCS,
-          %SNMP::Info::Layer3::FUNCS,
-          %SNMP::Info::Entity::FUNCS,
-         );
-         
+    %SNMP::Info::FUNCS, %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::Entity::FUNCS,
+);
+
 %MUNGE = (
-          %SNMP::Info::MUNGE,
-          %SNMP::Info::Layer3::MUNGE,
-          %SNMP::Info::Entity::MUNGE,
-         );
+    %SNMP::Info::MUNGE, %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::Entity::MUNGE,
+);

 sub layers {
    return '00000100';
@@ -80,9 +76,9 @@ sub model {
    my $e_model = $contivity->e_model() || {};

    my $model = $e_model->{1} || undef;
-    
-    return $1 if (defined $model and $model =~ /(CES\d+)/i);
-    return undef;
+
+    return $1 if ( defined $model and $model =~ /(CES\d+|NVR\d+)/i );
+    return;
 }

 sub os {
@@ -91,26 +87,26 @@ sub os {

 sub os_ver {
    my $contivity = shift;
-    my $descr = $contivity->description();
-    return undef unless defined $descr;
+    my $descr     = $contivity->description();
+    return unless defined $descr;

-    if ($descr =~ m/V(\d+_\d+\.\d+)/i){
+    if ( $descr =~ m/V(\d+_\d+\.\d+)/i ) {
        return $1;
    }
-    return undef;
+    return;
 }

 sub mac {
    my $contivity = shift;
-    my $i_mac = $contivity->i_mac();
+    my $i_mac     = $contivity->i_mac();

-# Return Interface MAC   
-    foreach my $entry (keys %$i_mac){
+    # Return Interface MAC
+    foreach my $entry ( keys %$i_mac ) {
        my $sn = $i_mac->{$entry};
        next unless $sn;
        return $sn;
    }
-    return undef;
+    return;
 }

 sub serial {
@@ -118,23 +114,23 @@ sub serial {
    my $e_serial = $contivity->e_serial() || {};

    my $serial = $e_serial->{1} || undef;
-    
-    return $1 if (defined $serial and $serial =~ /(\d+)/);
-    return undef;
-}

+    return $1 if ( defined $serial and $serial =~ /(\d+)/ );
+    return;
+}

 sub interfaces {
    my $contivity = shift;
-    my $partial = shift;
+    my $partial   = shift;

    my $description = $contivity->i_description($partial) || {};
-    
+
    my %interfaces = ();
-    foreach my $iid (keys %$description){
+    foreach my $iid ( keys %$description ) {
        my $desc = $description->{$iid};
+
        # Skip everything except Ethernet interfaces
-        next unless (defined $desc and $desc =~ /fe/i);
+        next unless ( defined $desc and $desc =~ /fe/i );

        $interfaces{$iid} = $desc;
    }
@@ -143,21 +139,22 @@ sub interfaces {

 sub i_name {
    my $contivity = shift;
-    my $partial = shift;
+    my $partial   = shift;

    my $i_name2 = $contivity->orig_i_name($partial) || {};
-    
+
    my %i_name;
-    foreach my $iid (keys %$i_name2){
+    foreach my $iid ( keys %$i_name2 ) {
        my $name = $i_name2->{$iid};
+
        #Skip everything except Ethernet interfaces
-        next unless (defined $name and $name =~ /fe/i);
+        next unless ( defined $name and $name =~ /fe/i );

        $name = $1 if $name =~ /(fei\.\d+\.\d+)/;

        $i_name{$iid} = $name;
-     }
-     return \%i_name;
+    }
+    return \%i_name;
 }

 1;
@@ -165,8 +162,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer3::Contivity - SNMP Interface to Nortel VPN Routers (Contivity
-Extranet Switches).
+SNMP::Info::Layer3::Contivity - SNMP Interface to Nortel VPN Routers
+(Contivity Extranet Switches).

 =head1 AUTHOR

@@ -178,7 +175,6 @@ Eric Miller
 my $contivity = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -237,21 +233,21 @@ Returns 'Nortel'

 Returns the chassis name.

-(B<entPhysicalModelName.1>)
+(C<entPhysicalModelName.1>)

 =item $contivity->os()

-Returns 'CES'
+Returns C<'CES'>

 =item $contivity->os_ver()

-Returns the software version extracted from (B<sysDescr>).
+Returns the software version extracted from (C<sysDescr>).

 =item $contivity->serial()

 Returns the chassis serial number.

-(B<entPhysicalSerialNum.1>)
+(C<entPhysicalSerialNum.1>)

 =item $contivity->mac()

@@ -293,8 +289,12 @@ to a hash.

 =item $contivity->interfaces()

-Returns reference to the map between IID and physical Port.  Skips loopback and
-tunnel interfaces.
+Returns reference to the map between IID and physical Port.  Skips loopback
+and tunnel interfaces.
+
+=item $contivity->i_name()
+
+Interface Name field.  Skips loopback and tunnel interfaces.

 =back

--- a/Info/Layer3/Dell.pm
+++ b/Info/Layer3/Dell.pm
@@ -1,200 +1,231 @@
 # SNMP::Info::Layer3::Dell - SNMP Interface to Dell devices
-# Eric Miller
+# $Id$
 #
-# Copyright (c) 2006 Eric Miller
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 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 
+#     * 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.
+#
+# 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::Dell;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-$VERSION = '1.07';
-
-@SNMP::Info::Layer3::Dell::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Dell::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Dell::EXPORT_OK = qw//;

-%MIBS = ( %SNMP::Info::Layer3::MIBS,
-          'RADLAN-Physicaldescription-MIB'   => 'rlPhdStackReorder',
-          'RADLAN-rlInterfaces'              => 'rlIfNumOfLoopbackPorts',
-          'RADLAN-HWENVIROMENT'              => 'rlEnvPhysicalDescription',
-          'Dell-Vendor-MIB'                  => 'productIdentificationVersion',
-        );
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    'RADLAN-Physicaldescription-MIB' => 'rlPhdStackReorder',
+    'RADLAN-rlInterfaces'            => 'rlIfNumOfLoopbackPorts',
+    'RADLAN-HWENVIROMENT'            => 'rlEnvPhysicalDescription',
+    'Dell-Vendor-MIB'                => 'productIdentificationVersion',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            'os_ver'        => 'productIdentificationVersion',
-            'dell_id_name'  => 'productIdentificationDisplayName',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    'os_ver'       => 'productIdentificationVersion',
+    'dell_id_name' => 'productIdentificationDisplayName',
+);

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            # RADLAN-rlInterfaces:swIfTable
-            'dell_duplex_admin' => 'swIfDuplexAdminMode',
-            'dell_duplex'       => 'swIfDuplexOperMode',
-            'dell_tag_mode'     => 'swIfTaggedMode',
-            'dell_i_type'            => 'swIfType',
-            'dell_fc_admin'     => 'swIfFlowControlMode',
-            'dell_speed_admin'  => 'swIfSpeedAdminMode',
-            'dell_auto'         => 'swIfSpeedDuplexAutoNegotiation',
-            'dell_fc'           => 'swIfOperFlowControlMode',
-            # RADLAN-Physicaldescription-MIB:rlPhdUnitGenParamTable
-            'dell_unit'      => 'rlPhdUnitGenParamStackUnit',
-            'dell_sw_ver'    => 'rlPhdUnitGenParamSoftwareVersion',           
-            'dell_fw_ver'    => 'rlPhdUnitGenParamFirmwareVersion',
-            'dell_hw_ver'    => 'rlPhdUnitGenParamHardwareVersion',
-            'dell_serial_no' => 'rlPhdUnitGenParamSerialNum',
-            'dell_asset_no'  => 'rlPhdUnitGenParamAssetTag',
-            # RADLAN-COPY-MIB:rlCopyTable
-            'dell_cp_idx'     => 'rlCopyIndex',
-            'dell_cp_sloc'    => 'rlCopySourceLocation',           
-            'dell_cp_sip'     => 'rlCopySourceIpAddress',
-            'dell_cp_sunit'   => 'rlCopySourceUnitNumber',
-            'dell_cp_sfile'   => 'rlCopySourceFileName',
-            'dell_cp_stype'   => 'rlCopySourceFileType',
-            'dell_cp_dloc'    => 'rlCopyDestinationLocation',
-            'dell_cp_dip'     => 'rlCopyDestinationIpAddress',           
-            'dell_cp_dunit'   => 'rlCopyDestinationUnitNumber',
-            'dell_cp_dfile'   => 'rlCopyDestinationFileName',
-            'dell_cp_dtype'   => 'rlCopyDestinationFileType',
-            'dell_cp_state'   => 'rlCopyOperationState',
-            'dell_cp_bkgnd'   => 'rlCopyInBackground',
-            'dell_cp_rstatus' => 'rlCopyRowStatus',
-            # RADLAN-HWENVIROMENT:rlEnvMonSupplyStatusTable
-            'dell_pwr_src'    => 'rlEnvMonSupplySource',
-            'dell_pwr_state'  => 'rlEnvMonSupplyState',           
-            'dell_pwr_desc'   => 'rlEnvMonSupplyStatusDescr',
-            # RADLAN-HWENVIROMENT:rlEnvMonFanStatusTable
-            'dell_fan_state' => 'rlEnvMonFanState',
-            'dell_fan_desc'  => 'rlEnvMonFanStatusDescr',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,

+    # RADLAN-rlInterfaces:swIfTable
+    'dell_duplex_admin' => 'swIfDuplexAdminMode',
+    'dell_duplex'       => 'swIfDuplexOperMode',
+    'dell_tag_mode'     => 'swIfTaggedMode',
+    'dell_i_type'       => 'swIfType',
+    'dell_fc_admin'     => 'swIfFlowControlMode',
+    'dell_speed_admin'  => 'swIfSpeedAdminMode',
+    'dell_auto'         => 'swIfSpeedDuplexAutoNegotiation',
+    'dell_fc'           => 'swIfOperFlowControlMode',

-%MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-         );
+    # RADLAN-Physicaldescription-MIB:rlPhdUnitGenParamTable
+    'dell_unit'      => 'rlPhdUnitGenParamStackUnit',
+    'dell_sw_ver'    => 'rlPhdUnitGenParamSoftwareVersion',
+    'dell_fw_ver'    => 'rlPhdUnitGenParamFirmwareVersion',
+    'dell_hw_ver'    => 'rlPhdUnitGenParamHardwareVersion',
+    'dell_serial_no' => 'rlPhdUnitGenParamSerialNum',
+    'dell_asset_no'  => 'rlPhdUnitGenParamAssetTag',
+
+    # RADLAN-COPY-MIB:rlCopyTable
+    'dell_cp_idx'     => 'rlCopyIndex',
+    'dell_cp_sloc'    => 'rlCopySourceLocation',
+    'dell_cp_sip'     => 'rlCopySourceIpAddress',
+    'dell_cp_sunit'   => 'rlCopySourceUnitNumber',
+    'dell_cp_sfile'   => 'rlCopySourceFileName',
+    'dell_cp_stype'   => 'rlCopySourceFileType',
+    'dell_cp_dloc'    => 'rlCopyDestinationLocation',
+    'dell_cp_dip'     => 'rlCopyDestinationIpAddress',
+    'dell_cp_dunit'   => 'rlCopyDestinationUnitNumber',
+    'dell_cp_dfile'   => 'rlCopyDestinationFileName',
+    'dell_cp_dtype'   => 'rlCopyDestinationFileType',
+    'dell_cp_state'   => 'rlCopyOperationState',
+    'dell_cp_bkgnd'   => 'rlCopyInBackground',
+    'dell_cp_rstatus' => 'rlCopyRowStatus',
+
+    # RADLAN-HWENVIROMENT:rlEnvMonSupplyStatusTable
+    'dell_pwr_src'   => 'rlEnvMonSupplySource',
+    'dell_pwr_state' => 'rlEnvMonSupplyState',
+    'dell_pwr_desc'  => 'rlEnvMonSupplyStatusDescr',
+
+    # RADLAN-HWENVIROMENT:rlEnvMonFanStatusTable
+    'dell_fan_state' => 'rlEnvMonFanState',
+    'dell_fan_desc'  => 'rlEnvMonFanStatusDescr',
+);
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 # Method OverRides

-sub bulkwalk_no { 1; }
-
 sub model {
    my $dell = shift;

-    my $name = $dell->dell_id_name();
-    
-    if ($name =~ m/(\d+)/){
+    my $name  = $dell->dell_id_name();
+    my $descr = $dell->description();
+
+    if ( defined $name and $name =~ m/(\d+)/ ) {
        return $1;
    }

-    return undef;
+    # Don't have a vendor MIB for D-Link
+    else {
+        return $descr;
+    }
 }

 sub vendor {
+    my $dell = shift;

-    return 'dell';
+    return $dell->_vendor();
 }

 sub os {
+    my $dell = shift;

-    return 'dell';
+    return $dell->_vendor();
 }

 sub serial {
-    my $dell    = shift;
+    my $dell = shift;

    my $numbers = $dell->dell_serial_no();
-    
-    foreach my $key (keys %$numbers){
-        my $serial = $numbers->{$key};  
-        return $serial if (defined $serial and $serial !~ /^\s*$/);
+
+    foreach my $key ( keys %$numbers ) {
+        my $serial = $numbers->{$key};
+        return $serial if ( defined $serial and $serial !~ /^\s*$/ );
        next;
    }

-    return undef;
+    # Last resort
+    return $dell->SUPER::serial();
 }

-# Descriptions are all the same, so use name instead
 sub interfaces {
-    my $dell = shift;
+    my $dell    = shift;
    my $partial = shift;

-    my $interfaces = $dell->i_index($partial) || {};
-    my $names = $dell->orig_i_name($partial) || {};
+    my $i_descr = $dell->i_description($partial) || {};
+    my $i_name  = $dell->orig_i_name($partial)   || {};

-    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
-        my $name = $names->{$iid};
+    # Descriptions are all the same on some Dells, so use name instead if
+    # available
+    foreach my $iid ( keys %$i_name ) {
+        my $name = $i_name->{$iid};
        next unless defined $name;
-
-        $interfaces{$iid} = $name;
+        $i_descr->{$iid} = $name;
    }
-    
-    return \%interfaces;
+
+    return $i_descr;
 }

 sub i_duplex_admin {
-    my $dell = shift;
+    my $dell    = shift;
    my $partial = shift;
-    
-    my $interfaces  = $dell->interfaces($partial) || {};
+
+    my $interfaces  = $dell->interfaces($partial)        || {};
    my $dell_duplex = $dell->dell_duplex_admin($partial) || {};
-    my $dell_auto   = $dell->dell_auto($partial) || {};
- 
+    my $dell_auto   = $dell->dell_auto($partial)         || {};
+
    my %i_duplex_admin;
-    foreach my $if (keys %$interfaces){
+    foreach my $if ( keys %$interfaces ) {
        my $duplex = $dell_duplex->{$if};
        next unless defined $duplex;
-        my $auto = $dell_auto->{$if}||'false';
-    
-        $duplex = 'half' if ($duplex =~ /half/i and $auto =~ /false/i);
-        $duplex = 'full' if ($duplex =~ /half/i and $auto =~ /false/i);
+        my $auto = $dell_auto->{$if} || 'false';
+
+        $duplex = 'half' if ( $duplex =~ /half/i and $auto =~ /false/i );
+        $duplex = 'full' if ( $duplex =~ /half/i and $auto =~ /false/i );
        $duplex = 'auto' if $auto =~ /true/i;
-        $i_duplex_admin{$if}=$duplex; 
+        $i_duplex_admin{$if} = $duplex;
    }
    return \%i_duplex_admin;
 }

-# Normal BRIDGE-MIB not working?  Use Q-BRIDGE-MIB for macsuck
+# Use same methods as netgear.  Some device didn't implement the bridge MIB
+# forwarding table and some don't return MACs for VLANs other than default yet
+# don't support community indexing, so we use the Q-BRIDGE-MIB forwarding
+# table.  Fall back to the orig functions if the qb versions don't
+# return anything.
 sub fw_mac {
    my $dell = shift;
-    my $partial = shift;
-
-    return $dell->qb_fw_mac($partial);
+    my $ret  = $dell->qb_fw_mac();
+    $ret = $dell->orig_fw_mac() if ( !defined($ret) );
+    return $ret;
 }

 sub fw_port {
    my $dell = shift;
-    my $partial = shift;
+    my $ret  = $dell->qb_fw_port();
+    $ret = $dell->orig_fw_port() if ( !defined($ret) );
+    return $ret;
+}

-    return $dell->qb_fw_port($partial);
+sub _vendor {
+    my $dell = shift;
+
+    my $id = $dell->id() || 'undef';
+    my %oidmap = (
+        2    => 'ibm',
+        171  => 'dlink',
+        674  => 'dell',
+        3955 => 'linksys',
+    );
+    $id = $1 if ( defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/ );
+
+    if ( defined($id) and exists( $oidmap{$id} ) ) {
+        return $oidmap{$id};
+    }
+    else {
+        return 'dlink';
+    }
 }

 1;
@@ -202,7 +233,8 @@ __END__

 =head1 NAME

-SNMP::Info::Layer3::Dell - SNMP Interface to Dell Power Connect Network Devices
+SNMP::Info::Layer3::Dell - SNMP Interface to Dell Power Connect Network
+Devices

 =head1 AUTHOR

@@ -214,7 +246,6 @@ Eric Miller
 my $dell = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -228,7 +259,8 @@ Eric Miller
 =head1 DESCRIPTION

 Provides abstraction to the configuration information obtainable from an 
-Dell Power Connect device through SNMP. 
+Dell Power Connect device through SNMP.  D-Link and the IBM BladeCenter
+Gigabit Ethernet Switch Module also use this module based upon MIB support. 

 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
@@ -247,13 +279,13 @@ my $dell = new SNMP::Info::Layer3::Dell(...);

 =over

-=item Dell-Vendor-MIB
+=item F<Dell-Vendor-MIB>

-=item RADLAN-Physicaldescription-MIB
+=item F<RADLAN-Physicaldescription-MIB>

-=item RADLAN-rlInterfaces
+=item F<RADLAN-rlInterfaces>

-=item RADLAN-HWENVIROMENT
+=item F<RADLAN-HWENVIROMENT>

 =item Inherited Classes' MIBs

@@ -269,23 +301,27 @@ These are methods that return scalar value from SNMP

 =item $dell->os_ver()

-(B<productIdentificationVersion>)
+(C<productIdentificationVersion>)

 =item $dell->dell_id_name()

-(B<productIdentificationDisplayName>)
+(C<productIdentificationDisplayName>)

 =item $dell->model()

-Returns model type.  Returns numeric from (B<productIdentificationDisplayName>).
+Returns model type.  Returns numeric from
+(C<productIdentificationDisplayName>) if available, otherwise if returns
+description().

 =item $dell->vendor()

-Returns dell
+Returns 'dell', 'dlink', or 'ibm' based upon the IANA enterprise number in
+id().  Defaults to 'dlink'.

 =item $dell->os()

-Returns dell
+Returns 'dell', 'dlink', or 'ibm' based upon the IANA enterprise number in
+id().  Defaults to 'dlink'.

 =back

@@ -293,13 +329,10 @@ Returns dell

 =over

-=item $dell->bulkwalk_no
-
-Return C<1>.  Bulkwalk is currently turned off for this class.
-
 =item $dell->serial()

-Returns serial number. (B<rlPhdUnitGenParamSerialNum>)
+Returns serial number. Returns (C<rlPhdUnitGenParamSerialNum>) if available,
+otherwise uses the Layer3 serial method.

 =back

@@ -312,41 +345,41 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 RADLAN Interface Table (B<swIfTable>)
+=head2 RADLAN Interface Table (C<swIfTable>)

 =over

 =item $dell->dell_duplex_admin()

-(B<swIfDuplexAdminMode>)
+(C<swIfDuplexAdminMode>)

 =item $dell->dell_duplex()

-(B<swIfDuplexOperMode>)
+(C<swIfDuplexOperMode>)

 =item $dell->dell_tag_mode()

-(B<swIfTaggedMode>)
+(C<swIfTaggedMode>)

 =item $dell->dell_i_type()

-(B<swIfType>)
+(C<swIfType>)

 =item $dell->dell_fc_admin()

-(B<swIfFlowControlMode>)
+(C<swIfFlowControlMode>)

 =item $dell->dell_speed_admin()

-(B<swIfSpeedAdminMode>)
+(C<swIfSpeedAdminMode>)

 =item $dell->dell_auto()

-(B<swIfSpeedDuplexAutoNegotiation>)
+(C<swIfSpeedDuplexAutoNegotiation>)

 =item $dell->dell_fc()

-(B<swIfOperFlowControlMode>)
+(C<swIfOperFlowControlMode>)

 =back

@@ -356,14 +389,31 @@ to a hash.

 =item $dell->interfaces()

-Returns the map between SNMP Interface Identifier (iid) and physical port name.
-Uses name instead of description since descriptions are not unique.
-
-Only returns those iids that have a name listed in $l3->i_name()
+Returns the map between SNMP Interface Identifier (iid) and physical port
+name.  Uses name if available instead of description since descriptions are 
+sometimes not unique.

 =item $dell->i_duplex_admin()

-Returns reference to hash of iid to current link administrative duplex setting.
+Returns reference to hash of iid to current link administrative duplex
+setting.
+
+=item $dell->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses.
+
+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->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+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.

 =back

--- a/Info/Layer3/Enterasys.pm
+++ b/Info/Layer3/Enterasys.pm
@@ -1,87 +1,84 @@
 # SNMP::Info::Layer3::Enterasys - SNMP Interface to Enterasys devices
-# Eric Miller
+# $Id$
 #
-# Copyright (c) 2007 Eric Miller
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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.
-# 
-# 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.
+#     * 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::Enterasys;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::MAU;
 use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-$VERSION = '1.07';
-
@SNMP::Info::Layer3::Enterasys::ISA = qw/SNMP::Info::MAU SNMP::Info::LLDP
-                                        SNMP::Info::CDP SNMP::Info::Layer3
-                                        Exporter/;
+    SNMP::Info::CDP SNMP::Info::Layer3
+    Exporter/;
@SNMP::Info::Layer3::Enterasys::EXPORT_OK = qw//;

+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-         %SNMP::Info::Layer3::MIBS,
-         %SNMP::Info::CDP::MIBS,
-         %SNMP::Info::LLDP::MIBS,
-         %SNMP::Info::MAU::MIBS,
-         'ENTERASYS-OIDS-MIB' => 'etsysOidDevice',
-        );
+    %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,
+    %SNMP::Info::LLDP::MIBS, %SNMP::Info::MAU::MIBS,
+    'ENTERASYS-OIDS-MIB' => 'etsysOidDevice',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::LLDP::GLOBALS,
-            %SNMP::Info::MAU::GLOBALS,
-            'mac'            => 'dot1dBaseBridgeAddress',
-           );
+    %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,   %SNMP::Info::MAU::GLOBALS,
+    'mac' => 'dot1dBaseBridgeAddress',
+);

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::LLDP::FUNCS,
-            %SNMP::Info::MAU::FUNCS,
-           );
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS, %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,   %SNMP::Info::MAU::FUNCS,
+);

 %MUNGE = (
-          %SNMP::Info::Layer3::MUNGE,
-          %SNMP::Info::CDP::MUNGE,
-          %SNMP::Info::LLDP::MUNGE,
-          %SNMP::Info::MAU::MUNGE,
-         );
+    %SNMP::Info::Layer3::MUNGE, %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,   %SNMP::Info::MAU::MUNGE,
+);

 sub model {
    my $enterasys = shift;
-    my $id = $enterasys->id();
-    
-    unless (defined $id){
-        print " SNMP::Info::Layer3::Enterasys::model() - Device does not support sysObjectID\n" if $enterasys->debug(); 
-        return undef;
+    my $id        = $enterasys->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::Enterasys::model() - Device does not support sysObjectID\n"
+            if $enterasys->debug();
+        return;
    }
-    
+
    my $model = &SNMP::translateObj($id);

    $model =~ s/^etsysOidDev//i;
@@ -101,36 +98,37 @@ sub os {

 sub os_ver {
    my $enterasys = shift;
-    my $descr = $enterasys->description();
-    return undef unless defined $descr;
+    my $descr     = $enterasys->description();
+    return unless defined $descr;

-    if ($descr =~ m/\bRev ([\d.]*)/){
+    if ( $descr =~ m/\bRev ([\d.]*)/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 # Use ifName as it is used for CDP and LLDP.
 sub interfaces {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

    #  We need the original ifName, SUPER:: would give us a method definition
    #  in a higher class, we could use orig_ but just call the MIB leaf since
    #  that's what we really want anyway.
-    return $enterasys->ifName($partial) || $enterasys->i_description($partial);
+    return $enterasys->ifName($partial)
+        || $enterasys->i_description($partial);
 }

 sub i_ignore {
    my $enterasys = shift;
-    my $partial = shift;
-    
+    my $partial   = shift;
+
    my $interfaces = $enterasys->i_type($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$interfaces) {
-        if ($interfaces->{$if} =~ /(rs232|tunnel|loopback|\blo\b|null)/i){
+    foreach my $if ( keys %$interfaces ) {
+        if ( $interfaces->{$if} =~ /(rs232|tunnel|loopback|\blo\b|null)/i ) {
            $i_ignore{$if}++;
        }
    }
@@ -139,15 +137,15 @@ sub i_ignore {

 sub i_duplex {
    my $enterasys = shift;
-    my $partial = shift;
-    
+    my $partial   = shift;
+
    return $enterasys->mau_i_duplex($partial);
 }

 sub i_duplex_admin {
    my $enterasys = shift;
-    my $partial = shift;
-    
+    my $partial   = shift;
+
    return $enterasys->mau_i_duplex_admin($partial);
 }

@@ -155,19 +153,25 @@ sub i_duplex_admin {
 # non-increasing oids, Use Q-BRIDGE-MIB for macsuck
 sub fw_mac {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

    return $enterasys->qb_fw_mac($partial);
 }

 sub fw_port {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

    return $enterasys->qb_fw_port($partial);
 }

 #  Use CDP and/or LLDP
+#
+#  LLDP table timefilter implementation continuously increments when walked
+#  and we may never reach the end of the table.  This behavior can be
+#  modified with the "set snmp timefilter break disable" command,
+#  unfortunately it is not the default.  Query with a partial value of zero
+#  which means no time filter.

 sub hasCDP {
    my $enterasys = shift;
@@ -177,20 +181,20 @@ sub hasCDP {

 sub c_ip {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

    my $cdp  = $enterasys->SUPER::c_ip($partial) || {};
-    my $lldp = $enterasys->lldp_ip($partial) || {};
+    my $lldp = $enterasys->lldp_ip(0)            || {};

    my %c_ip;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $ip = $cdp->{$iid};
        next unless defined $ip;

        $c_ip{$iid} = $ip;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $ip = $lldp->{$iid};
        next unless defined $ip;

@@ -201,20 +205,20 @@ sub c_ip {

 sub c_if {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

-    my $lldp = $enterasys->lldp_if($partial) || {};;
+    my $lldp = $enterasys->lldp_if(0)            || {};
    my $cdp  = $enterasys->SUPER::c_if($partial) || {};
-    
+
    my %c_if;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $if = $cdp->{$iid};
        next unless defined $if;

        $c_if{$iid} = $if;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $if = $lldp->{$iid};
        next unless defined $if;

@@ -225,20 +229,20 @@ sub c_if {

 sub c_port {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

-    my $lldp = $enterasys->lldp_port($partial) || {};
+    my $lldp = $enterasys->lldp_port(0)            || {};
    my $cdp  = $enterasys->SUPER::c_port($partial) || {};
-    
+
    my %c_port;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $port = $cdp->{$iid};
        next unless defined $port;

        $c_port{$iid} = $port;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $port = $lldp->{$iid};
        next unless defined $port;

@@ -249,20 +253,20 @@ sub c_port {

 sub c_id {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

-    my $lldp = $enterasys->lldp_id($partial) || {};
+    my $lldp = $enterasys->lldp_id(0)            || {};
    my $cdp  = $enterasys->SUPER::c_id($partial) || {};

    my %c_id;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $id = $cdp->{$iid};
        next unless defined $id;

        $c_id{$iid} = $id;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $id = $lldp->{$iid};
        next unless defined $id;

@@ -273,20 +277,20 @@ sub c_id {

 sub c_platform {
    my $enterasys = shift;
-    my $partial = shift;
+    my $partial   = shift;

-    my $lldp = $enterasys->lldp_rem_sysdesc($partial) || {};
+    my $lldp = $enterasys->lldp_rem_sysdesc(0)         || {};
    my $cdp  = $enterasys->SUPER::c_platform($partial) || {};

    my %c_platform;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $platform = $cdp->{$iid};
        next unless defined $platform;

        $c_platform{$iid} = $platform;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $platform = $lldp->{$iid};
        next unless defined $platform;

@@ -312,7 +316,6 @@ Eric Miller
 my $enterasys = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -351,7 +354,7 @@ my $enterasys = new SNMP::Info::Layer3::Enterasys(...);

 =over

-=item ENTERASYS-OIDS-MIB
+=item F<ENTERASYS-OIDS-MIB>

 =back

@@ -373,7 +376,8 @@ These are methods that return scalar value from SNMP

 =item $enterasys->model()

-Returns model type.  Checks $enterasys->id() against the ENTERASYS-OIDS-MIB.
+Returns model type.  Checks $enterasys->id() against the
+F<ENTERASYS-OIDS-MIB>.

 =item $enterasys->vendor()

@@ -383,11 +387,15 @@ Returns enterasys

 Returns enterasys

+=item $enterasys->os_ver()
+
+Returns os version extracted from C<sysDescr>
+
 =item $enterasys->mac()

 Returns base mac

-(B<dot1dBaseBridgeAddress>)
+(C<dot1dBaseBridgeAddress>)

 =back

@@ -422,11 +430,16 @@ to a hash.

 =over

+=item $enterasys->interfaces()
+
+Mapping between the Interface Table Index (iid) and the physical port name.
+
 =item $enterasys->i_ignore()

 Returns reference to hash.  Creates a key for each IID that should be ignored.

-Currently looks for rs232, tunnel,loopback,lo,null from $enterasys->interfaces()
+Currently looks for rs232, tunnel,loopback,lo,null from
+$enterasys->interfaces()

 =item $enterasys->i_duplex()

@@ -434,20 +447,32 @@ See documentation for mau_i_duplex() in L<SNMP::Info::MAU/"TABLE METHODS">.

 =item $enterasys->i_duplex_admin()

-See documentation for mau_i_duplex_admin() in L<SNMP::Info::MAU/"TABLE METHODS">.
+See documentation for mau_i_duplex_admin() in
+L<SNMP::Info::MAU/"TABLE METHODS">.
+
+=item $enterasys->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses.
+
+=item $enterasys->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid).
+
+(C<dot1qTpFdbPort>)

 =back

 =head2 Topology information

 Based upon the firmware version Enterasys devices may support Cabletron
-Discovery Protocol (CTRON-CDP), Cisco Discovery Protocol (CDP), Link Layer
+Discovery Protocol (CTRON CDP), Cisco Discovery Protocol (CDP), Link Layer
 Discovery Protocol (LLDP), or all.  This module currently supports CDP and
-LLDP, but not CTRON-CDP.  These methods will query both CDP and LLDP and
+LLDP, but not CTRON CDP.  These methods will query both CDP and LLDP 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 de-duplicate if necessary.
+identify any duplicate entries and remove duplicates if necessary.

 =over

@@ -466,9 +491,9 @@ 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.  
+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.

--- a/Info/Layer3/Extreme.pm
+++ b/Info/Layer3/Extreme.pm
@@ -1,112 +1,122 @@
 # SNMP::Info::Layer3::Extreme - SNMP Interface to Extreme devices
-# Eric Miller
-# Bill Fenner
+# $Id$
 #
-# Copyright (c) 2005 Eric Miller
+# Copyright (c) 2008 Eric Miller
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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.
+#
+# 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::Extreme;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-$VERSION = '1.07';
-
-@SNMP::Info::Layer3::Extreme::ISA = qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
+@SNMP::Info::Layer3::Extreme::ISA
+    = qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
@SNMP::Info::Layer3::Extreme::EXPORT_OK = qw//;

-%MIBS = ( %SNMP::Info::Layer3::MIBS,
-          %SNMP::Info::MAU::MIBS,
-          'EXTREME-BASE-MIB'   => 'extremeAgent',
-          'EXTREME-SYSTEM-MIB' => 'extremeSystem',
-          'EXTREME-FDB-MIB'    => 'extremeSystem',
-          'EXTREME-VLAN-MIB'   => 'extremeVlan',
-        );
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::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,
-            'serial1'        => 'extremeSystemID.0',
-            'temp'           => 'extremeCurrentTemperature',
-            'ps1_status_old' => 'extremePrimaryPowerOperational.0',
-            'ps1_status_new' => 'extremePowerSupplyStatus.1',
-            'ps2_status_old' => 'extremeRedundantPowerStatus.0',
-            'ps2_status_new' => 'extremePowerSupplyStatus.2',
-            'mac'            => 'dot1dBaseBridgeAddress',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    'serial1'        => 'extremeSystemID.0',
+    'temp'           => 'extremeCurrentTemperature',
+    'ps1_status_old' => 'extremePrimaryPowerOperational.0',
+    'ps1_status_new' => 'extremePowerSupplyStatus.1',
+    'ps2_status_old' => 'extremeRedundantPowerStatus.0',
+    'ps2_status_new' => 'extremePowerSupplyStatus.2',
+    'mac'            => 'dot1dBaseBridgeAddress',
+);

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::MAU::FUNCS,
-            'fan_state'         => 'extremeFanOperational',
-            # EXTREME-FDB-MIB:extremeFdbMacFdbTable
-            'ex_fw_mac'         => 'extremeFdbMacFdbMacAddress',
-            'ex_fw_port'        => 'extremeFdbMacFdbPortIfIndex',
-            'ex_fw_status'      => 'extremeFdbMacFdbStatus',
-            # EXTREME-VLAN-MIB:extremeVlanIfTable
-            'ex_vlan_descr'     => 'extremeVlanIfDescr',
-            'ex_vlan_global_id' => 'extremeVlanIfGlobalIdentifier',
-            # EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
-            'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    'fan_state' => 'extremeFanOperational',
+
+    # EXTREME-FDB-MIB:extremeFdbMacFdbTable
+    'ex_fw_mac'    => 'extremeFdbMacFdbMacAddress',
+    'ex_fw_port'   => 'extremeFdbMacFdbPortIfIndex',
+    'ex_fw_status' => 'extremeFdbMacFdbStatus',
+
+    # EXTREME-VLAN-MIB:extremeVlanIfTable
+    'ex_vlan_descr'     => 'extremeVlanIfDescr',
+    'ex_vlan_global_id' => 'extremeVlanIfGlobalIdentifier',
+
+    # EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
+    'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
+
+    'peth_port_power'   => 'extremePethPortMeasuredPower',
+);

 %MUNGE = (
-            # Inherit all the built in munging
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::MAU::MUNGE,
-            'ex_fw_mac' => \&SNMP::Info::munge_mac,
-            'ps1_status_old' => \&munge_true_ok,
-            'ps1_status_new' => \&munge_power_stat,
-            'ps2_status_old' => \&munge_power_stat,
-            'ps2_status_new' => \&munge_power_stat,
-            'fan_state' => \&munge_true_ok,
-         );
+
+    # Inherit all the built in munging
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    'ex_fw_mac'      => \&SNMP::Info::munge_mac,
+    'ps1_status_old' => \&munge_true_ok,
+    'ps1_status_new' => \&munge_power_stat,
+    'ps2_status_old' => \&munge_power_stat,
+    'ps2_status_new' => \&munge_power_stat,
+    'fan_state'      => \&munge_true_ok,
+);

 # Method OverRides

-*SNMP::Info::Layer3::Extreme::i_duplex       = \&SNMP::Info::MAU::mau_i_duplex;
-*SNMP::Info::Layer3::Extreme::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::Extreme::i_duplex = \&SNMP::Info::MAU::mau_i_duplex;
+*SNMP::Info::Layer3::Extreme::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;

 sub model {
    my $extreme = shift;
-    my $id = $extreme->id();
-    
-    unless (defined $id){
-        print " SNMP::Info::Layer3::Extreme::model() - Device does not support sysObjectID\n" if $extreme->debug(); 
-        return undef;
+    my $id      = $extreme->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::Extreme::model() - Device does not support sysObjectID\n"
+            if $extreme->debug();
+        return;
    }
-    
+
    my $model = &SNMP::translateObj($id);

    return $id unless defined $model;
@@ -124,14 +134,14 @@ sub os {

 sub os_ver {
    my $extreme = shift;
-    my $descr = $extreme->description();
-    return undef unless defined $descr;
+    my $descr   = $extreme->description();
+    return unless defined $descr;

-    if ($descr =~ m/Version ([\d.]*)/){
+    if ( $descr =~ m/Version ([\d.]*)/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 #
@@ -141,15 +151,16 @@ sub os_ver {
 # assigned for router interfaces, so we use ifDescr
 # for those.
 sub interfaces {
-    my $extreme = shift;
-    my $partial = shift;
-    my $i_name = $extreme->orig_i_name($partial);
+    my $extreme       = shift;
+    my $partial       = shift;
+    my $i_name        = $extreme->orig_i_name($partial);
    my $i_description = $extreme->orig_i_description($partial);
-    my $interfaces = {};
-    foreach my $idx (keys %$i_name) {
-        if ($i_name->{$idx} =~ /\([0-9.]+\)/) {
+    my $interfaces    = {};
+    foreach my $idx ( keys %$i_name ) {
+        if ( $i_name->{$idx} =~ /\([0-9.]+\)/ ) {
            $interfaces->{$idx} = $i_description->{$idx};
-        } else {
+        }
+        else {
            $interfaces->{$idx} = $i_name->{$idx};
        }
    }
@@ -161,12 +172,14 @@ sub interfaces {
 sub i_ignore {
    my $extreme = shift;
    my $partial = shift;
-    
+
    my $i_description = $extreme->i_description($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$i_description) {
-        if ($i_description->{$if} =~ /^(802.1Q Encapsulation Tag \d+|VLAN \d+|lo\d+)/i){
+    foreach my $if ( keys %$i_description ) {
+        if ( $i_description->{$if}
+            =~ /^(802.1Q Encapsulation Tag \d+|VLAN \d+|lo\d+)/i )
+        {
            $i_ignore{$if}++;
        }
    }
@@ -177,11 +190,11 @@ sub i_ignore {
 # Either way, Extreme uses a 1:1 mapping of bridge interface ID to
 # ifIndex.
 sub bp_index {
-    my $extreme = shift;
+    my $extreme  = shift;
    my $if_index = $extreme->i_index();

    my %bp_index;
-    foreach my $iid (keys %$if_index){
+    foreach my $iid ( keys %$if_index ) {
        $bp_index{$iid} = $iid;
    }
    return \%bp_index;
@@ -189,43 +202,43 @@ sub bp_index {

 sub munge_true_ok {
    my $val = shift;
-    return undef unless defined($val);
-    return "OK" if ($val eq 'true');
-    return "Not OK" if ($val eq 'false');
+    return unless defined($val);
+    return "OK"     if ( $val eq 'true' );
+    return "Not OK" if ( $val eq 'false' );
    return $val;
 }

 sub munge_power_stat {
    my $val = shift;
-    return undef unless defined($val);
+    return unless defined($val);
    $val =~ s/^present//;
    $val =~ s/^not/Not /i;
    return $val;
 }

 sub ps1_status {
-    my $extreme = shift;
+    my $extreme    = shift;
    my $ps1_status = $extreme->ps1_status_new();
    return $ps1_status || $extreme->ps1_status_old();
 }

 sub ps2_status {
-    my $extreme = shift;
+    my $extreme    = shift;
    my $ps2_status = $extreme->ps2_status_new();
    return $ps2_status || $extreme->ps2_status_old();
 }

 sub fan {
-    my $extreme = shift;
+    my $extreme   = shift;
    my $fan_state = $extreme->fan_state();
-    my $ret = "";
-    my $s = "";
-    foreach my $i (sort {$a <=> $b} keys %$fan_state) {
+    my $ret       = "";
+    my $s         = "";
+    foreach my $i ( sort { $a <=> $b } keys %$fan_state ) {
        $ret .= $s . $i . ": " . $fan_state->{$i};
        $s = ", ";
    }
-    return undef if ($s eq "");
-    $ret;
+    return if ( $s eq "" );
+    return $ret;
 }

 # Newer versions of the Extreme firmware have vendor-specific tables
@@ -233,7 +246,7 @@ sub fan {
 # these tables, so we use the BRIDGE-MIB tables.
 sub fw_mac {
    my $extreme = shift;
-    my $fw_mac = $extreme->ex_fw_mac;
+    my $fw_mac  = $extreme->ex_fw_mac;
    return $fw_mac if defined($fw_mac);
    return $extreme->orig_fw_mac();
 }
@@ -246,7 +259,7 @@ sub fw_port {
 }

 sub fw_status {
-    my $extreme = shift;
+    my $extreme   = shift;
    my $fw_status = $extreme->ex_fw_status;
    return $fw_status if defined($fw_status);
    return $extreme->orig_fw_status();
@@ -262,38 +275,41 @@ sub fw_status {
 #  To represent this, we use a negative version of the
 #  internal VLAN ID (the deprecated extremeVlanIfGlobalIdentifier)
 sub _if2tag {
-    my $extreme = shift;
-    my $partial = shift;
-    my $stack = shift || $extreme->ifStackStatus($partial);
-    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $extreme    = shift;
+    my $partial    = shift;
+    my $stack      = shift || $extreme->ifStackStatus($partial);
+    my $encap_tag  = $extreme->ex_vlan_encap_tag();
    my $vlan_descr = $extreme->ex_vlan_descr();

    my $stackmap = {};
-    foreach my $idx (keys %$stack) {
-        my ($higher, $lower) = split(/\./, $idx);
+    foreach my $idx ( keys %$stack ) {
+        my ( $higher, $lower ) = split( /\./, $idx );
        $stackmap->{$higher}->{$lower} = $stack->{$idx};
    }

    my %if2tag = ();
    my $missed = 0;
-    foreach my $if (keys %$vlan_descr) {
+    foreach my $if ( keys %$vlan_descr ) {
        $if2tag{$if} = -1;
-        foreach my $tagif (keys %$encap_tag) {
-            if (defined($stackmap->{$if}->{$tagif}) && $stackmap->{$if}->{$tagif} eq 'active') {
+        foreach my $tagif ( keys %$encap_tag ) {
+            if ( defined( $stackmap->{$if}->{$tagif} )
+                && $stackmap->{$if}->{$tagif} eq 'active' )
+            {
                $if2tag{$if} = $encap_tag->{$tagif};
            }
        }
-        if ($if2tag{$if} == -1) {
+        if ( $if2tag{$if} == -1 ) {
            $missed++;
        }
    }
    if ($missed) {
        my $global_id = $extreme->ex_vlan_global_id();
-        foreach my $if (keys %if2tag) {
-            $if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if}));
+        foreach my $if ( keys %if2tag ) {
+            $if2tag{$if} = -$global_id->{$if}
+                if ( $if2tag{$if} == -1 && defined( $global_id->{$if} ) );
        }
    }
-    \%if2tag;
+    return \%if2tag;
 }

 # No partial support in v_name or v_index, because the obivous partial
@@ -310,23 +326,24 @@ sub v_index {
 }

 sub i_vlan {
-    my $extreme = shift;
-    my $partial = shift;
-    my $stack = $extreme->ifStackStatus($partial);
-    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $extreme    = shift;
+    my $partial    = shift;
+    my $stack      = $extreme->ifStackStatus($partial);
+    my $encap_tag  = $extreme->ex_vlan_encap_tag();
    my $vlan_descr = $extreme->ex_vlan_descr();
-    my $stackmap = {};
-    foreach my $idx (keys %$stack) {
-        my ($higher, $lower) = split(/\./, $idx);
+    my $stackmap   = {};
+    foreach my $idx ( keys %$stack ) {
+        my ( $higher, $lower ) = split( /\./, $idx );
        $stackmap->{$higher}->{$lower} = $stack->{$idx};
    }
-    my $if2tag = $extreme->_if2tag($partial, $stack);
+    my $if2tag = $extreme->_if2tag( $partial, $stack );
+
    #
    # Now that we've done all that mapping work, we can map the
    #   ifStack indexes.
    my %i_vlan = ();
-    foreach my $if (keys %$if2tag) {
-        foreach my $lowif (keys %{$stackmap->{$if}}) {
+    foreach my $if ( keys %$if2tag ) {
+        foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
            $i_vlan{$lowif} = $if2tag->{$if};
        }
    }
@@ -334,31 +351,33 @@ sub i_vlan {
 }

 sub i_vlan_membership {
-    my $extreme = shift;
-    my $partial = shift;
-    my $stack = $extreme->ifStackStatus($partial);
-    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $extreme    = shift;
+    my $partial    = shift;
+    my $stack      = $extreme->ifStackStatus($partial);
+    my $encap_tag  = $extreme->ex_vlan_encap_tag();
    my $vlan_descr = $extreme->ex_vlan_descr();
-    my $stackmap = {};
-    foreach my $idx (keys %$stack) {
-        my ($higher, $lower) = split(/\./, $idx);
+    my $stackmap   = {};
+    foreach my $idx ( keys %$stack ) {
+        my ( $higher, $lower ) = split( /\./, $idx );
        $stackmap->{$higher}->{$lower} = $stack->{$idx};
    }
-    my $if2tag = $extreme->_if2tag($partial, $stack);
+    my $if2tag = $extreme->_if2tag( $partial, $stack );
+
    #
    # Now that we've done all that mapping work, we can map the
    #   ifStack indexes.
    my %i_vlan_membership = ();
-    foreach my $if (keys %$if2tag) {
-        foreach my $lowif (keys %{$stackmap->{$if}}) {
-	    push(@{$i_vlan_membership{$lowif}}, $if2tag->{$if});
+    foreach my $if ( keys %$if2tag ) {
+        foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
+            push( @{ $i_vlan_membership{$lowif} }, $if2tag->{$if} );
        }
    }
+
    #
    # Now add all the tagged ports.
-    foreach my $if (keys %$encap_tag) {
-        foreach my $lowif (keys %{$stackmap->{$if}}) {
-	    push(@{$i_vlan_membership{$lowif}}, $encap_tag->{$if});
+    foreach my $if ( keys %$encap_tag ) {
+        foreach my $lowif ( keys %{ $stackmap->{$if} } ) {
+            push( @{ $i_vlan_membership{$lowif} }, $encap_tag->{$if} );
        }
    }
    return \%i_vlan_membership;
@@ -370,12 +389,12 @@ sub i_vlan_membership {

 sub set_i_vlan {
    my $extreme = shift;
-    return $extreme->_extreme_set_i_vlan(0, @_);
+    return $extreme->_extreme_set_i_vlan( 0, @_ );
 }

 sub set_i_pvid {
    my $extreme = shift;
-    return $extreme->_extreme_set_i_vlan(1, @_);
+    return $extreme->_extreme_set_i_vlan( 1, @_ );
 }

 # set_i_vlan implicitly turns off any encapsulation
@@ -386,103 +405,133 @@ sub set_i_pvid {
 # off any encapsulation.
 sub _extreme_set_i_vlan {
    my $extreme = shift;
-    my ($is_pvid, $vlan_id, $ifindex) = @_;
+    my ( $is_pvid, $vlan_id, $ifindex ) = @_;
    my $encap_tag = $extreme->ex_vlan_encap_tag();
+
    # The inverted stack MIB would make this easier, since
    # we need to find the vlan interface
    # that's stacked above $ifindex.
    my $cur_stack = $extreme->ifStackStatus();
+
    #
    # create inverted stack
    my $invstack;
-    foreach my $idx (keys %$cur_stack) {
-        my ($higher, $lower) = split(/\./, $idx);
+    foreach my $idx ( keys %$cur_stack ) {
+        my ( $higher, $lower ) = split( /\./, $idx );
        $invstack->{$lower}->{$higher} = $cur_stack->{$idx};
    }
+
    # create vlan tag -> encap interface map
    my %encapif = reverse %$encap_tag;
+
    # now find encap interface from tag
    my $encapidx = $encapif{$vlan_id};
-    if (!defined($encapidx)) {
-        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
-        return undef;
+    if ( !defined($encapidx) ) {
+        $extreme->error_throw(
+            "can't map $vlan_id to encapsulation interface");
+        return;
    }
+
    # now find vlan interface stacked above encap
-    my @abovevlan =  keys %{$invstack->{$encapidx}};
-    if (@abovevlan != 1) {
-        $extreme->error_throw("can't map encap interface $encapidx for $vlan_id to encapsulation interface");
-        return undef;
+    my @abovevlan = keys %{ $invstack->{$encapidx} };
+    if ( @abovevlan != 1 ) {
+        $extreme->error_throw(
+            "can't map encap interface $encapidx for $vlan_id to encapsulation interface"
+        );
+        return;
    }
    my $vlanidx = $abovevlan[0];
    my $rv;
+
    # Delete old VLAN mapping
-    foreach my $oldidx (keys %{$invstack->{$ifindex}}) {
-        if ($is_pvid && defined($encap_tag->{$oldidx})) {
-            next;       # Don't delete tagged mappings
+    foreach my $oldidx ( keys %{ $invstack->{$ifindex} } ) {
+        if ( $is_pvid && defined( $encap_tag->{$oldidx} ) ) {
+            next;    # Don't delete tagged mappings
        }
-        $rv = $extreme->set_ifStackStatus("destroy", $oldidx . "." . $ifindex);
+        $rv = $extreme->set_ifStackStatus( "destroy",
+            $oldidx . "." . $ifindex );
        unless ($rv) {
-            $extreme->error_throw("Unable to remove $ifindex from old VLAN index $oldidx");
-            return undef;
+            $extreme->error_throw(
+                "Unable to remove $ifindex from old VLAN index $oldidx");
+            return;
        }
    }
+
    # Add new VLAN mapping
-    $rv = $extreme->set_ifStackStatus("createAndGo", $vlanidx . "." . $ifindex);
+    $rv = $extreme->set_ifStackStatus( "createAndGo",
+        $vlanidx . "." . $ifindex );
    unless ($rv) {
-        $extreme->error_throw("Unable to add new VLAN index $vlanidx to ifIndex $ifindex");
-        return undef;
+        $extreme->error_throw(
+            "Unable to add new VLAN index $vlanidx to ifIndex $ifindex");
+        return;
    }
-    # XXX invalidate cache of ifstack?
-    # XXX Info.pm library function for this?
-    # XXX set_ should do invalidation?
-    # $store = $extreme->store(); delete $store->{ifStackStatus}; $extreme->store($store);
-    # $extreme->{_ifStackStatus} = 0;
+
+# XXX invalidate cache of ifstack?
+# XXX Info.pm library function for this?
+# XXX set_ should do invalidation?
+# $store = $extreme->store(); delete $store->{ifStackStatus}; $extreme->store($store);
+# $extreme->{_ifStackStatus} = 0;
    return $rv;
 }

 sub set_remove_i_vlan_tagged {
    my $extreme = shift;
-    my ($vlan_id, $ifindex) = @_;
+    my ( $vlan_id, $ifindex ) = @_;
    my $encap_tag = $extreme->ex_vlan_encap_tag();
+
    # create vlan tag -> encap interface map
    my %encapif = reverse %$encap_tag;
+
    # now find encap interface from tag
    my $encapidx = $encapif{$vlan_id};
-    if (!defined($encapidx)) {
-        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
-        return undef;
+    if ( !defined($encapidx) ) {
+        $extreme->error_throw(
+            "can't map $vlan_id to encapsulation interface");
+        return;
    }
-    my $rv = $extreme->set_ifStackStatus("destroy", $encapidx . "." . $ifindex);
+    my $rv = $extreme->set_ifStackStatus( "destroy",
+        $encapidx . "." . $ifindex );
    unless ($rv) {
-        $extreme->error_throw("Unable to delete VLAN encap ifIndex $encapidx for VLAN $vlan_id from ifIndex $ifindex");
-        return undef;
+        $extreme->error_throw(
+            "Unable to delete VLAN encap ifIndex $encapidx for VLAN $vlan_id from ifIndex $ifindex"
+        );
+        return;
    }
+
    # invalidate cache of ifstack?
    return $rv;
 }

 sub set_add_i_vlan_tagged {
    my $extreme = shift;
-    my ($vlan_id, $ifindex) = @_;
+    my ( $vlan_id, $ifindex ) = @_;
    my $encap_tag = $extreme->ex_vlan_encap_tag();
+
    # create vlan tag -> encap interface map
    my %encapif = reverse %$encap_tag;
+
    # now find encap interface from tag
    my $encapidx = $encapif{$vlan_id};
-    if (!defined($encapidx)) {
-        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
-        return undef;
+    if ( !defined($encapidx) ) {
+        $extreme->error_throw(
+            "can't map $vlan_id to encapsulation interface");
+        return;
    }
-    my $rv = $extreme->set_ifStackStatus("createAndGo", $encapidx . "." . $ifindex);
+    my $rv = $extreme->set_ifStackStatus( "createAndGo",
+        $encapidx . "." . $ifindex );
    unless ($rv) {
-        $extreme->error_throw("Unable to add VLAN encap ifIndex $encapidx for VLAN $vlan_id to ifIndex $ifindex");
-        return undef;
+        $extreme->error_throw(
+            "Unable to add VLAN encap ifIndex $encapidx for VLAN $vlan_id to ifIndex $ifindex"
+        );
+        return;
    }
+
    # invalidate cache of ifstack?
    return $rv;
 }

 1;
+
 __END__

 =head1 NAME
@@ -499,7 +548,6 @@ Eric Miller, Bill Fenner
 my $extreme = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -515,8 +563,8 @@ Eric Miller, Bill Fenner
 Provides abstraction to the configuration information obtainable from an 
 Extreme device through SNMP. 

-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 

 my $extreme = new SNMP::Info::Layer3::Extreme(...);

@@ -534,13 +582,15 @@ my $extreme = new SNMP::Info::Layer3::Extreme(...);

 =over

-=item EXTREME-BASE-MIB
+=item F<EXTREME-BASE-MIB>

-=item EXTREME-SYSTEM-MIB
+=item F<EXTREME-SYSTEM-MIB>

-=item EXTREME-FDB-MIB
+=item F<EXTREME-FDB-MIB>

-=item EXTREME-VLAN-MIB
+=item F<EXTREME-VLAN-MIB>
+
+=item F<EXTREME-POE-MIB>

 =item Inherited Classes' MIBs

@@ -554,13 +604,9 @@ These are methods that return scalar value from SNMP

 =over

-#=item $extreme->bulkwalk_no
-#
-#Return C<1>.  Bulkwalk is currently turned off for this class.
-
 =item $extreme->model()

-Returns model type.  Checks $extreme->id() against the EXTREME-BASE-MIB.
+Returns model type.  Checks $extreme->id() against the F<EXTREME-BASE-MIB>.

 =item $extreme->vendor()

@@ -570,35 +616,45 @@ Returns extreme

 Returns extreme

+=item $extreme->os_ver()
+
+Parses device operating system version from description()
+
 =item $extreme->serial()

 Returns serial number

-(B<extremeSystemID>)
+(C<extremeSystemID>)

 =item $extreme->temp()

 Returns system temperature

-(B<extremeCurrentTemperature>)
+(C<extremeCurrentTemperature>)

 =item $extreme->ps1_status()

 Returns status of power supply 1

-(B<extremePowerSupplyStatus.1>)
+(C<extremePowerSupplyStatus.1>)
+
+=item $extreme->ps2_status()
+
+Returns status of power supply 2
+
+(C<extremePowerSupplyStatus.2>)

 =item $extreme->fan()

 Returns fan status

-(B<extremeFanOperational.1>)
+(C<extremeFanOperational.1>)

 =item $extreme->mac()

 Returns base mac

-(B<dot1dBaseBridgeAddress>)
+(C<dot1dBaseBridgeAddress>)

 =back

@@ -625,28 +681,82 @@ to a hash.

 =over

+=item $extreme->interfaces()
+
+Returns a mapping between the Interface Table Index (iid) and the physical
+port name.
+
+=item $extreme->i_duplex()
+
+Parses mau_index and mau_link to return the duplex information for
+interfaces.
+
+=item $extreme->i_duplex_admin()
+
+Parses C<mac_index>,C<mau_autostat>,C<mau_type_admin> in
+order to find the admin duplex setting for all the interfaces.
+
+Returns either (auto,full,half).
+
+=item $extreme->i_ignore()
+
+Returns reference to hash.  Increments value of IID if port is to be ignored.
+
+Ignores VLAN meta interfaces and loopback
+
 =item $extreme->fw_mac()

-(B<extremeFdbMacFdbMacAddress>)
+(C<extremeFdbMacFdbMacAddress>)

 =item $extreme->fw_port()

-(B<extremeFdbMacFdbPortIfIndex>)
+(C<extremeFdbMacFdbPortIfIndex>)

 =item $extreme->fw_status()

-(B<extremeFdbMacFdbStatus>)
+(C<extremeFdbMacFdbStatus>)

 =item $extreme->i_vlan()

-Returns a mapping between ifIndex and the VLAN.
+Returns a mapping between C<ifIndex> and the VLAN.

-=item $stack->bp_index()
+=item $extreme->i_vlan_membership()

-Returns reference to hash of bridge port table entries map back to interface identifier (iid)
+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.

-Returns (B<ifIndex>) for both key and value since we're using EXTREME-FDB-MIB
-rather than BRIDGE-MIB.
+  Example:
+  my $interfaces = $extreme->interfaces();
+  my $vlans      = $extreme->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 $extreme->v_index()
+
+Returns VLAN IDs
+
+=item $extreme->v_name()
+
+Returns VLAN names
+
+(C<extremeVlanIfDescr>)
+
+=item $extreme->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 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

@@ -658,10 +768,19 @@ See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.

 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 $extreme->set_i_vlan ( vlan, ifIndex )

 Changes an access (untagged) port VLAN, must be supplied with the numeric
-VLAN ID and port ifIndex.  This method should only be used on end station
+VLAN ID and port C<ifIndex>.  This method should only be used on end station
 (non-trunk) ports.

  Example:
@@ -672,7 +791,7 @@ VLAN ID and port ifIndex.  This method should only be used on end station
 =item $extreme->set_i_pvid ( pvid, ifIndex )

 Sets port default VLAN, must be supplied with the numeric VLAN ID and
-port ifIndex.  This method should only be used on trunk ports.
+port C<ifIndex>.  This method should only be used on trunk ports.

  Example:
  my %if_map = reverse %{$extreme->interfaces()};
@@ -682,7 +801,7 @@ port ifIndex.  This method should only be used on trunk ports.
 =item $extreme->set_add_i_vlan_tagged ( vlan, ifIndex )

 Adds the VLAN to the enabled VLANs list of the port, must be supplied with the
-numeric VLAN ID and port ifIndex.
+numeric VLAN ID and port C<ifIndex>.

  Example:
  my %if_map = reverse %{$extreme->interfaces()};
@@ -692,11 +811,28 @@ numeric VLAN ID and port ifIndex.
 =item $extreme->set_remove_i_vlan_tagged ( vlan, ifIndex )

 Removes the VLAN from the enabled VLANs list of the port, must be supplied
-with the numeric VLAN ID and port ifIndex.
+with the numeric VLAN ID and port C<ifIndex>.

  Example:
  my %if_map = reverse %{$extreme->interfaces()};
  $extreme->set_remove_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
    or die "Couldn't add port to egress list. ",$extreme->error(1);

+
+=back
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item $extreme->munge_power_stat()
+
+Removes 'present' and changes 'not' to 'Not' in the front of a string.
+
+=item $extreme->munge_true_ok()
+
+Replaces 'true' with "OK" and 'false' with "Not OK".
+
+=back
+
 =cut
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -1,90 +1,90 @@
 # SNMP::Info::Layer3::Foundry - SNMP Interface to Foundry devices
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004,2005 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::Foundry;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::FDP;
 use SNMP::Info::LLDP;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-$VERSION = '1.07';
-
@SNMP::Info::Layer3::Foundry::ISA = qw/SNMP::Info::FDP SNMP::Info::LLDP
-                                       SNMP::Info::Layer3 Exporter/;
+    SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Foundry::EXPORT_OK = qw//;

-%MIBS = ( %SNMP::Info::Layer3::MIBS,
-          %SNMP::Info::LLDP::MIBS,
-          %SNMP::Info::FDP::MIBS,
-          'FOUNDRY-SN-ROOT-MIB'         => 'foundry',
-          'FOUNDRY-SN-AGENT-MIB'        => 'snChasPwrSupplyDescription',
-          'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snSwGroupOperMode',
-        );
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::FDP::MIBS,
+    'FOUNDRY-SN-ROOT-MIB'         => 'foundry',
+    'FOUNDRY-SN-AGENT-MIB'        => 'snChasPwrSupplyDescription',
+    'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snSwGroupOperMode',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::LLDP::GLOBALS,
-            %SNMP::Info::FDP::GLOBALS,
-            'mac'        => 'ifPhysAddress.1',
-            'chassis'    => 'entPhysicalDescr.1',
-            'temp'       => 'snChasActualTemperature',
-            'ps1_type'   => 'snChasPwrSupplyDescription.1',
-            'ps1_status' => 'snChasPwrSupplyOperStatus.1',
-            'fan'        => 'snChasFanOperStatus.1',
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::FDP::GLOBALS,
+    'mac'        => 'ifPhysAddress.1',
+    'chassis'    => 'entPhysicalDescr.1',
+    'temp'       => 'snChasActualTemperature',
+    'ps1_type'   => 'snChasPwrSupplyDescription.1',
+    'ps1_status' => 'snChasPwrSupplyOperStatus.1',
+    'fan'        => 'snChasFanOperStatus.1',

-           );
+);

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::LLDP::FUNCS,
-            %SNMP::Info::FDP::FUNCS,
-            # FOUNDRY-SN-SWITCH-GROUP-MIB
-            # snSwPortInfoTable - Switch Port Information Group
-            'sw_index'    => 'snSwPortIfIndex',
-            'sw_duplex'   => 'snSwPortInfoChnMode',
-            'sw_type'     => 'snSwPortInfoMediaType',
-            'sw_speed'    => 'snSwPortInfoSpeed',
-           );
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::FDP::FUNCS,
+
+    # FOUNDRY-SN-SWITCH-GROUP-MIB
+    # snSwPortInfoTable - Switch Port Information Group
+    'sw_index'  => 'snSwPortIfIndex',
+    'sw_duplex' => 'snSwPortInfoChnMode',
+    'sw_type'   => 'snSwPortInfoMediaType',
+    'sw_speed'  => 'snSwPortInfoSpeed',
+);

 %MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::LLDP::MUNGE,
-            %SNMP::Info::FDP::MUNGE,
-         );
+    %SNMP::Info::Layer3::MUNGE, %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::FDP::MUNGE,
+);

 sub i_ignore {
    my $foundry = shift;
@@ -93,8 +93,8 @@ sub i_ignore {
    my $interfaces = $foundry->interfaces($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$interfaces) {
-        if ($interfaces->{$if} =~ /(tunnel|loopback|\blo\b|lb|null)/i){
+    foreach my $if ( keys %$interfaces ) {
+        if ( $interfaces->{$if} =~ /(tunnel|loopback|\blo\b|lb|null)/i ) {
            $i_ignore{$if}++;
        }
    }
@@ -105,16 +105,16 @@ sub i_duplex {
    my $foundry = shift;
    my $partial = shift;

-    my $sw_index = $foundry->sw_index($partial);
-    my $sw_duplex= $foundry->sw_duplex($partial);
+    my $sw_index  = $foundry->sw_index($partial);
+    my $sw_duplex = $foundry->sw_duplex($partial);

-    unless (defined $sw_index and defined $sw_duplex){
-       return $foundry->SUPER::i_duplex(); 
+    unless ( defined $sw_index and defined $sw_duplex ) {
+        return $foundry->SUPER::i_duplex();
    }
-    
+
    my %i_duplex;
-    foreach my $sw_port (keys %$sw_duplex){
-        my $iid = $sw_index->{$sw_port};
+    foreach my $sw_port ( keys %$sw_duplex ) {
+        my $iid    = $sw_index->{$sw_port};
        my $duplex = $sw_duplex->{$sw_port};
        next if $duplex =~ /none/i;
        $i_duplex{$iid} = 'half' if $duplex =~ /half/i;
@@ -125,36 +125,36 @@ sub i_duplex {

 sub model {
    my $foundry = shift;
-    my $id = $foundry->id();
-    my $model = &SNMP::translateObj($id);
+    my $id      = $foundry->id();
+    my $model   = &SNMP::translateObj($id);

    # EdgeIron
-    if ($id =~ /\.1991\.1\.[45]\./) {
+    if ( $id =~ /\.1991\.1\.[45]\./ ) {

        my $e_name = $foundry->e_name();

        # Find entity table entry for "unit.1"
        my $unit_iid = undef;
-        foreach my $e (keys %$e_name){
+        foreach my $e ( keys %$e_name ) {
            my $name = $e_name->{$e} || '';
            $unit_iid = $e if $name eq 'unit.1';
        }

        # Find Model Name
        my $e_model = $foundry->e_model();
-        if (defined $e_model->{$unit_iid}){
+        if ( defined $e_model->{$unit_iid} ) {
            return $e_model->{$unit_iid};
        }
    }
-    
+
    return $id unless defined $model;
-    
+
    $model =~ s/^sn//;

    return $model;
 }

-sub os { 
+sub os {
    return 'foundry';
 }

@@ -169,7 +169,7 @@ sub os_ver {

    # Some older ones don't have this value,so we cull it from the description
    my $descr = $foundry->description();
-    if ($descr =~ m/Version (\d\S*)/) {
+    if ( $descr =~ m/Version (\d\S*)/ ) {
        return $1;
    }

@@ -178,16 +178,16 @@ sub os_ver {

    # find entity table entry for "stackmanaget.1"
    my $unit_iid = undef;
-    foreach my $e (keys %$e_name){
+    foreach my $e ( keys %$e_name ) {
        my $name = $e_name->{$e} || '';
        $unit_iid = $e if $name eq 'stackmanaget.1';
    }

-    if (defined $unit_iid){
+    if ( defined $unit_iid ) {

        # Find Model Name
        my $e_fwver = $foundry->e_fwver();
-        if (defined $e_fwver->{$unit_iid}){
+        if ( defined $e_fwver->{$unit_iid} ) {
            return $e_fwver->{$unit_iid};
        }
    }
@@ -206,7 +206,7 @@ sub serial {
    # If no chassis serial use first module serial
    my $mod_serials = $foundry->snAgentConfigModuleSerialNumber();

-    foreach my $mod (sort keys %$mod_serials){
+    foreach my $mod ( sort keys %$mod_serials ) {
        my $serial = $mod_serials->{$mod} || '';
        next unless defined $serial;
        return $serial;
@@ -217,12 +217,13 @@ sub serial {

    # find entity table entry for "unit.1"
    my $unit_iid = undef;
-    foreach my $e (keys %$e_name){
+    foreach my $e ( keys %$e_name ) {
        my $name = $e_name->{$e} || '';
        $unit_iid = $e if $name eq 'unit.1';
    }

-    if (defined $unit_iid) {
+    if ( defined $unit_iid ) {
+
        # Look up serial of found entry.
        my $e_serial = $foundry->e_serial();
        return $e_serial->{$unit_iid} if defined $e_serial->{$unit_iid};
@@ -237,27 +238,27 @@ sub interfaces {
    my $partial = shift;

    my $i_descr = $foundry->i_description($partial) || {};
-    my $i_name  = $foundry->i_name($partial) || {};
+    my $i_name  = $foundry->i_name($partial)        || {};

    # Use ifName for EdgeIrons else use ifDescr
-    foreach my $iid (keys %$i_name){
+    foreach my $iid ( keys %$i_name ) {
        my $name = $i_name->{$iid};
        next unless defined $name;
-        $i_descr->{$iid} = $name 
+        $i_descr->{$iid} = $name
            if $name =~ /^port\d+/i;
    }
-    
+
    return $i_descr;
 }

 # Reported hangs on a EdgeIron 24G
 sub stp_p_state {
-    my $foundry = shift;  
+    my $foundry = shift;
    my $partial = shift;

    my $descr = $foundry->description();
-    if ($descr =~ m/\bEdgeIron 24G\b/) {
-        return undef;
+    if ( $descr =~ m/\bEdgeIron 24G\b/ ) {
+        return;
    }

    return $foundry->SUPER::stp_p_state($partial) || {};
@@ -277,17 +278,17 @@ sub c_ip {
    my $partial = shift;

    my $cdp  = $foundry->SUPER::c_ip($partial) || {};
-    my $lldp = $foundry->lldp_ip($partial) || {};
+    my $lldp = $foundry->lldp_ip($partial)     || {};

    my %c_ip;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $ip = $cdp->{$iid};
        next unless defined $ip;

        $c_ip{$iid} = $ip;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $ip = $lldp->{$iid};
        next unless defined $ip;

@@ -300,18 +301,18 @@ sub c_if {
    my $foundry = shift;
    my $partial = shift;

-    my $lldp = $foundry->lldp_if($partial) || {};;
+    my $lldp = $foundry->lldp_if($partial)     || {};
    my $cdp  = $foundry->SUPER::c_if($partial) || {};
-    
+
    my %c_if;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $if = $cdp->{$iid};
        next unless defined $if;

        $c_if{$iid} = $if;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $if = $lldp->{$iid};
        next unless defined $if;

@@ -324,18 +325,18 @@ sub c_port {
    my $foundry = shift;
    my $partial = shift;

-    my $lldp = $foundry->lldp_port($partial) || {};
+    my $lldp = $foundry->lldp_port($partial)     || {};
    my $cdp  = $foundry->SUPER::c_port($partial) || {};
-    
+
    my %c_port;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $port = $cdp->{$iid};
        next unless defined $port;

        $c_port{$iid} = $port;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $port = $lldp->{$iid};
        next unless defined $port;

@@ -348,18 +349,18 @@ sub c_id {
    my $foundry = shift;
    my $partial = shift;

-    my $lldp = $foundry->lldp_id($partial) || {};
+    my $lldp = $foundry->lldp_id($partial)     || {};
    my $cdp  = $foundry->SUPER::c_id($partial) || {};

    my %c_id;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $id = $cdp->{$iid};
        next unless defined $id;

        $c_id{$iid} = $id;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $id = $lldp->{$iid};
        next unless defined $id;

@@ -372,18 +373,18 @@ sub c_platform {
    my $foundry = shift;
    my $partial = shift;

-    my $lldp = $foundry->lldp_rem_sysdesc($partial) || {};
+    my $lldp = $foundry->lldp_rem_sysdesc($partial)  || {};
    my $cdp  = $foundry->SUPER::c_platform($partial) || {};

    my %c_platform;
-    foreach my $iid (keys %$cdp){
+    foreach my $iid ( keys %$cdp ) {
        my $platform = $cdp->{$iid};
        next unless defined $platform;

        $c_platform{$iid} = $platform;
    }

-    foreach my $iid (keys %$lldp){
+    foreach my $iid ( keys %$lldp ) {
        my $platform = $lldp->{$iid};
        next unless defined $platform;

@@ -409,7 +410,6 @@ Max Baker
 my $foundry = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -445,11 +445,11 @@ after determining a more specific class using the method above.

 =over

-=item FOUNDRY-SN-ROOT-MIB
+=item F<FOUNDRY-SN-ROOT-MIB>

-=item FOUNDRY-SN-AGENT-MIB
+=item F<FOUNDRY-SN-AGENT-MIB>

-=item FOUNDRY-SN-SWITCH-GROUP-MIB
+=item F<FOUNDRY-SN-SWITCH-GROUP-MIB>

 =item Inherited Classes' MIBs

@@ -469,8 +469,8 @@ These are methods that return scalar value from SNMP

 =item $foundry->model()

-Returns model type.  Checks $foundry->id() against the FOUNDRY-SN-ROOT-MIB
-and removes 'sn'.  EdgeIron models determined through ENTITY-MIB.  
+Returns model type.  Checks $foundry->id() against the F<FOUNDRY-SN-ROOT-MIB>
+and removes 'C<sn>'.  EdgeIron models determined through F<ENTITY-MIB>.  

 =item $foundry->vendor()

@@ -488,13 +488,13 @@ Returns the software version

 Returns MAC Address of root port.

-(B<ifPhysAddress.1>)
+(C<ifPhysAddress.1>)

 =item $foundry->chassis()

 Returns Chassis type.

-(B<entPhysicalDescr.1>)
+(C<entPhysicalDescr.1>)

 =item $foundry->serial()

@@ -504,25 +504,25 @@ Returns serial number of device.

 Returns the chassis temperature

-(B<snChasActualTemperature>)
+(C<snChasActualTemperature>)

 =item $foundry->ps1_type()

 Returns the Description for the power supply

-(B<snChasPwrSupplyDescription.1>)
+(C<snChasPwrSupplyDescription.1>)

 =item $foundry->ps1_status()

 Returns the status of the power supply.

-(B<snChasPwrSupplyOperStatus.1>)
+(C<snChasPwrSupplyOperStatus.1>)

 =item $foundry->fan()

 Returns the status of the chassis fan.

-(B<snChasFanOperStatus.1>)
+(C<snChasFanOperStatus.1>)

 =back

@@ -563,9 +563,18 @@ Returns reference to hash of interface link duplex status.

 Crosses $foundry->sw_duplex() with $foundry->sw_index()

+=item $foundry->stp_p_state()
+
+"The port's current state as defined by application of the Spanning Tree
+Protocol.
+
+Skipped if device is an EdgeIron 24G due to reports of hangs.
+
+(C<dot1dStpPortState>)
+
 =back

-=head2 Foundry Switch Port Information Table (B<snSwPortIfTable>)
+=head2 Foundry Switch Port Information Table (C<snSwPortIfTable>)

 =over

@@ -573,25 +582,25 @@ Crosses $foundry->sw_duplex() with $foundry->sw_index()

 Returns reference to hash.  Maps Table to Interface IID. 

-(B<snSwPortIfIndex>)
+(C<snSwPortIfIndex>)

 =item $foundry->sw_duplex()

 Returns reference to hash.   Current duplex status for switch ports. 

-(B<snSwPortInfoChnMode>)
+(C<snSwPortInfoChnMode>)

 =item $foundry->sw_type()

 Returns reference to hash.  Current Port Type .

-(B<snSwPortInfoMediaType>)
+(C<snSwPortInfoMediaType>)

 =item $foundry->sw_speed()

 Returns reference to hash.  Current Port Speed. 

-(B<snSwPortInfoSpeed>)
+(C<snSwPortInfoSpeed>)

 =back

@@ -602,7 +611,8 @@ Protocol (FDP) and Link Layer Discovery Protocol (LLDP). 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 de-duplicate if necessary.
+responsibility to identify any duplicate entries and remove duplicates if
+necessary.

 =over

@@ -621,9 +631,9 @@ 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-FDP/LLDP device in between two or
-more devices or multiple devices which are not directly connected.  
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non-FDP/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.

--- a/Info/Layer3/HP9300.pm
+++ b/Info/Layer3/HP9300.pm
@@ -0,0 +1,590 @@
+# SNMP::Info::Layer3::HP9300 - SNMP Interface to HP Foundry OEM devices
+# $Id$
+#
+# Copyright (c) 2008 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::HP9300;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::FDP;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::HP9300::ISA = qw/SNMP::Info::FDP SNMP::Info::LLDP
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::HP9300::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::FDP::MIBS,
+    'HP-SN-ROOT-MIB'         => 'hp',
+    'HP-SN-AGENT-MIB'        => 'snChasPwrSupplyDescription',
+    'HP-SN-SWITCH-GROUP-MIB' => 'snSwGroupOperMode',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::FDP::GLOBALS,
+    'mac'        => 'ifPhysAddress.1',
+    'chassis'    => 'entPhysicalDescr.1',
+    'temp'       => 'snChasActualTemperature',
+    'ps1_type'   => 'snChasPwrSupplyDescription.1',
+    'ps1_status' => 'snChasPwrSupplyOperStatus.1',
+    'fan'        => 'snChasFanOperStatus.1',
+
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::FDP::FUNCS,
+
+    # HP-SN-SWITCH-GROUP-MIB
+    # snSwPortInfoTable - Switch Port Information Group
+    # Fully qualify these since FDP class will load
+    # FOUNDRY-SN-SWITCH-GROUP-MIB which contains the same leaf names
+    'sw_index'  => 'HP_SN_SWITCH_GROUP_MIB__snSwPortIfIndex',
+    'sw_duplex' => 'HP_SN_SWITCH_GROUP_MIB__snSwPortInfoChnMode',
+    'sw_type'   => 'HP_SN_SWITCH_GROUP_MIB__snSwPortInfoMediaType',
+    'sw_speed'  => 'HP_SN_SWITCH_GROUP_MIB__snSwPortInfoSpeed',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE, %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::FDP::MUNGE,
+);
+
+sub i_ignore {
+    my $hp9300  = shift;
+    my $partial = shift;
+
+    my $interfaces = $hp9300->interfaces($partial) || {};
+
+    my %i_ignore;
+    foreach my $if ( keys %$interfaces ) {
+        if ( $interfaces->{$if} =~ /(tunnel|loopback|\blo\b|lb|null)/i ) {
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+sub i_duplex {
+    my $hp9300  = shift;
+    my $partial = shift;
+
+    my $sw_index  = $hp9300->sw_index($partial);
+    my $sw_duplex = $hp9300->sw_duplex($partial);
+
+    unless ( defined $sw_index and defined $sw_duplex ) {
+        return $hp9300->SUPER::i_duplex();
+    }
+
+    my %i_duplex;
+    foreach my $sw_port ( keys %$sw_duplex ) {
+        my $iid    = $sw_index->{$sw_port};
+        my $duplex = $sw_duplex->{$sw_port};
+        next if $duplex =~ /none/i;
+        $i_duplex{$iid} = 'half' if $duplex =~ /half/i;
+        $i_duplex{$iid} = 'full' if $duplex =~ /full/i;
+    }
+    return \%i_duplex;
+}
+
+sub model {
+    my $hp9300 = shift;
+    my $id     = $hp9300->id();
+    my $model  = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^hpSwitch//;
+
+    return $model;
+}
+
+sub os {
+    return 'hp';
+}
+
+sub vendor {
+    return 'hp';
+}
+
+sub os_ver {
+    my $hp9300 = shift;
+
+    return $hp9300->snAgImgVer() if ( defined $hp9300->snAgImgVer() );
+
+    # Some older ones don't have this value,so we cull it from the description
+    my $descr = $hp9300->description();
+    if ( $descr =~ m/Version (\d\S*)/ ) {
+        return $1;
+    }
+
+    # Last resort
+    return $hp9300->SUPER::os_ver();
+
+}
+
+sub serial {
+    my $hp9300 = shift;
+
+    # Return chassis serial number if available
+    return $hp9300->snChasSerNum() if ( $hp9300->snChasSerNum() );
+
+    # If no chassis serial use first module serial
+    my $mod_serials = $hp9300->snAgentConfigModuleSerialNumber();
+
+    foreach my $mod ( sort keys %$mod_serials ) {
+        my $serial = $mod_serials->{$mod} || '';
+        next unless defined $serial;
+        return $serial;
+    }
+
+    # Last resort
+    return $hp9300->SUPER::serial();
+}
+
+sub interfaces {
+    my $hp9300  = shift;
+    my $partial = shift;
+
+    my $i_descr = $hp9300->i_description($partial) || {};
+    my $i_name  = $hp9300->i_name($partial)        || {};
+
+    # Use ifName for EdgeIrons else use ifDescr
+    foreach my $iid ( keys %$i_name ) {
+        my $name = $i_name->{$iid};
+        next unless defined $name;
+        $i_descr->{$iid} = $name
+            if $name =~ /^port\d+/i;
+    }
+
+    return $i_descr;
+}
+
+#  Use FDP and/or LLDP
+
+sub hasCDP {
+    my $hp9300 = shift;
+
+    return $hp9300->hasLLDP() || $hp9300->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $hp9300  = shift;
+    my $partial = shift;
+
+    my $cdp  = $hp9300->SUPER::c_ip($partial) || {};
+    my $lldp = $hp9300->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 $hp9300  = shift;
+    my $partial = shift;
+
+    my $lldp = $hp9300->lldp_if($partial)     || {};
+    my $cdp  = $hp9300->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 $hp9300  = shift;
+    my $partial = shift;
+
+    my $lldp = $hp9300->lldp_port($partial)     || {};
+    my $cdp  = $hp9300->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 $hp9300  = shift;
+    my $partial = shift;
+
+    my $lldp = $hp9300->lldp_id($partial)     || {};
+    my $cdp  = $hp9300->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 $hp9300  = shift;
+    my $partial = shift;
+
+    my $lldp = $hp9300->lldp_rem_sysdesc($partial)  || {};
+    my $cdp  = $hp9300->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::HP9300 - SNMP Interface to HP Foundry OEM Network Devices
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $hp9300 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $hp9300->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for HP network devices which Foundry Networks was the
+Original Equipment Manufacturer (OEM) such as the HP ProCurve 9300 series.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above.
+
+ my $hp9300 = new SNMP::Info::Layer3::HP9300(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3;
+
+=item SNMP::Info::FDP;
+
+=item SNMP::Info::LLDP;
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<HP-SN-ROOT-MIB>
+
+=item F<HP-SN-AGENT-MIB>
+
+=item F<HP-SN-SWITCH-GROUP-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::FDP/"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 value from SNMP
+
+=over
+
+=item $hp9300->model()
+
+Returns model type.  Checks $hp9300->id() against the F<HP-SN-ROOT-MIB>
+and removes C<hpSwitch>.
+
+=item $hp9300->vendor()
+
+Returns 'hp'
+
+=item $hp9300->os()
+
+Returns 'hp'
+
+=item $hp9300->os_ver()
+
+Returns the software version
+
+=item $hp9300->mac()
+
+Returns MAC Address of root port.
+
+(C<ifPhysAddress.1>)
+
+=item $hp9300->chassis()
+
+Returns Chassis type.
+
+(C<entPhysicalDescr.1>)
+
+=item $hp9300->serial()
+
+Returns serial number of device.
+
+=item $hp9300->temp()
+
+Returns the chassis temperature
+
+(C<snChasActualTemperature>)
+
+=item $hp9300->ps1_type()
+
+Returns the Description for the power supply
+
+(C<snChasPwrSupplyDescription.1>)
+
+=item $hp9300->ps1_status()
+
+Returns the status of the power supply.
+
+(C<snChasPwrSupplyOperStatus.1>)
+
+=item $hp9300->fan()
+
+Returns the status of the chassis fan.
+
+(C<snChasFanOperStatus.1>)
+
+=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::FDP
+
+See documentation in L<SNMP::Info::FDP/"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
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $hp9300->interfaces()
+
+Returns reference to hash of interface names to iids.
+
+=item $hp9300->i_ignore()
+
+Returns reference to hash of interfaces to be ignored.
+
+Ignores interfaces with descriptions of  tunnel,loopback,null 
+
+=item $hp9300->i_duplex()
+
+Returns reference to hash of interface link duplex status. 
+
+Crosses $hp9300->sw_duplex() with $hp9300->sw_index()
+
+=back
+
+=head2 Switch Port Information Table (C<snSwPortIfTable>)
+
+=over
+
+=item $hp9300->sw_index()
+
+Returns reference to hash.  Maps Table to Interface IID. 
+
+(C<snSwPortIfIndex>)
+
+=item $hp9300->sw_duplex()
+
+Returns reference to hash.   Current duplex status for switch ports. 
+
+(C<snSwPortInfoChnMode>)
+
+=item $hp9300->sw_type()
+
+Returns reference to hash.  Current Port Type .
+
+(C<snSwPortInfoMediaType>)
+
+=item $hp9300->sw_speed()
+
+Returns reference to hash.  Current Port Speed. 
+
+(C<snSwPortInfoSpeed>)
+
+=back
+
+=head2 Topology information
+
+Based upon the software version devices may support Foundry Discovery
+Protocol (FDP) and Link Layer Discovery Protocol (LLDP). 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 $hp9300->hasCDP()
+
+Returns true if the device is running either FDP or LLDP.
+
+=item $hp9300->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $hp9300->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-FDP/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 $hp9300->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $hp9300->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $hp9300->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::FDP
+
+See documentation in L<SNMP::Info::FDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut
--- a/Info/Layer3/Juniper.pm
+++ b/Info/Layer3/Juniper.pm
@@ -1,88 +1,96 @@
 # SNMP::Info::Layer3::Juniper
-# Bill Fenner
+# $Id$
 #
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 Bill Fenner
+# 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 
+#     * 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.
+#
+# 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::Juniper;
-# $Id$

+use strict;
 use Exporter;
 use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
-@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/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-            %SNMP::Info::Layer3::MIBS,  
-	    'JUNIPER-CHASSIS-DEFINES-MIB' => 'jnxChassisDefines',
-	    'JUNIPER-MIB' => 'jnxBoxAnatomy',
-	);
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'JUNIPER-CHASSIS-DEFINES-MIB' => 'jnxChassisDefines',
+    'JUNIPER-MIB'                 => 'jnxBoxAnatomy',
+);

-%GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-	    'serial' => 'jnxBoxSerialNo.0',
-	   );
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, 
+	     %SNMP::Info::LLDP::GLOBALS,
+	     'serial' => 'jnxBoxSerialNo.0', );

-%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 'juniper';
+    return 'juniper';
 }

 sub os {
-	return 'junos';
+    return 'junos';
 }

 sub os_ver {
    my $juniper = shift;
-    my $descr = $juniper->description();
-    return undef unless defined $descr;
+    my $descr   = $juniper->description();
+    return unless defined $descr;

-    if ($descr =~ m/kernel JUNOS (\S+)/) {
-	return $1;
+    if ( $descr =~ m/kernel JUNOS (\S+)/ ) {
+        return $1;
    }
-    return undef;
+    return;
 }

 sub model {
    my $l3 = shift;
    my $id = $l3->id();
-    
-    unless (defined $id){
-        print " SNMP::Info::Layer3::Juniper::model() - Device does not support sysObjectID\n" if $l3->debug(); 
-        return undef;
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::Juniper::model() - Device does not support sysObjectID\n"
+            if $l3->debug();
+        return;
    }
-    
+
    my $model = &SNMP::translateObj($id);

    return $id unless defined $model;
@@ -98,23 +106,82 @@ sub serial {
 }

 sub i_vlan {
-	my ($juniper) = shift;
-	my ($partial) = shift;
+    my ($juniper) = shift;
+    my ($partial) = shift;

-	my ($i_type) = $juniper->i_type($partial);
-	my ($i_descr) = $juniper->i_description($partial);
-	my %i_vlan;
+    my ($i_type)  = $juniper->i_type($partial);
+    my ($i_descr) = $juniper->i_description($partial);
+    my %i_vlan;

-	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;
-			}
-		}
-	}
-	\%i_vlan;
+    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 \%i_vlan;
 }

+# 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);
+}
+
+
 1;
 __END__

@@ -132,7 +199,6 @@ Bill Fenner
 my $juniper = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
@@ -152,6 +218,8 @@ Subclass for Generic Juniper Routers running JUNOS

 =item SNMP::Info::Layer3

+=item SNMP::Info::LLDP
+
 =back

 =head2 Required MIBs
@@ -162,6 +230,8 @@ Subclass for Generic Juniper Routers running JUNOS

 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
@@ -172,20 +242,30 @@ These are methods that return scalar value from SNMP

 =item $juniper->vendor()

-    Returns 'juniper'
+Returns C<'juniper'>

 =item $juniper->os()

-    Returns 'junos'
+Returns C<'junos'>

 =item $juniper->os_ver()

-    Returns the software version extracted from sysDescr.
+Returns the software version extracted from C<sysDescr>.

 =item $juniper->model()

-    Returns the model from sysObjectID, with jnxProductName
-    removed from the beginning.
+Returns the model from C<sysObjectID>, with C<jnxProductNameremoved> from the
+beginning.
+
+=item $juniper->serial()
+
+Returns serial number
+
+(C<jnxBoxSerialNo.0>)
+
+=item $juniper->hasCDP()
+
+    Returns whether LLDP is enabled.

 =back

@@ -193,6 +273,10 @@ These are methods that return scalar value from SNMP

 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
@@ -202,13 +286,56 @@ to a hash.

 =item $juniper->i_vlan()

-Returns the list of interfaces whose ifType is l2vlan(135), and
+Returns the list of interfaces whose C<ifType> is l2vlan(135), and
 the VLAN ID extracted from the interface description.

+=item $juniper->c_id()
+
+Returns LLDP information.
+
+=item $juniper->c_if()
+
+Returns LLDP information.
+
+=item $juniper->c_ip()
+
+Returns LLDP information.
+
+=item $juniper->c_platform()
+
+Returns LLDP information.
+
+=item $juniper->c_port()
+
+Returns LLDP information.
+
 =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 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
--- a/Info/Layer3/Microsoft.pm
+++ b/Info/Layer3/Microsoft.pm
@@ -1,61 +1,60 @@
 # SNMP::Info::Layer3::Microsoft
-# 
-# Redistribution and use in source and binary forms, with or without 
+# $Id$
+#
+# Copyright (c) 2008 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 
+#     * 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.
+#
+# 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::Microsoft;
-$VERSION = '1.07';
-# $Id$

+use strict;
 use Exporter;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-@SNMP::Info::Layer3::Microsoft::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Microsoft::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Microsoft::EXPORT_OK = qw//;

-%MIBS = (
-            %SNMP::Info::Layer3::MIBS,  
-	);
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-%GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-	   );
+$VERSION = '2.04';

-%FUNCS = (
-            %SNMP::Info::Layer3::FUNCS,
-	 );
+%MIBS = ( %SNMP::Info::Layer3::MIBS, );

-%MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-	 );
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 sub vendor {
-	return 'microsoft';
+    return 'microsoft';
 }

 sub os {
-	return 'windows';
+    return 'windows';
 }

 sub os_ver {
@@ -63,28 +62,30 @@ sub os_ver {
 }

 sub model {
-     return 'Windows Router'
+    return 'Windows Router';
 }
+
 sub serial {
-     return '';
+    return '';
 }
+
 # $l3->interfaces() - Map the Interfaces to their physical names
 # Add interface number to interface name because if MS Win
 # have identical interface cards ("HP NC7782 Gigabit Server Adapter"
 # for example), than MS Win return identical ifDescr
 sub interfaces {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

-    my $interfaces = $l3->i_index($partial);
+    my $interfaces   = $l3->i_index($partial);
    my $descriptions = $l3->i_description($partial);

    my %interfaces = ();
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $desc = $descriptions->{$iid};
        next unless defined $desc;

-        $interfaces{$iid} = sprintf("(%U) %s", $iid, $desc);
+        $interfaces{$iid} = sprintf( "(%U) %s", $iid, $desc );
    }

    return \%interfaces;
@@ -107,7 +108,6 @@ begemot
 my $router = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 1
@@ -143,23 +143,29 @@ See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.

 These are methods that return scalar value from SNMP

+=head2 Overrides
+
 =over

 =item $router->vendor()

-    Returns 'microsoft'
+Returns C<'microsoft'>

 =item $router->os()

-    Returns 'windows'
+Returns C<'windows'>

 =item $router->os_ver()

-    Returns nothing.
+Returns ''

 =item $router->model()

-    Returns 'Windows Router'
+Returns C<'Windows Router'>
+
+=item $router->serial()
+
+Returns ''

 =back

@@ -172,6 +178,17 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

+=head2 Overrides
+
+=over
+
+=item $router->interfaces()
+
+Map the Interfaces to their physical names.  Adds interface number to
+interface name because identical interface cards return identical C<ifDescr>.
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::Layer3

 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
--- a/Info/Layer3/N1600.pm
+++ b/Info/Layer3/N1600.pm
@@ -1,84 +1,89 @@
 # SNMP::Info::Layer3::N1600 - SNMP Interface to Nortel N16XX devices
-# Eric Miller
+# $Id$
 #
-# Copyright (c) 2005 Eric Miller
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 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.
-# 
-# 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.
+#     * 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::N1600;
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::SONMP;

-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
-
-$VERSION = '1.07';
-
-@SNMP::Info::Layer3::N1600::ISA = qw/SNMP::Info::Layer3 SNMP::Info::SONMP Exporter/;
+@SNMP::Info::Layer3::N1600::ISA
+    = qw/SNMP::Info::Layer3 SNMP::Info::SONMP Exporter/;
@SNMP::Info::Layer3::N1600::EXPORT_OK = qw//;

-%MIBS = ( %SNMP::Info::Layer3::MIBS,
-          %SNMP::Info::SONMP::MIBS,
-          'SWL2MGMT-MIB' => 'swL2MgmtMIB',
-          'RAPID-CITY' => 'rapidCity',
-        );
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;

-%GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            %SNMP::Info::SONMP::GLOBALS,
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-            %SNMP::Info::Layer3::FUNCS,
-            %SNMP::Info::SONMP::FUNCS,
-            # SWL2MGMT-MIB
-            # swL2PortInfoTable
-            'n1600_nway_status'  => 'swL2PortInfoNwayStatus',
-            # swL2PortCtrlTable
-            'n1600_nway_state'   => 'swL2PortCtrlNwayState',
-           );
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::SONMP::MIBS,
+    'SWL2MGMT-MIB' => 'swL2MgmtMIB',
+    'RAPID-CITY'   => 'rapidCity',
+);
+
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::SONMP::GLOBALS, );
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,
+
+    # SWL2MGMT-MIB
+    # swL2PortInfoTable
+    'n1600_nway_status' => 'swL2PortInfoNwayStatus',
+
+    # swL2PortCtrlTable
+    'n1600_nway_state' => 'swL2PortCtrlNwayState',
+);

 %MUNGE = (
-            # Inherit all the built in munging
-            %SNMP::Info::Layer3::MUNGE,
-            %SNMP::Info::SONMP::MUNGE,
-         );
+
+    # Inherit all the built in munging
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
+);

 # Method OverRides

-sub bulkwalk_no { 1; }
-
 sub model {
    my $n1600 = shift;
-    my $id = $n1600->id();
-    
-    unless (defined $id){
-        print " SNMP::Info::Layer3::N1600::model() - Device does not support sysObjectID\n" if $n1600->debug(); 
-        return undef;
+    my $id    = $n1600->id();
+
+    unless ( defined $id ) {
+        print
+            " SNMP::Info::Layer3::N1600::model() - Device does not support sysObjectID\n"
+            if $n1600->debug();
+        return;
    }
-    
+
    my $model = &SNMP::translateObj($id);

    return $id unless defined $model;
@@ -98,23 +103,23 @@ sub os {
 sub os_ver {
    my $n1600 = shift;
    my $descr = $n1600->description();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    if ($descr =~ m/(\d+\.\d+\.\d+\.\d+)/){
+    if ( $descr =~ m/(\d+\.\d+\.\d+\.\d+)/ ) {
        return $1;
    }

-    return undef;
+    return;
 }

 sub interfaces {
-    my $n1600 = shift;
+    my $n1600   = shift;
    my $partial = shift;

    my $i_index = $n1600->i_index($partial) || {};
-    
+
    my %if;
-    foreach my $iid (keys %$i_index){
+    foreach my $iid ( keys %$i_index ) {
        my $index = $i_index->{$iid};
        next unless defined $index;

@@ -125,13 +130,13 @@ sub interfaces {
 }

 sub i_duplex {
-    my $n1600 = shift;
+    my $n1600   = shift;
    my $partial = shift;

    my $nway_status = $n1600->n1600_nway_status($partial) || {};
-    
+
    my %i_duplex;
-    foreach my $iid (keys %$nway_status){
+    foreach my $iid ( keys %$nway_status ) {
        my $duplex = $nway_status->{$iid};
        next unless defined $duplex;
        next if $duplex =~ /other/i;
@@ -142,13 +147,13 @@ sub i_duplex {
 }

 sub i_duplex_admin {
-    my $n1600 = shift;
+    my $n1600   = shift;
    my $partial = shift;

    my $nway_state = $n1600->n1600_nway_state($partial) || {};
-    
+
    my %i_duplex;
-    foreach my $iid (keys %$nway_state){
+    foreach my $iid ( keys %$nway_state ) {
        my $duplex = $nway_state->{$iid};
        next unless defined $duplex;
        next if $duplex =~ /other/i;
@@ -181,7 +186,6 @@ Eric Miller
 my $n1600 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
@@ -216,9 +220,9 @@ my $n1600 = new SNMP::Info::Layer3::N1600(...);

 =over

-=item SWL2MGMT-MIB
+=item F<SWL2MGMT-MIB>

-=item RAPID-CITY
+=item F<RAPID-CITY>

 =item Inherited Classes' MIBs

@@ -226,16 +230,6 @@ See classes listed above for their required MIBs.

 =back

-MIBs can be found on the CD that came with your product.
-
-Or, they can be downloaded directly from Nortel regardless of support
-contract status.
-
-Go to http://www.nortel.com Techninal Support, Browse Technical Support,
-Select by product, Java Device Manager, Software.  Download the latest version.
-After installation, all mibs are located under the install directory under mibs
-and the repspective product line.
-
 =head1 GLOBALS

 These are methods that return scalar value from SNMP
@@ -249,7 +243,7 @@ Return C<1>.  Bulkwalk is currently turned off for this class.
 =item $n1600->model()

 Returns model type.  Checks $n1600->id() against the 
-RAPID-CITY-MIB and then parses out rcA.
+F<RAPID-CITY-MIB> and then parses out C<rcA>.

 =item $n1600->vendor()

@@ -259,6 +253,10 @@ Returns 'nortel'

 Returns 'passport'

+=item $n1600->os_ver()
+
+Returns os version extracted from C<sysDescr>.
+
 =back

 =head2 Overrides
@@ -271,7 +269,7 @@ Required by SNMP::Info::SONMP.  Number representing the number of ports
 reserved per slot within the device MIB.

 Returns 64 since largest switch has 48 ports.  Since these switches can
-not stack, the only requirment to reserve more than the max number of ports.
+not stack, the only requirement to reserve more than the max number of ports.

 =back

@@ -296,7 +294,7 @@ to a hash.

 Returns reference to hash of interface names to iids.

-Places a 1 in front of index number.  This is required for compatibilty with
+Places a 1 in front of index number.  This is required for compatibility with
 SNMP::Info::SONMP.

 =item $n1600->i_duplex()
--- a/Info/Layer3/NetSNMP.pm
+++ b/Info/Layer3/NetSNMP.pm
@@ -1,61 +1,62 @@
 # SNMP::Info::Layer3::NetSNMP
-# Bradley Baetz and Bill Fenner
+# $Id$
 #
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 Bill Fenner
+# 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 
+#     * 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.

 package SNMP::Info::Layer3::NetSNMP;
-# $Id$

+use strict;
 use Exporter;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-$VERSION = '1.07';
-@SNMP::Info::Layer3::NetSNMP::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::NetSNMP::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::NetSNMP::EXPORT_OK = qw//;

+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
 %MIBS = (
-            %SNMP::Info::Layer3::MIBS,  
-            'UCD-SNMP-MIB' => 'versionTag',
-            'NET-SNMP-TC' => 'netSnmpAgentOIDs',
-            'HOST-RESOURCES-MIB' => 'hrSystem',
-        );
+    %SNMP::Info::Layer3::MIBS,
+    'UCD-SNMP-MIB'       => 'versionTag',
+    'NET-SNMP-TC'        => 'netSnmpAgentOIDs',
+    'HOST-RESOURCES-MIB' => 'hrSystem',
+);

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-            'netsnmp_vers' => 'versionTag',
-            'hrSystemUptime' => 'hrSystemUptime',
-           );
+    %SNMP::Info::Layer3::GLOBALS,
+    'netsnmp_vers'   => 'versionTag',
+    'hrSystemUptime' => 'hrSystemUptime',
+);

-%FUNCS = (
-            %SNMP::Info::Layer3::FUNCS,
-         );
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );

-%MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-         );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 sub vendor {
    return 'Net-SNMP';
@@ -63,19 +64,19 @@ sub vendor {

 sub os {
    my $netsnmp = shift;
-    my $descr = $netsnmp->description();
+    my $descr   = $netsnmp->description();

-    return $1 if ($descr =~ /^(\S+)\s+/);
-    return undef;
+    return $1 if ( $descr =~ /^(\S+)\s+/ );
+    return;
 }

 sub os_ver {
    my $netsnmp = shift;
-    my $descr = $netsnmp->description();
-    my $vers = $netsnmp->netsnmp_vers();
-    my $os_ver = undef;
+    my $descr   = $netsnmp->description();
+    my $vers    = $netsnmp->netsnmp_vers();
+    my $os_ver  = undef;

-    $os_ver = $1 if ($descr =~ /^\S+\s+\S+\s+(\S+)\s+/);
+    $os_ver = $1 if ( $descr =~ /^\S+\s+\S+\s+(\S+)\s+/ );
    if ($vers) {
        $os_ver = "???" unless defined($os_ver);
        $os_ver .= " / Net-SNMP " . $vers;
@@ -104,15 +105,16 @@ sub uptime {
 }

 sub i_ignore {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;
-    
+
    my $interfaces = $l3->interfaces($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$interfaces) {
+    foreach my $if ( keys %$interfaces ) {
+
        # lo0 etc
-        if ($interfaces->{$if} =~ /\blo\d*\b/i){
+        if ( $interfaces->{$if} =~ /\blo\d*\b/i ) {
            $i_ignore{$if}++;
        }
    }
@@ -136,7 +138,6 @@ Bradley Baetz and Bill Fenner
 my $netsnmp = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
@@ -162,11 +163,11 @@ Subclass for Generic Net-SNMP devices

 =over

-=item UCD-SNMP-MIB
+=item F<UCD-SNMP-MIB>

-=item NET-SNMP-TC
+=item F<NET-SNMP-TC>

-=item HOST-RESOURCES-MIB
+=item F<HOST-RESOURCES-MIB>

 =item Inherited Classes' MIBs

@@ -186,19 +187,23 @@ Returns 'Net-SNMP'.

 =item $netsnmp->os()

-Returns the OS extracted from sysDescr.
+Returns the OS extracted from C<sysDescr>.

 =item $netsnmp->os_ver()

-Returns the software version extracted from sysDescr, along
+Returns the software version extracted from C<sysDescr>, along
 with the Net-SNMP version.

 =item $netsnmp->uptime()

 Returns the system uptime instead of the agent uptime.
-NOTE: discontinuity timers and other TimeStamp-based objects
+NOTE: discontinuity timers and other Time Stamp based objects
 are based on agent uptime, so use orig_uptime().

+=item $netsnmp->serial()
+
+Returns ''.
+
 =back

 =head2 Globals imported from SNMP::Info::Layer3
@@ -210,6 +215,18 @@ See documentation in L<SNMP::Info::Layer3> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

+=head2 Overrides
+
+=over
+
+=item $netsnmp->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.
@@ -224,7 +241,7 @@ similar to

 where N is the object ID for your OS from the C<NET-SNMP-TC> MIB (or
 255 if not listed).  Some Net-SNMP installations default to an
-incorrect return value for system.sysObjectId.
+incorrect return value for C<system.sysObjectId>.

 In order to recognize a Net-SNMP device as Layer3, it may be necessary
 to put a configuration line similar to
--- a/Info/Layer3/Netscreen.pm
+++ b/Info/Layer3/Netscreen.pm
@@ -1,65 +1,62 @@
 # SNMP::Info::Layer3::Netscreen
-# Kent Hamilton
 # $Id$
 #
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 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 
+#     * 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.
+#
+# 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::Netscreen;
-$VERSION = '1.07';
-use strict;

+use strict;
 use Exporter;
 use SNMP::Info::Layer3;

-@SNMP::Info::Layer3::Netscreen::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Netscreen::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Netscreen::EXPORT_OK = qw//;

-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
- 
-%MIBS    = ( 
-	     %SNMP::Info::Layer3::MIBS,
-	     'NETSCREEN-SMI'             => 'netscreenSetting',
-             'NETSCREEN-PRODUCTS-MIB'    => 'netscreenGeneric',
-	     'NETSCREEN-INTERFACE-MIB'   => 'nsIfIndex',
-             'NETSCREEN-SET-GEN-MIB'     => 'nsSetGenSwVer',
-           );
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%GLOBALS = (
-             %SNMP::Info::Layer3::GLOBALS,
-	     'os_version'   =>  'nsSetGenSwVer',
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-             %SNMP::Info::Layer3::FUNCS,
-           );
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    'NETSCREEN-SMI'           => 'netscreenSetting',
+    'NETSCREEN-PRODUCTS-MIB'  => 'netscreenGeneric',
+    'NETSCREEN-INTERFACE-MIB' => 'nsIfIndex',
+    'NETSCREEN-SET-GEN-MIB'   => 'nsSetGenSwVer',
+);

-%MUNGE   = (
-             %SNMP::Info::Layer3::MUNGE,
-           );
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, 'os_version' => 'nsSetGenSwVer', );
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 sub layers {
-	return '01001100';
+    return '01001100';
 }

 sub vendor {
@@ -74,10 +71,10 @@ sub os_ver {
    my $netscreen = shift;

    my $descr = $netscreen->description();
-    if ( $descr =~ m/version (\d\S*) \(SN: /) {
-      return $1;
+    if ( $descr =~ m/version (\d\S*) \(SN: / ) {
+        return $1;
    }
-    return undef;
+    return;
 }

 sub serial {
@@ -87,12 +84,12 @@ sub serial {

    my $serial = $e_serial->{1} || undef;

-    return $1 if (defined $serial and $serial =~ /(\d+)/);
+    return $1 if ( defined $serial and $serial =~ /(\d+)/ );
    my $descr = $netscreen->description();
-    if ( $descr =~ m/version .*\(SN: (\d\S*),/) {
+    if ( $descr =~ m/version .*\(SN: (\d\S*),/ ) {
        return $1;
    }
-    return undef;
+    return;
 }

 1;
@@ -114,7 +111,6 @@ Kent Hamilton
    my $netscreen = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -145,13 +141,13 @@ my $netscreen = new SNMP::Info::Layer3::Netscreen(...);

 =over

-=item NETSCREEN-SMI
+=item F<NETSCREEN-SMI>

-=item NETSCREEN-PRODUCTS-MIB
+=item F<NETSCREEN-PRODUCTS-MIB>

-=item NETSCREEN-INTERFACE-MIB
+=item F<NETSCREEN-INTERFACE-MIB>

-=item NETSCREEN-SET-GEN-MIB
+=item F<NETSCREEN-SET-GEN-MIB>

 =item Inherited Classes

@@ -171,7 +167,7 @@ Returns 'netscreen'

 =item $netscreen->os()

-Returns 'screenos'
+Returns C<'screenos'>

 =item $netscreen->os_ver()

--- a/Info/Layer3/Passport.pm
+++ b/Info/Layer3/Passport.pm
--- a/Info/Layer3/Pf.pm
+++ b/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.04';
+
+%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
--- a/Info/Layer3/Sun.pm
+++ b/Info/Layer3/Sun.pm
@@ -1,97 +1,98 @@
 # SNMP::Info::Layer3::Sun
-# 
-# Redistribution and use in source and binary forms, with or without 
+# $Id$
+#
+# Copyright (c) 2008 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 
+#     * 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.
+#
+# 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::Sun;
-$VERSION = '1.07';

-# $Id$
 use strict;
-
 use Exporter;
 use SNMP::Info::Layer3;

-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
-@SNMP::Info::Layer3::Sun::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Sun::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Sun::EXPORT_OK = qw//;

-%MIBS = (
-            %SNMP::Info::Layer3::MIBS,  
-	);
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS, );

 %GLOBALS = (
-            %SNMP::Info::Layer3::GLOBALS,
-	    'sun_hostid' => '.1.3.6.1.4.1.42.3.1.2.0',
-	    'motd' => '.1.3.6.1.4.1.42.3.1.3.0',
-	   );
+    %SNMP::Info::Layer3::GLOBALS,
+    'sun_hostid' => '.1.3.6.1.4.1.42.3.1.2.0',
+    'motd'       => '.1.3.6.1.4.1.42.3.1.3.0',
+);

-%FUNCS = (
-            %SNMP::Info::Layer3::FUNCS,
-	 );
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );

-%MUNGE = (
-            %SNMP::Info::Layer3::MUNGE,
-	 );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );

 sub vendor {
-	return 'sun';
+    return 'sun';
 }

 sub os {
-	return 'sun';
+    return 'sun';
 }

 sub os_ver {
-    my $sun = shift;
+    my $sun   = shift;
    my $descr = $sun->motd();
-    return undef unless defined $descr;
+    return unless defined $descr;

-    if ($descr =~ m/SunOS (\S+)/) {
-	return $1;
+    if ( $descr =~ m/SunOS (\S+)/ ) {
+        return $1;
    }
-    return undef;
+    return;
 }

 sub model {
-     return 'Solaris Router'
+    return 'Solaris Router';
 }
+
 sub serial {
-     my $sun = shift;
-     my $serial = unpack("H*", $sun->sun_hostid());
-     return $serial; 
+    my $sun = shift;
+    my $serial = unpack( "H*", $sun->sun_hostid() );
+    return $serial;
 }

 sub i_ignore {
-    my $l3 = shift;
+    my $l3      = shift;
    my $partial = shift;

    my $interfaces = $l3->interfaces($partial) || {};

    my %i_ignore;
-    foreach my $if (keys %$interfaces) {
-        # lo0 
-        if ($interfaces->{$if} =~ /\blo0\b/i){
+    foreach my $if ( keys %$interfaces ) {
+
+        # lo0
+        if ( $interfaces->{$if} =~ /\blo0\b/i ) {
            $i_ignore{$if}++;
        }
    }
@@ -99,6 +100,7 @@ sub i_ignore {
 }

 1;
+
 __END__

 =head1 NAME
@@ -115,7 +117,6 @@ begemot
 my $sun = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'mysunrouter',
                          Community   => 'public',
                          Version     => 1
@@ -155,19 +156,23 @@ These are methods that return scalar value from SNMP

 =item $sun->vendor()

-    Returns 'sun'
+Returns 'sun'

 =item $sun->os()

-    Returns 'sun'
+Returns 'sun'

 =item $sun->os_ver()

-    Returns the software version extracted from motd.
+Returns the software version extracted from message of the day.

 =item $sun->model()

-    Returns 'Solaris Router'
+Returns 'Solaris Router'
+
+=item $sun->serial()
+
+Returns serial number

 =back

@@ -180,6 +185,18 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

+=head2 Overrides
+
+=over
+
+=item $sun->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/"TABLE METHODS"> for details.
--- a/Info/Layer3/Timetra.pm
+++ b/Info/Layer3/Timetra.pm
@@ -0,0 +1,194 @@
+# SNMP::Info::Layer3::Timetra
+# $Id$
+#
+# Copyright (c) 2008 Bill Fenner
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::Timetra;
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Timetra::ISA = qw/SNMP::Info::Layer3
+    Exporter/;
+@SNMP::Info::Layer3::Timetra::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.04';
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
+
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub model {
+    my $timetra = shift;
+    my $id      = $timetra->id();
+    my $model   = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^tmnxModel//;
+
+    return $model;
+}
+
+sub os {
+    return 'TiMOS';
+}
+
+sub vendor {
+    return 'alcatel-lucent';
+}
+
+sub os_ver {
+    my $timetra = shift;
+
+    my $descr = $timetra->description();
+    if ( $descr =~ m/^TiMOS-(\S+)/ ) {
+        return $1;
+    }
+
+    # No clue what this will try but hey
+    return $timetra->SUPER::os_ver();
+}
+
+# The interface description contains the SFP type, so
+# to avoid losing historical information through a configuration change
+# we use interface name instead.
+sub interfaces {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->orig_i_name($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Timetra - SNMP Interface to Alcatel-Lucent SR
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $alu = 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      = $alu->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Alcatel-Lucent Service Routers
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<TIMETRA-GLOBAL-MIB>
+
+=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
+
+=over
+
+=item $alu->vendor()
+
+Returns 'alcatel-lucent'
+
+=item $alu->os()
+
+Returns 'TiMOS'
+
+=item $alu->os_ver()
+
+Grabs the version string from C<sysDescr>.
+
+=item $alu->model()
+
+Tries to reference $alu->id() to one of the product MIBs listed above
+
+Removes 'tmnxModel' from the name for readability.
+
+=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.
+
+=over
+
+=item $alu->interfaces()
+
+Returns C<ifName>, since the default Layer3 C<ifDescr> varies based
+upon the transceiver inserted.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut
--- a/Info/MAU.pm
+++ b/Info/MAU.pm
@@ -1,132 +1,138 @@
 # SNMP::Info::MAU - Media Access Unit - RFC 2668
-# Max Baker
+# $Id$
 #
-# Copyright (c) 2004,2005 Max Baker changes from version 0.8 and beyond.
+# 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 
+#
+# 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 
+#     * 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.
+#
+# 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::MAU;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::MAU::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::MAU::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::MAU::EXPORT_OK = qw//;

-%MIBS = ('MAU-MIB' => 'mauMod');
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%GLOBALS = (
-           );
+$VERSION = '2.04';
+
+%MIBS = ( 'MAU-MIB' => 'mauMod' );
+
+%GLOBALS = ();

 %FUNCS = (
-          # Interface MAU Table
-          'mau_index'    => 'ifMauIfIndex',
-          'mau_link'     => 'ifMauType',
-          'mau_status'   => 'ifMauStatus',
-          'mau_up'       => 'ifMauMediaAvailable',
-          'mau_type'     => 'ifMauTypeList',
-          'mau_type_admin'     => 'ifMauDefaultType',
-          # Interface Auto-Negotiation Table
-          'mau_auto'     => 'ifMauAutoNegSupported',
-          'mau_autostat' => 'ifMauAutoNegAdminStatus',
-          'mau_autosent' => 'ifMauAutoNegCapAdvertised',
-          'mau_autorec'  => 'ifMauAutoNegCapReceived',
-          );
+
+    # Interface MAU Table
+    'mau_index'      => 'ifMauIfIndex',
+    'mau_link'       => 'ifMauType',
+    'mau_status'     => 'ifMauStatus',
+    'mau_up'         => 'ifMauMediaAvailable',
+    'mau_type'       => 'ifMauTypeList',
+    'mau_type_admin' => 'ifMauDefaultType',
+
+    # Interface Auto-Negotiation Table
+    'mau_auto'     => 'ifMauAutoNegSupported',
+    'mau_autostat' => 'ifMauAutoNegAdminStatus',
+    'mau_autosent' => 'ifMauAutoNegCapAdvertised',
+    'mau_autorec'  => 'ifMauAutoNegCapReceived',
+);

 %MUNGE = (
-          # Inherit all the built in munging
-          %SNMP::Info::MUNGE,
-          # Add ones for our class
-          'mau_type' => \&munge_int2bin,
-          'mau_autosent' => \&munge_int2bin,
-          'mau_autorec' => \&munge_int2bin,
-         );

+    # Inherit all the built in munging
+    %SNMP::Info::MUNGE,
+
+    # Add ones for our class
+    'mau_type'     => \&munge_int2bin,
+    'mau_autosent' => \&munge_int2bin,
+    'mau_autorec'  => \&munge_int2bin,
+);

 sub munge_int2bin {
    my $int = shift;
-    return undef unless defined $int;
-    return unpack("B32", pack("N", $int));
+    return unless defined $int;
+    return unpack( "B32", pack( "N", $int ) );
 }

-sub _isfullduplex{
-    my $mau = shift;
+sub _isfullduplex {
+    my $mau     = shift;
    my $mautype = shift;

    my @full_types = qw/11 13 16 18 20/;
-    foreach my $type ( @full_types ) {
-        return 1 if (substr($mautype,32-$type,1) eq '1')
+    foreach my $type (@full_types) {
+        return 1 if ( substr( $mautype, 32 - $type, 1 ) eq '1' );
    }
    return 0;
 }

-sub _ishalfduplex{
-    my $mau = shift;
+sub _ishalfduplex {
+    my $mau     = shift;
    my $mautype = shift;

    my @half_types = qw/10 12 15 17 19/;
-    foreach my $type ( @half_types ) {
-        return 1 if (substr($mautype,32-$type,1) eq '1')
+    foreach my $type (@half_types) {
+        return 1 if ( substr( $mautype, 32 - $type, 1 ) eq '1' );
    }
    return 0;
 }

 my %_mau_i_speed_map = (
- '10' => '10 Mbps',
- '100' => '100 Mbps',
- '1000' => '1.0 Gbps',
- '10Gig' => '10 Gbps',
+    '10'    => '10 Mbps',
+    '100'   => '100 Mbps',
+    '1000'  => '1.0 Gbps',
+    '10Gig' => '10 Gbps',
 );

 sub mau_i_speed_admin {
    my $mau = shift;

-    my $mau_index = $mau->mau_index();
+    my $mau_index      = $mau->mau_index();
    my $mau_type_admin = $mau->mau_type_admin();

    my %i_speed_admin;
-    foreach my $mau_port (keys %$mau_type_admin){
+    foreach my $mau_port ( keys %$mau_type_admin ) {
        my $iid = $mau_index->{$mau_port};
        next unless defined $iid;

        my $type_adminoid = $mau_type_admin->{$mau_port};
-        my $type_admin = &SNMP::translateObj($type_adminoid);
+        my $type_admin    = &SNMP::translateObj($type_adminoid);
        next unless defined $type_admin;

-	if ($type_adminoid eq '.0.0') {
-		$i_speed_admin{$iid} = 'auto';
-	} elsif ($type_admin =~ /^dot3MauType(.*)Base/ && $_mau_i_speed_map{$1}) {
-		$i_speed_admin{$iid} = $_mau_i_speed_map{$1};
-	}
+        if ( $type_adminoid eq '.0.0' ) {
+            $i_speed_admin{$iid} = 'auto';
+        }
+        elsif ($type_admin =~ /^dot3MauType(.*)Base/
+            && $_mau_i_speed_map{$1} )
+        {
+            $i_speed_admin{$iid} = $_mau_i_speed_map{$1};
+        }
    }
    return \%i_speed_admin;
 }
@@ -135,22 +141,23 @@ sub mau_i_duplex {
    my $mau = shift;

    my $mau_index = $mau->mau_index();
-    my $mau_link = $mau->mau_link();
+    my $mau_link  = $mau->mau_link();

    my %i_duplex;
-    foreach my $mau_port (keys %$mau_link){
+    foreach my $mau_port ( keys %$mau_link ) {
        my $iid = $mau_index->{$mau_port};
        next unless defined $iid;

        my $linkoid = $mau_link->{$mau_port};
-        my $link = &SNMP::translateObj($linkoid);
+        my $link    = &SNMP::translateObj($linkoid);
        next unless defined $link;

        my $duplex = undef;

-        if ($link =~ /fd$/i) {
+        if ( $link =~ /fd$/i ) {
            $duplex = 'full';
-        } elsif ($link =~ /hd$/i){
+        }
+        elsif ( $link =~ /hd$/i ) {
            $duplex = 'half';
        }

@@ -160,46 +167,54 @@ sub mau_i_duplex {
 }

 sub mau_i_duplex_admin {
-    my $mau = shift;
+    my $mau     = shift;
    my $partial = shift;

-    my $mau_index = $mau->mau_index();
-    my %rev_mau_index = reverse %$mau_index;
-    my $mau_autostat = defined $partial ? $mau->mau_autostat($rev_mau_index{$partial}) : $mau->mau_autostat();
-    my $mau_type_admin = defined $partial ? $mau->mau_type_admin($rev_mau_index{$partial}) : $mau->mau_type_admin();
+    my $mau_index = $mau->mau_index() || {};
+
+    if ($partial) {
+        my %rev_mau_index = reverse %$mau_index;
+        $partial = $rev_mau_index{$partial};
+    }
+
+    my $mau_autostat   = $mau->mau_autostat($partial)   || {};
+    my $mau_type_admin = $mau->mau_type_admin($partial) || {};

    # Older HP4000's don't implement ifMauDefaultType, but we can
    # figure out from ifMauAutoNegCapAdvertised what we'd like.
-    if (!defined($mau_type_admin)) {
-        if (defined($mau_index)) {
-            return mau_i_duplex_admin_old($mau,$mau_index,$mau_autostat);
-        } else {
-            return undef;
+    if ( !defined($mau_type_admin) ) {
+        if ( defined($mau_index) ) {
+            return mau_i_duplex_admin_old( $mau, $mau_index, $mau_autostat );
+        }
+        else {
+            return;
        }
    }

    my %i_duplex_admin;
-    foreach my $mau_port (keys %$mau_type_admin){
+    foreach my $mau_port ( keys %$mau_type_admin ) {
        my $iid = $mau_index->{$mau_port};
        next unless defined $iid;

        my $autostat = $mau_autostat->{$mau_port};
-        if (defined $autostat and $autostat =~ /enabled/i){
+        if ( defined $autostat and $autostat =~ /enabled/i ) {
            $i_duplex_admin{$iid} = 'auto';
            next;
-        } 
+        }

        my $type_adminoid = $mau_type_admin->{$mau_port};
-        my $type_admin = &SNMP::translateObj($type_adminoid);
+        my $type_admin    = &SNMP::translateObj($type_adminoid);
        next unless defined $type_admin;

        my $duplex = undef;

-        if ($type_admin =~ /fd$/i) {
+        if ( $type_admin =~ /fd$/i ) {
            $duplex = 'full';
-        } elsif ($type_admin =~ /hd$/i){
+        }
+        elsif ( $type_admin =~ /hd$/i ) {
            $duplex = 'half';
-        } elsif ($type_admin eq 'zeroDotZero') {
+        }
+        elsif ( $type_admin eq 'zeroDotZero' ) {
            $duplex = 'auto';
        }

@@ -209,8 +224,8 @@ sub mau_i_duplex_admin {
 }

 sub mau_i_duplex_admin_old {
-    my $mau = shift;
-    my $mau_index = shift;
+    my $mau          = shift;
+    my $mau_index    = shift;
    my $mau_autostat = shift;

    my $interfaces   = $mau->interfaces();
@@ -219,23 +234,23 @@ sub mau_i_duplex_admin_old {
    my %mau_reverse = reverse %$mau_index;

    my %i_duplex_admin;
-    foreach my $iid (keys %$interfaces){
+    foreach my $iid ( keys %$interfaces ) {
        my $mau_index = $mau_reverse{$iid};
        next unless defined $mau_index;

        my $autostat = $mau_autostat->{$mau_index};
-        
+
        # HP25xx has this value
-        if (defined $autostat and $autostat =~ /enabled/i){
+        if ( defined $autostat and $autostat =~ /enabled/i ) {
            $i_duplex_admin{$iid} = 'auto';
            next;
-        } 
-        
+        }
+
        my $type = $mau_autosent->{$mau_index};
-    
+
        next unless defined $type;

-        if ($type == 0) {
+        if ( $type == 0 ) {
            $i_duplex_admin{$iid} = 'none';
            next;
        }
@@ -243,13 +258,14 @@ sub mau_i_duplex_admin_old {
        my $full = $mau->_isfullduplex($type);
        my $half = $mau->_ishalfduplex($type);

-        if ($full and !$half){
+        if ( $full and !$half ) {
            $i_duplex_admin{$iid} = 'full';
-        } elsif ($half) {
+        }
+        elsif ($half) {
            $i_duplex_admin{$iid} = 'half';
-        } 
-    } 
-    
+        }
+    }
+
    return \%i_duplex_admin;
 }

@@ -281,15 +297,15 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info::MAU is a sublcass of SNMP::Info that supplies access to the
-MAU-MIB (RFC 2668). This MIB is sometimes implemented on Layer 2 network
+SNMP::Info::MAU is a subclass of SNMP::Info that supplies access to the
+F<MAU-MIB> (RFC 2668). This MIB is sometimes implemented on Layer 2 network
 devices like HP Switches.  MAU = Media Access Unit.

 The MAU table contains link and duplex info for the port itself and the device
 connected to that port.

-Normally you use or create a subclass of SNMP::Info that inherits this one.  Do
-not use directly.
+Normally you use or create a subclass of SNMP::Info that inherits this one.
+Do not use directly.

 For debugging purposes call the class directly as you would SNMP::Info

@@ -303,7 +319,7 @@ None.

 =over

-=item MAU-MIB
+=item F<MAU-MIB>

 =back

@@ -345,6 +361,10 @@ order to find the admin duplex setting for all the interfaces.

 Returns either (auto,none,full,half).

+=item $mau->mau_i_speed_admin()
+
+Returns admin speed setting for all the interfaces.
+
 =back

 =head2 MAU INTERFACE TABLE METHODS
@@ -354,14 +374,14 @@ Returns either (auto,none,full,half).
 =item $mau->mau_index() -  Returns a list of interfaces
 and their index in the MAU IF Table.

-(B<ifMauIfIndex>)
+(C<ifMauIfIndex>)

 =item $mau->mau_link() - Returns the type of Media Access used.  

    This is essentially the type of link in use.  
    eg. dot3MauType100BaseTXFD - 100BaseT at Full Duplex

-(B<ifMauType>)
+(C<ifMauType>)

 =item $mau->mau_status() - Returns the admin link condition as 

@@ -374,16 +394,16 @@ and their index in the MAU IF Table.

 Use 5 and !5 to see if the link is up or down on the admin side.

-(B<ifMauStatus>)
+(C<ifMauStatus>)

 =item $mau->mau_up() -  Returns the current link condition

- (B<ifMauMediaAvailable>)
+ (C<ifMauMediaAvailable>)

 =item $mau->mau_type() - Returns a 32bit string reporting the capabilities
 of the port from a MAU POV. 

-  Directly from the MAU-MIB : 
+  Directly from F<MAU-MIB> : 
          Bit   Capability
            0      other or unknown
            1      AUI
@@ -407,7 +427,7 @@ of the port from a MAU POV.
           19      100BASE-T2 half duplex mode
           20      100BASE-T2 full duplex mode

-(B<ifMauTypeList>)
+(C<ifMauTypeList>)

 =item $mau->mau_type_admin()

@@ -415,7 +435,7 @@ of the port from a MAU POV.

 =item $mau->mau_auto() - Returns status of auto-negotiation mode for ports.

-(B<ifMauAutoNegAdminStatus>)
+(C<ifMauAutoNegAdminStatus>)

 =item $mau->mau_autostat()

@@ -426,15 +446,14 @@ capabilities we are broadcasting on that port

    Uses the same decoder as $mau->mau_type().

-(B<ifMauAutoNegCapAdvertised>)
-
+(C<ifMauAutoNegCapAdvertised>)

 =item $mau->mau_autorec() - Returns a 32 bit bit-string representing the 
 capabilities of the device on the other end. 

    Uses the same decoder as $mau->mau_type().

-(B<ifMauAutoNegCapReceived>)
+(C<ifMauAutoNegCapReceived>)

 =back

@@ -446,13 +465,13 @@ capabilities of the device on the other end.

 =item $mau->_isfullduplex(bitstring)

-    Boolean. Checks to see if any of the full_duplex types from mau_type() are
-    high.  Currently bits 11,13,16,18,20.
+    Boolean. Checks to see if any of the full_duplex types from mau_type()
+    are     high.  Currently bits 11,13,16,18,20.

 =item $mau->_ishalfduplex(bitstring)
    
-    Boolean.  Checks to see if any of the half_duplex types from mau_type() are
-    high.  Currently bits 10,12,15,17,19.
+    Boolean.  Checks to see if any of the half_duplex types from mau_type()
+    are high.  Currently bits 10,12,15,17,19.

 =back

--- a/Info/NortelStack.pm
+++ b/Info/NortelStack.pm
--- a/Info/PowerEthernet.pm
+++ b/Info/PowerEthernet.pm
@@ -1,63 +1,65 @@
 # SNMP::Info::PowerEthernet
-# Bill Fenner
+# $Id$
 #
-# Copyright (c) 2007 Bill Fenner
-# 
-# Redistribution and use in source and binary forms, with or without 
+# Copyright (c) 2008 Bill Fenner
+# 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 
+#     * 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.
+#
+# 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::PowerEthernet;
-$VERSION = '1.07';
-# $Id$

 use strict;
-
 use Exporter;
 use SNMP::Info;

-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
-@SNMP::Info::PowerEthernet::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::PowerEthernet::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::PowerEthernet::EXPORT_OK = qw//;

-%MIBS    = ('POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus');
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-%GLOBALS = (
-           );
+$VERSION = '2.04';

-%FUNCS   = (
-	    # parts of pethPsePortTable
-	    'peth_port_admin'    => 'pethPsePortAdminEnable',
-	    'peth_port_status'   => 'pethPsePortDetectionStatus',
-	    'peth_port_class'    => 'pethPsePortPowerClassifications',
-	    # pethMainPseTable
-	    'peth_power_watts'       => 'pethMainPsePower',
-	    'peth_power_status'      => 'pethMainPseOperStatus',
-	    'peth_power_consumption' => 'pethMainPseConsumptionPower',
-	    'peth_power_threshold'   => 'pethMainPseUsageThreshold',
-           );
+%MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' );

-%MUNGE   = (
-           );
+%GLOBALS = ();
+
+%FUNCS = (
+
+    # parts of pethPsePortTable
+    'peth_port_admin'  => 'pethPsePortAdminEnable',
+    'peth_port_status' => 'pethPsePortDetectionStatus',
+    'peth_port_class'  => 'pethPsePortPowerClassifications',
+
+    # pethMainPseTable
+    'peth_power_watts'       => 'pethMainPsePower',
+    'peth_power_status'      => 'pethMainPseOperStatus',
+    'peth_power_consumption' => 'pethMainPseConsumptionPower',
+    'peth_power_threshold'   => 'pethMainPseUsageThreshold',
+);
+
+%MUNGE = ();

 # POWER-ETHERNET-MIB doesn't define a mapping of its
 # "module"/"port" index to ifIndex.  Different vendors
@@ -67,30 +69,56 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 # If there is a module != 1, this heuristic doesn't work
 # so returns undef.
 sub peth_port_ifindex {
-    my $peth = shift;
+    my $peth    = shift;
    my $partial = shift;

    my $peth_port_status = $peth->peth_port_status($partial);
    my $peth_port_ifindex;

-    foreach my $i (keys %$peth_port_status) {
-	my ($module, $port) = split(/\./, $i);
-	if ($module != 1) {
-	    # This heuristic won't work, so say that we got nothing.
-	    # If you have this case, you have to write a device-specific
-	    # version of this function.
-	    return undef;
-	}
-	$peth_port_ifindex->{$i} = $port;
+    foreach my $i ( keys %$peth_port_status ) {
+        my ( $module, $port ) = split( /\./, $i );
+        if ( $module != 1 ) {
+
+            # This heuristic won't work, so say that we got nothing.
+            # If you have this case, you have to write a device-specific
+            # version of this function.
+            return;
+        }
+        $peth_port_ifindex->{$i} = $port;
    }
    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__
+
 =head1 NAME

-SNMP::Info::PowerEthernet - SNMP Interface to data stored in POWER-ETHERNET-MIB.
+SNMP::Info::PowerEthernet - SNMP Interface to data stored in
+F<POWER-ETHERNET-MIB>.

 =head1 AUTHOR

@@ -102,7 +130,6 @@ Bill Fenner
 my $poe = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
@@ -114,11 +141,12 @@ Bill Fenner

 =head1 DESCRIPTION

-POWER-ETHERNET-MIB is used to describe PoE (IEEE 802.3af)
+F<POWER-ETHERNET-MIB> is used to describe PoE (IEEE 802.3af)

 Create or use a device subclass that inherit this class.  Do not use directly.

-For debugging purposes you can call this class directly as you would SNMP::Info
+For debugging purposes you can call this class directly as you would
+SNMP::Info

 my $poe = new SNMP::Info::PowerEthernet (...);

@@ -130,7 +158,7 @@ none.

 =over

-=item POWER-ETHERNET-MIB
+=item F<POWER-ETHERNET-MIB>

 =back

@@ -163,15 +191,15 @@ C<pethPsePortDetectionStatus>

 =item $poe->peth_port_class()

-Device class: if status is deliveringPower, this represents the 802.3af
+Device class: if status is delivering power, this represents the 802.3af
 class of the device being powered.

 C<pethPsePortPowerClassifications>

 =item $poe->peth_port_ifindex()

-A mapping function from the pethPsePortTable INDEX of
-module.port to an ifIndex.  The default mapping ignores the
+A mapping function from the C<pethPsePortTable> INDEX of
+module.port to an C<ifIndex>.  The default mapping ignores the
 module (returning undef if there are any module values greater
 than 1) and returns the port number, assuming that there is a
 1:1 mapping.
@@ -181,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
@@ -202,7 +238,7 @@ C<pethMainPseOperStatus>
 =item $poe->peth_power_consumption()

 How much power, in watts, this power supply has been committed to
-deliver.  (Note: certain devices seem to supply this value in milliwats,
+deliver.  (Note: certain devices seem to supply this value in milliwatts,
 so be cautious interpreting it.)

 C<pethMainPseConsumptionPower>
--- a/Info/RapidCity.pm
+++ b/Info/RapidCity.pm
--- a/Info/SONMP.pm
+++ b/Info/SONMP.pm
@@ -1,69 +1,69 @@
 # SNMP::Info::SONMP
-# Eric Miller
 # $Id$
 #
-# Copyright (c) 2004 Eric Miller, Max Baker
+# Copyright (c) 2008 Eric Miller
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without 
+# 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 
+#     * 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.
+#
+# 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::SONMP;
-$VERSION = '1.07';

 use strict;
-
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::SONMP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::SONMP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::SONMP::EXPORT_OK = qw//;

-use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-%MIBS    = (
-            'SYNOPTICS-ROOT-MIB' => 'synoptics',
-            'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop',
-            );
+$VERSION = '2.04';
+
+%MIBS = (
+    'SYNOPTICS-ROOT-MIB'           => 'synoptics',
+    'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop',
+);

 %GLOBALS = (
-            'cdp_id'  => 's5EnMsTopIpAddr',
-            'cdp_run' => 's5EnMsTopStatus',
-            );
+    'cdp_id'  => 's5EnMsTopIpAddr',
+    'cdp_run' => 's5EnMsTopStatus',
+);

-%FUNCS  = (
-            # From S5-ETH-MULTISEG-TOPOLOGY-MIB::TopNmmTable
-            'sonmp_topo_slot'     => 's5EnMsTopNmmSlot',
-            'sonmp_topo_port'     => 's5EnMsTopNmmPort',
-            'sonmp_topo_ip'       => 's5EnMsTopNmmIpAddr',
-            'sonmp_topo_seg'      => 's5EnMsTopNmmSegId',
-            'sonmp_topo_mac'      => 's5EnMsTopNmmMacAddr',
-            'sonmp_topo_platform' => 's5EnMsTopNmmChassisType',
-            'sonmp_topo_localseg' => 's5EnMsTopNmmLocalSeg',
-          );
+%FUNCS = (

-%MUNGE = (
-         'sonmp_topo_mac'           => \&SNMP::Info::munge_mac
-         );
+    # From S5-ETH-MULTISEG-TOPOLOGY-MIB::TopNmmTable
+    'sonmp_topo_slot'     => 's5EnMsTopNmmSlot',
+    'sonmp_topo_port'     => 's5EnMsTopNmmPort',
+    'sonmp_topo_ip'       => 's5EnMsTopNmmIpAddr',
+    'sonmp_topo_seg'      => 's5EnMsTopNmmSegId',
+    'sonmp_topo_mac'      => 's5EnMsTopNmmMacAddr',
+    'sonmp_topo_platform' => 's5EnMsTopNmmChassisType',
+    'sonmp_topo_localseg' => 's5EnMsTopNmmLocalSeg',
+);
+
+%MUNGE = ( 'sonmp_topo_mac' => \&SNMP::Info::munge_mac );

 sub index_factor {
    return 32;
@@ -83,56 +83,59 @@ sub hasCDP {
 }

 sub c_if {
-    my $sonmp = shift;
+    my $sonmp   = shift;
    my $partial = shift;

    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
    my $sonmp_topo_slot = $sonmp->sonmp_topo_slot($partial) || {};
-    my $index_factor = $sonmp->index_factor();
-    my $slot_offset = $sonmp->slot_offset();
-    my $port_offset = $sonmp->port_offset();
-    my $model = $sonmp->model();
+    my $index_factor    = $sonmp->index_factor();
+    my $slot_offset     = $sonmp->slot_offset();
+    my $port_offset     = $sonmp->port_offset();
+    my $model           = $sonmp->model();

    my %c_if;
-    foreach my $entry (keys %$sonmp_topo_port){
+    foreach my $entry ( keys %$sonmp_topo_port ) {
        my $port = $sonmp_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;
        my $slot = $sonmp_topo_slot->{$entry} || 0;

-        if ($model eq 'Baystack Hub') {
-        my $comidx = $slot;
-            if (! ($comidx % 5)) {
-               $slot = ($slot / 5);
-            } elsif ($comidx =~ /[16]$/) {
-               $slot = int($slot/5);
-               $port = 25;          
-            } elsif ($comidx =~ /[27]$/) {
-               $slot = int($slot/5);
-               $port = 26;          
+        if ( $model eq 'Baystack Hub' ) {
+            my $comidx = $slot;
+            if ( !( $comidx % 5 ) ) {
+                $slot = ( $slot / 5 );
+            }
+            elsif ( $comidx =~ /[16]$/ ) {
+                $slot = int( $slot / 5 );
+                $port = 25;
+            }
+            elsif ( $comidx =~ /[27]$/ ) {
+                $slot = int( $slot / 5 );
+                $port = 26;
            }
        }

-        my $index = (($slot-$slot_offset)*$index_factor) + ($port-$port_offset);
-        
+        my $index = ( ( $slot - $slot_offset ) * $index_factor )
+            + ( $port - $port_offset );
+
        $c_if{$entry} = $index;
    }
    return \%c_if;
 }

 sub c_ip {
-    my $sonmp = shift;
+    my $sonmp   = shift;
    my $partial = shift;

    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
-    my $sonmp_topo_ip   = $sonmp->sonmp_topo_ip($partial) || {};
+    my $sonmp_topo_ip   = $sonmp->sonmp_topo_ip($partial)   || {};

    my %c_ip;
-    foreach my $entry (keys %$sonmp_topo_ip){
+    foreach my $entry ( keys %$sonmp_topo_ip ) {
        my $port = $sonmp_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;
-        
+
        my $ip = $sonmp_topo_ip->{$entry};
        $c_ip{$entry} = $ip;
    }
@@ -140,54 +143,57 @@ sub c_ip {
 }

 sub c_port {
-    my $sonmp = shift;
+    my $sonmp   = shift;
    my $partial = shift;

-    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
-    my $sonmp_topo_seg = $sonmp->sonmp_topo_seg($partial) || {};
+    my $sonmp_topo_port     = $sonmp->sonmp_topo_port($partial)     || {};
+    my $sonmp_topo_seg      = $sonmp->sonmp_topo_seg($partial)      || {};
    my $sonmp_topo_platform = $sonmp->sonmp_topo_platform($partial) || {};

    my %c_port;
-    foreach my $entry (keys %$sonmp_topo_seg){
+    foreach my $entry ( keys %$sonmp_topo_seg ) {
        my $port = $sonmp_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;

-        my $seg  = $sonmp_topo_seg->{$entry};
+        my $seg      = $sonmp_topo_seg->{$entry};
        my $platform = $sonmp_topo_platform->{$entry};
+
        # AP-222x Series does not adhere to port numbering
-        if ($platform =~ /AccessPoint/i) {
+        if ( $platform =~ /AccessPoint/i ) {
            $c_port{$entry} = 'dp0';
        }
-        # BayHubs send the lower three bytes of the MAC not the slot/port        
-        elsif ($seg > 4000) {
+
+        # BayHubs send the lower three bytes of the MAC not the slot/port
+        elsif ( $seg > 4000 ) {
            $c_port{$entry} = 'unknown';
        }
        else {
+
            # Segment id is (256 * remote slot_num) + (remote_port)
            my $remote_port = $seg % 256;
-            my $remote_slot = int($seg / 256);
-    
-           $c_port{$entry} = "$remote_slot.$remote_port";
+            my $remote_slot = int( $seg / 256 );
+
+            $c_port{$entry} = "$remote_slot.$remote_port";
        }
    }
    return \%c_port;
 }

 sub c_platform {
-    my $sonmp = shift;
+    my $sonmp   = shift;
    my $partial = shift;

-    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
+    my $sonmp_topo_port     = $sonmp->sonmp_topo_port($partial)     || {};
    my $sonmp_topo_platform = $sonmp->sonmp_topo_platform($partial) || {};

    my %c_platform;
-    foreach my $entry (keys %$sonmp_topo_platform){
+    foreach my $entry ( keys %$sonmp_topo_platform ) {
        my $port = $sonmp_topo_port->{$entry};
        next unless defined $port;
        next if $port == 0;

-        my $platform  = $sonmp_topo_platform->{$entry};
+        my $platform = $sonmp_topo_platform->{$entry};

        $c_platform{$entry} = $platform;
    }
@@ -198,16 +204,17 @@ sub mac {
    my $sonmp = shift;

    my $sonmp_topo_port = $sonmp->sonmp_topo_port();
-    my $sonmp_topo_mac = $sonmp->sonmp_topo_mac();
-    
-    foreach my $entry (keys %$sonmp_topo_port){
+    my $sonmp_topo_mac  = $sonmp->sonmp_topo_mac();
+
+    foreach my $entry ( keys %$sonmp_topo_port ) {
        my $port = $sonmp_topo_port->{$entry};
        next unless $port == 0;
        my $mac = $sonmp_topo_mac->{$entry};
        return $mac;
    }
+
    # Topology turned off, not supported.
-    return undef;
+    return;
 }

 1;
@@ -215,7 +222,8 @@ __END__

 =head1 NAME

-SNMP::Info::SONMP - SNMP Interface to SynOptics Network Management Protocol (SONMP)
+SNMP::Info::SONMP - SNMP Interface to SynOptics Network Management Protocol
+(SONMP)

 =head1 AUTHOR

@@ -257,11 +265,13 @@ interface to the SynOptics Network Management Protocol (SONMP) information
 through SNMP.

 SONMP is a Layer 2 protocol that supplies topology information of devices that
-also speak SONMP, mostly switches and hubs.  SONMP is implemented in SynOptics,
-Bay, and Nortel devices.  SONMP has been rebranded by Bay then Nortel and is
-know by several different names, most recently Nortel Discovery Protocol (NDP).
+also speak SONMP, mostly switches and hubs.  SONMP is implemented in
+SynOptics, Bay, and Nortel devices.  SONMP has been rebranded by Bay then
+Nortel and is know by several different names, most recently Nortel
+Discovery Protocol (NDP).

-Create or use a device subclass that inherits this class.  Do not use directly.
+Create or use a device subclass that inherits this class.  Do not use
+directly.

 Each device implements a subset of the global and cache entries. 
 Check the return value to see if that data is held by the device.
@@ -274,9 +284,9 @@ None.

 =over

-=item SYNOPTICS-ROOT-MIB
+=item F<SYNOPTICS-ROOT-MIB>

-=item S5-ETH-MULTISEG-TOPOLOGY-MIB
+=item F<S5-ETH-MULTISEG-TOPOLOGY-MIB>

 =back

@@ -307,13 +317,13 @@ Is SONMP is active in this device?

 Returns the IP that the device is sending out for its Nmm topology info.

-(B<s5EnMsTopIpAddr>)
+(C<s5EnMsTopIpAddr>)

 =item $sonmp->cdp_run()

 Returns true if SONMP is on for this device. 

-(B<s5EnMsTopStatus>)
+(C<s5EnMsTopStatus>)

 =item $sonmp->mac()

@@ -326,7 +336,7 @@ Returns MAC of the advertised IP address of the device.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 Layer2 Topology info (B<s5EnMsTopNmmTable>)
+=head2 Layer2 Topology info (C<s5EnMsTopNmmTable>)

 =over

@@ -334,29 +344,30 @@ to a hash.

 Returns reference to hash.  Key: Table entry, Value:slot number

-(B<s5EnMsTopNmmSlot>)
+(C<s5EnMsTopNmmSlot>)

 =item $sonmp->sonmp_topo_port()

-Returns reference to hash.  Key: Table entry, Value:Port Number (interface iid)
+Returns reference to hash.  Key: Table entry, Value:Port Number
+(interface iid)

-(B<s5EnMsTopNmmPort>)
+(C<s5EnMsTopNmmPort>)

 =item $sonmp->sonmp_topo_ip()

 Returns reference to hash.  Key: Table entry, Value:Remote IP address of entry

-(B<s5EnMsTopNmmIpAddr>)
+(C<s5EnMsTopNmmIpAddr>)

 =item $sonmp->sonmp_topo_seg()

 Returns reference to hash.  Key: Table entry, Value:Remote Segment ID

-(B<s5EnMsTopNmmSegId>)
+(C<s5EnMsTopNmmSegId>)

 =item $sonmp->sonmp_topo_mac()

-(B<s5EnMsTopNmmMacAddr>)
+(C<s5EnMsTopNmmMacAddr>)

 Returns reference to hash.  Key: Table entry, Value:Remote MAC address

@@ -364,18 +375,18 @@ Returns reference to hash.  Key: Table entry, Value:Remote MAC address

 Returns reference to hash.  Key: Table entry, Value:Remote Device Type

-(B<s5EnMsTopNmmChassisType>)
+(C<s5EnMsTopNmmChassisType>)

 =item $sonmp->sonmp_topo_localseg

-Returns reference to hash.  Key: Table entry, Value: Boolean, if bay_topo_seg()
-is local.
+Returns reference to hash.  Key: Table entry, Value: Boolean, if
+bay_topo_seg() is local.

-(B<s5EnMsTopNmmLocalSeg>)
+(C<s5EnMsTopNmmLocalSeg>)

 =back

-=head2 Psuedo CDP information
+=head2 Pseudo CDP information

 All entries with port=0 are local and ignored.

@@ -389,8 +400,8 @@ Returns reference to hash.  Key: IID, Value: Local port (interfaces)

 Returns reference to hash.  Key: IID, Value: Remote IP address

-If multiple entries exist with the same local port, c_if(), with different IPv4
-addresses, c_ip(), there is either a non-SONMP device in between two or
+If multiple entries exist with the same local port, c_if(), with different
+IPv4 addresses, c_ip(), there is either a non SONMP 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.
--- a/16
+++ b/16
@@ -1,5 +1,6 @@
 ChangeLog
 COPYRIGHT
+DEVELOP
 DeviceMatrix.txt
 Info.pm
 Info/Airespace.pm
@@ -13,11 +14,13 @@ Info/CiscoQOS.pm
 Info/CiscoRTT.pm
 Info/CiscoStack.pm
 Info/CiscoStats.pm
+Info/CiscoStpExtensions.pm
 Info/CiscoVTP.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
@@ -38,6 +41,7 @@ Info/Layer2/Centillion.pm
 Info/Layer2/Cisco.pm
 Info/Layer2/Foundry.pm
 Info/Layer2/HP.pm
+Info/Layer2/HP4000.pm
 Info/Layer2/N2270.pm
 Info/Layer2/NAP222x.pm
 Info/Layer2/Netgear.pm
@@ -45,24 +49,31 @@ Info/Layer2/Orinoco.pm
 Info/Layer2/ZyXEL_DSLAM.pm
 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/BayRS.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/Foundry.pm
+Info/Layer3/HP9300.pm
 Info/Layer3/Juniper.pm
 Info/Layer3/Microsoft.pm
 Info/Layer3/N1600.pm
 Info/Layer3/Netscreen.pm
 Info/Layer3/NetSNMP.pm
 Info/Layer3/Passport.pm
+Info/Layer3/Pf.pm
 Info/Layer3/Sun.pm
+Info/Layer3/Timetra.pm
 Info/LLDP.pm
 Info/MAU.pm
 Info/NortelStack.pm
@@ -72,7 +83,12 @@ Info/SONMP.pm
 Makefile.PL
 MANIFEST			This list of files
 README
+t/00-load.t
 t/docmunge
 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
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -0,0 +1,24 @@
+# Version control files and dirs.
+\bRCS\b
+\bCVS\b
+,v$
+\B\.svn\b
+
+# Makemaker generated files and dirs.
+^MANIFEST\.
+^Makefile$
+^blib/
+^MakeMaker-\d
+
+# Temp, old and emacs backup files.
+~$
+\.old$
+^#.*#$
+^\.#
+
+# Private Regression Tests
+\d+_local_
+\.?perl\w+\.?rc$
+
+# Komodo project file
+\.kpf$
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,26 +1,39 @@
-# SNMP::Info -  Makefile.PL
+# Module makefile for SNMP::Info (using ExtUtils::MakeMaker)
 # $Id$

-use ExtUtils::MakeMaker;
-WriteMakefile(
-    'NAME'               => 'SNMP::Info',
-    'VERSION_FROM'       => 'Info.pm',
-    'PREREQ_PM'          => {
-                                'Math::BigInt' => 0
-                                # SNMP not available on CPAN . 
-                                # Install with net-snmp.sourceforge.net
-                                # 'SNMP' => '4'
-                            },
-    ($] >= 5.005 ?    
-          (ABSTRACT_FROM => 'Info.pm', 
-           AUTHOR        => 'Max Baker <max@warped.org>')
-                 : () 
-    ),
-    'PMLIBDIRS'          => ['Info','$(BASEEXT)'],
-             );
+require 5.006;

-sub MY::postamble { "
+use strict;
+use warnings;
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+    NAME          => 'SNMP::Info',
+    AUTHOR        => 'Eric A. Miller <emiller@cpan.org>',
+    VERSION_FROM  => 'Info.pm',
+    ABSTRACT_FROM => 'Info.pm',
+    PREREQ_PM     => {
+        'Test::More'   => 0,
+        'Math::BigInt' => 0,
+        'SNMP'         => 0,
+    },
+    PMLIBDIRS => [ 'Info', '$(BASEEXT)' ],
+    dist      => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+    clean     => { FILES    => 'SNMP-Info-*' },
+    realclean => { FILES    => 'Makefile.old' },
+    (     ( ExtUtils::MakeMaker->VERSION() lt '6.25' ) ? ( 'PL_FILES' => {} )
+        : ()
+    ),
+    (   ( ExtUtils::MakeMaker->VERSION() gt '6.30' ) ? ( 'LICENSE' => 'bsd' )
+        : ()
+    ),
+
+);
+
+sub MY::postamble {
+    "
 .PHONY: readme
 readme: README
 README: Info.pm
-	pod2text -l Info.pm > README" }
+	pod2text -l Info.pm > README";
+}
--- a/608
+++ b/608
--- a/t/.perltidyrc
+++ b/t/.perltidyrc
@@ -0,0 +1,18 @@
+# .perltidyrc - PBP perltidy configuration file for SNMP::Info
+# $Id$
+
+-l=78   # Max line width is 78 cols
+-i=4    # Indent level is 4 cols
+-ci=4   # Continuation indent is 4 cols
+-nst    # Output to STDOUT
+-se     # Errors to STDERR
+-vt=2   # Maximal vertical tightness
+-cti=0  # No extra indentation for closing brackets
+-pt=1   # Medium parenthesis tightness
+-bt=1   # Medium brace tightness
+-sbt=1  # Medium square bracket tightness
+-bbt=1  # Medium block brace tightness
+-nsfs   # No space before semicolons
+-nolq   # Don't outdent long quoted strings
+-wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= && += -= /= |= >>= ||= .= %= ^= x=" # Break before all operators
+
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+# 00-load.t - Test loading of SNMP::Info 
+# $Id$
+
+use strict;
+use warnings;
+use Test::More tests => 1;
+
+BEGIN {
+	use_ok( 'SNMP::Info' );
+}
+
+diag( "Testing SNMP::Info $SNMP::Info::VERSION, Perl $], $^X" );
--- a/t/00_local_distribution.t
+++ b/t/00_local_distribution.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+# 00_local_distribution.t - Private test to check distribution
+# $Id$
+
+use strict;
+use warnings;
+use Test::More;
+
+eval { require Test::Distribution; };
+
+plan skip_all => 'Optional Test::Distribution not installed' if ($@);
+
+# Skip POD tests as we will test separately
+import Test::Distribution not => [ qw/pod podcover/ ];
--- a/t/00_local_docininfo.t
+++ b/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($_);
+}
--- a/t/00_local_perlcritic.t
+++ b/t/00_local_perlcritic.t
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+# 00_local_perlcritic.t - Test file for PBP compliance for SNMP::Info
+# $Id$
+
+use strict;
+use warnings;
+use Test::More;
+
+eval "use Test::Perl::Critic (-profile => 't/perlcritic.rc')";
+plan skip_all => "Test::Perl::Critic required for testing PBP compliance" if $@;
+
+Test::Perl::Critic::all_critic_ok();
+
--- a/t/00_local_spelling.t
+++ b/t/00_local_spelling.t
@@ -0,0 +1,252 @@
+#!/usr/bin/perl
+# 00_local_spelling.t - Private test to spell check documentation
+# $Id$
+
+use warnings;
+use strict;
+use Test::More;
+
+eval "use Test::Spelling";
+plan skip_all => "Test::Spelling required for checking spelling"
+    if $@;
+
+set_spell_cmd('aspell list');
+add_stopwords(<DATA>);
+all_pod_files_spelling_ok();
+
+__DATA__
+5000BH
+accelar
+acl
+adsl
+af
+agere
+airespace
+aironet
+airos
+Alcatel
+alcatel
+alteon
+Altiga
+altiga
+AOS
+ap
+APs
+Arista
+arista
+arn
+arp
+aruba
+asa
+asante
+ascii
+asn
+ati
+attr
+augenstein
+autonegotiate
+autospecify
+baetz
+bayrs
+baystack
+bcn
+begemot
+bes
+bgp
+bigint
+bigiron
+bitmask
+bladecenter
+bln
+bpdus
+BSSID
+bulkrepeaters
+bulkwalk
+cabletron
+catos
+cdp
+centillion
+circuitless
+cisco
+cisco's
+ciscovtp
+cli
+conf
+config
+contivity
+CPAN
+cpu
+ctron
+cyclades
+datatype
+deauthenticate
+debugsnmp
+dlink
+dmitry
+DOCSIS
+ds
+dslam
+dslams
+dsss
+dynamicgvrp
+eapol
+edgeiron
+eigrp
+enterasys
+EOS
+erszenyi
+ess
+etherlike
+ethernet
+extranet
+fastiron
+fdb
+fdp
+fenner
+fsm
+FWSM
+fwsm
+gbe
+gbesm
+getnext
+Ghz
+gigabit
+hartmaier
+iana
+ibm
+icf
+ieee
+ietf
+ifindex
+igmp
+iid
+iids
+indices
+ingen
+ios
+ip
+IPV
+IPv
+jeroen
+junos
+kramarov
+lans
+linksys
+lldp
+loopback
+loopdetect
+lorensen
+lsb
+Lucent
+lucent
+luiggi
+lwapp
+macfilter
+mau
+maxrepeaters
+mbs
+mckeown
+mda
+MIB
+mibdirs
+mib
+mibs
+milliwatts
+msb
+mtu
+multi
+multicast
+multiseg
+multivlan
+munge
+munges
+namespace
+ndp
+netdisco
+netgear
+netmask
+netscreen
+nmm
+nopassword
+nortel
+nosuch
+oem
+ofdm
+oid
+oids
+OmniSwitch
+os
+osi
+ospf
+overridable
+pae
+petri
+phy
+pinkoski
+poe
+pov
+powerconnect
+procurve
+propvirtual
+proxim
+pvid
+qbridge
+qos
+queueing
+radlan
+rapidcity
+readme
+readonly
+rebranded
+retrynosuch
+rom
+rtt
+rttmon
+sca
+Schenau
+sergienko
+sieborger
+SNMP
+snmp
+SNMP's
+snmpv2
+snmpv3
+snmpwalk
+solaris
+sonmp
+ssid
+SSID's
+SSIDs
+Stickland
+stackable
+stdout
+stg
+stp
+subcomponents
+subnet
+sunos
+supply's
+synoptics
+sys
+telesyn
+telesys
+tftp
+tftpfilename
+tftpserver
+TiMOS
+tmnxModel
+todo
+tuttle
+ucsc
+uninstall
+uptime
+vlan
+vlans
+vpn
+vtp
+watanabe
+wlan
+wlans
+WS
+zoltan
+zyxel
--- a/t/00_local_versionsync.t
+++ b/t/00_local_versionsync.t
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+# 00_local_versionsync.t - Private test to check all version numbers match
+# $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 $last_version = undef;
+find({wanted => \&check_version, no_chdir => 1}, 'blib');
+if (! defined $last_version) {
+    fail('Failed to find any files with $VERSION');
+}
+
+sub check_version {
+    # $_ is the full path to the file
+    return if (! m{blib/script/}xms && ! m{\.pm \z}xms);
+
+    my $content = read_file($_);
+
+    # only look at perl scripts, not sh scripts
+    return if (m{blib/script/}xms && $content !~ m/\A \#![^\r\n]+?perl/xms);
+
+    my @version_lines = $content =~ m/ ( [^\n]* \$VERSION\s= [^\n]* ) /gxms;
+    if (@version_lines == 0) {
+       fail($_);
+    }
+    for my $line (@version_lines) {
+        if (!defined $last_version) {
+            $last_version = shift @version_lines;
+            pass($_);
+        }
+        else {
+            is($line, $last_version, $_);
+        }
+    }
+}
+
--- a/t/make_dev_matrix.pl
+++ b/t/make_dev_matrix.pl
@@ -40,6 +40,7 @@ if ($@) {
    $gvds->graph()->as_png($DevPNG);
 }

+print "Creating $DevHTML\n";
 open (HTML, "> $DevHTML") or die "Can't open $DevHTML. $!\n";
 $old_fh = select(HTML);
 &html_head;
--- a/t/perlcritic.rc
+++ b/t/perlcritic.rc
@@ -0,0 +1,290 @@
+# perlcritic.rc - Perl::Critic configuration file for SNMP::Info
+# $Id$
+
+# Items commented with "Modified back to default" are not set IAW PBP.
+
+##############################################################################
+# This Perl::Critic configuration file sets the Policy severity levels
+# according to Damian Conway's own personal recommendations.  Feel free to
+# use this as your own, or make modifications.
+##############################################################################
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitLvalueSubstr]
+severity   = 3
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitReverseSortBlock]
+severity   = 1
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitSleepViaSelect]
+severity   = 5
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitStringyEval]
+severity   = 5
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitStringySplit]
+severity   = 2
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalCan]
+severity   = 4
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalIsa]
+severity   = 4
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidGrep]
+severity   = 3
+
+[Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidMap]
+severity   = 3
+
+[Perl::Critic::Policy::BuiltinFunctions::RequireBlockGrep]
+severity   = 4
+
+[Perl::Critic::Policy::BuiltinFunctions::RequireBlockMap]
+severity   = 4
+
+[Perl::Critic::Policy::BuiltinFunctions::RequireGlobFunction]
+severity   = 5
+
+[Perl::Critic::Policy::BuiltinFunctions::RequireSimpleSortBlock]
+severity   = 3
+
+[Perl::Critic::Policy::ClassHierarchies::ProhibitAutoloading]
+severity   = 3
+
+[Perl::Critic::Policy::ClassHierarchies::ProhibitExplicitISA]
+severity   = 4
+
+[Perl::Critic::Policy::ClassHierarchies::ProhibitOneArgBless]
+severity   = 5
+
+[Perl::Critic::Policy::CodeLayout::ProhibitHardTabs]
+severity   = 3
+
+[Perl::Critic::Policy::CodeLayout::ProhibitParensWithBuiltins]
+severity   = 1
+
+[Perl::Critic::Policy::CodeLayout::ProhibitQuotedWordLists]
+severity   = 2
+
+[Perl::Critic::Policy::CodeLayout::RequireConsistentNewlines]
+severity   = 4
+
+[Perl::Critic::Policy::CodeLayout::RequireTidyCode]
+severity   = 1
+
+[Perl::Critic::Policy::CodeLayout::RequireTrailingCommas]
+severity   = 3
+
+[Perl::Critic::Policy::ControlStructures::ProhibitCStyleForLoops]
+severity   = 3
+
+[Perl::Critic::Policy::ControlStructures::ProhibitCascadingIfElse]
+severity   = 3
+
+[Perl::Critic::Policy::ControlStructures::ProhibitDeepNests]
+severity   = 3
+
+[Perl::Critic::Policy::ControlStructures::ProhibitMutatingListFunctions]
+severity   = 5
+
+[Perl::Critic::Policy::ControlStructures::ProhibitPostfixControls]
+severity   = 4
+
+[Perl::Critic::Policy::ControlStructures::ProhibitUnlessBlocks]
+severity   = 4
+
+[Perl::Critic::Policy::ControlStructures::ProhibitUnreachableCode]
+severity   = 4
+
+[Perl::Critic::Policy::ControlStructures::ProhibitUntilBlocks]
+severity   = 4
+
+[Perl::Critic::Policy::Documentation::RequirePodAtEnd]
+severity   = 2
+
+[Perl::Critic::Policy::Documentation::RequirePodSections]
+severity   = 2
+
+[Perl::Critic::Policy::ErrorHandling::RequireCarping]
+severity   = 4
+
+[Perl::Critic::Policy::InputOutput::ProhibitBacktickOperators]
+severity   = 3
+
+[Perl::Critic::Policy::InputOutput::ProhibitBarewordFileHandles]
+severity   = 5
+
+[Perl::Critic::Policy::InputOutput::ProhibitInteractiveTest]
+severity   = 4
+
+[Perl::Critic::Policy::InputOutput::ProhibitOneArgSelect]
+severity   = 4
+
+[Perl::Critic::Policy::InputOutput::ProhibitReadlineInForLoop]
+severity   = 5
+
+[Perl::Critic::Policy::InputOutput::ProhibitTwoArgOpen]
+severity   = 4
+
+[Perl::Critic::Policy::InputOutput::RequireBracedFileHandleWithPrint]
+severity   = 3
+
+[Perl::Critic::Policy::Miscellanea::ProhibitFormats]
+severity   = 3
+
+[Perl::Critic::Policy::Miscellanea::ProhibitTies]
+severity   = 4
+
+[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
+
+[Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
+severity   = 4
+
+[Perl::Critic::Policy::Modules::ProhibitEvilModules]
+severity   = 5
+
+[Perl::Critic::Policy::Modules::ProhibitMultiplePackages]
+severity   = 4
+
+[Perl::Critic::Policy::Modules::RequireBarewordIncludes]
+severity   = 5
+
+[Perl::Critic::Policy::Modules::RequireEndWithOne]
+severity   = 4
+
+[Perl::Critic::Policy::Modules::RequireExplicitPackage]
+severity   = 4
+
+[Perl::Critic::Policy::Modules::RequireFilenameMatchesPackage]
+severity   = 5
+
+[Perl::Critic::Policy::Modules::RequireVersionVar]
+severity   = 4
+
+[Perl::Critic::Policy::NamingConventions::ProhibitAmbiguousNames]
+severity   = 3
+
+[Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseSubs]
+severity   = 1
+
+[Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseVars]
+severity   = 1
+
+[Perl::Critic::Policy::References::ProhibitDoubleSigils]
+severity   = 4
+
+[Perl::Critic::Policy::RegularExpressions::ProhibitCaptureWithoutTest]
+severity   = 4
+
+# Modified back to default from 5 - To Do
+[Perl::Critic::Policy::RegularExpressions::RequireExtendedFormatting]
+severity   = 2
+
+# Modified back to default from 5 - To Do
+[Perl::Critic::Policy::RegularExpressions::RequireLineBoundaryMatching]
+severity   = 3
+
+[Perl::Critic::Policy::Subroutines::ProhibitAmpersandSigils]
+severity   = 2
+
+[Perl::Critic::Policy::Subroutines::ProhibitBuiltinHomonyms]
+severity   = 4
+
+[Perl::Critic::Policy::Subroutines::ProhibitExcessComplexity]
+severity   = 3
+
+[Perl::Critic::Policy::Subroutines::ProhibitExplicitReturnUndef]
+severity   = 5
+
+[Perl::Critic::Policy::Subroutines::ProhibitSubroutinePrototypes]
+severity   = 4
+
+[Perl::Critic::Policy::Subroutines::ProtectPrivateSubs]
+severity   = 3
+
+[Perl::Critic::Policy::Subroutines::RequireFinalReturn]
+severity   = 5
+
+[Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict]
+severity   = 5
+
+[Perl::Critic::Policy::TestingAndDebugging::ProhibitNoWarnings]
+severity   = 4
+
+[Perl::Critic::Policy::TestingAndDebugging::ProhibitProlongedStrictureOverride]
+severity   = 4
+
+[Perl::Critic::Policy::TestingAndDebugging::RequireTestLabels]
+severity   = 3
+
+[Perl::Critic::Policy::TestingAndDebugging::RequireUseStrict]
+severity   = 5
+
+[Perl::Critic::Policy::TestingAndDebugging::RequireUseWarnings]
+severity   = 4
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitConstantPragma]
+severity   = 4
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitEmptyQuotes]
+severity   = 2
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitEscapedCharacters]
+severity   = 2
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitInterpolationOfLiterals]
+severity   = 1
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitLeadingZeros]
+severity   = 5
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitMismatchedOperators]
+severity   = 2
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitMixedBooleanOperators]
+severity   = 4
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitNoisyQuotes]
+severity   = 2
+
+[Perl::Critic::Policy::ValuesAndExpressions::ProhibitVersionStrings]
+severity   = 3
+
+[Perl::Critic::Policy::ValuesAndExpressions::RequireInterpolationOfMetachars]
+severity   = 1
+
+[Perl::Critic::Policy::ValuesAndExpressions::RequireNumberSeparators]
+severity   = 2
+
+[Perl::Critic::Policy::ValuesAndExpressions::RequireQuotedHeredocTerminator]
+severity   = 4
+
+[Perl::Critic::Policy::ValuesAndExpressions::RequireUpperCaseHeredocTerminator]
+severity   = 4
+
+[Perl::Critic::Policy::Variables::ProhibitConditionalDeclarations]
+severity   = 5
+
+[Perl::Critic::Policy::Variables::ProhibitLocalVars]
+severity   = 2
+
+[Perl::Critic::Policy::Variables::ProhibitMatchVars]
+severity   = 4
+
+[Perl::Critic::Policy::Variables::ProhibitPackageVars]
+severity   = 3
+
+[Perl::Critic::Policy::Variables::ProhibitPunctuationVars]
+severity   = 2
+
+[Perl::Critic::Policy::Variables::ProtectPrivateVars]
+severity   = 3
+
+[Perl::Critic::Policy::Variables::RequireInitializationForLocalVars]
+severity   = 5
+
+[Perl::Critic::Policy::Variables::RequireLexicalLoopIterators]
+severity   = 5
+
+[Perl::Critic::Policy::Variables::RequireNegativeIndices]
+severity   = 4
--- a/t/pod-coverage.t
+++ b/t/pod-coverage.t
@@ -0,0 +1,22 @@
+#!/usr/bin/perl
+# pod-coverage.t - Test to check POD coverage of SNMP::Info
+# $Id$
+
+use strict;
+use warnings;
+use Test::More;
+
+# Ensure a recent version of Test::Pod::Coverage
+my $min_tpc = 1.08;
+eval "use Test::Pod::Coverage $min_tpc";
+plan skip_all => "Test::Pod::Coverage $min_tpc required for testing POD coverage"
+    if $@;
+
+# Test::Pod::Coverage doesn't require a minimum Pod::Coverage version,
+# but older versions don't recognize some common documentation styles
+my $min_pc = 0.18;
+eval "use Pod::Coverage $min_pc";
+plan skip_all => "Pod::Coverage $min_pc required for testing POD coverage"
+    if $@;
+
+all_pod_coverage_ok();
--- a/t/pod.t
+++ b/t/pod.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+# pod.t - Test to check for POD errors in SNMP::Info
+# $Id$
+
+use strict;
+use warnings;
+use Test::More;
+
+# Ensure a recent version of Test::Pod
+my $min_tp = 1.22;
+eval "use Test::Pod $min_tp";
+plan skip_all => "Test::Pod $min_tp required for testing POD" if $@;
+
+all_pod_files_ok();
--- a/t/prereq.t
+++ b/t/prereq.t
@@ -2,6 +2,8 @@
 # prereq.t - Test file for prerequesites for SNMP::Info
 # $Id$

+use strict;
+use warnings;
 use Test::More tests=> 3;

 # Check for SNMP Module
@@ -14,10 +16,11 @@ eval {
 if ($@){
    print STDERR <<'end_snmp';

-Net-SNMP not found.  Net-SNMP installs the perl modules
-SNMP and SNMP::Session.  As of version 4.2.1 and greater the Perl
-modules are no longer distributed on CPAN, as they are specific to different
-versions of SNMP. 
+Net-SNMP not found.  Net-SNMP installs the perl modules SNMP and
+SNMP::Session.
+
+Versions 4.2.1 to 5.3 the Perl modules are not distributed on CPAN, you must
+install from the distribution. 

 Install Net-SNMP from http://net-snmp.sourceforge.net and make sure you run
 configure with the --with-perl-modules switch!
@@ -26,7 +29,7 @@ Note to Redhat Users:  Redhat, in its infinite wisdom, does not install the
 Perl modules as part of their 8.0 RPMS.  Please uninstall them and install the
 newest version by hand.

-
+Versions 5.3.1 and higher are once again available from CPAN.

 end_snmp
    ok(0,'Net-SNMP not installed, or missing Perl modules.');
@@ -67,7 +70,17 @@ Perl module of Net-SNMP 5.0.1 is buggy. Please upgrade.


 end_501
+    }
+ 
+    if(( $ver_maj == 5 and $ver_min == 3 and $ver_rev == 1 ) or
+      ( $ver_maj == 5 and $ver_min == 2 and $ver_rev == 3 )) {
+        print STDERR << "end_bulkwalk";

+
+Perl module of Net-SNMP Versions 5.3.1 and 5.2.3 have issues with bulkwalk,
+turn off bulkwalk. Please upgrade.
+
+end_bulkwalk
    } 
 }

--- a/t/push_ver
+++ b/t/push_ver
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+# $Id$
+
+use File::Glob qw/bsd_glob/;
+
+my @pms = glob_rec("../Info");
+
+$new_version = shift @ARGV || '2.05';
+
+foreach my $p (@pms) {
+    print "$p\n";
+
+    rename($p,"$p.orig");
+    open (O,"<$p.orig") or die;
+    open (P,">$p") or die "Can't open $p for write. $!\n";
+
+    while (<O>) {
+        s/^\s*\$VERSION\s+=\s*'[^']+'\s*;/\$VERSION = '$new_version';/;
+        print P;
+    }
+
+    close O;
+    close P or die "Can't write $p. $!\n";
+    #last;
+}
+
+sub glob_rec {
+    my $dir = shift;
+
+    my @files = bsd_glob("$dir/*");
+
+    my @pms;
+
+    foreach my $f (@files) {
+        next if $f eq '\.$';
+        
+        if (-d $f) {
+            push @pms, glob_rec($f);
+            next;
+        }
+
+        push @pms,$f if $f =~ /.pm$/;
+    }
+
+    return @pms;
+}
--- a/t/run_test
+++ b/t/run_test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run this from ../
+/usr/local/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/$1
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Oliver Gorwits	bc8c8a6061	prep for 2.04 release	2011-03-31 08:34:57 +00:00
Oliver Gorwits	d09e5de229	renamed Ipv6.pm to IPv6.pm	2011-03-31 08:24:29 +00:00
Oliver Gorwits	1df1bda641	change from Ipv6 to IPv6 everywhere	2011-03-31 08:04:52 +00:00
Jeroen van Ingen	e8612e3779	Method i_speed_raw didn't return raw values; patch by Alexander Hartmaier.	2011-03-30 12:39:00 +00:00
Carlos Vicente	a58d060310	Adding missing method for mapping v6 addresses with prefixes	2011-02-23 04:32:14 +00:00
Brian de Wolf	a77c539f38	These are actually listed as not-accessible so they shoudn't be defined. Their information has to be extracted from n2p_paddr instead.	2011-01-19 00:04:07 +00:00
Oliver Gorwits	b5107b5634	shorten abstract for Ipv6.pm	2011-01-09 20:42:41 +00:00
Oliver Gorwits	6c880bb7b3	add doc links to Info.pm for new Ipv6 and Pf modules	2011-01-09 18:55:31 +00:00
Jeroen van Ingen	9297c70d11	Added switch models 2915, 2615, 2520G and 1810G to HP class. Won't be correctly identified until hpicfoid mib is updated to include these models.	2011-01-04 15:00:22 +00:00
Eric Miller	bfafdc99d9	Update port indexing for newer code and switches (5698)	2010-11-23 13:50:16 +00:00
Eric Miller	ab111a8e93	Modify detection for newer code levels	2010-11-17 23:18:39 +00:00
Eric Miller	c2ce3d81e1	Improve os detection for newer versions. Improve forward compatibility.	2010-11-17 23:17:04 +00:00
Carlos Vicente	fb9813af51	C2970 and C2960 were not being correctly recognized if has_layer(3) was true	2010-11-16 00:41:00 +00:00
Bill Fenner	4fb63d8a7b	Implement peth_port_neg_power, reporting the actual negotiated value in CiscoPower and the max for the class in the generic PowerEthernet.	2010-11-08 07:49:40 +00:00
Jeroen van Ingen	77982188bd	Match for ME340x in Layer3 section, class as L3::C3550 for proper macsuck (ME340x requires community-based indexing)	2010-10-29 13:03:44 +00:00
Jeroen van Ingen	8748932460	Enable IPv6 support in Layer3 base class by including Layer3::Ipv6	2010-10-21 10:29:57 +00:00
Brian de Wolf	6c88df1ac0	Fix error in FWSM support patch that caused FWSMs to not be detected.	2010-10-04 23:34:14 +00:00
Carlos Vicente	cacb0777b7	POD fixes to pass tests	2010-09-22 23:18:22 +00:00
Carlos Vicente	bdf5a80868	Adding LLDP support for Juniper and C3550 classes	2010-09-22 21:45:08 +00:00
Jeroen van Ingen	ad1f1933e2	Move Cisco CBS3xxx from generic L3::Cisco to L3::C6500 (mainly for community based indexing, to succesfully retrieve forwarding tables).	2010-09-01 16:16:43 +00:00
Carlos Vicente	d7fe49a028	Additions to extract IPv6 addresses used in device interfaces	2010-08-25 00:09:42 +00:00
Jeroen van Ingen	e802ccdc6e	Revert to status of rev 1.7, "peth_port_power" sub as a placeholder didn't work as expected (behaved as override, but should have been overridden)	2010-08-23 14:45:04 +00:00
Jeroen van Ingen	af2a881142	Fixed error in IPv6 support for Extreme	2010-08-23 12:02:10 +00:00
Jeroen van Ingen	0ccf5409ca	Fixed potential warnings about "Use of uninitialized value in string eq"	2010-08-23 11:47:58 +00:00
Jeroen van Ingen	2529305803	Add placeholder method peth_port_power() to PowerEthernet class; overrides to actually return data in Cisco, Extreme and HP classes.	2010-08-23 11:38:55 +00:00
Jeroen van Ingen	bb8fb9d01a	Initial version for Info::Ipv6 class. Not to be used directly, intended use is to be inherited by Info::Layer3. This class provides mapping of IPv6 network addresses to Ethernet media addresses (MACs) and interface indexes. It will try various MIBs; with debug on, when data is returned, a message will be logged to inform which MIB contained the relevant data.	2010-08-11 16:41:29 +00:00
Jeroen van Ingen	665f33a482	Small fix for sysServices ("layers") check	2010-07-26 14:31:41 +00:00
Jeroen van Ingen	e5f948acda	Allow support for devices without sysServices	2010-07-26 11:39:37 +00:00
Jeroen van Ingen	c28bbd5728	Changes to Info.pm to support devices that don't return sysServices.0	2010-07-26 11:32:48 +00:00
Jeroen van Ingen	262fa5a3cd	Incorporate patch from jrbinks to support obscure Proxim/Orinoco device (item 2688801 on SF). Fallback for all Agere (11898) devices to Orinoco class.	2010-07-23 15:39:03 +00:00
Jeroen van Ingen	a58b774443	Added "vendor_i_type()" method to HP classes as suggested by Mikat1 on SF. Tracker artifact 2599795. Method can be used to determine more detailed type information about a port, eg 10/100 interface, 1000Base-LX, etc. Details are vendor specific.	2010-07-23 15:07:58 +00:00
Brian de Wolf	6deceb6bd1	Fix for C1900 bp_index not containing interfaces.	2010-05-25 23:30:20 +00:00
Max Baker	808d3fd5c6	add PF Support	2010-05-07 00:01:33 +00:00
Max Baker	b82d3b82d9	update copyright and developers	2010-05-04 20:58:32 +00:00
Jeroen van Ingen	cb8d780d70	Added os_bin() method to CiscoStats. Determines ROM version on several Cisco switches and routers by scanning for version string in rom_id().	2010-05-04 14:18:37 +00:00
Jeroen van Ingen	01cd78c75d	Added table methods to %FUNCS in CDP.pm to retrieve management addresses of connected devices. Useful for improving neighbor detection in Netdisco.	2010-05-03 14:51:35 +00:00
Brian de Wolf	e7b289c399	Add L3::CiscoFWSM for Cisco Firewall Services Modules.	2010-04-28 17:08:32 +00:00
Bill Fenner	a9b28c2270	For Cisco WLCs, pretend to have the CISCO-DOT11-MIB for signal strengths, etc.	2010-03-23 18:00:08 +00:00
Bill Fenner	5b059e6286	"arpnip" on Airespace: use the controller's snooping on the IP addresses of its clients, plus the knowledge of the APs' IP and ethernet MAC addresses, to arpnip. This is useful when there is communication (between controller and AP, or between wireless and wired devices) that does not cross routers.	2010-03-23 17:58:30 +00:00
Jeroen van Ingen	2c84636b7f	Update to Juniper class: use Q-BRIDGE-MIB for switch forwarding tables	2010-02-06 12:52:54 +00:00
Jeroen van Ingen	2aba8dd8f1	Moved older HP Procurve switch models to separate L2:HP4000 class. Reimplemented VLAN changing for Procurve switches; several updates to MODEL_MAP.	2009-12-03 07:55:12 +00:00
Max Baker	41d68936b0	add some recent questions to DEVELOP	2009-12-02 17:49:27 +00:00
Max Baker	cb750624f9	* empty log message *	2009-11-28 20:05:49 +00:00
Max Baker	bf3a37195b	2.01 update	2009-06-12 22:47:50 +00:00
Max Baker	1e37f80368	* empty log message *	2009-06-12 22:36:50 +00:00
Max Baker	5f9c2d3e62	pod updates	2009-06-12 22:25:32 +00:00
Max Baker	c88449151e	up version to 2.01	2009-06-12 22:24:25 +00:00
Max Baker	9c4f031581	update MANIFEST	2009-06-12 22:17:22 +00:00
Max Baker	3cac59adf4	simple script to launch a single test	2009-06-12 21:59:50 +00:00
Max Baker	77bcf720d3	simple script to push out a version number to each module	2009-06-12 21:59:05 +00:00
Max Baker	e6b4c607e0	add check for package documentation in Info.pm	2009-06-12 21:58:49 +00:00
Max Baker	cbeb41c728	fix for PerlCritic	2009-06-12 20:48:44 +00:00
Max Baker	101aaa0a68	fix up spelling	2009-06-12 18:56:22 +00:00
Max Baker	2233511fad	add missing POD	2009-06-12 18:36:00 +00:00
Max Baker	8efa868ca3	bring POD uptodate and clean-up module a litte	2009-06-12 18:35:06 +00:00
Max Baker	e738d502ef	change inheritance order in @ISA, add POD, and remove tabs	2009-06-12 18:11:52 +00:00
Max Baker	2a7d5b51d9	update to 2009	2009-06-12 18:03:45 +00:00
Max Baker	67c4f160aa	Update to sorta match 2.0	2009-06-12 18:03:03 +00:00
Max Baker	6d87313283	fix subtle bug in the loading order of CiscoVTP vs CiscoStpExtensions because of a conflict between Bridge::v_name and CiscoVTP::v_name	2009-06-11 21:49:37 +00:00
Max Baker	98e07690be	add qb_v_name for completeness and to match POD	2009-06-11 21:48:11 +00:00
Max Baker	c0bc769be9	add CVS revision number to debugging output to aid future email dumps	2009-06-11 18:06:15 +00:00
Max Baker	01d9b0f291	minor pod bug	2009-06-10 16:43:50 +00:00
Max Baker	2539692016	Add Cisco FWSM detection	2009-06-08 22:06:24 +00:00
Max Baker	3a3fc548ca	Added Sam's patch to support more weird cisco crap :)	2009-06-08 02:28:31 +00:00
Max Baker	84d6cd18fb	[2020353] Added L3::Altiga class	2009-06-07 23:35:06 +00:00
Max Baker	2d7b94e5a7	* empty log message *	2009-06-07 22:52:09 +00:00
Max Baker	98eceb7c57	add cisco id by OID for vendor for some problem devices. c/o Sam Stickland	2009-06-07 22:50:04 +00:00
Max Baker	be92ec0379	fix case on mib name per alexander H	2009-06-07 01:33:12 +00:00
Bill Fenner	34d4ec66a3	Add Info/CiscoStpExtensions.pm	2009-03-27 07:14:52 +00:00
Bill Fenner	35c8ed6038	Add MBSSID-aware i_ssidlist and i_ssidbcast methods Add CiscoConfig, remove dangling CiscoVTP Add cd11_rateset	2009-03-23 21:29:11 +00:00
Bill Fenner	dd10a88ee2	Add Arista and EOS, also sort -f	2009-03-23 21:19:26 +00:00
Bill Fenner	71f0947988	Turn Arista vendor name to 'arista', to match, e.g., 'cisco' and 'juniper'	2009-03-23 19:30:30 +00:00
Carlos Vicente	d7cd3ff9e7	Updating copyright	2009-03-20 17:34:59 +00:00
Carlos Vicente	2567d6a5c9	Committing missing file	2009-03-20 17:13:12 +00:00
Carlos Vicente	5831d9e4ae	Adding keyword for detecting C6500 with Sup32 PISA engine	2009-03-12 22:28:55 +00:00
Carlos Vicente	690bc6bfa0	Add support for other CDP/LLDP binary formatted values (ID 1909147)	2009-03-10 16:57:37 +00:00
Carlos Vicente	5f0e73bcb4	Adding support for CISCO-STP-EXTENSIONS-MIB (ID 1872450)	2009-03-10 16:52:08 +00:00
Carlos Vicente	b1a7b67ae7	Adding Cisco WLC module support (ID 2231376)	2009-03-10 01:25:52 +00:00
Max Baker	f0539d51ff	update test_class.pl to add mib dirs, relative path, and more debug info	2009-03-09 19:12:55 +00:00
Bill Fenner	1af34e3e25	Patch from Thomas Ristic to recognize CIGESM as C2900.	2009-03-06 22:30:53 +00:00
Bill Fenner	0510dbfafc	Add Layer3::Arista. Work around Net-SNMP's failure to load IF-MIB because it prefers the obsolete RFC1213-MIB more completely: add the new ifOperState values explicitly (e.g., lowerLayerDown, dormant, notPresent,...)	2009-03-06 20:09:38 +00:00
Bill Fenner	ca35689475	Use orig_i_name, so that setting an interface description does not change the netdisco port name.	2009-03-06 20:07:41 +00:00
Eric Miller	2ac1cc2308	update for Alcatel-Lucent additions	2008-08-02 03:31:20 +00:00
Eric Miller	0eebef47b0	Prep 2.00	2008-08-02 03:22:04 +00:00
Bill Fenner	29ef1301fb	Mention Alcatel-Lucent in ChangeLog.	2008-08-01 09:28:56 +00:00
Bill Fenner	cfd5c5d9d7	perltidy	2008-08-01 08:10:47 +00:00
Bill Fenner	347e1f9f59	Add classes for Alcatel OmniSwitch and Service Router, update Info.pm for Alcatel	2008-07-31 18:36:52 +00:00
Bill Fenner	2575320ec5	Add some spelling words. Make local_versionsync fail gracefully (instead of planning twice) if File::Slurp isn't found. Make spelling skip all tests if Test::Spelling isn't found.	2008-07-31 18:35:20 +00:00
Bill Fenner	6c8ec356ec	Missed a MIB when I merged my changes. Add a commented-out reference to the Alcatel MIB that results in Alcatel model names getting translated. Return the alcatel-lucent model name and OS based on sysObjectID	2008-07-31 16:57:41 +00:00
Bill Fenner	6e0712b189	Update i_name to return wlanAPFQLN if it's available. Add i_mac to map BSSID to port.	2008-07-31 15:56:04 +00:00
Eric Miller	906b1cb52f	[ 2031292 ] HP POE support - port to ifIndex mapping (Jeroen van Ingen)	2008-07-30 02:05:54 +00:00
Eric Miller	1eff8f8224	Silence warnings/errors from uninitialized variables	2008-07-29 03:23:35 +00:00
Eric Miller	6a1f6d43cf	final update for 1.09	2008-07-23 02:14:25 +00:00
Eric Miller	8ab37354ff	update for 1.09	2008-07-23 02:06:23 +00:00
Eric Miller	64340bf92e	regenerate for 1.09	2008-07-23 02:04:27 +00:00
Eric Miller	f0d490539e	POD cleanup	2008-07-23 02:03:07 +00:00
Eric Miller	808464a7d0	- Documentation updates - C1250 and Linksys additions	2008-07-21 03:26:15 +00:00
Eric Miller	3b8b70f760	- Move _load_attr() loopdetect code below other end of table checks. - Add another check for SNMPv1 - noSuchName where we've already seen the iid and iid is not null but the return value is null. Don't report a loop, just exit the table.	2008-07-21 03:24:16 +00:00
Eric Miller	cb58701af2	- Require Perl 5.6+ - Account for ExtUtils::MakeMaker version	2008-07-20 03:46:08 +00:00
Eric Miller	f05fbae8fc	Private test to check all version numbers match	2008-07-20 03:36:34 +00:00
Eric Miller	f1589d2ffe	PBP perltidy configuration file for SNMP::Info	2008-07-20 03:32:58 +00:00
Eric Miller	2d1df6c0e4	skip config files for private tests	2008-07-20 03:31:53 +00:00
Eric Miller	158596cede	perltidy	2008-07-20 03:30:56 +00:00
Eric Miller	6c7df418af	SNMP is available from CPAN again, stop smoke test failures	2008-07-19 03:16:01 +00:00
Eric Miller	4e666d63b3	Update for newer Net-SNMP versions	2008-07-19 03:03:53 +00:00
Eric Miller	d1674dade2	POD coverage test	2008-07-19 02:44:42 +00:00
Eric Miller	ecb26a8b68	POD coverage	2008-07-19 02:41:59 +00:00
Eric Miller	03785c4365	POD coverage	2008-07-18 03:11:38 +00:00
Eric Miller	58c1d01b4a	sp	2008-07-15 03:12:54 +00:00
Eric Miller	dc48aa08ba	Move munge_e_type() to Info.pm	2008-07-15 03:09:18 +00:00
Eric Miller	53f9cc8c3d	- Documentation updates - Replace munge_ns_com_type() and munge_ns_store_type() with munge_e_type() in Info.pm - Prefix ns_e_is_virtual() and ns_e_is_stack() with _ to indicate private method	2008-07-15 03:07:29 +00:00
Eric Miller	0db888ef88	Document serial()	2008-07-15 02:40:49 +00:00
Eric Miller	2ee8817103	EAPOL	2008-07-15 02:40:17 +00:00
Eric Miller	71b0e7c60f	Add munge_caps() and munge_null()	2008-07-15 02:39:43 +00:00
Eric Miller	740707539e	Documentation updates	2008-07-15 02:32:39 +00:00
Eric Miller	ba088bf717	- Move munge_null() to Info.pm - Change munge_caps() to munge_bits() from Info.pm	2008-07-15 02:19:32 +00:00
Eric Miller	aa58a2ba56	- Document munge_power() - Move munge_caps() and munge_null() to Info.pm	2008-07-15 02:15:59 +00:00
Eric Miller	ca9caf6e12	- Documentation updates - Move munge_caps() to Info.pm	2008-07-15 01:56:34 +00:00
Eric Miller	5a983c9600	Document e_name()	2008-07-14 03:13:14 +00:00
Eric Miller	d02c6ab450	Document e_name()	2008-07-14 03:01:14 +00:00
Eric Miller	4284cb8ea0	Document model()	2008-07-14 02:54:39 +00:00
Eric Miller	0743d4bce9	Prefix validate_vlan_param() with _ to indicate private method.	2008-07-14 02:51:02 +00:00
Eric Miller	66ce0da9bc	Document i_stp_state(), qb_i_vlan_t(), set_add_i_vlan_tagged(), set_i_pvid(), set_i_vlan(), set_remove_i_vlan_tagged(), v_index()	2008-07-14 02:48:45 +00:00
Eric Miller	3e4f700a70	- Prefix check_forbidden_ports() and validate_vlan_param() with _ to indicate private methods. - Document v_index()	2008-07-14 02:24:42 +00:00
Eric Miller	7518408d89	set_i_speed_admin() use portAdminSpeed (Justin Hunter)	2008-07-11 19:58:46 +00:00
Eric Miller	c5caffc75e	don't distribute perlcritic.rc	2008-07-09 03:08:16 +00:00
Eric Miller	086fea0349	Add Perl::Critic for Perl Best Practices compliance	2008-07-09 03:07:32 +00:00
Eric Miller	f436c9f69c	P::C - don't declare variable in conditional statement	2008-07-09 02:46:37 +00:00
Eric Miller	a153913d29	PBP - lexicals	2008-07-09 02:36:03 +00:00
Eric Miller	5189871fde	PBP - use bare return	2008-07-09 02:34:17 +00:00
Eric Miller	daa0162639	- PBP - never modify $_ in list functions - PBP - use named lexicals as explicit for loop iterators	2008-07-09 02:27:39 +00:00
Eric Miller	4e6a452c87	## no critic on string eval	2008-07-09 01:53:16 +00:00
Eric Miller	a70a895a29	PBP always return via an explicit return	2008-07-09 01:37:19 +00:00
Eric Miller	84bc3f5269	PBP always return via an explicit return	2008-07-09 01:16:42 +00:00
Eric Miller	27f2bd1b26	add linksys	2008-07-09 00:42:32 +00:00
Eric Miller	38c63a3086	- PBP compliance via Perl::Critic - Use bare return to return failure - No code before strictures are enabled	2008-07-09 00:41:56 +00:00
Eric Miller	2c5301b676	- PBP compliance via Perl::Critic - Use bare return to return failure - No code before strictures are enabled	2008-07-09 00:32:47 +00:00
Bill Fenner	1b85820314	Support Cisco 1250 and Linksys SRW2048	2008-07-08 16:38:34 +00:00
Eric Miller	3855c92564	Test POD for syntax	2008-07-07 04:12:07 +00:00
Eric Miller	ba85dc670b	- POD Validation - POD spell check - Prep 1.09	2008-07-07 04:10:39 +00:00
Eric Miller	6221228d1f	Add private tests and load test. Don't distribute private tests.	2008-07-07 03:59:47 +00:00
Eric Miller	a901d9a61c	Remove VLAN set methods, not working consistently across devices	2008-07-03 02:43:54 +00:00
Eric Miller	0a0fac4ddb	Remove VLAN set methods, not working consistently across devices	2008-07-03 02:33:22 +00:00
Eric Miller	0e16cfecf6	[ 1868017 ] i_vlan_membership incorrectly includes voice vlan "4096"	2008-07-03 02:12:13 +00:00
Eric Miller	838eb71a15	Query LLDP table with time filter of zero.	2008-07-03 01:59:31 +00:00
Eric Miller	e373b1f74e	Added munge_port_list(), modify_port_list(), and set_multi() methods	2008-04-21 20:57:30 +00:00
Eric Miller	b03e292d95	Document fully qualifying a MIB leaf in %GLOBALS and %FUNCS	2008-04-21 20:55:52 +00:00
Eric Miller	2139cb0212	- Use munge_port_list(), modify_port_list(), and set_multi() methods - Add set_create_vlan() method	2008-04-21 20:51:58 +00:00
Eric Miller	35392a8c5c	- Modify set_i_vlan() to use set_multi() - Use munge_port_list() and modify_port_list()	2007-12-20 04:23:58 +00:00
Eric Miller	b7fab49da2	modifications to i_vlan_membership()	2007-12-20 04:05:58 +00:00
Eric Miller	d0061b4ec9	- Added munge_port_list() - Added modify_port_list() - Added set_multi() to enable a SNMP set command on several new values in the one request.	2007-12-20 04:01:17 +00:00
Eric Miller	2ffa82aff9	clean up error messages	2007-12-15 04:11:17 +00:00
Eric Miller	1c33f38323	Correct sequencing and improve validation in set_i_vlan()	2007-12-15 03:56:18 +00:00
Eric Miller	4bb41fc368	[ 1849103 ] CiscoVTP.pm patch (subtracting error) (Justin Hunter)	2007-12-14 03:10:19 +00:00
Eric Miller	c666fe30d8	[ 1841131 ] Incorrect munging of stp_root (Carlos Vicente)	2007-12-08 02:51:37 +00:00
Eric Miller	1813e60cec	- Add i_speed_raw() (Alexander Hartmaier) - [ 1841131 ] Incorrect munging of stp_root (Carlos Vicente)	2007-12-08 02:50:39 +00:00
Eric Miller	4ae8f31c8f	- Add a munge and IEEE8021-PAE-MIB	2007-12-07 23:13:01 +00:00
Eric Miller	df466ac2eb	updates	2007-12-07 04:27:22 +00:00
Eric Miller	846b3201b7	Qualify leafs from HP-SN-SWITCH-GROUP-MIB since FDP class will load FOUNDRY-SN-SWITCH-GROUP-MIB which contains the same leaf names.	2007-12-07 04:23:37 +00:00
Eric Miller	a2ab73c24a	- Support for newer models and Nortel BladeCenter Layer2-3 GbE Switch Modules. - Support for new VLAN read methods.	2007-12-07 04:18:32 +00:00
Eric Miller	98e6693525	Add support for D-Link and the IBM BladeCenter Gigabit Ethernet Switch Module, since D-Link uses RADLAN MIB as well.	2007-12-07 04:09:47 +00:00
Eric Miller	fed85592cb	- D-Link and IBM BladeCenter GbESM support (Alex Kramarov) - Add support to specify MIB to resolve leaf names conflicts in %GLOBALS and %FUNCS.	2007-12-07 04:07:01 +00:00
Bill Fenner	2b4a296128	Document that e_type munges the OID into object name.	2007-12-02 20:01:59 +00:00
Bill Fenner	c1b0e81b6c	+ Use Cisco Client Association MIBs for Aironet client reporting via fw_mac + Support VLANs on Aironet + Get the proper radio MAC address from aironet in MBSS mode + Additional wireless statistics from Aironet	2007-12-02 19:58:10 +00:00
Bill Fenner	9a0915f3a1	Infrastructure for SNMPv3 support: - Save the SecName passed into the constructor - Create an update() function, which replaces the underlying SNMP session using different parameters. - Return the SecName instead of community from snmp_comm() when using SNMPv3. This is a little wrong, but is probably better than returning undef.	2007-12-02 18:55:54 +00:00
Eric Miller	a9481c86d2	updates, bump version 1.09	2007-12-02 05:06:12 +00:00
Eric Miller	5f0148dd72	Add CISCO-PAE-MIB (Kesy)	2007-12-02 03:16:44 +00:00
Eric Miller	dedefde79f	- Updates to fan, power supply, and serial number methods (Jeroen van Ingen)	2007-12-02 03:02:01 +00:00
Eric Miller	8c421d333a	[ 1464654 ] HP Procurve 9315 FDP Support	2007-12-02 02:37:43 +00:00
Eric Miller	97fbd36c6a	[ 1464654 ] HP Procurve 9315 FDP Support \n pod updates	2007-12-02 02:34:58 +00:00
Eric Miller	e81344c357	- bump version - pod update	2007-11-29 02:31:13 +00:00
Eric Miller	33450039c7	- ISA Layer3 instead of Layer2 to support arpnip - Add more models from HP-ICF-OID to map	2007-11-29 02:29:26 +00:00
Eric Miller	5849f4ce3d	Silence warnings from devices which don't return values for extended VLANs (>1024)	2007-11-27 17:19:28 +00:00