added c2940 support, fixed typo in Orinoco detection.

This commit is contained in:
Max Baker
2006-06-20 18:26:52 +00:00
parent 4d262872c8
commit 3416928233
2 changed files with 3 additions and 3 deletions

View File

@@ -3,7 +3,7 @@ ChangeLog $Id$
version 1.04 version 1.04
+ Added C1130 and C1240 to L2::Aironet (Ralf Gross) + Added C1130 and C1240 to L2::Aironet (Ralf Gross)
+ Added detection for Cisco 2960. + Added detection for Cisco 2960, 2940.
+ Added generic L2::Cisco Class + Added generic L2::Cisco Class
* Corrected detection for Cisco Supervisor Engine 2 and 32 (IOS). * Corrected detection for Cisco Supervisor Engine 2 and 32 (IOS).
* Fixed warnings in CiscoStack * Fixed warnings in CiscoStack

View File

@@ -916,7 +916,7 @@ sub device_type {
$objtype = 'SNMP::Info::Layer2::C1900' if ($desc =~ /catalyst/i and $desc =~ /\D19\d{2}/); $objtype = 'SNMP::Info::Layer2::C1900' if ($desc =~ /catalyst/i and $desc =~ /\D19\d{2}/);
# Catalyst 2900 and 3500XL (IOS) series override # Catalyst 2900 and 3500XL (IOS) series override
$objtype = 'SNMP::Info::Layer2::C2900' if ($desc =~ /(C2900XL|C2950|C3500XL)/i ); $objtype = 'SNMP::Info::Layer2::C2900' if ($desc =~ /(C2900XL|C2950|C3500XL|C2940)/i );
# Catalyst WS-C series override 2926,4k,5k,6k in Hybrid # Catalyst WS-C series override 2926,4k,5k,6k in Hybrid
$objtype = 'SNMP::Info::Layer2::Catalyst' if ($desc =~ /WS-C\d{4}/); $objtype = 'SNMP::Info::Layer2::Catalyst' if ($desc =~ /WS-C\d{4}/);
@@ -951,7 +951,7 @@ sub device_type {
$objtype = 'SNMP::Info::Layer2::NAP222x' if ($desc =~ /Access\s+Point\s+222/); $objtype = 'SNMP::Info::Layer2::NAP222x' if ($desc =~ /Access\s+Point\s+222/);
# Orinco # Orinco
$objtype = 'SNMP::Info::Layer2::Orinoco' if ($desc =~ /AP-\d{3}|WavePOINT/); $objtype = 'SNMP::Info::Layer2::Orinoco' if ($desc =~ /(AP-\d{3}|WavePOINT)/);
# Aironet - IOS # Aironet - IOS
$objtype = 'SNMP::Info::Layer2::Aironet' if ($desc =~ /\b(C1100|C1130|AP1200|C350|C1200|C1240)\b/ and $desc =~ /\bIOS\b/); $objtype = 'SNMP::Info::Layer2::Aironet' if ($desc =~ /\b(C1100|C1130|AP1200|C350|C1200|C1240)\b/ and $desc =~ /\bIOS\b/);