machinezone · cosminpolifronie · Apr 25, 2026 · Apr 25, 2026 · Apr 25, 2026 · Apr 25, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -303,12 +303,21 @@ endif()
 
 if (USE_WS OR USE_TEST)
   include(FetchContent)
+
+  set(MSGPACK11_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+  set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE STRING "" FORCE)
+
+  FetchContent_Declare(msgpack11
+      GIT_REPOSITORY "https://github.com/ar90n/msgpack11"
+      GIT_TAG "5d051ec8409c96280dcb09f2d2d2f3102b3cc674"
+      GIT_SHALLOW 1)
+
   FetchContent_Declare(spdlog
       GIT_REPOSITORY "https://github.com/gabime/spdlog"
-      GIT_TAG "v1.8.0"
+      GIT_TAG "v1.17.0"
       GIT_SHALLOW 1) 
 
-  FetchContent_MakeAvailable(spdlog)
+  FetchContent_MakeAvailable(spdlog msgpack11)
 
   if (USE_WS)
     add_subdirectory(ws)

diff --git a/ixwebsocket/IXGzipCodec.cpp b/ixwebsocket/IXGzipCodec.cpp
@@ -19,6 +19,7 @@ namespace ix
     std::string gzipCompress(const std::string& str)
     {
 #ifndef IXWEBSOCKET_USE_ZLIB
+        (void) str;
         return std::string();
 #else
         z_stream zs; // z_stream is zlib's control structure
@@ -74,6 +75,8 @@ namespace ix
     bool gzipDecompress(const std::string& in, std::string& out)
     {
 #ifndef IXWEBSOCKET_USE_ZLIB
+        (void) in;
+        (void) out;
         return false;
 #else
         z_stream inflateState;

diff --git a/ixwebsocket/IXNetSystem.cpp b/ixwebsocket/IXNetSystem.cpp
@@ -153,7 +153,7 @@ namespace ix
                 }
             }
 
-            DWORD n = WSAWaitForMultipleEvents(handles.size(), handles.data(), FALSE, timeout != -1 ? static_cast<DWORD>(timeout) : WSA_INFINITE, FALSE);
+            DWORD n = WSAWaitForMultipleEvents(static_cast<DWORD>(handles.size()), handles.data(), FALSE, timeout != -1 ? static_cast<DWORD>(timeout) : WSA_INFINITE, FALSE);
 
             if (n == WSA_WAIT_FAILED) return SOCKET_ERROR;
             if (n == WSA_WAIT_TIMEOUT) return 0;
@@ -243,7 +243,7 @@ namespace ix
             tv.tv_sec = timeout / 1000;
             tv.tv_usec = (timeout % 1000) * 1000;
 
-            int ret = select(maxfd + 1, &readfds, &writefds, &errorfds, timeout != -1 ? &tv : NULL);
+            int ret = select(static_cast<int>(maxfd + 1), &readfds, &writefds, &errorfds, timeout != -1 ? &tv : NULL);
 
             if (ret < 0)
             {

diff --git a/ixwebsocket/IXNetSystem.h b/ixwebsocket/IXNetSystem.h
@@ -18,6 +18,10 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
 #include <ws2tcpip.h>
 #include <winsock2.h>
 #include <basetsd.h>

diff --git a/ixwebsocket/IXSocket.cpp b/ixwebsocket/IXSocket.cpp
@@ -43,7 +43,7 @@ namespace ix
 
     PollResultType Socket::poll(bool readyToRead,
                                 int timeoutMs,
-                                int sockfd,
+                                socket_t sockfd,
                                 const SelectInterruptPtr& selectInterrupt)
     {
         PollResultType pollResult = PollResultType::ReadyForRead;
@@ -247,7 +247,11 @@ namespace ix
         flags = MSG_NOSIGNAL;
 #endif
 
+#ifdef _WIN32
+        return ::send(_sockfd, buffer, static_cast<int>(length), flags);
+#else
         return ::send(_sockfd, buffer, length, flags);
+#endif
     }
 
     ssize_t Socket::send(const std::string& buffer)
@@ -262,7 +266,11 @@ namespace ix
         flags = MSG_NOSIGNAL;
 #endif
 
+#ifdef _WIN32
+        return ::recv(_sockfd, (char*) buffer, static_cast<int>(length), flags);
+#else
         return ::recv(_sockfd, (char*) buffer, length, flags);
+#endif
     }
 
     int Socket::getErrno()
@@ -290,7 +298,7 @@ namespace ix
         return false;
     }
 
-    void Socket::closeSocket(int fd)
+    void Socket::closeSocket(socket_t fd)
     {
 #ifdef _WIN32
         closesocket(fd);

diff --git a/ixwebsocket/IXSocket.h b/ixwebsocket/IXSocket.h
@@ -25,6 +25,7 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #include "IXCancellationRequest.h"
+#include "IXNetSystem.h"
 #include "IXProgressCallback.h"
 #include "IXSelectInterrupt.h"
 
@@ -81,11 +82,11 @@ namespace ix
 
         static int getErrno();
         static bool isWaitNeeded();
-        static void closeSocket(int fd);
+        static void closeSocket(socket_t fd);
 
         static PollResultType poll(bool readyToRead,
                                    int timeoutMs,
-                                   int sockfd,
+                                   socket_t sockfd,
                                    const SelectInterruptPtr& selectInterrupt);
 
     protected:

diff --git a/ixwebsocket/IXSocketConnect.cpp b/ixwebsocket/IXSocketConnect.cpp
@@ -47,7 +47,7 @@ namespace ix
         // block us for too long
         SocketConnect::configure(fd);
 
-        int res = ::connect(fd, address->ai_addr, address->ai_addrlen);
+        int res = ::connect(fd, address->ai_addr, static_cast<int>(address->ai_addrlen));
 
         if (res == -1 && !Socket::isWaitNeeded())
         {
@@ -82,7 +82,7 @@ namespace ix
             }
             else if (pollResult == PollResultType::ReadyForWrite)
             {
-                return fd;
+                return static_cast<int>(fd);
             }
             else
             {
@@ -128,7 +128,7 @@ namespace ix
     }
 
     // FIXME: configure is a terrible name
-    void SocketConnect::configure(int sockfd)
+    void SocketConnect::configure(socket_t sockfd)
     {
         // 1. disable Nagle's algorithm
         int flag = 1;

diff --git a/ixwebsocket/IXSocketConnect.h b/ixwebsocket/IXSocketConnect.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
+#include "IXNetSystem.h"
 #include <string>
 
 struct addrinfo;
@@ -21,7 +22,7 @@ namespace ix
                            std::string& errMsg,
                            const CancellationRequest& isCancellationRequested);
 
-        static void configure(int sockfd);
+        static void configure(socket_t sockfd);
 
     private:
         static int connectToAddress(const struct addrinfo* address,

diff --git a/ixwebsocket/IXSocketServer.cpp b/ixwebsocket/IXSocketServer.cpp
@@ -314,7 +314,7 @@ namespace ix
             socklen_t addressLen = sizeof(client);
             memset(&client, 0, sizeof(client));
 
-            if ((clientFd = accept(_serverFd, (struct sockaddr*) &client, &addressLen)) < 0)
+            if ((clientFd = static_cast<int>(accept(_serverFd, (struct sockaddr*) &client, &addressLen))) < 0)
             {
                 if (!Socket::isWaitNeeded())
                 {

diff --git a/ixwebsocket/IXUdpSocket.cpp b/ixwebsocket/IXUdpSocket.cpp
@@ -56,7 +56,7 @@ namespace ix
         return false;
     }
 
-    void UdpSocket::closeSocket(int fd)
+    void UdpSocket::closeSocket(socket_t fd)
     {
 #ifdef _WIN32
         closesocket(fd);
@@ -67,7 +67,7 @@ namespace ix
 
     bool UdpSocket::init(const std::string& host, int port, std::string& errMsg)
     {
-        _sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        _sockfd = static_cast<int>(socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP));
         if (_sockfd < 0)
         {
             errMsg = "Could not create socket";
@@ -110,7 +110,7 @@ namespace ix
     ssize_t UdpSocket::sendto(const std::string& buffer)
     {
         return (ssize_t)::sendto(
-            _sockfd, buffer.data(), buffer.size(), 0, (struct sockaddr*) &_server, sizeof(_server));
+            _sockfd, buffer.data(), static_cast<int>(buffer.size()), 0, (struct sockaddr*) &_server, sizeof(_server));
     }
 
     ssize_t UdpSocket::recvfrom(char* buffer, size_t length)
@@ -121,6 +121,6 @@ namespace ix
         socklen_t addressLen = (socklen_t) sizeof(_server);
 #endif
         return (ssize_t)::recvfrom(
-            _sockfd, buffer, length, 0, (struct sockaddr*) &_server, &addressLen);
+            _sockfd, buffer, static_cast<int>(length), 0, (struct sockaddr*) &_server, &addressLen);
     }
 } // namespace ix
diff --git a/ixwebsocket/IXUdpSocket.h b/ixwebsocket/IXUdpSocket.h
@@ -36,7 +36,7 @@ namespace ix
 
         static int getErrno();
         static bool isWaitNeeded();
-        static void closeSocket(int fd);
+        static void closeSocket(socket_t fd);
 
     private:
         std::atomic<int> _sockfd;

diff --git a/ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp b/ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
@@ -58,6 +58,8 @@ namespace ix
 
         return true;
 #else
+        (void) deflateBits;
+        (void) clientNoContextTakeOver;
         return false;
 #endif
     }
@@ -163,6 +165,8 @@ namespace ix
 
         return true;
 #else
+        (void) in;
+        (void) out;
         return false;
 #endif
     }
@@ -202,6 +206,8 @@ namespace ix
 
         return true;
 #else
+        (void) inflateBits;
+        (void) clientNoContextTakeOver;
         return false;
 #endif
     }
@@ -246,6 +252,8 @@ namespace ix
 
         return true;
 #else
+        (void) in;
+        (void) out;
         return false;
 #endif
     }

diff --git a/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h b/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
@@ -36,10 +36,10 @@ namespace ix
         template<typename T>
         bool endsWithEmptyUnCompressedBlock(const T& value);
 
+#ifdef IXWEBSOCKET_USE_ZLIB
         int _flush;
         std::array<unsigned char, 1 << 14> _compressBuffer;
 
-#ifdef IXWEBSOCKET_USE_ZLIB
         z_stream _deflateState;
 #endif
     };
@@ -54,10 +54,10 @@ namespace ix
         bool decompress(const std::string& in, std::string& out);
 
     private:
+#ifdef IXWEBSOCKET_USE_ZLIB
         int _flush;
         std::array<unsigned char, 1 << 14> _compressBuffer;
 
-#ifdef IXWEBSOCKET_USE_ZLIB
         z_stream _inflateState;
 #endif
     };

diff --git a/ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp b/ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp
@@ -14,12 +14,13 @@ namespace ix
 {
     /// Default values as defined in the RFC
     const uint8_t WebSocketPerMessageDeflateOptions::kDefaultServerMaxWindowBits = 15;
+    const uint8_t WebSocketPerMessageDeflateOptions::kDefaultClientMaxWindowBits = 15;
+#ifdef IXWEBSOCKET_USE_ZLIB
     static const uint8_t minServerMaxWindowBits = 8;
     static const uint8_t maxServerMaxWindowBits = 15;
-
-    const uint8_t WebSocketPerMessageDeflateOptions::kDefaultClientMaxWindowBits = 15;
     static const uint8_t minClientMaxWindowBits = 8;
     static const uint8_t maxClientMaxWindowBits = 15;
+#endif
 
     WebSocketPerMessageDeflateOptions::WebSocketPerMessageDeflateOptions(
         bool enabled,

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -60,15 +60,14 @@ target_sources(ixwebsocket_test PRIVATE
     ${JSONCPP_SOURCES}
     test_runner.cpp
     IXTest.cpp
-    ../third_party/msgpack11/msgpack11.cpp
 )
 target_compile_definitions(ixwebsocket_test PRIVATE ${TEST_PROGRAMS_DEFINITIONS})
 target_include_directories(ixwebsocket_test PRIVATE
   ${PROJECT_SOURCE_DIR}/Catch2/single_include
-  ../third_party
 )
 target_link_libraries(ixwebsocket_test ixwebsocket)
 target_link_libraries(ixwebsocket_test spdlog)
+target_link_libraries(ixwebsocket_test msgpack11)
 
 foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
   add_executable(${TEST_TARGET_NAME}
@@ -77,8 +76,6 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
 
   target_include_directories(${TEST_TARGET_NAME} PRIVATE
     ${PROJECT_SOURCE_DIR}/Catch2/single_include
-    ../third_party
-    ../third_party/msgpack11
   )
 
   target_compile_definitions(${TEST_TARGET_NAME} PRIVATE SPDLOG_COMPILED_LIB=1)
@@ -92,6 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
   target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
 
   target_link_libraries(${TEST_TARGET_NAME} spdlog)
+  target_link_libraries(${TEST_TARGET_NAME} msgpack11)
 
   add_test(NAME ${TEST_TARGET_NAME}
            COMMAND ${TEST_TARGET_NAME}

diff --git a/test/IXTest.cpp b/test/IXTest.cpp
@@ -173,6 +173,7 @@ namespace ix
 #if defined(IXWEBSOCKET_USE_MBED_TLS) || defined(IXWEBSOCKET_USE_OPEN_SSL)
         tlsOptionsServer.tls = preferTLS;
 #else
+        (void) preferTLS;
         tlsOptionsServer.tls = false;
 #endif
         return tlsOptionsServer;
@@ -201,6 +202,7 @@ namespace ix
             scheme = "ws://";
         }
 #else
+        (void) preferTLS;
         scheme = "ws://";
 #endif
         return scheme;

diff --git a/third_party/.clang-format b/third_party/.clang-format
diff --git a/third_party/README.md b/third_party/README.md