summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-05-31 08:41:36 -0700
committerGerald Combs <gerald@wireshark.org>2015-05-31 15:41:40 +0000
commit8f6edb1077214db5ca8a2aededde222281e2e203 (patch)
tree1b7ef3d692c25787a8e2855656afe851a1bcdb7d /services
parentf9a40317b707b4ec7e813e7aef73844bcf3f5280 (diff)
downloadwireshark-8f6edb1077214db5ca8a2aededde222281e2e203.tar.gz
[Automatic update for 2015-05-31]
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Iebf7aa4179d59c519ca6192909f6007939488657 Reviewed-on: https://code.wireshark.org/review/8708 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'services')
-rw-r--r--services4
1 files changed, 2 insertions, 2 deletions
diff --git a/services b/services
index 0895f11516..808559909d 100644
--- a/services
+++ b/services
@@ -3839,8 +3839,8 @@ netiq-ncap 2219/tcp # NetIQ NCAP Protocol [Roger_Huebner] [Roger_Huebner]
netiq-ncap 2219/udp # NetIQ NCAP Protocol [Roger_Huebner] [Roger_Huebner] 2010-08-25
netiq 2220/tcp # NetIQ End2End [Michael_Sharpe] [Michael_Sharpe] 2010-09-14
netiq 2220/udp # NetIQ End2End [Michael_Sharpe] [Michael_Sharpe] 2010-09-14
-rockwell-csp1 2221/tcp # Rockwell CSP1 [Brian_Batke] [Brian_Batke]
-rockwell-csp1 2221/udp # Rockwell CSP1 [Brian_Batke] [Brian_Batke]
+ethernet-ip-s 2221/tcp # EtherNet/IP over TLS [ODVA_Inc] [Brian_Batke_3] 2015-05-28
+ethernet-ip-s 2221/udp # EtherNet/IP over DTLS [ODVA_Inc] [Brian_Batke_3] 2015-05-28
EtherNet-IP-1 2222/tcp # EtherNet/IP I/OIANA assigned this well-formed service name as a replacement for "EtherNet/IP-1". [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01
EtherNet/IP-1 2222/tcp # EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01This entry is an alias to "EtherNet-IP-1".This entry is now historic, not usable for use with manycommon service discovery mechanisms.
EtherNet-IP-1 2222/udp # EtherNet/IP I/OIANA assigned this well-formed service name as a replacement for "EtherNet/IP-1". [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01