Adding upstream version 4.4.0.upstream/4.4.0upstream

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

1 files changed, 9 insertions, 6 deletions

diff --git a/epan/services-data.c b/epan/services-data.c
index 2ba6b043..a384fe0b 100644
--- a/epan/services-data.c
+++ b/epan/services-data.c
@@ -11,13 +11,15 @@
  * service names, e.g. TCP port 80 -> http.
  *
  * It is subject to copyright and being used with IANA's permission:
- * https://www.wireshark.org/lists/wireshark-dev/200708/msg00160.html
+ * https://lists.wireshark.org/archives/wireshark-dev/200708/msg00160.html
  *
  * The original file can be found at:
  * https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.csv
+ *
+ * Generated by tools/make-services.py
  */
 
-static ws_services_entry_t global_tcp_udp_services_table[] = {
+static const ws_services_entry_t global_tcp_udp_services_table[] = {
     { 1, "tcpmux",              "TCP Port Service Multiplexer" },
     { 2, "compressnet",         "Management Utility" },
     { 3, "compressnet",         "Compression Process" },
@@ -5273,7 +5275,7 @@ static ws_services_entry_t global_tcp_udp_services_table[] = {
     { 48653, "robotraconteur",  "Robot Raconteur transport" },
 };
 
-static ws_services_entry_t global_tcp_services_table[] = {
+static const ws_services_entry_t global_tcp_services_table[] = {
     { 113, "ident",             "" },
     { 143, "imap",              "Internet Message Access Protocol" },
     { 271, "pt-tls",            "IETF Network Endpoint Assessment (NEA) Posture Transport Protocol over TLS (PT-TLS)" },
@@ -5662,6 +5664,7 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 7563, "cfw",              "Control Framework" },
     { 7569, "dell-eql-asm",     "Dell EqualLogic Host Group Management" },
     { 7574, "coherence",        "Oracle Coherence Cluster Service" },
+    { 7575, "wtmi-panel",       "Main access port for WTMI Panel" },
     { 7626, "simco",            "SImple Middlebox COnfiguration (SIMCO) Server" },
     { 7630, "hawk",             "HA Web Konsole" },
     { 7631, "tesla-sys-msg",    "TESLA System Messaging" },
@@ -5970,7 +5973,7 @@ static ws_services_entry_t global_tcp_services_table[] = {
     { 49150, "inspider",        "InSpider System" },
 };
 
-static ws_services_entry_t global_udp_services_table[] = {
+static const ws_services_entry_t global_udp_services_table[] = {
     { 113, "auth",              "Authentication Service" },
     { 270, "gist",              "Q-mode encapsulation for GIST messages" },
     { 456, "macon-udp",         "" },
@@ -6276,7 +6279,7 @@ static ws_services_entry_t global_udp_services_table[] = {
     { 49001, "nusdp-disc",      "Nuance Unity Service Discovery Protocol" },
 };
 
-static ws_services_entry_t global_sctp_services_table[] = {
+static const ws_services_entry_t global_sctp_services_table[] = {
     { 9, "discard",             "Discard" },
     { 20, "ftp-data",           "File Transfer [Default Data]" },
     { 21, "ftp",                "File Transfer Protocol [Control]" },
@@ -6366,7 +6369,7 @@ static ws_services_entry_t global_sctp_services_table[] = {
     { 38472, "f1-control",      "F1 Control Plane (3GPP)" },
 };
 
-static ws_services_entry_t global_dccp_services_table[] = {
+static const ws_services_entry_t global_dccp_services_table[] = {
     { 9, "discard",             "Discard" },
     { 1021, "exp1",             "RFC3692-style Experiment 1" },
     { 1022, "exp2",             "RFC3692-style Experiment 2" },