Update to latest device descriptions

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33745 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index b892f55326c66cc5d0f213fedc67e55463d40d21..2eebea2ec5057eefe8a2c42decc74fc96a6baf28 100644 (file)
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -47,88 +47,90 @@
 
   
 /* chassis types */
-/* From  synro199.mib - SnpxChassisType */
+/* Last updated from version 229 ("200609010000Z") of SnpxChassisType in SYNOPTICS-ROOT-MIB.mib */
 static const value_string sonmp_chassis_val[] =
 {
-       {2, "m3000"},
-       {3, "m3030"},
-       {4, "m2310"},
-       {5, "m2810"},
-       {6, "m2912"},
-       {7, "m2914"},
-       {8, "m271x"},
-       {9, "m2813"},
-       {10, "m2814"},
-       {11, "m2915"},
-       {12, "m5000"},
-       {13, "m2813SA"},
-       {14, "m2814SA"},
-       {15, "m810M"},
-       {16, "m1032x Ethercell"},
+       {1, "other"),
+       {2, "3000"},
+       {3, "3030"},
+       {4, "2310"},
+       {5, "2810"},
+       {6, "2912"},
+       {7, "2914"},
+       {8, "271x"},
+       {9, "2813"},
+       {10, "2814"},
+       {11, "2915"},
+       {12, "5000"},
+       {13, "2813SA"},
+       {14, "2814SA"},
+       {15, "810M"},
+       {16, "Ethercell"},
        {17, "5005"},
-       {18, "Alcatel Ethernet workgroup conc"},
-       {20, "m2715SA"},
-       {21, "m2486"},
-       {22, "m28xxx"},
-       {23, "m23xxx"},
-       {24, "5DN000"},
-       {25, "NBayStack"},
-       {26, "m2310x"},
-       {27, "BayStack100 hub"},
-       {28, "M3000 Fast ethernet"},
-       {29, "Xedia"},
-       {31, "28200"},
-       {32, "Centillion-sixSlot"},
-       {33, "Centillion-twelveSlot"},
-       {34, "Centillion-singleSlot"},
-       {35, "BayStack301"},
-       {36, "BayStackTr"},
+       {18, "Alcatel Ethernet workgroup conc."},
+       {20, "2715SA"},
+       {21, "2486"},
+       {22, "28000 series"},
+       {23, "23000 series"},
+       {24, "5DN00x series"},
+       {25, "BayStack Ethernet"},
+       {26, "23100 series"},
+       {27, "100Base-T Hub"},
+       {28, "3000 Fast Ethernet"},
+       {29, "Orion switch"},
+       /* 30 is "not used" */
+       {31, "DDS"},
+       {32, "Centillion (6 slot)"},
+       {33, "Centillion (12 slot)"},
+       {34, "Centillion (1 slot)"},
+       {35, "BayStack 301"},
+       {36, "BayStack TokenRing Hub"},
        {37, "FVC Multimedia Switch"},
-       {38, "SwitchNode"},
-       {39, "BayStack 302"},
-       {40, "BayStack 350"},
-       {41, "BayStack 150"},
-       {42, "Centillion 50"},
-       {43, "Centillion 50tr"},
-       {44, "BayStack 303-304"},
-       {45, "BayStack 200"},
-       {46, "BayStack 250"},
-       {47, "StackProbe"},
-       {48, "BayStack 450"},
-       {49, "BayStack 303-24T"},
-       {50, "Accelar 1200 L3 switch"},
-       {51, "Accelar 1250 L3 switch"},
-       {52, "Accelar 1100 L3 switch"},
-       {53, "Accelar 1150 L3 switch"},
-       {54, "Accelar 1050 L3 switch"},
-       {55, "Accelar 1051 L3 switch"},
-       {56, "Accelar 8610 L3 switch"},
-       {57, "Accelar 8006"},
-       {58, "Accelar 8010"},
-       {59, "Accelar 8006"},
-       {60, "BayStack 670"},
-       {61, "Accelar 740"},
-       {62, "Accelar 750"},
-       {63, "Accelar 790"},
-       {64, "Business Policy switch 2000"},
-       {65, "Accelar 8110 L2 switch"},
-       {66, "Accelar 8106 L2 switch"},
-       {67, "BayStack 3580"},
-       {68, "Baystack 10 PSU"},
-       {69, "BayStack 420"},
-       {70, "OPTera Metro 1200ESM"},
+       {38, "Switch Node"},
+       {39, "BayStack 302 Switch"},
+       {40, "BayStack 350 Switch"},
+       {41, "BayStack 150 Ethernet Hub"},
+       {42, "Centillion 50N switch"},
+       {43, "Centillion 50T switch"},
+       {44, "BayStack 303 and 304 Switches"},
+       {45, "BayStack 200 Ethernet Hub"},
+       {46, "BayStack 250 10/100 Ethernet Hub"},
+       /*{47, "StackProbe"}, XXX - No longer listed */
+       {48, "BayStack 450 10/100/1000 Switches"},
+       {49, "BayStack 410 10/100 Switches"},
+       {50, "Passport 1200 L3 Switch"},
+       {51, "Passport 1250 L3 Switch"},
+       {52, "Passport 1100 L3 Switch"},
+       {53, "Passport 1150 L3 Switch"},
+       {54, "Passport 1050 L3 Switch"},
+       {55, "Passport 1051 L3 Switch"},
+       {56, "Passport 8610 L3 Switch"},
+       {57, "Passport 8606 L3 Switch"},
+       {58, "Passport 8010"},
+       {59, "Passport 8006"},
+       {60, "BayStack 670 wireless access point"},
+       {61, "Passport 740"},
+       {62, "Passport 750"},
+       {63, "Passport 790"},
+       {64, "Business Policy Switch 2000 10/100 Switches"},
+       {65, "Passport 8110 L2 Switch"},
+       {66, "Passport 8106 L2 Switch"},
+       {67, "BayStack 3580 Gig Switch"},
+       {68, "BayStack 10 Power Supply Unit"},
+       {69, "BayStack 420 10/100 Switch"},
+       {70, "OPTera Metro 1200 Ethernet Service Module"},
        {71, "OPTera 8010co"},
        {72, "OPTera 8610co L3 switch"},
        {73, "OPTera 8110co L2 switch"},
        {74, "OPTera 8003"},
        {75, "OPTera 8603 L3 switch"},
        {76, "OPTera 8103 L2 switch"},
-       {77, "Baystack 380 10/100/1000 switch"},
-       {78, "Baystack 470 10/100 switch"},
-       {79, "OPTera Metro 1450ESM"},
-       {80, "OPTera Metro 1400ESM"},
-       {81, "Alteon switch family"},
-       {82, "BayStack 460-24T-PWR"},
+       {77, "BayStack 380 10/100/1000 Switch"},
+       {78, "Ethernet Switch 470-48T"},
+       {79, "OPTera Metro 1450 Ethernet Service Module"},
+       {80, "OPTera Metro 1400 Ethernet Service Module"},
+       {81, "Alteon Switch Family"},
+       {82, "Ethernet Switch 460-24T-PWR"},
        {83, "OPTera Metro 8010 OPM L2 Switch"},
        {84, "OPTera Metro 8010co OPM L2 Switch"},
        {85, "OPTera Metro 8006 OPM L2 Switch"},
@@ -141,22 +143,75 @@ static const value_string sonmp_chassis_val[] =
        {92, "Passport 1648 L3 switch"},
        {93, "Passport 1612 L3 switch"},
        {94, "Passport 1624 L3 switch"},
-       {95, "BayStack 380-24F Fiber 1000 switch"},
-       {96, "BayStack 4700 24T switch"},
-       {97, "BayStack 4700 48T switch"},
-       {98, "BayStack 5510 24-port"},
-       {99, "BayStack 2200 Wireless LAN AP"},
+       {95, "BayStack 380-24F Fiber 1000 Switch"},
+       {96, "Ethernet Routing Switch 5510-24T"},
+       {97, "Ethernet Routing Switch 5510-48T"},
+       {98, "Ethernet Switch 470-24T"},
+       {99, "Nortel Networks Wireless LAN Access Point 2220"},
        {100, "Passport RBS 2402 L3 switch"},
-       {101, "Alteon AAS 2424"},
-       {102, "Alteon AAS 2224"},
-       {103, "Alteon AAS 2208"},
-       {104, "Alteon AAS 2216"},
-       {105, "Alteon AAS 3408"},
-       {106, "Alteon AAS 3416"}, 
-        {107, "WLAN SecuritySwitch 2250"},
-        {108, "BayStack 425 48-port"},
-        {109, "Baystack 425 24-port"},
-        {110, "WLAN AP 2221"},
+       {101, "Alteon Application Switch 2424"},
+       {102, "Alteon Application Switch 2224"},
+       {103, "Alteon Application Switch 2208"},
+       {104, "Alteon Application Switch 2216"},
+       {105, "Alteon Application Switch 3408"},
+       {106, "Alteon Application Switch 3416"}, 
+       {107, "Nortel Networks Wireless LAN SecuritySwitch 2250"},
+       {108, "Ethernet Switch 425-48T"},
+       {109, "Ethernet Switch 425-24T"},
+       {110, "Nortel Networks Wireless LAN Access Point 2221"},
+       {111, "Nortel Metro Ethernet Service Unit 24-T SPF switch"},
+       {112, " Nortel Metro Ethernet Service Unit 24-T LX DC switch"},
+       {113, "Passport 8300 10-slot chassis"},
+       {114, "Passport 8300 6-slot chassis"},
+       {115, "Ethernet Routing Switch 5520-24T-PWR"},
+       {116, "Ethernet Routing Switch 5520-48T-PWR"},
+       {117, "Nortel Networks VPN Gateway 3050"},
+       {118, "Alteon SSL 310 10/100"},
+       {119, "Alteon SSL 310 10/100 Fiber"},
+       {120, "Alteon SSL 310 10/100 FIPS"},
+       {121, "Alteon SSL 410 10/100/1000"},
+       {122, "Alteon SSL 410 10/100/1000 Fiber"},
+       {123, "Alteon Application Switch 2424-SSL"},
+       {124, "Ethernet Switch 325-24T"},
+       {125, "Ethernet Switch 325-24G"},
+       {126, "Nortel Networks Wireless LAN Access Point 2225"},
+       {127, "Nortel Networks Wireless LAN SecuritySwitch 2270"},
+       {128, "24-port Ethernet Switch 470-24T-PWR"},
+       {129, "48-port Ethernet Switch 470-48T-PWR"},
+       {130, "Ethernet Routing Switch 5530-24TFD"},
+       {131, "Ethernet Switch 3510-24T"},
+       {132, "Nortel Metro Ethernet Service Unit 12G AC L3 switch"},
+       {133, "Nortel Metro Ethernet Service Unit 12G DC L3 switch"},
+       {134, "Nortel Secure Access Switch"},
+       {135, "Nortel Networks VPN Gateway 3070"},
+       {136, "OPTera Metro 3500"},
+       {137, "SMB BES 1010 24T"},
+       {138, "SMB BES 1010 48T"},
+       {139, "SMB BES 1020 24T PWR"},
+       {140, "SMB BES 1020 48T PWR"},
+       {141, "SMB BES 2010 24T"},
+       {142, "SMB BES 2010 48T"},
+       {143, "SMB BES 2020 24T PWR"},
+       {144, "SMB BES 2020 48T PWR"},
+       {145, "SMB BES 110 24T"},
+       {146, "SMB BES 110 48T"},
+       {147, "SMB BES 120 24T PWR"},
+       {148, "SMB BES 120 48T PWR"},
+       {149, "SMB BES 210 24T"},
+       {150, "SMB BES 210 48T"},
+       {151, "SMB BES 220 24T PWR"},
+       {152, "SMB BES 220 48T PWR"},
+       {153, "OME 6500"},
+       {154, "Ethernet Routing Switch 4548GT"},
+       {155, "Ethernet Routing Switch 4548GT-PWR"},
+       {156, "Ethernet Routing Switch 4550T"},
+       {157, "Ethernet Routing Switch 4550T-PWR"},
+       {158, "Ethernet Routing Switch 4526FX"},
+       {159, "Ethernet Routing Switch 2500-26T"},
+       {160, "Ethernet Routing Switch 2500-26T-PWR"},
+       {161, "Ethernet Routing Switch 2500-50T"},
+       {162, "Ethernet Routing Switch 2500-50T-PWR"},
+
        {0, NULL}
 };