aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-03-15 08:05:41 -0700
committerGerald Combs <gerald@wireshark.org>2015-03-15 15:05:46 +0000
commit1b90259d2ba4409cf8956d6be6e094868d7734a1 (patch)
treeb1a990753c4f7aac22aa5e2a191f8773a582d4cc /epan
parentbed6816879e7c24e399ce610426668c8566bcf16 (diff)
[Automatic manuf, services and enterprise-numbers update for 2015-03-15]
Change-Id: Ia77e5cac3d0c79f10d87f21bd4e19bd8187a01ff Reviewed-on: https://code.wireshark.org/review/7691 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/usb.c72
-rw-r--r--epan/enterprise-numbers206
-rw-r--r--epan/sminmpec.c51
3 files changed, 306 insertions, 23 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 8c3827e726..3760f5b56a 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1683,7 +1683,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0da1, "Suzhou Peter's Precise Industrial Co., Ltd" },
{ 0x0da2, "Land Instruments International, Ltd" },
{ 0x0da3, "Nippon Electro-Sensory Devices Corp." },
- { 0x0da4, "Polar Electro OY" },
+ { 0x0da4, "Polar Electro Oy" },
{ 0x0da7, "IOGear, Inc." },
{ 0x0da8, "softDSP Co., Ltd" },
{ 0x0dab, "Cubig Group" },
@@ -1693,6 +1693,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x0db2, "Shian Hwi Plug Parts, Plastic Factory" },
{ 0x0db3, "Tekram Technology Co., Ltd" },
{ 0x0db4, "Chung Fu Chen Yeh Enterprise Corp." },
+ { 0x0db5, "Access IS" },
{ 0x0db7, "ELCON Systemtechnik" },
{ 0x0dba, "Digidesign" },
{ 0x0dbc, "A&D Medical" },
@@ -3108,6 +3109,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f00212, "DeskJet 1220C" },
{ 0x03f00217, "LaserJet 2200" },
{ 0x03f00218, "APOLLO P2500/2600" },
+ { 0x03f0022a, "Laserjet CP1525nw" },
{ 0x03f00241, "Link-5 micro dongle" },
{ 0x03f00304, "DeskJet 810c/812c" },
{ 0x03f00305, "ScanJet 4300c" },
@@ -3380,7 +3382,7 @@ static const value_string usb_products_vals[] = {
{ 0x03f03f02, "PhotoSmart 7550~" },
{ 0x03f03f11, "PSC-1315/PSC-1317" },
{ 0x03f04002, "HP PhotoSmart ..." },
- { 0x03f04004, "cp1160" },
+ { 0x03f04004, "CP1160" },
{ 0x03f04102, "PhotoSmart 618" },
{ 0x03f04105, "ScanJet 4370" },
{ 0x03f04111, "OfficeJet 7200 series" },
@@ -3640,6 +3642,7 @@ static const value_string usb_products_vals[] = {
{ 0x04030232, "Serial Converter" },
{ 0x04031060, "JTAG adapter" },
{ 0x04031234, "IronLogic RFID Adapter [Z-2 USB]" },
+ { 0x04031235, "Iron Logic Z-397 RS-485/422 converter" },
{ 0x04036001, "FT232 USB-Serial (UART) IC" },
{ 0x04036002, "Lumel PD12" },
{ 0x04036007, "Serial Converter" },
@@ -3664,6 +3667,7 @@ static const value_string usb_products_vals[] = {
{ 0x04038b2a, "Alpermann+Velte Rubidium Q1" },
{ 0x04038b2b, "Alpermann+Velte TCD" },
{ 0x04038b2c, "Alpermann+Velte TCC70" },
+ { 0x04039090, "SNAP Stick 200" },
{ 0x04039132, "LCD and Temperature Interface" },
{ 0x04039133, "CallerID" },
{ 0x04039135, "Rotary Pub alarm" },
@@ -4048,6 +4052,7 @@ static const value_string usb_products_vals[] = {
{ 0x041100db, "External Hard Drive HD-PF32OU2 [Buffalo Ministation]" },
{ 0x041100e8, "WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]" },
{ 0x04110105, "External Hard Drive HD-CEU2 [Drive Station]" },
+ { 0x0411012c, "SATA Bridge" },
{ 0x0411012e, "WLI-UC-AG300N Wireless LAN Adapter" },
{ 0x04110148, "WLI-UC-G300HP Wireless LAN Adapter" },
{ 0x04110150, "WLP-UC-AG300 Wireless LAN Adapter" },
@@ -4736,6 +4741,8 @@ static const value_string usb_products_vals[] = {
{ 0x04516070, "RNDIS/BeWAN ADSL2+" },
{ 0x0451625f, "TUSB6250 ATA Bridge" },
{ 0x04518042, "Hub" },
+ { 0x04518142, "TUSB8041 4-Port Hub" },
+ { 0x0451926b, "TUSB9260 Boot Loader" },
{ 0x0451dbc0, "Device Bay Controller" },
{ 0x0451e001, "GraphLink [SilverLink]" },
{ 0x0451e003, "TI-84 Plus Calculator" },
@@ -5377,6 +5384,7 @@ static const value_string usb_products_vals[] = {
{ 0x046d0a17, "G330 Headset" },
{ 0x046d0a1f, "G930" },
{ 0x046d0a29, "H600 [Wireless Headset]" },
+ { 0x046d0a37, "USB Headset H540" },
{ 0x046d0a38, "Headset H340" },
{ 0x046d0a44, "Wired headset" },
{ 0x046d0a4d, "G430 Surround Sound Gaming Headset" },
@@ -5458,7 +5466,7 @@ static const value_string usb_products_vals[] = {
{ 0x046dc11f, "Harmony 900/1100 Remote" },
{ 0x046dc121, "Harmony One Remote" },
{ 0x046dc122, "Harmony 650/700 Remote" },
- { 0x046dc124, "Harmony 300 Remote" },
+ { 0x046dc124, "Harmony 300/350 Remote" },
{ 0x046dc125, "Harmony 200 Remote" },
{ 0x046dc126, "Harmony Link" },
{ 0x046dc129, "Harmony Hub" },
@@ -5747,6 +5755,7 @@ static const value_string usb_products_vals[] = {
{ 0x047120e3, "GoGear Raga" },
{ 0x047120e4, "GoGear ViBE 8GB" },
{ 0x047120e5, "Philips GoGear Vibe/02" },
+ { 0x04712160, "Mio LINK Heart Rate Monitor" },
{ 0x0471262c, "SPC230NC Webcam" },
{ 0x0471485d, "Senselock SenseIV v2.x" },
{ 0x04717e01, "Philips PSA235" },
@@ -5902,6 +5911,7 @@ static const value_string usb_products_vals[] = {
{ 0x04832017, "Biometric Smart Card Reader" },
{ 0x04832018, "BioSimKey" },
{ 0x04832302, "Portable Flash Device (PFD)" },
+ { 0x0483347b, "ST-LINK/V2-1" },
{ 0x04833744, "STLINK Pseudo disk" },
{ 0x04833747, "ST Micro Connect Lite" },
{ 0x04833748, "ST-LINK/V2" },
@@ -5929,6 +5939,7 @@ static const value_string usb_products_vals[] = {
{ 0x0489e016, "Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]" },
{ 0x0489e02c, "Atheros AR5BBU12 Bluetooth Device" },
{ 0x0489e040, "Vizio VTAB1008" },
+ { 0x0489e04d, "Atheros AR3012 Bluetooth" },
{ 0x048d1165, "IT1165 Flash Controller" },
{ 0x048d1336, "SD/MMC Cardreader" },
{ 0x048d1345, "Multi Cardreader" },
@@ -7369,6 +7380,7 @@ static const value_string usb_products_vals[] = {
{ 0x04d8f437, "SBE Tech Ultrasonic Anemometer" },
{ 0x04d8f4b5, "SmartScope" },
{ 0x04d8f8da, "Hughski Ltd. ColorHug" },
+ { 0x04d8f8e8, "Harmony 300/350 Remote" },
{ 0x04d8f91c, "SPROG IIv3" },
{ 0x04d8faff, "Dangerous Prototypes BusPirate v4 Bootloader mode" },
{ 0x04d8fb00, "Dangerous Prototypes BusPirate v4" },
@@ -7743,7 +7755,7 @@ static const value_string usb_products_vals[] = {
{ 0x04e8662e, "MITs Sync" },
{ 0x04e86630, "MITs Sync" },
{ 0x04e86632, "MITs Sync" },
- { 0x04e8663e, "D900e Phone" },
+ { 0x04e8663e, "D900e/B2100 Phone" },
{ 0x04e8663f, "SGH-E720/SGH-E840" },
{ 0x04e86640, "Usb Modem Enumerator" },
{ 0x04e86642, "Samsung M7600 Beat/GT-S8300T/SGH-F490/S8300" },
@@ -7754,8 +7766,8 @@ static const value_string usb_products_vals[] = {
{ 0x04e86727, "Samsung F250 Mobile Phone" },
{ 0x04e86734, "Samsung Juke (SCH-U470)" },
{ 0x04e86752, "Samsung GT-B2700" },
- { 0x04e86759, "D900e Media Player" },
- { 0x04e8675a, "D900e Mass Storage" },
+ { 0x04e86759, "D900e/B2100 Media Player" },
+ { 0x04e8675a, "D900e/B2100 Mass Storage" },
{ 0x04e8675b, "D900e Camera" },
{ 0x04e86763, "Samsung SAMSUNG Trance" },
{ 0x04e86772, "Standalone LTE device (Trial)" },
@@ -8620,6 +8632,7 @@ static const value_string usb_products_vals[] = {
{ 0x054c05a8, "Sony NWZ-S765" },
{ 0x054c05b3, "Sony Sony Tablet S" },
{ 0x054c05b4, "Sony Sony Tablet S1" },
+ { 0x054c05c4, "DualShock 4" },
{ 0x054c061f, "Sony DSC-HX200V" },
{ 0x054c0689, "Walkman NWZ-B173F" },
{ 0x054c06bb, "WALKMAN NWZ-F805" },
@@ -8831,6 +8844,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a00de, "CTH-470 [Bamboo Fun Pen & Touch]" },
{ 0x056a00f6, "Cintiq 24HD touch (DTH-2400) touchscreen" },
{ 0x056a00f8, "Cintiq 24HD touch (DTH-2400) tablet" },
+ { 0x056a0302, "Intuos CTH480S2 [Manga]" },
{ 0x056a0307, "Cintiq Companion Hybrid 13HD (DTH-A1300) tablet" },
{ 0x056a0309, "Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen" },
{ 0x056a030e, "Intuos Pen Small (CTL480)" },
@@ -9639,7 +9653,7 @@ static const value_string usb_products_vals[] = {
{ 0x05af9267, "KB 9251B - 678 Mouse" },
{ 0x05b11389, "Bluetooth Wireless Adapter" },
{ 0x05b44857, "M-Any DAH-210" },
- { 0x05b46001, "Digisette DUO-MP3 AR-100" },
+ { 0x05b46001, "HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller" },
{ 0x05b83002, "Scroll Mouse" },
{ 0x05ba0007, "Fingerprint Reader" },
{ 0x05ba0008, "Fingerprint Reader" },
@@ -9660,6 +9674,7 @@ static const value_string usb_products_vals[] = {
{ 0x05c69000, "SIMCom SIM5218 modem" },
{ 0x05c69001, "Gobi Wireless Modem" },
{ 0x05c69002, "Gobi Wireless Modem" },
+ { 0x05c69003, "Quectel UC20" },
{ 0x05c69008, "Gobi Wireless Modem (QDL mode)" },
{ 0x05c69018, "Qualcomm HSUSB Device" },
{ 0x05c69025, "Qualcomm HSUSB Device" },
@@ -9954,6 +9969,7 @@ static const value_string usb_products_vals[] = {
{ 0x05dca811, "16GB Gizmo!" },
{ 0x05dca813, "16gB flash thumb drive" },
{ 0x05dca815, "JumpDrive V10" },
+ { 0x05dca833, "JumpDrive S23 64GB" },
{ 0x05dcb002, "USB CF Reader" },
{ 0x05dcb018, "Multi-Card Reader" },
{ 0x05dcb047, "SDHC Reader [RW047-7000]" },
@@ -10201,6 +10217,7 @@ static const value_string usb_products_vals[] = {
{ 0x064ea136, "Asus Integrated Webcam [CN031B]" },
{ 0x064ea219, "1.3M WebCam (notebook emachines E730, Acer sub-brand)" },
{ 0x064ec107, "HP webcam [dv6-1190en]" },
+ { 0x064ec335, "HP TrueVision HD" },
{ 0x064ed101, "Acer CrystalEye Webcam" },
{ 0x064ed217, "HP TrueVision HD" },
{ 0x064ee201, "Lenovo Integrated Webcam" },
@@ -11124,6 +11141,7 @@ static const value_string usb_products_vals[] = {
{ 0x07632881, "M-Audio DFU" },
{ 0x07640005, "Cyber Power UPS" },
{ 0x07640501, "CP1500 AVR UPS" },
+ { 0x07640601, "PR1500LCDRT2U UPS" },
{ 0x07655001, "Huey PRO Colorimeter" },
{ 0x07655020, "i1 Display Pro" },
{ 0x07656003, "ColorMunki Smile" },
@@ -11419,6 +11437,7 @@ static const value_string usb_products_vals[] = {
{ 0x07b3090c, "OpticBook 3600 Plus Scanner" },
{ 0x07b30a06, "TVcam VD100" },
{ 0x07b30b00, "SmartPhoto F50" },
+ { 0x07b30c00, "OpticPro ST64 Scanner" },
{ 0x07b30c03, "OpticPro ST64+ Scanner" },
{ 0x07b30c04, "Optic Film 7200i scanner" },
{ 0x07b30c0c, "PL806 Scanner" },
@@ -11905,6 +11924,7 @@ static const value_string usb_products_vals[] = {
{ 0x08469040, "WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]" },
{ 0x08469041, "WNA1000M 802.11bgn [Realtek RTL8188CUS]" },
{ 0x08469042, "On Networks N150MA 802.11bgn [Realtek RTL8188CUS]" },
+ { 0x08469043, "WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?]" },
{ 0x08469050, "A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
{ 0x08469052, "A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]" },
{ 0x0846a001, "PA101 10 Mbps HPNA Home Phoneline RJ-1" },
@@ -12111,6 +12131,7 @@ static const value_string usb_products_vals[] = {
{ 0x08e30301, "RNIS" },
{ 0x08e40142, "Pioneer DVR-LX60D" },
{ 0x08e40148, "Pioneer XMP3" },
+ { 0x08e40184, "DDJ-WeGO" },
{ 0x08e40185, "DDJ-WeGO2" },
{ 0x08e60001, "GemPC-Touch 430" },
{ 0x08e60430, "GemPC430 SmartCard Reader" },
@@ -12267,6 +12288,7 @@ static const value_string usb_products_vals[] = {
{ 0x090c0373, "Silicon Motion Camera" },
{ 0x090c037a, "Silicon Motion Camera" },
{ 0x090c037b, "Silicon Motion Camera" },
+ { 0x090c037c, "300k Pixel Camera" },
{ 0x090c1000, "Flash Drive" },
{ 0x090c1132, "5-in-1 Card Reader" },
{ 0x090c337b, "Silicon Motion Camera" },
@@ -12281,6 +12303,7 @@ static const value_string usb_products_vals[] = {
{ 0x090c937b, "Silicon Motion Camera" },
{ 0x090cb370, "Silicon Motion SM370 Camera" },
{ 0x090cb371, "Silicon Motion SM371 Camera" },
+ { 0x090cf37d, "Endoscope camera" },
{ 0x0911149a, "SpeechMike II Pro Plus LFH5276" },
{ 0x09112512, "SpeechMike Pro" },
{ 0x09150001, "DSL Modem" },
@@ -12360,6 +12383,7 @@ static const value_string usb_products_vals[] = {
{ 0x09258800, "WiseGroup Ltd, MP-8800 Quad Joypad" },
{ 0x09258866, "WiseGroup Ltd, MP-8866 Dual Joypad" },
{ 0x09288000, "Firmware uploader" },
+ { 0x0928ffff, "Blank Oxford Device" },
{ 0x092f0004, "JTAG-4" },
{ 0x092f0005, "JTAG-5" },
{ 0x09300009, "Toshiba Gigabeat MEGF-40" },
@@ -13788,6 +13812,9 @@ static const value_string usb_products_vals[] = {
{ 0x0c4b0401, "cyberJack pinpad(a2)" },
{ 0x0c4b0500, "cyberJack RFID standard dual interface smartcard reader" },
{ 0x0c4b0501, "cyberJack RFID comfort dual interface smartcard reader" },
+ { 0x0c4b0502, "cyberJack compact" },
+ { 0x0c4b0504, "cyberJack go / go plus" },
+ { 0x0c4b0505, "cyberJack wave" },
{ 0x0c4b9102, "cyberJack RFID basis contactless smartcard reader" },
{ 0x0c4c0021, "EMP-21 Universal Programmer" },
{ 0x0c522101, "SeaLINK+232" },
@@ -13845,6 +13872,16 @@ static const value_string usb_products_vals[] = {
{ 0x0c550540, "SPI540" },
{ 0x0c555416, "TMS320C5416 DSK" },
{ 0x0c556416, "TMS320C6416 DDB" },
+ { 0x0c600001, "MiniMe" },
+ { 0x0c600002, "MiniDAC" },
+ { 0x0c600003, "ONE" },
+ { 0x0c600004, "GiO" },
+ { 0x0c600007, "Duet" },
+ { 0x0c600009, "Jam" },
+ { 0x0c60000a, "Jam Bootloader" },
+ { 0x0c60000b, "MiC" },
+ { 0x0c60000c, "MiC Bootloader" },
+ { 0x0c608007, "Duet DFU Mode" },
{ 0x0c6a0005, "Color 320 x 240 LCD Display Terminal with Touchscreen" },
{ 0x0c6c04b2, "Specbos 1201" },
{ 0x0c700000, "USB08 Development board" },
@@ -14213,6 +14250,9 @@ static const value_string usb_products_vals[] = {
{ 0x0db0a97a, "Bluetooth EDR Device" },
{ 0x0db0b970, "Bluetooth EDR Device" },
{ 0x0db0b97a, "Bluetooth EDR Device" },
+ { 0x0db50139, "LSR116 CDC" },
+ { 0x0db5013a, "LSR116 Keyboard" },
+ { 0x0db5013b, "LSR116 HID" },
{ 0x0db70002, "Goldpfeil P-LAN" },
{ 0x0dba1000, "Mbox 1 [Mbox]" },
{ 0x0dba3000, "Mbox 2" },
@@ -14429,6 +14469,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e6f0003, "Freebird wireless Controller" },
{ 0x0e6f0005, "Eclipse wireless Controller" },
{ 0x0e6f0006, "Edge wireless Controller" },
+ { 0x0e6f0128, "Wireless PS3 Controller" },
{ 0x0e791106, "Pocket Media Assistant - PMA400" },
{ 0x0e791204, "Gmini XS 200" },
{ 0x0e791207, "Archos Gmini XS100" },
@@ -14488,6 +14529,7 @@ static const value_string usb_products_vals[] = {
{ 0x0e8f0016, "4 port USB 1.1 hub UH-174" },
{ 0x0e8f0020, "USB to PS/2 Adapter" },
{ 0x0e8f0021, "Multimedia Keyboard Controller" },
+ { 0x0e8f0022, "multimedia keyboard controller" },
{ 0x0e8f0201, "SmartJoy Frag Xpad/PS2 adaptor" },
{ 0x0e900100, "Storage Adapter V1" },
{ 0x0e96c001, "TRUST 380 USB2 SPACEC@M" },
@@ -14519,6 +14561,7 @@ static const value_string usb_products_vals[] = {
{ 0x0ed5f201, "Fiberbyte USB-inSync DAQ-2500X" },
{ 0x0edf2060, "FID irock! 100 Series" },
{ 0x0ee31000, "Image Tank 1.5" },
+ { 0x0ee40690, "SATA 3 Adapter" },
{ 0x0eee8810, "Mass Storage Drive" },
{ 0x0eef0001, "eGalax TouchScreen" },
{ 0x0eef0002, "Touchscreen Controller(Professional)" },
@@ -14761,7 +14804,7 @@ static const value_string usb_products_vals[] = {
{ 0x0fcee166, "Xperia Mini Pro" },
{ 0x0fcee167, "XPERIA mini" },
{ 0x0fcee19b, "C2005 [Xperia M dual] (Mass Storage)" },
- { 0x0fcef0fa, "Liveview micro display MN800 in DFU mode" },
+ { 0x0fcef0fa, "MN800 / Smartwatch 2 (DFU mode)" },
{ 0x0fcf1003, "ANT Development Board" },
{ 0x0fcf1004, "ANTUSB Stick" },
{ 0x0fcf1006, "ANT Development Board" },
@@ -14810,6 +14853,7 @@ static const value_string usb_products_vals[] = {
{ 0x100461c5, "P880 / Charge only" },
{ 0x100461c6, "Vortex (msc)" },
{ 0x100461cc, "Optimus S" },
+ { 0x100461da, "G2 Android Phone [tethering mode]" },
{ 0x100461f1, "Optimus Android Phone [LG Software mode]" },
{ 0x100461f9, "LG Electronics Inc. V909 G-Slate" },
{ 0x100461fc, "Optimus 3" },
@@ -14817,7 +14861,7 @@ static const value_string usb_products_vals[] = {
{ 0x10046300, "Optimus Android Phone" },
{ 0x1004631c, "LG Electronics Inc. LG-E617G/P700" },
{ 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" },
- { 0x1004631e, "Optimus Android Phone [Camera/PTP mode]" },
+ { 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" },
{ 0x1004631f, "Optimus Android Phone (Charge Mode)" },
{ 0x10046356, "Optimus Android Phone [Virtual CD mode]" },
{ 0x10046800, "CDMA Modem" },
@@ -14895,6 +14939,7 @@ static const value_string usb_products_vals[] = {
{ 0x10466694, "Generic W6694 USB" },
{ 0x10468901, "Bluetooth Device" },
{ 0x10469967, "W9967CF/W9968CF Webcam IC" },
+ { 0x10482010, "4-Port hub" },
{ 0x104d1003, "Model-52 LED Light Source Power Supply and Driver" },
{ 0x104f0001, "Infinity Phoenix" },
{ 0x104f0002, "Smartmouse" },
@@ -14905,9 +14950,12 @@ static const value_string usb_products_vals[] = {
{ 0x104f0008, "Infinity CryptoKey" },
{ 0x104f0009, "RE-BL PlayStation 3 IR-to-Bluetooth converter" },
{ 0x10500010, "Yubikey" },
- { 0x10500110, "Yubikey NEO OTP" },
- { 0x10500111, "Yubikey NEO OTP+CCID" },
- { 0x10500112, "Yubikey NEO CCID" },
+ { 0x10500110, "Yubikey NEO(-N) OTP" },
+ { 0x10500111, "Yubikey NEO(-N) OTP+CCID" },
+ { 0x10500112, "Yubikey NEO(-N) CCID" },
+ { 0x10500113, "Yubikey NEO(-N) U2F" },
+ { 0x10500114, "Yubikey NEO(-N) OTP+U2F" },
+ { 0x10500115, "Yubikey NEO(-N) U2F+CCID" },
{ 0x10500200, "U2F Gnubby" },
{ 0x10500211, "Gnubby" },
{ 0x10545004, "DSL 7420 Loader" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 162f3ee71e..273e518235 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-03-06)
+(last updated 2015-03-13)
SMI Network Management Private Enterprise Codes:
@@ -2679,8 +2679,8 @@ Decimal
ray.caruso&netvion.com
666
Oki Electric Industry Co., Ltd.
- Shigeru Urushibara
- uru&cs1.cs.oki.co.jp
+ Naoki Hayashi
+ hayashi753&oki.com
667
Specialix International
Jeremy Rolls
@@ -14223,8 +14223,8 @@ Decimal
dobrad&wnt.sas.com
3555
NetLock Ltd.
- Zsolt Rozsahegyi
- rozsahegyi_zs&netlock.net
+ Katalin Szűcs
+ szucs.katalin&netlock.hu
3556
GENO-RZ GmbH
Herr Medovic
@@ -108611,9 +108611,9 @@ de l'Ouest(RESAO)
Kare Langedrag
kare&novasecure.no
27259
- Power-One
+ BEL POWER SOLUTIONS (formerly "Power-One")
Juerg Labhart
- juerg.labhart&power-one.com
+ juerg.labhart&psbel.com
27260
DynaPel Systems Inc.
Dr. Dieter Koller
@@ -113923,9 +113923,9 @@ Decentralization / Helenic Public Administra
Mike French
macvoip&gmail.com
28586
- ELPRO Technologies Pty Ltd
+ EATON Wireless
Harry Courtice
- harry.courtice&elprotech.com
+ harrycourtice&eaton.com
28587
Mobilesoft (Aust) Pty Limited
Cameron Hutchison
@@ -181359,6 +181359,194 @@ Decentralization / Helenic Public Administra
ecg.local
Ralf Balzer
balzer&manthey.it
+45445
+ Kuantic SAS
+ Mike O'Dowd
+ modowd&kuantic.com
+45446
+ Ministerio Publico de la Acusación
+ Ing. Alejandro Azario
+ aazario&mpa.santafe.gov.ar
+45447
+ SOCIETE DU FIGARO
+ Bruno Coutureau
+ bcoutureau&lefigaro.fr
+45448
+ UF Health Oncology - Baymeadows
+ Kathy Politano
+ kpolitano&21co.com
+45449
+ Blue Krait Consulting Inc.
+ Blair Sandberg
+ blair.sandberg&bluekrait.com
+45450
+ Parsec (Pty) Ltd
+ Francois Joubert
+ francoisj&parsec.co.za
+45451
+ reBTSOFT
+ Björn Ternes
+ bjoern.ternes&gmail.com
+45452
+ Instituto Medico Alexander Fleming
+ Mario Cazeneuve
+ mcazeneuve&alexanderfleming.org
+45453
+ Banff Cyber Technologies Pte Ltd
+ Alex Ngo
+ alexngo&banffcyber.com
+45454
+ Shanghai Digigrid Technology Co.,Ltd
+ Ivy Jiang
+ ivy.jiang&digigrid.com.cn
+45455
+ John Wason
+ John Wason
+ wason&wasontech.com
+45456
+ Galaxia Electronics Co., Ltd.
+ Hong-rae, Kim
+ hrkim&galaxia.co.kr
+45457
+ Kanton Thurgau
+ Patrik Stacher
+ patrik.stacher&tg.ch
+45458
+ VKBit Betrieb GmbH
+ Matthias Fischer
+ matthias.fischer&vkb.de
+45459
+ Lonix Oy
+ Jarmo Mitjonen
+ jm&lonix.com
+45460
+ Comfact AB
+ Anders Tornqvist
+ anders&comfact.com
+45461
+ Pocos bv
+ JordI Smits
+ jordi&pocos.nl
+45462
+ Koch-IT
+ Martin Koch
+ post&koch-it.de
+45463
+ Federal Public Service Justice, Belgium
+ David Roskams
+ ict.infra.pen&just.fgov.be
+45464
+ Verband Christlicher Pfadfinderinnen und Pfadfinder in Württemberg
+ Frederik Held
+ frederik.held&wuerttemberg.vcp.de
+45465
+ Clear2Pay NV/SA
+ Dieter Boden-Schelfthout
+ dieter.boden&clear2pay.com
+45466
+ PIXEL Sp. z o.o.
+ Seweryn Kamiński
+ s.kaminski&pixel.pl
+45467
+ Vidat
+ Jochen Ulbricht
+ j.ulbricht&vidat.eu
+45468
+ Avi Networks
+ Anand Parthasarathy
+ anpartha&avinetworks.com
+45469
+ IQ Messenger
+ Ramazan Aslan
+ r.aslan&iqmessenger.com
+45470
+ Azienda Ospedaliero-Universitaria di Bologna
+ Luca Boccafogli
+ luca.boccafogli&aosp.bo.it
+45471
+ Triangle Wholefoods Collective Ltd.
+ Pod Andrews
+ pod&suma.coop
+45472
+ Ebee Smart Technologies GmbH
+ Robert Weyrauch
+ iana&ebeesmarttechnologies.de
+45473
+ Excelfore Corporation
+ Anoop Balakrishnan
+ admin&excelfore.com
+45474
+ HfMT Hamburg
+ Axel Schnellbügel
+ axel.schnellbuegel&hfmt-hamburg.de
+45475
+ MEYTEC GmbH
+ Gerhard W. Meyer
+ info&meytec.com
+45476
+ StreamVue Ltd
+ Sonia Griffiths
+ hostmaster&streamvue.com
+45477
+ ZOO Digital Group plc.
+ Stuart Green
+ stuart.green&zoodigital.com
+45478
+ DIVA IT SIA
+ Dmitrijs Petrovs
+ dmitrijs.petrovs&divait.lv
+45479
+ PXP Solutions Ltd
+ James Russell
+ hostmaster&pxp-solutions.com
+45480
+ Packetwerk GmbH
+ Sven Roethig
+ s.roethig&packetwerk.de
+45481
+ Galore Networks Private Limited
+ Balaji Kulothungan
+ balajik&ga-lore.com
+45482
+ St Jude Medical
+ Eric Crist
+ ecrist&sjm.com
+45483
+ FusionLayer, Inc.
+ Rauno Haapaniemi
+ snmp-admin&fusionlayer.com
+45484
+ Siama Systems Inc.
+ Marco Mascitto
+ marco.mascitto&siamasystems.com
+45485
+ SCUBI
+ Justin Jensen
+ justin.jensen&capgemini-gs.com
+45486
+ ACSS Communications Pty Ltd
+ Alex Lodge
+ AlexL&acsscomms.com.au
+45487
+ Polydata Corporate
+ Jing Kang
+ jing.kang&polydata.com.cn
+45488
+ KONAR
+ Anton Myachin
+ noc&konar.ru
+45489
+ groupe-alpha
+ Alain Mouilleron
+ iana&groupe-alpha.com
+45490
+ Nexperteam
+ Nathan Van Overloop
+ operations&nexperteam.be
+45491
+ Gainde 2000
+ Magatte MBAYE
+ mmbaye&gainde2000.sn
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 2dac4f658b..7afd20753e 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -27279,7 +27279,7 @@ const value_string sminmpec_values[] = {
{ 27256, "NPF \"KRUG\"" },
{ 27257, "Valimo Wireless Oy" },
{ 27258, "NovaSecure AS" },
- { 27259, "Power-One" },
+ { 27259, "BEL POWER SOLUTIONS (formerly \"Power-One\")" },
{ 27260, "DynaPel Systems Inc." },
{ 27261, "Servicios Avanzados para las Instituciones S.L." },
{ 27262, "DANTE Ltd." },
@@ -28606,7 +28606,7 @@ const value_string sminmpec_values[] = {
{ 28583, "Tangent Systems, Inc." },
{ 28584, "Allegro Networks pty ltd" },
{ 28585, "Sniddle LLC" },
- { 28586, "ELPRO Technologies Pty Ltd" },
+ { 28586, "EATON Wireless" },
{ 28587, "Mobilesoft (Aust) Pty Limited" },
{ 28588, "Kaplan Software, LLC" },
{ 28589, "IDERs Inc" },
@@ -45465,6 +45465,53 @@ const value_string sminmpec_values[] = {
{ 45442, "Wroc\0305\0202aw University of Technology" },
{ 45443, "Arca Sistemi Scarl" },
{ 45444, "ecg.local" },
+ { 45445, "Kuantic SAS" },
+ { 45446, "Ministerio Publico de la Acusaci\0303\0263n " },
+ { 45447, "SOCIETE DU FIGARO" },
+ { 45448, "UF Health Oncology - Baymeadows" },
+ { 45449, "Blue Krait Consulting Inc." },
+ { 45450, "Parsec (Pty) Ltd" },
+ { 45451, "reBTSOFT" },
+ { 45452, "Instituto Medico Alexander Fleming" },
+ { 45453, "Banff Cyber Technologies Pte Ltd" },
+ { 45454, "Shanghai Digigrid Technology Co.,Ltd" },
+ { 45455, "John Wason" },
+ { 45456, "Galaxia Electronics Co., Ltd." },
+ { 45457, "Kanton Thurgau" },
+ { 45458, "VKBit Betrieb GmbH" },
+ { 45459, "Lonix Oy" },
+ { 45460, "Comfact AB" },
+ { 45461, "Pocos bv" },
+ { 45462, "Koch-IT" },
+ { 45463, "Federal Public Service Justice, Belgium" },
+ { 45464, "Verband Christlicher Pfadfinderinnen und Pfadfinder in W\0303\0274rttemberg " },
+ { 45465, "Clear2Pay NV/SA" },
+ { 45466, "PIXEL Sp. z o.o." },
+ { 45467, "Vidat" },
+ { 45468, "Avi Networks" },
+ { 45469, "IQ Messenger" },
+ { 45470, "Azienda Ospedaliero-Universitaria di Bologna" },
+ { 45471, "Triangle Wholefoods Collective Ltd." },
+ { 45472, "Ebee Smart Technologies GmbH" },
+ { 45473, "Excelfore Corporation" },
+ { 45474, "HfMT Hamburg" },
+ { 45475, "MEYTEC GmbH" },
+ { 45476, "StreamVue Ltd" },
+ { 45477, "ZOO Digital Group plc." },
+ { 45478, "DIVA IT SIA" },
+ { 45479, "PXP Solutions Ltd" },
+ { 45480, "Packetwerk GmbH" },
+ { 45481, "Galore Networks Private Limited" },
+ { 45482, "St Jude Medical" },
+ { 45483, "FusionLayer, Inc." },
+ { 45484, "Siama Systems Inc." },
+ { 45485, "SCUBI" },
+ { 45486, "ACSS Communications Pty Ltd" },
+ { 45487, "Polydata Corporate" },
+ { 45488, "KONAR" },
+ { 45489, "groupe-alpha" },
+ { 45490, "Nexperteam" },
+ { 45491, "Gainde 2000" },
{ 0, NULL}
};