Merging upstream version 4.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 70 insertions, 4 deletions

diff --git a/epan/services-data.c b/epan/services-data.c
index 47766eea..a5f42924 100644
--- a/epan/services-data.c
+++ b/epan/services-data.c
@@ -2736,7 +2736,7 @@ static ws_services_entry_t global_tcp_udp_services_table[] = {
     { 3154, "ccmrmi",           "ON RMI Registry" },
     { 3155, "jpegmpeg",         "JpegMpeg Port" },
     { 3156, "indura",           "Indura Collector" },
-    { 3157, "e3consultants",    "CCC Listener Port" },
+    { 3157, "lsa-comm",         "LSA Communicator" },
     { 3158, "stvp",             "SmashTV Protocol" },
     { 3159, "navegaweb-port",   "NavegaWeb Tarification" },
     { 3160, "tip-app-server",   "TIP Application Server" },
@@ -4242,6 +4242,68 @@ static ws_services_entry_t global_tcp_udp_services_table[] = {
     { 5992, "consul-insight",   "Consul InSight Security" },
     { 5999, "cvsup",            "CVSup" },
     { 6000, "x11",              "X Window System" },
+    { 6001, "x11",              "X Window System" },
+    { 6002, "x11",              "X Window System" },
+    { 6003, "x11",              "X Window System" },
+    { 6004, "x11",              "X Window System" },
+    { 6005, "x11",              "X Window System" },
+    { 6006, "x11",              "X Window System" },
+    { 6007, "x11",              "X Window System" },
+    { 6008, "x11",              "X Window System" },
+    { 6009, "x11",              "X Window System" },
+    { 6010, "x11",              "X Window System" },
+    { 6011, "x11",              "X Window System" },
+    { 6012, "x11",              "X Window System" },
+    { 6013, "x11",              "X Window System" },
+    { 6014, "x11",              "X Window System" },
+    { 6015, "x11",              "X Window System" },
+    { 6016, "x11",              "X Window System" },
+    { 6017, "x11",              "X Window System" },
+    { 6018, "x11",              "X Window System" },
+    { 6019, "x11",              "X Window System" },
+    { 6020, "x11",              "X Window System" },
+    { 6021, "x11",              "X Window System" },
+    { 6022, "x11",              "X Window System" },
+    { 6023, "x11",              "X Window System" },
+    { 6024, "x11",              "X Window System" },
+    { 6025, "x11",              "X Window System" },
+    { 6026, "x11",              "X Window System" },
+    { 6027, "x11",              "X Window System" },
+    { 6028, "x11",              "X Window System" },
+    { 6029, "x11",              "X Window System" },
+    { 6030, "x11",              "X Window System" },
+    { 6031, "x11",              "X Window System" },
+    { 6032, "x11",              "X Window System" },
+    { 6033, "x11",              "X Window System" },
+    { 6034, "x11",              "X Window System" },
+    { 6035, "x11",              "X Window System" },
+    { 6036, "x11",              "X Window System" },
+    { 6037, "x11",              "X Window System" },
+    { 6038, "x11",              "X Window System" },
+    { 6039, "x11",              "X Window System" },
+    { 6040, "x11",              "X Window System" },
+    { 6041, "x11",              "X Window System" },
+    { 6042, "x11",              "X Window System" },
+    { 6043, "x11",              "X Window System" },
+    { 6044, "x11",              "X Window System" },
+    { 6045, "x11",              "X Window System" },
+    { 6046, "x11",              "X Window System" },
+    { 6047, "x11",              "X Window System" },
+    { 6048, "x11",              "X Window System" },
+    { 6049, "x11",              "X Window System" },
+    { 6050, "x11",              "X Window System" },
+    { 6051, "x11",              "X Window System" },
+    { 6052, "x11",              "X Window System" },
+    { 6053, "x11",              "X Window System" },
+    { 6054, "x11",              "X Window System" },
+    { 6055, "x11",              "X Window System" },
+    { 6056, "x11",              "X Window System" },
+    { 6057, "x11",              "X Window System" },
+    { 6058, "x11",              "X Window System" },
+    { 6059, "x11",              "X Window System" },
+    { 6060, "x11",              "X Window System" },
+    { 6061, "x11",              "X Window System" },
+    { 6062, "x11",              "X Window System" },
     { 6063, "x11",              "X Window System" },
     { 6064, "ndl-ahp-svc",      "NDL-AHP-SVC" },
     { 6065, "winpharaoh",       "WinPharaoh" },
@@ -5467,6 +5529,7 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 5473, "apsolab-tags",     "The Apsolab company's secure dynamic tag protocol" },
     { 5475, "apsolab-data",     "The Apsolab company's data retrieval protocol" },
     { 5507, "psl-management",   "PowerSysLab Electrical Management" },
+    { 5543, "qftest-licserve",  "QF-Test License Server" },
     { 5550, "cbus",             "Model Railway control using the CBUS message protocol" },
     { 5557, "farenet",          "Sandlab FARENET" },
     { 5565, "dp-bura",          "Data Protector BURA" },
@@ -5548,6 +5611,9 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 6655, "pcs-sf-ui-man",    "PC SOFT - Software factory UI/manager" },
     { 6656, "emgmsg",           "Emergency Message Control Service" },
     { 6665, "ircu",             "IRCU" },
+    { 6666, "ircu",             "IRCU" },
+    { 6667, "ircu",             "IRCU" },
+    { 6668, "ircu",             "IRCU" },
     { 6669, "ircu",             "IRCU" },
     { 6678, "vfbp",             "Viscount Freedom Bridge Protocol" },
     { 6687, "clever-ctrace",    "CleverView for cTrace Message Service" },
@@ -5627,7 +5693,6 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 8066, "toad-bi-appsrvr",  "Toad BI Application Server" },
     { 8067, "infi-async",       "Infinidat async replication" },
     { 8070, "ucs-isc",          "Oracle Unified Communication Suite's Indexed Search Converter" },
-    { 8077, "mles",             "Mles is a client-server data distribution protocol targeted to serve as a lightweight and reliable distributed publish/subscribe database service." },
     { 8084, "websnp",           "Snarl Network Protocol over HTTP" },
     { 8090, "opsmessaging",     "Vehicle to station messaging" },
     { 8091, "jamlink",          "Jam Link Framework" },
@@ -5820,6 +5885,7 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 24577, "bilobit",         "bilobit Service" },
     { 24666, "sdtvwcam",        "Service used by SmarDTV to communicate between a CAM and a second screen application" },
     { 24754, "cslg",            "Citrix StorageLink Gateway" },
+    { 25100, "db2c-tls",        "IBM Db2 Client Interface - Encrypted" },
     { 25576, "sauterdongle",    "Sauter Dongle" },
     { 25604, "idtp",            "Identifier Tracing Protocol" },
     { 26257, "cockroach",       "CockroachDB" },
@@ -5922,8 +5988,8 @@ static ws_services_entry_t global_udp_services_table[] = {
     { 775, "acmaint-transd",    "" },
     { 861, "owamp-test",        "OWAMP-Test" },
     { 862, "twamp-test",        "TWAMP-Test Receiver Port" },
-    { 914, "rift-lies",         "Routing in Fat Trees Link Information Elements (TEMPORARY - registered 2023-02-17, expires 2024-02-17)" },
-    { 915, "rift-ties",         "Routing in Fat Trees Topology Information Elements (TEMPORARY - registered 2023-02-17, expires 2024-02-17)" },
+    { 914, "rift-lies",         "Routing in Fat Trees Link Information Elements (TEMPORARY - registered 2023-02-17, extension registered 2024-01-12, expires 2025-02-17)" },
+    { 915, "rift-ties",         "Routing in Fat Trees Topology Information Elements (TEMPORARY - registered 2023-02-17, extension registered 2024-01-12, expires 2025-02-17)" },
     { 998, "puparp",            "" },
     { 999, "applix",            "Applix ac" },
     { 1027, "6a44",             "IPv6 Behind NAT44 CPEs" },