[Automatic manuf, services and enterprise-numbers update for 2015-03-29]

Change-Id: Ied01fe7ddb1734f1f8974c725b802075220bbd0f
Reviewed-on: https://code.wireshark.org/review/7843
Reviewed-by: Gerald Combs <gerald@wireshark.org>

3 files changed, 358 insertions, 26 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 4a33cb7ec4..cdd70f9075 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2559,6 +2559,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x198f, "Beceem Communications Inc." },
     { 0x1990, "Acron Precision Industrial Co., Ltd." },
     { 0x1995, "Trillium Technology Pty. Ltd." },
+    { 0x1996, "PixeLINK" },
     { 0x199b, "MicroStrain, Inc." },
     { 0x199e, "The Imaging Source Europe GmbH" },
     { 0x199f, "Benica Corporation" },
@@ -2851,6 +2852,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x27b8, "ThingM" },
     { 0x2821, "ASUSTek Computer Inc." },
     { 0x2899, "Toptronic Industrial Co., Ltd" },
+    { 0x289b, "Dracal/Raphnet technologies" },
     { 0x2931, "Jolla Oy" },
     { 0x2a03, "dog hunter AG" },
     { 0x2c02, "Planex Communications" },
@@ -16551,10 +16553,22 @@ static const value_string usb_products_vals[] = {
     { 0x1781083e, "MetaGeek Wi-Spy" },
     { 0x1781083f, "MetaGeek Wi-Spy 2.4x" },
     { 0x17810938, "Iguanaworks USB IR Transceiver" },
+    { 0x17810a96, "raphnet.net usb_game12" },
+    { 0x17810a97, "raphnet.net SNES mouse adapter" },
+    { 0x17810a98, "raphnet.net USBTenki" },
+    { 0x17810a99, "raphnet.net NES" },
+    { 0x17810a9a, "raphnet.net Gamecube/N64 controller" },
+    { 0x17810a9b, "raphnet.net DB9Joy" },
+    { 0x17810a9c, "raphnet.net Intellivision" },
+    { 0x17810a9d, "raphnet.net 4nes4snes" },
+    { 0x17810a9e, "raphnet.net Megadrive multitap" },
+    { 0x17810a9f, "raphnet.net MultiDB9joy" },
     { 0x17810c30, "Telldus TellStick" },
     { 0x17810c31, "Telldus TellStick Duo" },
     { 0x17810c9f, "USBtiny" },
     { 0x17811eef, "OpenAPC SecuKey" },
+    { 0x17811ef0, "E1701 Modular Controller Card" },
+    { 0x17811ef1, "E1701 Modular Controller Card" },
     { 0x17840001, "eHome Infrared Transceiver" },
     { 0x17840004, "RF Combo Device" },
     { 0x17840006, "eHome Infrared Transceiver" },
@@ -16817,6 +16831,9 @@ static const value_string usb_products_vals[] = {
     { 0x198f0220, "BCSM250 WiMAX Adapter" },
     { 0x19953202, "REC-ADPT-USB (recorder)" },
     { 0x19953203, "REC-A-ADPT-USB (recorder)" },
+    { 0x19963010, "Camera Release 4" },
+    { 0x19963011, "OEM Camera" },
+    { 0x19963012, "e-ImageData Corp. ScanPro" },
     { 0x199b3065, "3DM-GX3-25 Orientation Sensor" },
     { 0x199e8101, "DFx 21BU04 Camera" },
     { 0x19ab1000, "ProScope HR" },
@@ -17681,6 +17698,21 @@ static const value_string usb_products_vals[] = {
     { 0x2821160f, "WL-160g 802.11g Wireless Adapter [Envara WiND512]" },
     { 0x28213300, "WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]" },
     { 0x2899012c, "Camera Device" },
+    { 0x289b0001, "Gamecube/N64 controller v2.2" },
+    { 0x289b0002, "2nes2snes" },
+    { 0x289b0003, "4nes4snes" },
+    { 0x289b0004, "Gamecube/N64 controller v2.3" },
+    { 0x289b0005, "Saturn (Joystick mode)" },
+    { 0x289b0006, "Saturn (Mouse mode)" },
+    { 0x289b0007, "Famicom controller" },
+    { 0x289b0008, "Dreamcast (Joystick mode)" },
+    { 0x289b0009, "Dreamcast (Mouse mode)" },
+    { 0x289b000a, "Dreamcast (Keyboard mode)" },
+    { 0x289b000b, "Gamecube/N64 controller v2.9 (Keyboard mode)" },
+    { 0x289b000c, "Gamecube/N64 controller v2.9 (Joystick mode)" },
+    { 0x289b0100, "Dual-relay board" },
+    { 0x289b0500, "Energy meter" },
+    { 0x289b0502, "Precision barometer" },
     { 0x29310a01, "Jolla Phone MTP" },
     { 0x29310a02, "Jolla Phone Developer" },
     { 0x29310a05, "Jolla PC connection" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 6810445470..02233fe01d 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-03-21)
+(last updated 2015-03-29)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -6247,8 +6247,8 @@ Decimal
       jwelfeld&howl.com
 1558
   Skog-Data AS
-    Haakon Beitnes
-      hb&skogdata.no
+    Trond Karlsen
+      tk&skogdata.no
 1559
   mitec a/s
     Arne-J=F8rgen Auberg
@@ -52230,9 +52230,9 @@ Decimal
     Glenn Retsky
       tradebullion&netzero.net
 13169
-  C&D Technologies, Inc.
-    Paul Knauber
-      pknauber&cdtechno.com
+  UNIPOWER, LLC. - IPS (formerly "C&D Technologies, Inc.")
+    Cliff Murphy
+      cliff.murphy&unipowerco.com
 13170
   caresys GmbH
     Thomas Lohmueller
@@ -62623,9 +62623,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Josef Brunner
       josef.brunner&triblen.de
 15768
-  BelAir Networks
-    Marcel Chenier
-      mchenier&belairnetworks.com
+  Ericsson Inc. (formerly "BelAir Networks")
+    Ryan Greer
+      ryan.greer&ericsson.com
 15769
   Argecy Computer Corporation
     Steve Lee
@@ -112128,8 +112128,8 @@ Decentralization / Helenic Public Administra
       pm&deltadore.com
 28137
   NXP Semiconductors B.V.
-    Kay Behnke
-      Kay.Behnke&nxp.com
+    Hauke Meyn
+      hauke.meyn&nxp.com
 28138
   Icepeak AB
     Tobias Svensson
@@ -135067,9 +135067,9 @@ Decentralization / Helenic Public Administra
     Volker Zipfel
       volker.zipfel&zibimed.de
 33872
-  Cheetah Technologies L.P.
+  Alpha Technologies, Inc. (formerly "Cheetah Technologies L.P.")
     Mark Bereit
-      mbereit&cheetahtech.com
+      mbereit&alpha.com
 33873
   ARC Créations
     Marc Laflutte
@@ -157153,8 +157153,8 @@ Decentralization / Helenic Public Administra
       james&jameskinnaird.ca
 39393
   Global Reach Technology Limited
-    Dr Chris Spencer
-      chris.spencer&globalreach.eu.com
+    Dr Christopher Spencer
+      chris&globalreachtech.com
 39394
   Direccion General de Escuela Nacional Preparatoria
     Gabriela Cancino Ramirez
@@ -157168,9 +157168,9 @@ Decentralization / Helenic Public Administra
     R.G. Wilsher
       RGW&Zygma.biz
 39397
-  ToolBox Solution GmbH
+  amitego engineering GmbH (formerly "ToolBox Solution GmbH")
     Tillmann Basien
-      tab&tbsol.de
+      tab&amitego.com
 39398
   HvS-Consulting AG
     Michael Hochenrieder
@@ -161453,8 +161453,8 @@ Decentralization / Helenic Public Administra
       roelof.dutoit&netronome.com
 40468
   LSE Leading Security Experts GmbH
-    Cornelius Kölbel
-      cornelius.koelbel&lsexperts.de
+    Stefan Pietsch
+      stefan.pietsch&lsexperts.de
 40469
   Arkansas Heart Hospital
     Shannon Jacobson
@@ -171554,7 +171554,7 @@ Decentralization / Helenic Public Administra
 42993
   Cornerstone Health Care, P.A.
     Ian Atchison
-      ian.atchison&cornerstonehealthcare.com
+      infosec&cornerstonehealthcare.com
 42994
   Institut de Physique de Rennes
     Jérémy Gardais
@@ -181560,7 +181560,7 @@ Decentralization / Helenic Public Administra
     Ibrahim Afaneh
       ibrahim.afaneh&gistec.com
 45495
-  Konneka Bilgi ve Iletisim Teknolojileri Imalat Tic. Ltd. Sti.
+  Konneka Information Technologies (formerly "Konneka Bilgi ve Iletisim Teknolojileri Imalat Tic. Ltd. Sti.")
     Kursad Yusuf KONUS
       kykonus&konneka.com.tr
 45496
@@ -181683,6 +181683,246 @@ Decentralization / Helenic Public Administra
   Ubiqam LTD
     Dovalle Yankelovich
       Dovalle&ubiqam.com
+45526
+  Snapper Services
+    David Stamp 
+      david.stamp&snapper.co.nz
+45527
+  Diehl AKO Stiftung & Co. KG
+    Armin Ruess
+      armin.ruess&diehl-controls.com
+45528
+  Joerg-Peter Hempel
+    Joerg-Peter Johann Hempel
+      mail&jphempel.eu
+45529
+  vishmail.net
+    Joerg-Peter Hempel
+      mail&jphempel.eu
+45530
+  Medien Service Untermain GmbH
+    Peter Bethke
+      bethke&msu.biz
+45531
+  M.A.D.A.
+    Dovalle Yankelovich
+      Dovalle&MadaTechnologies.com
+45532
+  Infinicore inc
+    David Chen
+      Dchen&infinicoreinc.com
+45533
+  Red Arrow (Southampton) Group Limited
+    Alex Martin
+      Alex.Martin&redarrow.co.uk
+45534
+  WestNet
+    Paul Cunnane
+      paul.cunnane&westnet.ie
+45535
+  Information Systems Dynamics
+    Hakeem P. Fahm
+      bills&isdynamics.com
+45536
+  Rheinmetall Defence Electronics GmbH
+    Herbst, Andre
+      andre.herbst&rheinmetall.com
+45537
+  NUAZ
+    Dick Hofflamut
+      dick.hofflamut&nuaz.fr
+45538
+  PHARMAGEST INTERACTIVE
+    Sebastien DEON
+      sebastien.deon&pharmagest.com
+45539
+  private use - Domain fritze.org
+    Stefan Fritze
+      sf&fritze.org
+45540
+  Rueval S.A.
+    Ricardo Arias
+      rarias&rueval.com.uy
+45541
+  Schneider Elektronik GmbH
+    Jan Keßler
+      jan.kessler&schneider-elektronik.de
+45542
+  Orlando Utilities Commission
+    Andy Bailey
+      abailey&ouc.com
+45543
+  Mekansal Yazilim
+    Ömür YAVUZ
+      omur.yavuz&intergis.com.tr
+45544
+  IT Kimmig
+    Alexander Kimmig
+      info&it-kimmig.de
+45545
+  Ormazabal
+    SNMP Administrator
+      licenses.electronics&ormazabal.com
+45546
+  SECUWAVE CO,. LT
+    PARK BYUNG WOOK
+      bwpark&openbase.co.kr
+45547
+  Wirtgen (China) Machinery Co., Ltd.
+    Richard Shao
+      richard.shao&wirtgen-china.com.cn
+45548
+  Asian Hope Inc
+    Lyle Kozloff
+      lyle&asianhope.org
+45549
+  Shenzhen Zontele Technologies Co., Ltd
+    king zhu
+      king.zhu&zontele.com
+45550
+  Webstudio Information Technology Inc.
+    Ruyi Wang
+      webstudio&webstudio.com.cn
+45551
+  VIPP
+    CE NOYELLE
+      cenoyelle&vippinterstis.com
+45552
+  Unisys 
+    Abhineet Pandey
+      abhineet.pandey&in.unisys.com
+45553
+  GE Healthcare - Engineering
+    METIVIER Maxime
+      maximemetivier&ge.com
+45554
+  Grupo JAMPIG S.A.S.
+    Fabián E. Barón
+      fbaron&jampig.co
+45555
+  RDP
+    Nechay Anton
+      anechay&rdp.ru
+45556
+  Triadic Industries, LLC
+    Alex McWhirter
+      alexmcwhirter&vantagetitle.com
+45557
+  SHENZHEN CAN TECHNOLOGY CO.,LTD
+    Skye Zhao
+      zhaoxiao&canpdu.com
+45558
+  CJSC GROUP OF COMPANIES RENOVA
+    Sergey Kulikov
+      it&renova-group.ru
+45559
+  Prevoty, Inc.
+    Kunal Anand
+      kunal&prevoty.com
+45560
+  Inovapar Soluções LTDA.
+    Antonio Calegare
+      suporte&inovapar.com.br
+45561
+  Masterclock, Inc.
+    William Clark
+      sysadmin&masterclock.com
+45562
+  Capella Aerospace Systems Engineering Inc.
+    Sean Hamilton
+      seanh&capellaaero.com
+45563
+  SOMNOmedics GmbH
+    Jonas Zeiger
+      jz&somnomedics.de
+45564
+  Beijing SplendidTel Co.,Ltd.
+    Marco Jun Peng
+      marco.peng&splendidtel.com
+45565
+  INTERBYSS S.R.L
+    Alvin Nunez
+      a.nunez&interbyss.com
+45566
+  INTELMA CONSULTING Inc.
+    Badis Omarouayache
+      badis.omarouayache&intelmas.com
+45567
+  Ticom Geomatics, Inc.
+    Craig Hamilton
+      chamilton&ticom-geo.com
+45568
+  GoCardless Ltd
+    James Cunningham
+      webops&gocardless.com
+45569
+  Core Network Dynamics
+    Dragos Vingarzan
+      dragos&corenetdynamics.com
+45570
+  IQ Tel d.o.o.
+    Ognjen Seslija
+      ognjen.seslija&iqtel.rs
+45571
+  Midfin Systems
+    Shuvabrata Ganguly
+      sganguly&midfinsystems.com
+45572
+  awelten
+    Roman Hector Bianco
+      roman.bianco&awelten.com
+45573
+  Western Michigan University Homer Stryker M.D. School of Medicine
+    David Mitchell
+      david.mitchell&med.wmich.edu
+45574
+  Hellea SPRL
+    Jean-Charles de Longueville
+      iana.pen&hellea.net
+45575
+  China Beijing Stegosaurus Technology Laboratory
+    Sean.Zhu
+      SeanZhu&163.com
+45576
+  Hulu LLC
+    Robert Minsk
+      iana&hulu.com
+45577
+  Shenzhen Sundray Technologies Company Limited
+    MaoXing Qin
+      qmx&sundray.com
+45578
+  BroadQuest
+    MI HYE, KIM
+      mhkim&broadquest.co.kr
+45579
+  Guangdong Nenkingtech Development Co,Ltd.
+    MINXUAN CAO
+      maxoncao&163.com
+45580
+  DENTCAT
+    Masood Behabadi
+      masood&dentcat.com
+45581
+  YICHUN YILIAN PRINT TECH CO.,LTD
+    Chloe Sun
+      chloe_lishan&sina.cn
+45582
+  paysafecard.com Wertkarten GmbH
+    Michael Postmann
+      m.postmann&paysafecard.com
+45583
+  Puminsoft Co.,Ltd.
+    Pumin Duangmanee
+      puminsoft&gmail.com
+45584
+  OJSC "RIRT"
+    Alexander Barskiy
+      Barskiy_AA&rirt.ru
+45585
+  Space Imaging Middle East (SIME)
+    Spandan Kar 
+      spandan&dsi.co.ae
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 3b676f9abb..8c94f50090 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -13189,7 +13189,7 @@ const value_string sminmpec_values[] = {
     { 13166, "Acamar Systems" },
     { 13167, "Oeko.neT Mueller & Brandt" },
     { 13168, "Aries e-Publishing" },
-    { 13169, "C&D Technologies, Inc." },
+    { 13169, "UNIPOWER, LLC. - IPS (formerly \"C&D Technologies, Inc.\")" },
     { 13170, "caresys GmbH" },
     { 13171, "Cilys" },
     { 13172, "Dark Side of the Moon Software" },
@@ -15788,7 +15788,7 @@ const value_string sminmpec_values[] = {
     { 15765, "JX Solutions Ltd." },
     { 15766, "Matrix Mailing, LLC" },
     { 15767, "Triblen" },
-    { 15768, "BelAir Networks" },
+    { 15768, "Ericsson Inc. (formerly \"BelAir Networks\")" },
     { 15769, "Argecy Computer Corporation" },
     { 15770, "Zeera Networks, Inc." },
     { 15771, "JF Possibilities" },
@@ -33892,7 +33892,7 @@ const value_string sminmpec_values[] = {
     { 33869, "Kompas Xnet d.o.o." },
     { 33870, "EXXOSS S.P.R.L." },
     { 33871, "ZIBImed GmbH" },
-    { 33872, "Cheetah Technologies L.P." },
+    { 33872, "Alpha Technologies, Inc. (formerly \"Cheetah Technologies L.P.\")" },
     { 33873, "ARC Cr\0303\0251ations" },
     { 33874, "Novita" },
     { 33875, "National Bank of Ukraine" },
@@ -39417,7 +39417,7 @@ const value_string sminmpec_values[] = {
     { 39394, "Direccion General de Escuela Nacional Preparatoria" },
     { 39395, "ELDIS Pardubice, s.r.o." },
     { 39396, "Zygma LLC" },
-    { 39397, "ToolBox Solution GmbH" },
+    { 39397, "amitego engineering GmbH (formerly \"ToolBox Solution GmbH\")" },
     { 39398, "HvS-Consulting AG" },
     { 39399, "Gumilyov Eurasian National University" },
     { 39400, "Institut f\0303\0274r angewandte Funksystemtechnik GmbH" },
@@ -45515,7 +45515,7 @@ const value_string sminmpec_values[] = {
     { 45492, "Connexin Software, Inc." },
     { 45493, "Media System Technologies Srl" },
     { 45494, "GISTEC" },
-    { 45495, "Konneka Bilgi ve Iletisim Teknolojileri Imalat Tic. Ltd. Sti." },
+    { 45495, "Konneka Information Technologies (formerly \"Konneka Bilgi ve Iletisim Teknolojileri Imalat Tic. Ltd. Sti.\")" },
     { 45496, "Groupe ESB" },
     { 45497, "Qucell" },
     { 45498, "Novella-R SIA" },
@@ -45546,6 +45546,66 @@ const value_string sminmpec_values[] = {
     { 45523, "RFE Broadcast srl" },
     { 45524, "Advancapp" },
     { 45525, "Ubiqam LTD" },
+    { 45526, "Snapper Services" },
+    { 45527, "Diehl AKO Stiftung & Co. KG" },
+    { 45528, "Joerg-Peter Hempel" },
+    { 45529, "vishmail.net" },
+    { 45530, "Medien Service Untermain GmbH" },
+    { 45531, "M.A.D.A." },
+    { 45532, "Infinicore inc" },
+    { 45533, "Red Arrow (Southampton) Group Limited" },
+    { 45534, "WestNet" },
+    { 45535, "Information Systems Dynamics" },
+    { 45536, "Rheinmetall Defence Electronics GmbH" },
+    { 45537, "NUAZ" },
+    { 45538, "PHARMAGEST INTERACTIVE" },
+    { 45539, "private use - Domain fritze.org" },
+    { 45540, "Rueval S.A." },
+    { 45541, "Schneider Elektronik GmbH" },
+    { 45542, "Orlando Utilities Commission" },
+    { 45543, "Mekansal Yazilim" },
+    { 45544, "IT Kimmig" },
+    { 45545, "Ormazabal" },
+    { 45546, "SECUWAVE CO,. LT" },
+    { 45547, "Wirtgen (China) Machinery Co., Ltd." },
+    { 45548, "Asian Hope Inc" },
+    { 45549, "Shenzhen Zontele Technologies Co., Ltd" },
+    { 45550, "Webstudio Information Technology Inc." },
+    { 45551, "VIPP" },
+    { 45552, "Unisys " },
+    { 45553, "GE Healthcare - Engineering" },
+    { 45554, "Grupo JAMPIG S.A.S." },
+    { 45555, "RDP" },
+    { 45556, "Triadic Industries, LLC" },
+    { 45557, "SHENZHEN CAN TECHNOLOGY CO.,LTD" },
+    { 45558, "CJSC GROUP OF COMPANIES RENOVA" },
+    { 45559, "Prevoty, Inc." },
+    { 45560, "Inovapar Solu\0303\0247\0303\0265es LTDA." },
+    { 45561, "Masterclock, Inc." },
+    { 45562, "Capella Aerospace Systems Engineering Inc." },
+    { 45563, "SOMNOmedics GmbH" },
+    { 45564, "Beijing SplendidTel Co.,Ltd." },
+    { 45565, "INTERBYSS S.R.L" },
+    { 45566, "INTELMA CONSULTING Inc." },
+    { 45567, "Ticom Geomatics, Inc." },
+    { 45568, "GoCardless Ltd" },
+    { 45569, "Core Network Dynamics" },
+    { 45570, "IQ Tel d.o.o." },
+    { 45571, "Midfin Systems" },
+    { 45572, "awelten" },
+    { 45573, "Western Michigan University Homer Stryker M.D. School of Medicine" },
+    { 45574, "Hellea SPRL" },
+    { 45575, "China Beijing Stegosaurus Technology Laboratory" },
+    { 45576, "Hulu LLC" },
+    { 45577, "Shenzhen Sundray Technologies Company Limited" },
+    { 45578, "BroadQuest" },
+    { 45579, "Guangdong Nenkingtech Development Co,Ltd." },
+    { 45580, "DENTCAT" },
+    { 45581, "YICHUN YILIAN PRINT TECH CO.,LTD" },
+    { 45582, "paysafecard.com Wertkarten GmbH" },
+    { 45583, "Puminsoft Co.,Ltd." },
+    { 45584, "OJSC \"RIRT\"" },
+    { 45585, "Space Imaging Middle East (SIME)" },
     {    0, NULL}
 };