From 2e9773b76a89392de5db8ef2c5cda4926811c5cb Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 13 Feb 2025 14:50:47 +0100
Subject: [PATCH] tests: change from curlx_ultous to util_ultous

Since the former function is getting removed from the lib.

Closes #16319
---
 tests/server/mqttd.c    |  2 +-
 tests/server/rtspd.c    |  2 +-
 tests/server/sockfilt.c |  4 ++--
 tests/server/socksd.c   |  2 +-
 tests/server/sws.c      |  6 +++---
 tests/server/tftpd.c    |  2 +-
 tests/server/util.c     | 21 +++++++++++++++++++++
 tests/server/util.h     |  2 ++
 8 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c
index 4927d1105e..759a66c5b6 100644
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@@ -993,7 +993,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 0df94ae56c..691063304e 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -1113,7 +1113,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 37931b64ef..1cb2c61f40 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -1450,7 +1450,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
@@ -1467,7 +1467,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        connectport = curlx_ultous(ulnum);
+        connectport = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index 6788a1a540..f74d0b7ac2 100644
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -1060,7 +1060,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 3763410ee0..ee7f746272 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -517,7 +517,7 @@ static int ProcessRequest(struct httprequest *req)
             if(!ulnum || (ulnum > 65535UL))
               logmsg("Invalid CONNECT port received");
             else
-              req->connect_port = curlx_ultous(ulnum);
+              req->connect_port = util_ultous(ulnum);
 
           }
           logmsg("Port number: %d, test case number: %ld",
@@ -2144,7 +2144,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
@@ -2166,7 +2166,7 @@ int main(int argc, char *argv[])
                   "be number of seconds\n", argv[arg]);
           return 0;
         }
-        keepalive_secs = curlx_ultous(ulnum);
+        keepalive_secs = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index b513ecc5cb..2313d6d1f1 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -612,7 +612,7 @@ int main(int argc, char **argv)
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/util.c b/tests/server/util.c
index c7fe4bbc97..388dab1479 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -899,3 +899,24 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
   return rc;
 }
 #endif
+
+/*
+** unsigned long to unsigned short
+*/
+#define CURL_MASK_USHORT  ((unsigned short)~0)
+#define CURL_MASK_SSHORT  (CURL_MASK_USHORT >> 1)
+
+unsigned short util_ultous(unsigned long ulnum)
+{
+#ifdef __INTEL_COMPILER
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
+#endif
+
+  DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_USHORT);
+  return (unsigned short)(ulnum & (unsigned long) CURL_MASK_USHORT);
+
+#ifdef __INTEL_COMPILER
+#  pragma warning(pop)
+#endif
+}
diff --git a/tests/server/util.h b/tests/server/util.h
index a91ecf4778..b225478ff9 100644
--- a/tests/server/util.h
+++ b/tests/server/util.h
@@ -95,4 +95,6 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
         struct sockaddr_un *sau);
 #endif  /* USE_UNIX_SOCKETS */
 
+unsigned short util_ultous(unsigned long ulnum);
+
 #endif  /* HEADER_CURL_SERVER_UTIL_H */
-- 
2.47.2