aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-12-13 08:11:28 -0800
committerGerald Combs <gerald@wireshark.org>2015-12-13 16:11:35 +0000
commit9fcf004cdbb955f0959888aa29d91af2b203621f (patch)
tree7a70362bc84b98878d483b1efd8c16b96433b445 /epan
parent56aa05227f6bc18211d9ddec669af77ba5cd78e9 (diff)
[Automatic update for 2015-12-13]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I690eec9b47df9bbc770773f8c7a8e1c4b4ef5415 Reviewed-on: https://code.wireshark.org/review/12588 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/enterprise-numbers312
-rw-r--r--epan/sminmpec.c78
2 files changed, 380 insertions, 10 deletions
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index aa93b33831..81f7c739d9 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2015-12-05)
+(last updated 2015-12-11)
SMI Network Management Private Enterprise Codes:
@@ -127025,7 +127025,7 @@ Decentralization / Helenic Public Administra
31861
embinet GmbH
Stephan Eisvogel
- admins&embinet.de
+ info-iana&embinet.de
31862
Infinity Trust SRL
Chifu Valerian
@@ -174026,7 +174026,7 @@ Decentralization / Helenic Public Administra
43611
Power Ethernet
James Gardiner
- james.gardiner&powerethernet.com
+ support&powerethernet.com
43612
IOLAN
Ernst Lemm
@@ -174529,8 +174529,8 @@ Decentralization / Helenic Public Administra
mmackenzie&standardimaging.com
43737
MedAllies
- Devin Kusek
- dkusek&medallies.com
+ Nicole Domkiw
+ ndomkiw&medallies.com
43738
Doshisha University
TANAKA, Yasuhiro
@@ -183600,7 +183600,7 @@ Decentralization / Helenic Public Administra
Thomas Naumann
thomas.naumann&50hertz.com
46005
- SAG Informatik AG
+ SAG Services AG (formerly 'SAG Informatik AG')
Anthony Uk
sysadmin&sag-ag.ch
46006
@@ -186798,7 +186798,7 @@ Decentralization / Helenic Public Administra
46804
Himnark CJSC
Ruben Osipyan
- melikyanarmen86&gmail.com
+ ruben&himnark.am
46805
Oncology Consultants
Jerel Sukarangsan
@@ -186988,7 +186988,7 @@ Decentralization / Helenic Public Administra
Bill McLaren
billmcl&terremark.com
46852
- Viagogo
+ viagogo AG
David Suart
iana&viagogo.com
46853
@@ -187023,6 +187023,302 @@ Decentralization / Helenic Public Administra
Bittacle Consulting Limited
Craig Baltzer
Craig.Baltzer&bittacle.com
+46861
+ JVCKENWOOD Corporation
+ Manabu Sato
+ snmp.support&jvckenwood.com
+46862
+ Digital Life Promotion Association
+ Kazuhiro Tabuchi
+ info&dlpa.jp
+46863
+ Bosch Thermotechnik GmbH
+ Tobias Baumgartner
+ tobias.baumgartner2&de.bosch.com
+46864
+ Embedtronics Oy
+ Sami Kantoluoto
+ sami.kantoluoto&embedtronics.fi
+46865
+ IS4U, s.r.o.
+ Petr Dadák
+ tech&is4u.cz
+46866
+ Virdata NV
+ Jeremy De Clercq
+ jeremy.declercq&virdata.com
+46867
+ Synthetel Corporation
+ Shao Miller
+ iana-pen&synthetel.com
+46868
+ Secure Energy Services
+ Tim Nickerson
+ tnickerson&secure-energy.com
+46869
+ Torchmind
+ Johannes Donath
+ johannesd&torchmind.com
+46870
+ relaxt confusion labs e.U.
+ Thomas Gradisnik
+ tg&relaxt.at
+46871
+ Magic Mike, Ltd
+ Michael Bonhomme
+ michael.bonhomme&gmail.com
+46872
+ Bimex Energy AG
+ Lukas Kaufmann / Simon Kech
+ lukas.kaufmann&polytech.ch
+46873
+ y1s2
+ smail chamrah
+ yossefsaso2015&gmail.com
+46874
+ Wavenet sprl
+ Jean-Noël Wallez
+ iana&wavenet.be
+46875
+ prodot GmbH
+ Mischa Hueschen
+ mischa.hueschen&prodot.de
+46876
+ GE Lighting
+ SiNguyen Vo
+ singuyen.vo&ge.com
+46877
+ ATB Financial
+ Dustin Heywood
+ dheywood&atb.com
+46878
+ PermaGreen Supreme, Inc.
+ Christopher McChristian
+ clm&permagreen.com
+46879
+ Lengvarsky.com
+ Igor Lengvarsky
+ igor&lengvarsky.com
+46880
+ Technology Kitchen Corporation
+ Brad Claflin
+ bradclaflin&technologykitchen.com
+46881
+ henz.co
+ John Henz
+ john.henz&jhenz.net
+46882
+ LSTI
+ Philippe Bouchet
+ pbouchet&exchange.lsti.fr
+46883
+ Capsicum Business Architects
+ Michael Wyatt
+ mwyatt&capsi.com.au
+46884
+ Freie ev. Gemeinde Giessen
+ Peter Schuster
+ admin&feg-giessen.de
+46885
+ TwoFive, Inc.
+ Masatatsu Akamine
+ akamine&twofive25.com
+46886
+ Beken Learning Systems, Inc.
+ Steve Benoit
+ steve.benoit&bekenlearning.com
+46887
+ Bulletin.net Ltd
+ Kerry Sainsbury
+ kerry.sainsbury&bulletin.net
+46888
+ KRDS
+ Guillaume Simon
+ hosting&krds.com
+46889
+ Gravity Academy Engineering
+ grant haywood
+ mrgranthaywood&gmail.com
+46890
+ SOLUM Co., Ltd.
+ ChangWoo Lee
+ cw0220.lee&solu-m.com
+46891
+ fmad engineering llc
+ Aaron Foo
+ aaron_ppus&fmad.com
+46892
+ TwelveBaud Studios, LLC
+ Andrew Cook
+ andrew.cook&twelvebaud.net
+46893
+ Antelope Enterprises
+ Joel Maslak
+ jmaslak&antelope.net
+46894
+ Hanwha S&C
+ See Yun Kim
+ seeyunk&hanwha.com
+46895
+ NexDefense, Inc.
+ Jeff Barber
+ jeff.barber&nexdefense.com
+46896
+ UNIACC Electronic Technology Ltd. of Suzhou
+ Kingtonlee
+ kingtonlee&sina.com
+46897
+ Virtual Hold Technology, LLC
+ Sean O'Rourke
+ sorourke&virtualhold.com
+46898
+ Hewlett Packard Enterprise
+ John Henz
+ john.henz&hpe.com
+46899
+ TDK LAMBDA LTD
+ SHMUEL MASSIL
+ samuel.m&tdk-lambda.co.il
+46900
+ TiePie engineering
+ Anton Poelsma
+ sysops&tiepie.nl
+46901
+ Wilhelmsen Loom Consulting
+ Lars Wilhelmsen
+ lars&sral.org
+46902
+ Keegan Moodley Ltd
+ Keegan Moodley
+ keeganmoodley96&gmail.com
+46903
+ DE-CIX Management GmbH
+ Kay Schroeder
+ kay.schroeder&de-cix.net
+46904
+ Sepura plc
+ Nick James
+ nick.james&sepura.com
+46905
+ KTI RÁDIO, spol. s r.o.
+ Miroslav Sajko
+ sajko&kti.sk
+46906
+ Enghouse Networks Nordics AB
+ Johan Norborg
+ johan.norborg&enghouse.com
+46907
+ Qognify LTD
+ Info at Qognify
+ info&qognify.com
+46908
+ Ascot Industrial
+ Marco Bambili
+ m.bambili&ascotinternational.it
+46909
+ Centric Housing & Healthcare
+ Erik van Alderwegen
+ erik.van.alderwegen&centric.eu
+46910
+ AIC S.A.
+ IT Department
+ it&myaic.com
+46911
+ KERLINK
+ Dubourg Ronan
+ ronan.dubourg&kerlink.fr
+46912
+ Nassauische Heimstaette Wohnungs- und Entwicklungsgesellschaft mbH
+ Michael Schreck
+ michael.schreck&naheimst.de
+46913
+ Hotspot Tiefenort
+ Thomas Pinkert
+ thomas.pinkert&hotspot-tiefenort.de
+46914
+ Administration des Ponts et Chaussées
+ Georges Goebel
+ georges.goebel&pch.etat.lu
+46915
+ raffel.biz
+ Joern Raffel
+ joern&raffel.biz
+46916
+ Aviva Voice Systems and Services SL
+ Javier Moreno
+ jmoreno&avivavoice.com
+46917
+ PC-TipTop
+ Robert Christian Strasser
+ robert.strasser&pc-tiptop.de
+46918
+ GRUPO REVENGA
+ FRANCISCO JOSÉ ELENO PARDO
+ elias.molinedo&revenga.com
+46919
+ Aadi Network Tools
+ Hemant Kelkar
+ hemantkelkar2001&yahoo.com
+46920
+ DEVISE FUTURES - IT SOLUTIONS, LDA
+ José Eduardo Pina Miranda
+ jose.miranda&devisefutures.com
+46921
+ Universidade Federal de Sao Joao del-Rei
+ Roosevelt Mairink dos Santos Junior
+ mairink&ufsj.edu.br
+46922
+ Wolf GmbH
+ David Mager
+ David-Arpad.Mager&Wolf-Heiztechnik.de
+46923
+ LG&E-KU LLC
+ Steven Ramirez
+ Steven.Ramirez&lge-ku.com
+46924
+ Oncology Specialists of Charlotte, PA
+ Erin LeMire
+ elemire&oncologycharlotte.com
+46925
+ EEBus Initiative e.V.
+ Andreas Schwackenberg
+ schwackenberg&eebus.org
+46926
+ Midas Green Technologies
+ Chris Boyd
+ iana&midasgt.com
+46927
+ INVITE Networks Incorporated
+ Josh Whiting
+ josh&invitenetworks.com
+46928
+ r0ck.net
+ Cary Kempston
+ iana&r0ck.net
+46929
+ Uzma Iqbal MD PA
+ Barbara Hand
+ manager&houstoncenterofhope.com
+46930
+ Sandelman Software Works
+ Michael Richardson
+ mcr&sandelman.ca
+46931
+ Welch Allyn Singapore Pte Ltd
+ Michael Lim
+ michael.lim&welchallyn.com
+46932
+ OAO NEFAZ
+ Gavrilenko Sergey
+ admin&nefaz.ru
+46933
+ Business&Decision
+ Blyednova Iryna
+ iryna.blyednova&businessdecision.com
+46934
+ AFSOC
+ David Bricker
+ afsoc.csf.scp.cmia&us.af.mil
End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 70269c94a2..b97d66c76e 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -46025,7 +46025,7 @@ const value_string sminmpec_values[] = {
{ 46002, "6Harmonics Inc." },
{ 46003, "NAUTILUS INFOTECH Co., Ltd." },
{ 46004, "50Hertz Transmission GmbH" },
- { 46005, "SAG Informatik AG" },
+ { 46005, "SAG Services AG (formerly 'SAG Informatik AG')" },
{ 46006, "Greetz BV" },
{ 46007, "Augustinum gGmbH" },
{ 46008, "Codan A/S" },
@@ -46872,7 +46872,7 @@ const value_string sminmpec_values[] = {
{ 46849, "Irving Independent School District" },
{ 46850, "Tula State Center of Information Technology" },
{ 46851, "Terremark" },
- { 46852, "Viagogo" },
+ { 46852, "viagogo AG" },
{ 46853, "PAC Enterprises" },
{ 46854, "Hagenberger Kreis zur F\0303\0266rderung der digitalen Sicherheit" },
{ 46855, "ShowCase PRO Tecnologia LTDA" },
@@ -46881,6 +46881,80 @@ const value_string sminmpec_values[] = {
{ 46858, "Dgoujard" },
{ 46859, "Guangdong Quantum Technology Co., Ltd" },
{ 46860, "Bittacle Consulting Limited" },
+ { 46861, "JVCKENWOOD Corporation" },
+ { 46862, "Digital Life Promotion Association" },
+ { 46863, "Bosch Thermotechnik GmbH" },
+ { 46864, "Embedtronics Oy" },
+ { 46865, "IS4U, s.r.o." },
+ { 46866, "Virdata NV" },
+ { 46867, "Synthetel Corporation" },
+ { 46868, "Secure Energy Services" },
+ { 46869, "Torchmind" },
+ { 46870, "relaxt confusion labs e.U." },
+ { 46871, "Magic Mike, Ltd" },
+ { 46872, "Bimex Energy AG" },
+ { 46873, "y1s2" },
+ { 46874, "Wavenet sprl" },
+ { 46875, "prodot GmbH" },
+ { 46876, "GE Lighting" },
+ { 46877, "ATB Financial" },
+ { 46878, "PermaGreen Supreme, Inc." },
+ { 46879, "Lengvarsky.com" },
+ { 46880, "Technology Kitchen Corporation" },
+ { 46881, "henz.co" },
+ { 46882, "LSTI" },
+ { 46883, "Capsicum Business Architects" },
+ { 46884, "Freie ev. Gemeinde Giessen" },
+ { 46885, "TwoFive, Inc." },
+ { 46886, "Beken Learning Systems, Inc." },
+ { 46887, "Bulletin.net Ltd" },
+ { 46888, "KRDS" },
+ { 46889, "Gravity Academy Engineering " },
+ { 46890, "SOLUM Co., Ltd." },
+ { 46891, "fmad engineering llc" },
+ { 46892, "TwelveBaud Studios, LLC" },
+ { 46893, "Antelope Enterprises" },
+ { 46894, "Hanwha S&C" },
+ { 46895, "NexDefense, Inc." },
+ { 46896, "UNIACC Electronic Technology Ltd. of Suzhou" },
+ { 46897, "Virtual Hold Technology, LLC" },
+ { 46898, "Hewlett Packard Enterprise" },
+ { 46899, "TDK LAMBDA LTD" },
+ { 46900, "TiePie engineering" },
+ { 46901, "Wilhelmsen Loom Consulting" },
+ { 46902, "Keegan Moodley Ltd " },
+ { 46903, "DE-CIX Management GmbH" },
+ { 46904, "Sepura plc" },
+ { 46905, "KTI R\0303\0201DIO, spol. s r.o." },
+ { 46906, "Enghouse Networks Nordics AB" },
+ { 46907, "Qognify LTD" },
+ { 46908, "Ascot Industrial" },
+ { 46909, "Centric Housing & Healthcare" },
+ { 46910, "AIC S.A." },
+ { 46911, "KERLINK" },
+ { 46912, "Nassauische Heimstaette Wohnungs- und Entwicklungsgesellschaft mbH" },
+ { 46913, "Hotspot Tiefenort" },
+ { 46914, "Administration des Ponts et Chauss\0303\0251es" },
+ { 46915, "raffel.biz" },
+ { 46916, "Aviva Voice Systems and Services SL" },
+ { 46917, "PC-TipTop" },
+ { 46918, "GRUPO REVENGA " },
+ { 46919, "Aadi Network Tools" },
+ { 46920, "DEVISE FUTURES - IT SOLUTIONS, LDA" },
+ { 46921, "Universidade Federal de Sao Joao del-Rei" },
+ { 46922, "Wolf GmbH" },
+ { 46923, "LG&E-KU LLC" },
+ { 46924, "Oncology Specialists of Charlotte, PA" },
+ { 46925, "EEBus Initiative e.V." },
+ { 46926, "Midas Green Technologies" },
+ { 46927, "INVITE Networks Incorporated" },
+ { 46928, "r0ck.net" },
+ { 46929, "Uzma Iqbal MD PA" },
+ { 46930, "Sandelman Software Works" },
+ { 46931, "Welch Allyn Singapore Pte Ltd" },
+ { 46932, "OAO NEFAZ" },
+ { 46933, "Business&Decision" },
+ { 46934, "AFSOC" },
{ 0, NULL}
};