[Automatic manuf, services and enterprise-numbers update for 2011-07-24]

svn path=/trunk/; revision=38181

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index e538318d37ea7d3ba9f7f8ddbc0f58ed824dbbd9..4ec605a6d8848bbe5599f4411170875dc0830782 100644 (file)
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-07-16)
+(last updated 2011-07-24)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -30974,9 +30974,9 @@ Decimal
     Giovanni Iamonte
       iamonte&infosquare.com
 7755
-  Walt Disney Internet Group
-    Matthew McKenna
-      matthew.mckenna&dig.com
+  Disney Technology Solutions and Services
+    Ian Funk
+      ian.funk&disney.com
 7756
   Netarena Communications
     Michael Lum
@@ -104912,9 +104912,9 @@ Auswertungsstelle
     Alfred Marx
       alfred.marx&megatrondataservices.com
 26335
-  IPortent Ltd.
-    Alon Marx
-      alon&iportent.com
+  Divinetworks Ltd. (previous was 'IPortent Ltd.')
+    Ezra Muallem
+      yoel&divinetworks.com
 26336
   Pawel Kraszewski
     Pawel Kraszewski
@@ -152915,6 +152915,154 @@ Decentralization / Helenic Public Administra
   LeonIT GbR
     Maximilian Thoma
       info&leonit.net
+38333
+  Network Solution Technologies Co., Ltd.
+    Minyoung Lee
+      mylee&nstco.co.kr
+38334
+  ArchOne
+    Roman Sergey
+      rs&archone.org
+38335
+  AVIN Networks Private Limited
+    Pankaj Kumar Roy
+      pankaj_roy&avinnetworks.com
+38336
+  Platte Valley Medical Center
+    Darrell Messsersmith
+      dmessersmith&pvmc.org
+38337
+  Power Instruments Pte Ltd.
+    Wang Yetao
+      wangyt&powerinstruments.com.sg
+38338
+  Suntel Ltd
+    Arasaratnam Umakanthan
+      UmakanthanA&suntel.lk
+38339
+  Centrum Informatyki Statystycznej
+    Roman Mendaluk
+      r.mendaluk&stat.gov.pl
+38340
+  Broadcast Partners
+    Yves Vermeersch
+      support&broadcastpartners.nl
+38341
+  AGETO Innovation GmbH
+    Christian Kahlo
+      c.kahlo&ageto.net
+38342
+  City of Hope
+    Jon Sharp
+      jsharp&coh.org
+38343
+  Wilcom Technologies
+    Qizhi Yi
+      yiqizhi&wilcom.com.cn
+38344
+  Maxwell Worthington
+    Mark Madere
+      mark&maxwellworthington.com
+38345
+  S&T Ukraine
+    Iurii Chernichenko
+      iurii.chernichenko&snt.ua
+38346
+  Pallas GmbH
+    Stephan Sachweh
+      helpdesk&pallas.com
+38347
+  Ing. Günther Vlaschits
+    Ing. Günther Vlaschits
+      office&vlaschits.at
+38348
+  ISDEFE Ingenieria de Sistemas para la Defensa de España S.A.
+    Carlos Manuel Gonzalez Rodriguez
+      cmgonzalez&isdefe.es
+38349
+  Firstcom A/S
+    Jon Schøpzinsky
+      jos&firstcom.dk
+38350
+  XtreemFS project
+    Michael Berlin
+      berlin&zib.de
+38351
+  net-lab GmbH
+    Andreas John
+      internet&net-lab.net
+38352
+  National Information Technology Center
+    Nabeel Al-Fayoumi
+      generaldirector&pki.jo
+38353
+  Weebly, Inc.
+    Network Operations
+      netops&weebly.com
+38354
+  Princeton Consultants
+    Attila Mihalyi
+      amihalyi&princeton.com
+38355
+  TTTech Computertechnik AG
+    Dominique Riezler
+      dominique.riezler&tttech.com
+38356
+  Mike Becker
+    Mike Becker
+      mike.becker&redpeppersworld.de
+38357
+  ActualMed
+    Rafael Forcada
+      rafael.forcada&actualmed.com
+38358
+  Western Electricity Coordinating Council
+    Lyonell Keplar
+      lkeplar&wecc.biz
+38359
+  Meissner
+    Oliver Meissner
+      oliver-sd94&la-familia-grande.de
+38360
+  Delled Company Ltd
+    Delmiro Paes
+      delmiro&delled.com.br
+38361
+  Exabre Ltd
+    Chris Jupp
+      chris.jupp&exabre.com
+38362
+  alpha dot net Australia
+    James Ponza
+      jponza&alpha.net.au
+38363
+  PT Primatama Sentra Solusi
+    Martin Otterman
+      otterman&primatama.net
+38364
+  Netsis Technology
+    Edgardo Gonzales II
+      edgardo.gonzales&netsis.com.sg
+38365
+  BKW FMB Energie AG
+    Sven Mehlhase
+      sven.mehlhase&bkw-fmb.ch
+38366
+  Joint-Stock Bank "Master-Bank"
+    Aleksey Jastrebcev 
+      snmpmaster&masterbank.ru
+38367
+  KIS Information Services GmbH
+    Joachim Kaule
+      joachim.kaule&kis-is.com
+38368
+  Radimetrics Inc.
+    John Adziovsky
+      john&radimetrics.com
+38369
+  ZiXi, LLC
+    Igor Ratner
+      igor&zixi.us
 
 
 End of Document

diff --git a/services b/services
index fc5b3e4eda4769f128df4654a2bfca2ded86426b..0dde767e6addf5fcfdde95db5faf0aecd08e1c35 100644 (file)
--- a/services
+++ b/services
@@ -14,7 +14,17 @@
 
 PORT NUMBERS
 
-(last updated 2011-07-11)
+(last updated 2011-07-21)
+
+****************************************************************************
+ATTENTION:  This registry has recently been combined with the Service Names 
+Registry according to the recently approved document            
+[http://tools.ietf.org/html/draft-ietf-tsvwg-iana-ports].                
+For the new version of the registry, please see:                      
+http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml.  
+This URL will soon redirect to the new registry and the old registry format 
+will be removed.
+*****************************************************************************
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -15609,10 +15619,10 @@ qb-db-server    10160/udp  QB Database Server
 #                          Wei Wang <Wei_Wang&intuit.com> November 2005
 snmptls         10161/tcp  SNMP-TLS
 snmpdtls        10161/udp  SNMP-DTLS
-#                          [RFC-5953]
+#                          [RFC6353]
 snmptls-trap    10162/tcp  SNMP-Trap-TLS
 snmpdtls-trap   10162/udp  SNMP-Trap-DTLS
-#                          [RFC5953]
+#                          [RFC6353]
 #               10163-10199 Unassigned
 trisoap                10200/tcp  Trigence AE Soap Service
 trisoap                10200/udp  Trigence AE Soap Service
@@ -16805,7 +16815,10 @@ kitim           35354/tcp   KIT Messenger
 altova-lm       35355/tcp   Altova License Management
 altova-lm-disc  35355/udp   Altova License Management Discovery
 #                           Alexander Falk <al&altova.com> 07 July 2011
-#               35356-36000 Unassigned
+guttersnex      35356/tcp   Gutters Note Exchange
+#                           Tristan Seifert <tristan&squee.co> 19 July 2011
+#               35356/udp   Reserved 
+#               35357-36000 Unassigned
 allpeers       36001/tcp   AllPeers Network
 allpeers       36001/udp   AllPeers Network
 #                          Cedric Maloux <cedric&allpeers.com> April 2007
@@ -17263,9 +17276,6 @@ References
 [RFC5905]  J. Burbank, W. Kasch, J. Martin, Ed., D. Mills, "Network Time Protocol Version 4 
            Protocol And Algorithms Specification," RFC 5905, June 2010.
 
-[RFC5953]  W. Hardaker, "Transport Layer Security (TLS) Transport Model for the Simple 
-           Network Management Protocol (SNMP)", RFC 5953, August 2010.
-
 [RFC5971]  H. Schulzrinne, R. Hancock, "GIST: General Internet Signalling Transport", 
            RFC 5971, October 2010.
 
@@ -17292,6 +17302,9 @@ References
 [RFC6242]  M. Wasserman, T. Goddard, "Using the NETCONF Configuration Protocol over 
            Secure Shell (SSH)", RFC 6242, June 2011.
 
+[RFC6353]  W. Hardaker, "Transport Layer Security (TLS) Transport Model for the Simple 
+           Network Management Protocol (SNMP)", RFC 6353, July 2011.
+           
 [RFC-ietf-ancp-protocol-17.txt]
             S. Wadhwa, J. Moisand, T. Haag, N. Voigt, T. Taylor, Ed., "Protocol for 
             Access Node Control Mechanism in Broadband Networks", RFC XXXX, Month Year.