aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-12-25 08:34:52 -0800
committerGerald Combs <gerald@wireshark.org>2016-12-25 16:35:24 +0000
commit730b2ed14ce4e1acb9b9f37f96ff1a2c08328c83 (patch)
tree824259ed2a37d516b8353a300f068943ffc82a6d /epan
parent96d15102f56900acdac587b6407eb4c6545721de (diff)
[Automatic update for 2016-12-25]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I8fd8115fdfd4623bdf94602b6fd55a724e09cec3 Reviewed-on: https://code.wireshark.org/review/19429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/enterprise-numbers240
-rw-r--r--epan/sminmpec.c59
2 files changed, 272 insertions, 27 deletions
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 853062080e..58fca3778c 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2016-12-18)
+(last updated 2016-12-25)
SMI Network Management Private Enterprise Codes:
@@ -1918,9 +1918,9 @@ Decimal
walter&wg.com
476
- Emerson Computer Power
- Mike Velten
- mike.velten&emerson.com
+ Vertiv (formerly 'Emerson Computer Power')
+ Phil Ulrich
+ Phil.Ulrich&vertivco.com
477
Network Software Associates
Leslie Santiago
@@ -3615,8 +3615,8 @@ Decimal
marcus&datus.uucp
900
Matrox Electronic Systems Limited
- Marc-Andre Joyal
- marc-andre.joyal&matrox.com
+ Peter Michelakis
+ licenseadm&matrox.com
901
Digital Products, Inc.
Ross Dreyer
@@ -118935,9 +118935,9 @@ Decentralization / Helenic Public Administra
Anatoly Gladkov
gladkov&dialognauka.ru
29839
- Dalman Technical Services Ltd
+ Simoco EMEA Ltd (formerly 'Dalman Technical Services Ltd')
John Witchell
- jw&dalmants.co.uk
+ john.witchell&simocogroup.com
29840
llrp.org
John R. Hogerhuis
@@ -122652,8 +122652,8 @@ Decentralization / Helenic Public Administra
mshahar&fullspectrumnet.com
30768
Collège de France
- van-Trung TRUONG
- van-trung.truong&college-de-france.fr
+ Cyrille Ghesquiere
+ cyrille.ghesquiere&college-de-france.fr
30769
Citec S.p.A.
Alberto Storch
@@ -154520,8 +154520,8 @@ Decentralization / Helenic Public Administra
Krishna Padilha
krishna&padilha.com
38735
- Stephen Perryman
- Stephen Perryman
+ Stephen Timothy Perryman
+ Stephen Timothy Perryman
steve&stephenperryman.com
38736
Promise Regional Medical Center - Hutchinson
@@ -156364,9 +156364,9 @@ Decentralization / Helenic Public Administra
Iurii Rashkovskyi
yrashk&spawngrid.com
39196
- Oxynux
+ AltNet (formerly 'Oxynux')
Benjamin Collet
- bcollet&oxynux.org
+ iana-pen&alt.tf
39197
Xitek Design Ltd
Alan Jacks
@@ -156385,8 +156385,8 @@ Decentralization / Helenic Public Administra
somporn.jaru&ktbcs.co.th
39201
redtoo ag
- Daniel von Büren
- Daniel.vonBueren&redtoo.com
+ Patrick Sczepanski
+ patrick.sczepanski&redtoo.com
39202
ASP Alerce Tecnology SL
Alvaro Fernandez Corugedo Feilenreiter
@@ -183630,7 +183630,7 @@ Decentralization / Helenic Public Administra
46012
Redhot OOO
Andrey Petrovsky
- admin&redhot.ooo
+ admin&redhot.su
46013
Yhat, Inc.
Ryan J. O'Neil
@@ -185489,8 +185489,8 @@ Decentralization / Helenic Public Administra
martijn&vhoof.com
46477
HealthNow New York Inc
- Kyle Obear
- obear.kyle&healthnow.org
+ EIS
+ EIS&healthnow.org
46478
DIAL GmbH
Administration
@@ -191316,9 +191316,9 @@ Decentralization / Helenic Public Administra
Mads Ulrik Kristoffersen
muk&terma.com
47934
- Freifunk Burgenland - Verein freie Netze im Burgenland
- Andreas Terpotiz
- freifunk.burgenland&gmail.com
+ World Privacy and Identity Association (WPIA) (formerly 'Freifunk Burgenland - Verein freie Netze im Burgenland')
+ Juergen Bruckner
+ info&wpia.club
47935
tiri GmbH
Gerald Fehringer
@@ -196043,6 +196043,202 @@ Decentralization / Helenic Public Administra
GreenAnt
Frank Giorlando
ldap&greenant.net
+49116
+ 天津蓝天科技股份有限公司 (Tianjin Blue Sky Technology Co., Ltd)
+ chengjun pan
+ panchj&zanpu.com
+49117
+ Micronet Communications Inc.
+ Albert Feng
+ albert&micronet.com.tw
+49118
+ Utilex
+ Alexey Khrestolyubov
+ lex&utilex.ru
+49119
+ Setra Trävaror
+ Mårten Stjernberg
+ Marten.stjernberg&setragroup.com
+49120
+ pureLiFi Limited
+ Ron Schaeffer
+ ron.schaeffer&purelifi.com
+49121
+ Legislative Assembly of British Columbia
+ Graeme Brown
+ Graeme.Brown&leg.bc.ca
+49122
+ Antheus Telecom Ltd
+ Nik Middleton
+ nik.middleton&antheus.co.uk
+49123
+ Turbonomic, Inc.
+ Yuri Rabover
+ yuri.rabover&turbonomic.com
+49124
+ Hematology Oncology Associates Of Brooklyn
+ Tammi Ramos
+ Tramos&brooklynoncology.com
+49125
+ Xoriah Solutions Inc.
+ Wilson Fung
+ wilson&xoriah.com
+49126
+ Sudo Security Group, Inc
+ William Strafach
+ will.strafach&sudosecuritygroup.com
+49127
+ Musée Guérin
+ JACQUES CORNILY
+ cornily&gmail.com
+49128
+ PromKomplektServis
+ Michael
+ itpks&pks.su
+49129
+ finke Das Erlebnis-Einrichten GmbH & Co. KG
+ Michael Vogt
+ it-srv-net&finke.de
+49130
+ access fintech
+ steve fazio
+ steve&access-fintech.com
+49131
+ OWLCO
+ Alexey Sovenko
+ alexey.sovenko&owlco.ru
+49132
+ Globility Limited
+ Oliver Kemmis
+ okemmis&globility.co.uk
+49133
+ Stiegele Datensysteme GmbH
+ Felix Puchinger
+ felix.puchinger&stiegele.eu
+49134
+ BKS Systems, Inc.
+ Brian Strelioff
+ BKStrelioff&Hotmail.com
+49135
+ Carbon Soft Ltd
+ Osintsev Sergey
+ sergey&carbonsoft.ru
+49136
+ ALGcom
+ Lissandro Gerhardt
+ lissandro&algcom.com.br
+49137
+ Ljusnans Virkesfrakt AB
+ Lars Svedåker
+ lvfrakt&lvfrakt.se
+49138
+ bjut, Inc.
+ qian yong
+ qianyong&mail.taiji.com.cn
+49139
+ First State Investments (UK) Limited
+ Tom Lloyd
+ PKIAdministrators&firststate.co.uk
+49140
+ exands
+ wei zhang
+ zw&exands.com
+49141
+ VAG-Armaturen GmbH
+ Ibanez Jose-Manuel
+ it&vag-group.com
+49142
+ Gemalto AG Switzerland
+ Michael Lehmann
+ michael.lehmann&gemalto.com
+49143
+ cryptosource GmbH
+ Dr. Falko Strenzke
+ fstrenzke&cryptosource.de
+49144
+ AB Högland Såg & Hyvleri
+ Ulrika Rehn
+ ulrika&hoglandssagen.se
+49145
+ IHK Nürnberg für Mittelfranken
+ Mirko Hoffmann
+ admins&nuernberg.ihk.de
+49146
+ bpost banque SA - bpost bank NV
+ Sacha Heinen
+ ictsecurity&bpostbank.be
+49147
+ Bexen Cardio
+ Estefania Gutierrez
+ egutierrez&bexencardio.com
+49148
+ Civis Grand Casino Kft.
+ Szendrei Attila
+ online&grandcasino.hu
+49149
+ Deutsche Gesellschaft zum Bau und Betrieb von Endlagern fuer Abfallstoffe mbH (DBE)
+ IT-Service
+ it-service&dbe.de
+49150
+ Vertiv Co
+ John Bogdan
+ john.bogdan&vertivco.com
+49151
+ California Credit Union
+ Charles Lacuesta
+ charlesl&californiacu.org
+49152
+ BlueArchive
+ Jeff Flowers
+ jflowers&bluearchive.com
+49153
+ Stratos
+ Wassilios Stratos
+ wst&stratox.de
+49154
+ Nordic Automation Systems
+ Viljo Veesaar
+ viljo&nasys.no
+49155
+ jusst technologies GmbH
+ Julian Scheel
+ jscheel&jusst.de
+49156
+ Canham
+ Paul Canham
+ paul&canham.eu
+49157
+ Sylpheo
+ Mathias Bazire
+ mathias.bazire&sylpheo.com
+49158
+ Cancer Center of Southern Califonria/Sarcoma Oncology Research Center
+ Victoria Chua
+ vchua&sarcomaoncology.com
+49159
+ Milai Digital
+ Keisuke Watanabe
+ k-wata&mail.milai-digital.com
+49160
+ Forssjö Pellets AB
+ Tina Gyllengahm
+ tina.g&sandasa.se
+49161
+ CEIA S.p.A.
+ Mr. Riccardo Bruni
+ rbruni&ceia-spa.com
+49162
+ Team GeoLook
+ Usanov Denis
+ team&geolook.me
+49163
+ Nippon Electronics Service Co.
+ YOSHIHIRO OHURA
+ info&neskk.co.jp
+49164
+ Japan Novel Corporation
+ Mari Miyata
+ mari.miyata&jnovel.co.jp
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 7e94256c2d..b04c63c9bf 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -496,7 +496,7 @@ const value_string sminmpec_values[] = {
{ 473, "J. Stainsbury PLC" },
{ 474, "Manage Operations" },
{ 475, "Wandel and Goltermann Technologies" },
- { 476, "Emerson Computer Power" },
+ { 476, "Vertiv (formerly 'Emerson Computer Power')" },
{ 477, "Network Software Associates" },
{ 478, "Procter and Gamble" },
{ 479, "Meridian Technology Corporation" },
@@ -29859,7 +29859,7 @@ const value_string sminmpec_values[] = {
{ 29836, "China Internet Network Information Center" },
{ 29837, "Erema - Engineering Recycling Maschinen und Anlagen GmbH" },
{ 29838, "DialogueScience, Inc." },
- { 29839, "Dalman Technical Services Ltd" },
+ { 29839, "Simoco EMEA Ltd (formerly 'Dalman Technical Services Ltd')" },
{ 29840, "llrp.org" },
{ 29841, "Fat Spaniel Technologies" },
{ 29842, "macmon secure gmbh (formerly 'mikado soft gmbH')" },
@@ -38755,7 +38755,7 @@ const value_string sminmpec_values[] = {
{ 38732, "Sachsen DV GmbH" },
{ 38733, "VoiceRite, Inc." },
{ 38734, "Padilha com" },
- { 38735, "Stephen Perryman" },
+ { 38735, "Stephen Timothy Perryman" },
{ 38736, "Promise Regional Medical Center - Hutchinson" },
{ 38737, "MyOwnFile BV" },
{ 38738, "NL Technologies" },
@@ -39216,7 +39216,7 @@ const value_string sminmpec_values[] = {
{ 39193, "Vayosoft Network Technologies Ltd." },
{ 39194, "CSSS IUGS (Centre de Sante et des Services Sociaux - Institut Universitaire de Geriatrie de Sherbrooke)" },
{ 39195, "Spawngrid, Inc." },
- { 39196, "Oxynux" },
+ { 39196, "AltNet (formerly 'Oxynux')" },
{ 39197, "Xitek Design Ltd" },
{ 39198, "Brekeke Software, Inc." },
{ 39199, "EXPRESSTRAK - DATS" },
@@ -47954,7 +47954,7 @@ const value_string sminmpec_values[] = {
{ 47931, "ExteNet Systems, Inc." },
{ 47932, "Andrino" },
{ 47933, "Terma A/S" },
- { 47934, "Freifunk Burgenland - Verein freie Netze im Burgenland" },
+ { 47934, "World Privacy and Identity Association (WPIA) (formerly 'Freifunk Burgenland - Verein freie Netze im Burgenland')" },
{ 47935, "tiri GmbH" },
{ 47936, "HansBeerman B.V." },
{ 47937, "Ophir Energy PLC" },
@@ -49136,6 +49136,55 @@ const value_string sminmpec_values[] = {
{ 49113, "ITooLabs" },
{ 49114, "simplicity wins" },
{ 49115, "GreenAnt" },
+ { 49116, "\0345\0244\0251\0346\0264\0245\0350\0223\0235\0345\0244\0251\0347\0247\0221\0346\0212\0200\0350\0202\0241\0344\0273\0275\0346\0234\0211\0351\0231\0220\0345\0205\0254\0345\0217\0270 (Tianjin Blue Sky Technology Co., Ltd)" },
+ { 49117, "Micronet Communications Inc." },
+ { 49118, "Utilex" },
+ { 49119, "Setra Tr\0303\0244varor" },
+ { 49120, "pureLiFi Limited" },
+ { 49121, "Legislative Assembly of British Columbia" },
+ { 49122, "Antheus Telecom Ltd" },
+ { 49123, "Turbonomic, Inc." },
+ { 49124, "Hematology Oncology Associates Of Brooklyn " },
+ { 49125, "Xoriah Solutions Inc." },
+ { 49126, "Sudo Security Group, Inc" },
+ { 49127, "Mus\0303\0251e Gu\0303\0251rin" },
+ { 49128, "PromKomplektServis" },
+ { 49129, "finke Das Erlebnis-Einrichten GmbH & Co. KG" },
+ { 49130, "access fintech" },
+ { 49131, "OWLCO" },
+ { 49132, "Globility Limited" },
+ { 49133, "Stiegele Datensysteme GmbH" },
+ { 49134, "BKS Systems, Inc." },
+ { 49135, "Carbon Soft Ltd" },
+ { 49136, "ALGcom " },
+ { 49137, "Ljusnans Virkesfrakt AB" },
+ { 49138, "bjut, Inc." },
+ { 49139, "First State Investments (UK) Limited" },
+ { 49140, "exands" },
+ { 49141, "VAG-Armaturen GmbH" },
+ { 49142, "Gemalto AG Switzerland" },
+ { 49143, "cryptosource GmbH" },
+ { 49144, "AB H\0303\0266gland S\0303\0245g & Hyvleri" },
+ { 49145, "IHK N\0303\0274rnberg f\0303\0274r Mittelfranken" },
+ { 49146, "bpost banque SA - bpost bank NV" },
+ { 49147, "Bexen Cardio" },
+ { 49148, "Civis Grand Casino Kft." },
+ { 49149, "Deutsche Gesellschaft zum Bau und Betrieb von Endlagern fuer Abfallstoffe mbH (DBE)" },
+ { 49150, "Vertiv Co" },
+ { 49151, "California Credit Union" },
+ { 49152, "BlueArchive" },
+ { 49153, "Stratos" },
+ { 49154, "Nordic Automation Systems" },
+ { 49155, "jusst technologies GmbH" },
+ { 49156, "Canham" },
+ { 49157, "Sylpheo" },
+ { 49158, "Cancer Center of Southern Califonria/Sarcoma Oncology Research Center" },
+ { 49159, "Milai Digital" },
+ { 49160, "Forssj\0303\0266 Pellets AB" },
+ { 49161, "CEIA S.p.A." },
+ { 49162, "Team GeoLook" },
+ { 49163, "Nippon Electronics Service Co." },
+ { 49164, "Japan Novel Corporation" },
{ 0, NULL}
};