[Automatic manuf, services and enterprise-numbers update for 2012-01-15]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40513 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 71fcf164e2ff57fb91a3ce25ad7eaeb1c77a070f..381c3184803346e31db4eb94ee6229f25ac958b7 100644 (file)
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2012-01-08)
+(last updated 2012-01-14)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -366,9 +366,9 @@ Decimal
     Roland Bless
       ldap&tm.uka.de
 88
-  NYU
-    Bill Russell
-      russell&cmcl2.NYU.EDU
+  New York University
+    Jimmy Kyriannis
+      jimmy.kyriannis&nyu.edu
 89
   RND
     Rina Nethaniel
@@ -27730,9 +27730,9 @@ Decimal
     Vladimir A. Grishin
       info&alpha.ru
 6944
-  SERMEPA
-    Angel Lozano Rodriguez
-      alozano&sermepa.es
+  REDSYS (previous was 'SERMEPA')
+    Gonzalo Alvarez-Castellanos
+      galvarez&redsys.es
 6945
   LAKE Communications
     Mark McCarville
@@ -39222,9 +39222,9 @@ Decimal
     Alexander Finkelshtein
       alex&wanwall.com
 9817
-  WaveNET(PVT) Ltd.
-    Eranga Weeraratne
-      eranga&infotechs.lk
+  WaveNET International (Pvt) Ltd.
+    Vance Shipley
+      vance&wavenet.lk
 9818
   Xwave GmbH
     Marcus Spiegel
@@ -66683,9 +66683,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Michael Dickey
       mdickey&clickcadence.com
 16783
-  Abacus Technical Training Company
+  Abacus Technical Services
     Michael Hammond
-      MCTMike&Ameritech.net
+      MCTMike&AbacusTech.info
 16784
   Olson Technology, Inc.
     Tom Olson
@@ -116209,8 +116209,8 @@ Decentralization / Helenic Public Administra
       cia&fatbit.pipe2.net
 29157
   Bytemark Hosting
-    Alex Howells
-      alex&bytemark.co.uk
+    Patrick Cherry
+      iana&bytemark.co.uk
 29158
   Alinea Software Solutions SL
     J.C. Ramos
@@ -118521,7 +118521,7 @@ Decentralization / Helenic Public Administra
       iana&wartsila.com
 29735
   E.T.S.V. Scintilla
-    Leon Haverkotte
+    Koen Zandberg
       sot&scintilla.utwente.nl
 29736
   Unified Business Solutions
@@ -126710,8 +126710,8 @@ Decentralization / Helenic Public Administra
       rath&technikgruppe.com
 31782
   SyferLock Technology Corporation
-    Michael Forrest
-      mforrest&syferlock.com
+    Abu Marcose
+      support&syferlock.com
 31783
   MetroSouth Medical Center
     LeAndre Jones
@@ -148880,8 +148880,8 @@ Decentralization / Helenic Public Administra
       ymatsuo&oregano.ocn.ne.jp
 37324
   Albany Medical Center
-    Eddy Rospide
-      rospide&mail.amc.edu
+    Joseph Hoffman
+      hoffmaj&mail.amc.edu
 37325
   York College of Pennsylvania
     Kyle Smith
@@ -156354,6 +156354,210 @@ Decentralization / Helenic Public Administra
   IBSmm Engineering, spol. s r.o.
     Radomir Vrbovsky
       R.Vrbovsky&IBSmm.com
+39193
+  Vayosoft Network Technologies Ltd.
+    Jean Dubenko
+      jean&vayosoft.com
+39194
+  CSSS IUGS (Centre de Sante et des Services Sociaux - Institut Universitaire de Geriatrie de Sherbrooke)
+    Sylvain Gobeil
+      slgobeil.csss-iugs&ssss.gouv.qc.ca
+39195
+  Spawngrid, Inc.
+    Iurii Rashkovskyi
+      yrashk&spawngrid.com
+39196
+  Oxynux
+    Benjamin Collet
+      bcollet&oxynux.org
+39197
+  Xitek Design Ltd
+    Alan Jacks
+      support&xitekdesign.com
+39198
+  Brekeke Software, Inc.
+    Shinichi Mitsumata
+      mitu&brekeke.com
+39199
+  EXPRESSTRAK - DATS
+    Vijay Pavuluri
+      vijayp000&gmail.com
+39200
+  KTB COMPUTER SERVICES Co.,Ltd
+    Somporn Jarusinchai
+      somporn.jaru&ktbcs.co.th
+39201
+  redtoo ag
+    Daniel von Büren
+      Daniel.vonBueren&redtoo.com
+39202
+  ASP Alerce Tecnology SL
+    Alvaro Fernandez Corugedo Feilenreiter
+      acorugedo&aspalerce.es
+39203
+  Qualysoft Informatikai Zrt.
+    Jacint Toth
+      jacint.toth&qualysoft.com
+39204
+  QuanticEvents
+    Eric Fries
+      eric.fries&quanticevents.com
+39205
+  Broadnet Telecom Inc
+    Christian Mokbel
+      cmokbel&broadnet-telecom.ca
+39206
+  EITV - Entretenimento e Interatividade para TV Digital
+    Roberto Marchesini
+      roberto.marchesini&eitv.com.br
+39207
+  SparkYard, Inc.
+    Jonathan Layes
+      iana-pen-support&sparkyard.com
+39208
+  LivingObjects
+    Damien DUMEZ
+      damien.dumez&livingobjects.fr
+39209
+  Plexus Corp.
+    Scott Reynolds
+      hostmaster&plexus.com
+39210
+  Impulse Point LLC
+    Andrew Tams
+      atams&impulse.com
+39211
+  Positronics Enterprise Limited
+    Kelvin Chan
+      kelvin.chan&positronics.com
+39212
+  Prosyscor Ltd
+    Bradley Kite
+      support&prosyscor.com
+39213
+  Datakonsult Magnus Sandberg
+    Magnus Sandberg
+      oid&datakon.se
+39214
+  MT2IT
+    Joerg-Uwe Meyer
+      joerg-uwe.meyer&mt2it.com
+39215
+  Kernun
+    Vladimir Tulacka
+      iana&kernun.cz
+39216
+  BroadForward B.V.
+    Raymond van der Laan
+      raymond.van.der.laan&broadforward.com
+39217
+  Triple T Broadband PCL
+    Aroon Janthong
+      aroon.j&jasmine.com
+39218
+  Connection Electronics Ltd.
+    Victor Lau
+      victor&cel.hk
+39219
+  Overkiz
+    COSSERAT Hubert
+      h.cosserat&overkiz.com
+39220
+  Theoldmonk.net
+    Devendra Gera
+      iana.pen&theoldmonk.net
+39221
+  Pakedge Device and Software Inc
+    Dusan Jankov
+      dusan&pakedge.com
+39222
+  Patrick Shuff Industries
+    Patrick Shuff
+      patrick.shuff&gmail.com
+39223
+  ADNET Systems, Inc.
+    Lucas Yamanishi
+      lyamanishi&sesda2.com
+39224
+  Djipalo Junuz
+    Djipalo Junuz
+      djipalo.junuz&djipalo.com.ba
+39225
+  AVRO Electrics
+    Krzysztof Sroka
+      krzysztof.sroka&avro.com.pl
+39226
+  REWOO Technologies AG
+    Andreas Gall
+      administration&rewoo.com
+39227
+  GIE Vauban Humanis
+    Vincent Dussaucy
+      oid.admin&vaubanhumanis.com
+39228
+  Kemira Oyj
+    Hannu Strang
+      kits.infra&kemira.com
+39229
+  Convergence Technologies
+    Jeff Ehman
+      jehman&converge-tech.com
+39230
+  lenic.eu
+    Lukasz Kapiec
+      lukasz&lenic.eu
+39231
+  Hosting.com, Inc.
+    Darrell Hyde
+      darrell&hosting.com
+39232
+  Drogentherapiezentrum LAGO
+    Raphael Beer
+      raphael.beer&gmx.de
+39233
+  Saint John's Health System
+    Jennifer Marcum
+      jlmarcum&sjhsnet.org
+39234
+  Mitroko Inc.
+    Dmitry Stremkouski
+      mitroko&gmail.com
+39235
+  Exelis Inc.
+    Paul Lafferty 
+      paul.lafferty&exelisinc.com
+39236
+  Sacred Point Studios
+    Joshua Porter
+      jporter&sacredpointstudios.com
+39237
+  FW-Systeme GmbH
+    Reiner Onnen
+      onnen&fw-systeme.de
+39238
+  VelociData, Inc
+    Michael Henrichs
+      mhenrichs&velocidata.com
+39239
+  LittleJackal 
+    Paul Kiela
+      iana&littlejackal.com
+39240
+  Atacama Large Millimeter/submillimeter Array
+    Marcelo Bartsch
+      software&alma.cl
+39241
+  volkszaehler.org
+    Gerhard Bertelsmann
+      info&gerhard-bertelsmann.de
+39242
+  Krki IT
+    Lafo Mamone
+      krki-it&hotmail.com
+39243
+  VNLI LTD CO.
+    VINCENT KIBET KIRUI/ LILIAN CHEPKORIR KIRUI
+      vkirui11&yahoo.com
 
 
 End of Document

diff --git a/manuf b/manuf
index 2b8f45418b903bc543f6e69a361cf8463e5d7e52..099f43fd9c5f0ce1603f58836607d5fe51772ab4 100644 (file)
--- a/manuf
+++ b/manuf
@@ -14581,6 +14581,14 @@
 00:50:C2:F1:10:00/36   Organis                # Organis GmbH
 00:50:C2:F1:20:00/36   GeneralI               # General Industrial Controls Pvt Ltd
 00:50:C2:F1:30:00/36   PacketPl               # Packet Plus, Inc.
+00:50:C2:F1:40:00/36   VisionAe               # VISION SYSTEMS AERONAUTIC
+00:50:C2:F1:50:00/36   SascalDi               # Sascal Displays Ltd
+00:50:C2:F1:60:00/36   PeterHub               # Peter Huber K�ltemaschinenbau GmbH
+00:50:C2:F1:70:00/36   AbbTrans               # ABB Transmission and Distribution Automation Equipment (Xiamen) Co., Ltd
+00:50:C2:F1:80:00/36   VitecMul               # Vitec Multimedia
+00:50:C2:F1:90:00/36   NetlinkB               # Netlink Bilisim Sistemleri San. ve Tic. Ltd. Sti.
+00:50:C2:F1:A0:00/36   AquaMana               # Aqua Management
+00:50:C2:F1:B0:00/36   Saia-Bur               # Saia-Burgess Controls AG
 00:50:C4       Imd
 00:50:C5       AdsTechn               # ADS Technologies, Inc
 00:50:C6       LoopTele               # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -16777,6 +16785,7 @@
 08:76:FF       ThomsonT               # Thomson Telecom Belgium
 08:86:3B       BelkinIn               # Belkin International, Inc.
 08:8D:C8       RyowaEle               # Ryowa Electronics Co.,Ltd
+08:8F:2C       HillsSou               # Hills Sound Vision & Lighting
 08:9F:97       LeroyAut               # LEROY AUTOMATION
 08:A1:2B       Shenzhen               # ShenZhen EZL Technology Co., Ltd
 08:A9:5A       Azurewav               # Azurewave
@@ -17466,6 +17475,7 @@
 40:F4:EC       Cisco                  # Cisco Systems
 40:F5:2E       LeicaMic               # Leica Microsystems (Schweiz) AG
 40:FC:89       Motorola               # Motorola Mobility, Inc.
+44:13:19       WkkTechn               # WKK TECHNOLOGY LTD.
 44:1E:A1       Hewlett-               # Hewlett-Packard Company
 44:25:BB       BambooEn               # Bamboo Entertainment Corporation
 44:2A:60       Apple                  # Apple, Inc.
@@ -17644,6 +17654,7 @@
 50:C9:71       GnNetcom               # GN Netcom A/S
 50:CC:F8       SamsungE               # Samsung Electro Mechanics
 50:CE:75       MeasyEle               # Measy Electronics Ltd
+50:D2:74       Steffes                # Steffes Corporation
 50:D6:D7       Takahata               # Takahata Precision
 50:E5:49       Giga-Byt               # GIGA-BYTE TECHNOLOGY CO.,LTD.
 50:EA:D6       Apple                  # Apple, Inc.
@@ -17842,6 +17853,7 @@
 64:1E:81       Dowslake               # Dowslake Microsystems
 64:20:0C       Apple                  # Apple, Inc.
 64:27:37       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd. 
+64:2D:B7       SeungilE               # SEUNGIL ELECTRONICS
 64:31:50       Hewlett-               # Hewlett-Packard Company
 64:31:7E       Dexin                  # Dexin Corporation
 64:34:09       BitwaveP               # BITwave Pte Ltd
@@ -18120,6 +18132,7 @@
 78:92:9C       IntelCor               # Intel Corporate
 78:99:8F       Mediline               # MEDILINE ITALIA SRL
 78:A0:51       IinetLab               # iiNet Labs Pty Ltd 
+78:A1:83       Advidia
 78:A2:A0       Nintendo               # Nintendo Co., Ltd.
 78:A3:E4       Apple                  # Apple, Inc.
 78:A5:DD       Shenzhen               # Shenzhen Smarteye Digital Electronics Co., Ltd
@@ -18543,6 +18556,7 @@
 98:F8:DB       MariniIm               # Marini Impianti Industriali s.r.l.
 98:FC:11       Cisco-Li               # Cisco-Linksys, LLC
 98:FE:03       Ericsson               # Ericsson - North America
+9C:01:11       Shenzhen               # Shenzhen Newabel Electronic Co., Ltd.
 9C:02:98       SamsungE               # Samsung Electronics Co.,Ltd 
 9C:18:74       NokiaDan               # Nokia Danmark A/S
 9C:1F:DD       Accupix                # Accupix Inc.
@@ -18725,6 +18739,7 @@ A8:BD:1A        HoneyBee               # Honey Bee (Hong Kong) Limited
 A8:C2:22       Tm-Resea               # TM-Research Inc.
 A8:CB:95       EastBest               # EAST BEST CO., LTD.
 A8:CE:90       Cvc
+A8:D0:E5       JuniperN               # Juniper Networks
 A8:D3:C8       Wachendo               # Wachendorff Elektronik  GmbH & Co. KG
 A8:E0:18       Nokia                  # Nokia Corporation
 A8:E3:EE       SonyComp               # Sony Computer Entertainment Inc.
@@ -19662,6 +19677,7 @@ F4:3E:9D        BenuNetw               # Benu Networks, Inc.
 F4:42:27       SSResear               # S & S Research Inc.
 F4:44:50       Bnd                    # BND Co., Ltd.
 F4:45:ED       Portable               # Portable Innovation Technology Ltd.
+F4:48:48       Amscreen               # Amscreen Group Ltd
 F4:4E:FD       ActionsS               # Actions Semiconductor Co.,Ltd.(Cayman Islands)
 F4:50:EB       Telechip               # Telechips Inc
 F4:55:95       Hengbao                # HENGBAO Corporation LTD.
@@ -19707,6 +19723,7 @@ F8:35:53        MagentaR               # Magenta Research Ltd.
 F8:3D:FF       HuaweiTe               # Huawei Technologies Co., Ltd
 F8:46:2D       SyntecIn               # SYNTEC Incorporation
 F8:47:2D       X2genDig               # X2gen Digital Corp. Ltd
+F8:50:63       Verathon
 F8:52:DF       VnlEurop               # VNL Europe AB
 F8:66:F2       Cisco                  # Cisco Systems
 F8:69:71       SeibuEle               # Seibu Electric Co.,

diff --git a/services b/services
index d374c4c48da92fe63b6b7c649ad876bd1f3f4f05..5d8a3e9a45910b5c09dd50d87645308a96cf0e7e 100644 (file)
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 # Service Name and Transport Protocol Port Number Registry
 # 
 # Last Updated
-# 2012-01-04
+# 2012-01-11
 # 
 # Note
 # 
@@ -10178,7 +10178,8 @@ awacs-ice       4488/udp        # Apple Wide Area Connectivity [Rory_McGuire]
 ipsec-nat-t    4500/tcp        # IPsec NAT-Traversal                                                                                                                                        [RFC3947]
 ipsec-nat-t    4500/udp        # IPsec NAT-Traversal                                                                                                                                        [RFC3947]
 # 4501               Unassigned                   [IANA]                                    [IANA]                                                                                                                                            De-registered 08 June 2001
-# 4502-4534            Unassigned
+a25-fap-fgw    4502/sctp       # A25 (FAP-FGW)                [ThreeGPP2]                               [Zhiming_Li]                                              2012-01-11
+# 4503-4534            Unassigned
 ehs    4535/tcp        # Event Heap Server
 ehs    4535/udp        # Event Heap Server
 ehs-ssl        4536/tcp        # Event Heap Server SSL        [Brad_Johanson]                           [Brad_Johanson]                                           2005-08
@@ -20780,6 +20781,7 @@ matahari        49000/tcp       # Matahari Broker              [Matahari_Project]
 # [Thomas_Zwick]                                            Thomas Zwick                                    mailto:thomas.zwick&tz-software.de                            2011-10-12
 # [Thor_Olson]                                              Thor Olson                                      mailto:Thor&terabase.com
 # [Thorvald_Natvig]                                         Thorvald Natvig                                 mailto:thorvald&natvig.com
+# [ThreeGPP2]                                                                         3GPP2                 mailto:lizhiming&huawei.com                                   2012-01-11
 # [Tiago_Bittencourt_Si]                                    Tiago Bittencourt Silva                         mailto:tiagobs&ufpr.br                                        2005-08
 # [Tightrope_Media_Systems]                                                           Tightrope Media       mailto:sjann&trms.com                                         2011-10-17
 # Systems, Inc.
@@ -21138,6 +21140,7 @@ matahari        49000/tcp       # Matahari Broker              [Matahari_Project]
 # [Zdenek_Kolba]                                            Zdenek Kolba                                    mailto:zdenek.kolba&id-karta.cz
 # [Zenon_Fortuna]                                           Zenon Fortuna                                   mailto:zenon&mips.com                                         2007-02
 # [Zhengli]                                                 Zhengli                                         mailto:std&iwncomm.com                                        2010-06-28
+# [Zhiming_Li]                                              Zhiming Li                3GPP2                 mailto:lizhiming&huawei.com                                   2012-01-11
 # [Zhizhong_Zhuang]                                         Zhizhong Zhuang                                 mailto:ZZhuang&optellios.com                                  2006-12
 # [Zia_Bhatti]                                              Zia Bhatti                                      mailto:zia&netright.com
 # [Ziad_Sawalha]                                            Ziad Sawalha              Rackspace Hosting     mailto:ziad.sawalha&rackspace.com                             2011-08-15