diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-10-04 08:17:12 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-10-04 15:17:18 +0000 |
commit | 6a162872079285fd56edf1d1defc89328cf11bfe (patch) | |
tree | 317d5d6c0c7e72e153d130e46792244a4a605a86 /epan | |
parent | dc625e90d9d11513a7b33314ce8e461368522e97 (diff) | |
download | wireshark-6a162872079285fd56edf1d1defc89328cf11bfe.tar.gz |
[Automatic update for 2015-10-04]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: Ia89c4a947d96b1449a912cb559d7fa47f869ba9b
Reviewed-on: https://code.wireshark.org/review/10783
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/usb.c | 6 | ||||
-rw-r--r-- | epan/enterprise-numbers | 208 | ||||
-rw-r--r-- | epan/sminmpec.c | 53 |
3 files changed, 246 insertions, 21 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c index 6e08accc00..f5c70a4c8f 100644 --- a/epan/dissectors/usb.c +++ b/epan/dissectors/usb.c @@ -14681,9 +14681,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" }, + { 0x0db50139, "Barcode Module - CDC serial" }, + { 0x0db5013a, "Barcode Module - Virtual Keyboard" }, + { 0x0db5013b, "Barcode Module - HID" }, { 0x0db50160, "NFC and Smartcard Module (NSM)" }, { 0x0db70002, "Goldpfeil P-LAN" }, { 0x0dba1000, "Mbox 1 [Mbox]" }, diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers index e30626e3cb..285433af23 100644 --- a/epan/enterprise-numbers +++ b/epan/enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2015-09-25) +(last updated 2015-10-03) SMI Network Management Private Enterprise Codes: @@ -459,8 +459,8 @@ Decimal ashwani.Singhal&netscout.com 111 Oracle - John Hanley - jhanley&oracle.com + John Priest + john.priest&oracle.com 112 Control Data Corporation Nelluri L. Reddy @@ -147148,9 +147148,9 @@ Decentralization / Helenic Public Administra Myongsu Choe msc&nomadictechs.com 36892 - Axel Springer AG - Ulrich Middelberg - ulrich.middelberg&axelspringer.de + Axel Springer SE + Niko Alandt + niko.alandt&axelspringer.de 36893 Takacom Corporation Takahiro Yokota @@ -150082,7 +150082,7 @@ Decentralization / Helenic Public Administra 37625 Mike Johnson Mike Johnson - m.d.johnson&durhamonline.org + m.d.johnson&kuub.org 37626 STC AKTOR Alexey Vorontsov @@ -155372,9 +155372,9 @@ Decentralization / Helenic Public Administra Sylvain Riendeau riendeau.sylvain&ireq.ca 38948 - Eid Passport Inc. + SureID, Inc. (formerly 'Eid Passport Inc.') Abrar Ahmed - aahmed&eidpassport.com + aahmed&sureid.com 38949 Ballard Technology, Inc. Andrew Nicolas @@ -155788,9 +155788,9 @@ Decentralization / Helenic Public Administra Matt Mahoney sysadmin&g360apps.com 39052 - Sky Control sro + Vutlan sro (formerly 'Sky Control sro') Vasily Tyazhev - vasily&skycontrol.com + vasily&vutlan.com 39053 Rail & Sea Wolfgang Anditsch @@ -185584,9 +185584,9 @@ Decentralization / Helenic Public Administra Richard Omi romi&trukai.com.pg 46501 - Vutlan sro - Vasily Tyazhev - vasily&vutlan.com + Didactum® Ltd. Deutschland (formerly 'Vutlan sro') + Roger Oeltjendiers + roe&didactum.com 46502 TASS Denis Ovchinnikov @@ -185639,6 +185639,186 @@ Decentralization / Helenic Public Administra Mhashim Ltd Babiker Mohammed mhashim.gm&gmail.com +46515 + Wolf-Medizintechnik GmbH + Torsten Peukert + torsten.peukert&womed.net +46516 + Ante Grup Elektrik Elektronik Bilişim İnşaat Danışmanlık San. ve Tic. Ltd. Şti. + Alper SEZEN + alper.sezen&antegrup.com.tr +46517 + FitX Deutschland GmbH + Markus Warg + markus.warg&fitx.de +46518 + SPD Electrical Engineers (Pty) Ltd + Dr Andries Hercules Putter + aputter&vukanet.com +46519 + Albertslund Kommune + It-afdelingen + it.teknik&albertslund.dk +46520 + Hitachi Industry & Control Solutions, Ltd. + Toshio Ooga + enterprise-mib&ml.hitachi-ics.co.jp +46521 + PMC - PERIPHERIQUES ET MATERIELS DE CONTROLE + Franck LEDAY + f.leday&pmc-sa.com +46522 + Dino Occhialini + Dino Occhialini + dino.occhialini&gmail.com +46523 + Bridgetec Corp. + SuJeung Shin + sujeungshin&gmail.com +46524 + Linkbroad Technology Beijing Corporation Limited + WU JIANMING + digger.wu&linkbroad.com +46525 + Hedvig Inc. + Reece Joyner + rjoyner&hedviginc.com +46526 + Moldeo AB + Joakim Nilén + joakim.nilen&moldeo.se +46527 + Trans Link Systems B.V. + Stefan van Someren + stefan.van.someren&translink.nl +46528 + storswift.com + Yiqing Wang + yiqing&storswift.com +46529 + ldap4mail + Jan Krüger + jk&jk.gs +46530 + R-SYS s.r.o. + Attila Csontos + attila.csontos&r-sys.sk +46531 + PGE Polska Grupa Energetyczna S.A. + Jerzy Compa + jerzy.compa&gkpge.pl +46532 + Hinchingbrooke Hospital NHS Health Care Trust + Sean Diviney + sean.diviney&nhs.net +46533 + Open Source System + Brian Lockwood + Lockwoodbj&gmail.com +46534 + Arx One + Steven Rogers + servers&arx.one +46535 + CosmoKey GmbH & Co. KG + Christian Tacke + iana&cosmokey.com +46536 + Textel Marimon s.a. + Carlos Marimón + carlos&textel-marimon.com +46537 + Yodel Delivery Network Limited + Mark Needham + mark.needham&yodel.co.uk +46538 + Pioneers Memorial Healthcare + Alicia Ortega + aortega&pmhd.org +46539 + Virtual Network Element, Inc. + Kalidas Porika + kporika&vne.io +46540 + VSSUT + Janmejaya Barik + barikjanmejaya&gmail.com +46541 + Seneca Data Distributors, Inc. + Rob Dukette + robd&senecadata.com +46542 + Mountain Blue Cancer Care Center + Amy Holleran + amy.holleran&mountainbluecare.org +46543 + CNIAP - Guinea Ecuatorial + Djassi Fonseca + djassi.fonseca&nosi.cv +46544 + Axion Technologies Ltd. + Carl Cassista + ticontact&axiontech.ca +46545 + Rechtsanwaltskanzlei Schaalo + Wolfram Schaalo + kanzlei&schaalo.de +46546 + Impavid LLC + Benjamin Wilson + ben&impavid.io +46547 + BILD GmbH & Co. KG + Harald Brückner + harald.brueckner&bild.de +46548 + Secvice Information Technologies Private Limited + Raju Alluri + raju&secvice.net +46549 + Messer Information Services GmbH + Matthias Thaler + matthias.thaler&messer-is.com +46550 + Dufoort + Dufoort Michaël + iana&dufoort.be +46551 + Amprion GmbH + Andreas Westhoff + andreas.westhoff&rion.net +46552 + Eltham College + Piotr Zdarzil + pz&eltham-college.org.uk +46553 + Amsterdamtelecom Ltd. + Victor Litvin + v.litvin&amsterdamtelecom.ru +46554 + Anthon Romanov + Anthon Romanov + alxadm&yandex.ru +46555 + Kostya.Pro + Konstantin Ol'khovyy + olkhovyy&kostya.pro +46556 + L.D. Lutum + Leonardo D'Onofrio + leonardo&ldlutum.com +46557 + Scale Genius Inc. + Michael Vallaly + iana&scalegenius.com +46558 + FutoIn + Andrey Galkin + andrey&futoin.eu +46559 + ESC - Electronic Service Center GbR + Martin A. Wielebinski + marwie&esc.de End of Document diff --git a/epan/sminmpec.c b/epan/sminmpec.c index c16ac7a6ec..8d3561de8e 100644 --- a/epan/sminmpec.c +++ b/epan/sminmpec.c @@ -36912,7 +36912,7 @@ const value_string sminmpec_values[] = { { 36889, "China Bluedon information security technology co., ltd" }, { 36890, "future Training & Consulting GmbH" }, { 36891, "Nomadic Technologies Inc." }, - { 36892, "Axel Springer AG" }, + { 36892, "Axel Springer SE" }, { 36893, "Takacom Corporation" }, { 36894, "Compagnie Europ\0303\0251enne des Emballages Robert Schisler" }, { 36895, "Guangdong Newstart Technology Service Co.,Ltd" }, @@ -38968,7 +38968,7 @@ const value_string sminmpec_values[] = { { 38945, "NASA Center for Climate Simulation (NCCS)" }, { 38946, "Raja Consulting Ltd" }, { 38947, "IREQ (Institut de recherche d'Hydro-Quebec)" }, - { 38948, "Eid Passport Inc." }, + { 38948, "SureID, Inc. (formerly 'Eid Passport Inc.')" }, { 38949, "Ballard Technology, Inc." }, { 38950, "Mars Space Flight Facility" }, { 38951, "Beijing Zigvine Tech. Co. Ltd." }, @@ -39072,7 +39072,7 @@ const value_string sminmpec_values[] = { { 39049, "Byte, SIA" }, { 39050, "Forschungsgemeinschaft elektronische Medien (FeM) e.V." }, { 39051, "g360apps.com" }, - { 39052, "Sky Control sro" }, + { 39052, "Vutlan sro (formerly 'Sky Control sro')" }, { 39053, "Rail & Sea" }, { 39054, "NetUP Inc." }, { 39055, "S2 Communications AB" }, @@ -46521,7 +46521,7 @@ const value_string sminmpec_values[] = { { 46498, "Jiangsu Sinolte Wireless Technology Co., Ltd. " }, { 46499, "ICD CO.,LTD" }, { 46500, "Trukai Industries Limited" }, - { 46501, "Vutlan sro" }, + { 46501, "Didactum\0302\0256 Ltd. Deutschland (formerly 'Vutlan sro')" }, { 46502, "TASS" }, { 46503, "Quench Worldwide Limited" }, { 46504, "Stolt-Nielsen Limited" }, @@ -46535,6 +46535,51 @@ const value_string sminmpec_values[] = { { 46512, "Times Internet Limited" }, { 46513, "ZorgNed Automatisering BV" }, { 46514, "Mhashim Ltd" }, + { 46515, "Wolf-Medizintechnik GmbH" }, + { 46516, "Ante Grup Elektrik Elektronik Bili\0305\0237im \0304\0260n\0305\0237aat Dan\0304\0261\0305\0237manl\0304\0261k San. ve Tic. Ltd. \0305\0236ti." }, + { 46517, "FitX Deutschland GmbH" }, + { 46518, "SPD Electrical Engineers (Pty) Ltd" }, + { 46519, "Albertslund Kommune" }, + { 46520, "Hitachi Industry & Control Solutions, Ltd." }, + { 46521, "PMC - PERIPHERIQUES ET MATERIELS DE CONTROLE" }, + { 46522, "Dino Occhialini" }, + { 46523, "Bridgetec Corp." }, + { 46524, "Linkbroad Technology Beijing Corporation Limited" }, + { 46525, "Hedvig Inc." }, + { 46526, "Moldeo AB" }, + { 46527, "Trans Link Systems B.V." }, + { 46528, "storswift.com" }, + { 46529, "ldap4mail" }, + { 46530, "R-SYS s.r.o." }, + { 46531, "PGE Polska Grupa Energetyczna S.A." }, + { 46532, "Hinchingbrooke Hospital NHS Health Care Trust" }, + { 46533, "Open Source System" }, + { 46534, "Arx One" }, + { 46535, "CosmoKey GmbH & Co. KG" }, + { 46536, "Textel Marimon s.a." }, + { 46537, "Yodel Delivery Network Limited" }, + { 46538, "Pioneers Memorial Healthcare" }, + { 46539, "Virtual Network Element, Inc." }, + { 46540, "VSSUT" }, + { 46541, "Seneca Data Distributors, Inc." }, + { 46542, "Mountain Blue Cancer Care Center " }, + { 46543, "CNIAP - Guinea Ecuatorial" }, + { 46544, "Axion Technologies Ltd." }, + { 46545, "Rechtsanwaltskanzlei Schaalo" }, + { 46546, "Impavid LLC" }, + { 46547, "BILD GmbH & Co. KG" }, + { 46548, "Secvice Information Technologies Private Limited" }, + { 46549, "Messer Information Services GmbH" }, + { 46550, "Dufoort" }, + { 46551, "Amprion GmbH" }, + { 46552, "Eltham College" }, + { 46553, "Amsterdamtelecom Ltd." }, + { 46554, "Anthon Romanov" }, + { 46555, "Kostya.Pro" }, + { 46556, "L.D. Lutum" }, + { 46557, "Scale Genius Inc." }, + { 46558, "FutoIn" }, + { 46559, "ESC - Electronic Service Center GbR" }, { 0, NULL} }; |