[Automatic manuf, services and enterprise-numbers update for 2011-06-05]

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

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index e9a03eee25aaffdf37d15f5f491214dc85c6ae0c..2196009a2033b13ed665896bc125cda98a10daf6 100644 (file)
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-05-27)
+(last updated 2011-06-04)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -2319,8 +2319,8 @@ Decimal
       (716) 688-4640
 576
   General Dynamics C4 Systems
-    John J. Holzhauer
-      john.holzhauer&gdc4s.com
+    Charlie Limoges
+      charlie.limoges&gdc4s.com
 577
   Geneva Software, Inc.
     Andy Denenberg
@@ -129662,9 +129662,9 @@ Decentralization / Helenic Public Administra
     Enrique Cimadevila Lage
       ecimadevila&wirelessmundi.com
 32520
-  Anglo European Ltd.
-    Charlie Jepson Orford
-      charlie.orford&angloeuropean.com
+  Anglo European Aviation AG
+    Charles Orford
+      c.orford&angloeuropean.com
 32521
   kontur networx
     Sascha Dorow
@@ -140036,8 +140036,8 @@ Decentralization / Helenic Public Administra
       valentini&vem.com
 35113
   OpTier
-    Marie-Pierre Belanger
-      marie-pierre.belanger&optier.com
+    Elad Schulman
+      elad.schulman&optier.com
 35114
   Robert Wood Johnson University Hospital
     Martin A Flynn
@@ -144856,9 +144856,9 @@ Decentralization / Helenic Public Administra
     Chris Blyseth
       cblyseth&avcomofva.com
 36318
-  Marathon Oil Company
-    Rod Holmes
-      externaldomainmgt&marathonoil.com
+  Marathon Petroleum Company
+    Joe Froelich
+      externaldomainmgt&marathonpetroleum.com
 36319
   iT-CUBE SYSTEMS GmbH
     Thomas Fischer
@@ -148054,7 +148054,7 @@ Decentralization / Helenic Public Administra
 37117
   Industrial Thinking Ltd
     Bill Graham
-      bill.graham&industrialthinking.com
+      oid&industrialthinking.com
 37118
   Panoramic Data
     David Bond
@@ -151667,6 +151667,150 @@ Decentralization / Helenic Public Administra
   Franklin County Public Schools
     John Vehmeier
       john.vehmeier&frco.k12.va.us
+38021
+  Cfengine AS
+    Jon Henrik Bjornstad
+      contact&cfengine.com
+38022
+  HappyBooking UG (haftungsbeschränkt)
+    Daniel Boldura
+      info&happybooking.de
+38023
+  ultrachaos
+    Stefan Horst
+      stefan&ultrachaos.de
+38024
+  Logic Soft sas 
+    Paolo Tarantola
+      paolo&logicsoft.it
+38025
+  MindArray Systems (P) Ltd
+    Alpesh  Dhamelia
+      alpesh&mindarraysystems.com
+38026
+  ACOME
+    LUCAS Anne
+      anne.lucas&acome.fr
+38027
+  Ltd "InfoTechnoService"
+    Boris Stepchenko
+      boris&its.kiev.ua
+38028
+  DANTECH Limited
+    Daniel Houlbrooke
+      daniel&dantech.net.nz
+38029
+  University of South Florida
+    Eric Pierce
+      epierce&usf.edu
+38030
+  Conngame Co.Ltd.
+    Sailer Shen
+      tshen&conngame.com
+38031
+  NextGate
+    Les Marcum
+      les&nextgate.com
+38032
+  EFOLIA
+    Gabriel GIL
+      gabriel.gil&efolia.fr
+38033
+  TeamF1
+    Madhusudhan Kovalmudi
+      madhu&teamf1.com
+38034
+  IHSE GmbH
+    Heiner Esseln
+      esseln&ihse.de
+38035
+  GS1 Sweden AB
+    Jeremy Morton
+      jm&gs1.se
+38036
+  ChronoPay B.V.
+    Valentine Zaitsev
+      v.zaitsev&chronopay.com
+38037
+  Ståle Hebæk Ødegården
+    Ståle Hebæk Ødegården
+      mail&hebaek.no
+38038
+  Informacijsko svetovanje, Miha Valenčič, s.p.
+    Miha Valenčič
+      miha.valencic&gmail.com
+38039
+  Klika d.o.o.
+    Miha Valenčič
+      miha.valencic&klika.si
+38040
+  Reliable System Services Corporation
+    Andrew Oldenburg
+      aoldenburg&rsscorp.org
+38041
+  Via Christi Health
+    Denise Johnson
+      Denise.Johnson&viachristi.org
+38042
+  Via Christi Health
+    Denise Johnson
+      Denise.Johnson&viachristi.org
+38043
+  Hear And See Systems OÜ
+    Imre Tabur
+      imre.tabur&eesti.ee
+38044
+  wu-way, inc.
+    Basit Mustafa
+      basit&wu-way.com
+38045
+  Shenzhen Winhap Commucations Inc.
+    HU ZHIQIANG
+      lieryou&gmail.com
+38046
+  CJSC UniCredit Bank
+    Maxim Ivlev
+      Maxim.Ivlev&unicreditgroup.ru
+38047
+  JSC STC Electron-Service
+    Sergey Kizin
+      pen&elserv.ru
+38048
+  Institut des Sciences de l'Homme
+    DUSSURGET Frederic
+      fdussurget&ish-lyon.cnrs.fr
+38049
+  Zaehlwerk GbR
+    Gregor Giesen
+      iana&zaehlwerk.net
+38050
+  Lightbar Software Solutions LLC
+    Bart Stevens
+      bart&lightbar.org
+38051
+  Boy Scouts of America
+    David Gersting
+      dgersting&oa-c4.org
+38052
+  Attackplan Software
+    Charles Orford
+      iana-contact&attackplan.net
+38053
+  Avisit Solutions Limited
+    Arjen Visser
+      arjen.visser&avisit.co.nz
+38054
+  Arellia Corporation
+    Michael Sainsbury
+      msainsbury&arellia.com
+38055
+  Gforce Inc.
+    Bin LIU
+      binliu&greencache.com
+38056
+  Nason Hospital
+    Brian Lilly
+      blilly&nasonhospital.com
 
 
 End of Document

diff --git a/services b/services
index f5c9cf98456619395fa3d66426946065cb84c60b..4e3677b6ff25f602ef15725268ac995427a75f7b 100644 (file)
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 
 PORT NUMBERS
 
-(last updated 2011-05-27)
+(last updated 2011-06-02)
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -14225,8 +14225,8 @@ sncp            7560/udp    Sniffer Command Protocol
 #                           Dominick Cafarelli <dominick.cafarelli&networkgeneral.com> August 2005
 #               7561-7562   Unassigned
 cfw             7563/tcp    Control Framework
+#                           [RFC6230]
 #               7563/udp    Reserved
-#                           [RFC-ietf-mediactrl-sip-control-framework-12.txt]
 #               7564-7565   Unassigned
 vsi-omega       7566/tcp    VSI Omega  
 vsi-omega       7566/udp    VSI Omega
@@ -17234,19 +17234,17 @@ References
 
 [RFC6120]  P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", 
            RFC 6120, March 2011.
-            
+
+[RFC6126]  J. Chroboczek, "The Babel Routing Protocol", RFC 6126, April 2011.
+           
 [RFC6142]   A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", 
             RFC 6142, March 2011.
 
 [RFC6143]  T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC 6143, 
            March 2011.
 
-[RFC6126]  J. Chroboczek, "The Babel Routing Protocol", RFC 6126, April 2011.
-
-
-[RFC-ietf-mediactrl-sip-control-framework-12.txt]
-            C. Boulton, T. Melanchuk, S. McGlashan, "Media Control Channel Framework", 
-            RFC XXXX, Month Year.
+[RFC6230]  C. Boulton, T. Melanchuk, S. McGlashan, "Media Control Channel Framework", 
+           RFC 6230, May 2011.
 
 [RFC-ietf-netconf-rfc4742bis-08.txt]
             M. Wasserman, T. Goddard, "Using the NETCONF Configuration Protocol over