Update CHANGELOG.md

This cause CI to fail on macOS.

See this migration guide => https://github.com/ARMmbed/mbedtls/blob/development/docs/3.0-migration-guide.md

appveyor.yml

@@ -0,0 +1,22 @@
+image:
+- Visual Studio 2017
+
+install:
+- cd C:\Tools\vcpkg
+- git pull
+- .\bootstrap-vcpkg.bat
+- cd %APPVEYOR_BUILD_FOLDER%
+- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+- vcpkg install zlib:x64-windows
+- vcpkg install mbedtls:x64-windows
+- mkdir build
+- cd build
+- cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_WS=1 -DUSE_TEST=1 -DUSE_TLS=1 -G"NMake Makefiles" ..
+- nmake
+- cd ..
+- cd test
+- ..\build\test\ixwebsocket_unittest.exe
+
+cache: c:\tools\vcpkg\installed\
+
+build: off

docs/CHANGELOG.md

@@ -2,10 +2,6 @@
 
 All changes to this project will be documented in this file.
 
-## [11.3.2] - 2021-11-24
-
-(server) Add getters for basic Servers properties (like port, host, etc...) (#327) + fix one compiler warning
-
 ## [11.3.1] - 2021-10-22
 
 (library/cmake) Compatible with MbedTLS 3 + fix a bug on Windows where the incorrect remote port is computed (#320)

ixwebsocket/IXHttpServer.cpp

@@ -226,10 +226,4 @@ namespace ix
                     200, "OK", HttpErrorCode::Ok, headers, std::string("OK"));
             });
     }
-
-    int HttpServer::getTimeoutSecs()
-    {
-        return _timeoutSecs;
-    }
-
 } // namespace ix

ixwebsocket/IXHttpServer.h

@@ -40,7 +40,6 @@ namespace ix
 
         void makeDebugServer();
 
-        int getTimeoutSecs();
     private:
         // Member variables
         OnConnectionCallback _onConnectionCallback;

ixwebsocket/IXNetSystem.cpp

@@ -5,8 +5,6 @@
  */
 
 #include "IXNetSystem.h"
-#include <cstdint>
-#include <cstdio>
 
 namespace ix
 {
@@ -280,17 +278,4 @@ namespace ix
 #endif
     }
 
-    // Convert network bytes to host bytes. Copied from the ASIO library
-    unsigned short network_to_host_short(unsigned short value)
-    {
-        #if defined(_WIN32)
-          unsigned char* value_p = reinterpret_cast<unsigned char*>(&value);
-          unsigned short result = (static_cast<unsigned short>(value_p[0]) << 8)
-            | static_cast<unsigned short>(value_p[1]);
-          return result;
-        #else // defined(_WIN32)
-          return ntohs(value);
-        #endif // defined(_WIN32)
-    }
-
 } // namespace ix

ixwebsocket/IXNetSystem.h

@@ -34,8 +34,8 @@
 // Define our own poll on Windows, as a wrapper on top of select
 typedef unsigned long int nfds_t;
 
-// pollfd is not defined by some versions of mingw64 since _WIN32_WINNT is too low
-#if _WIN32_WINNT < 0x0600
+// mingw does not know about poll so mock it
+#if defined(__GNUC__)
 struct pollfd
 {
     int fd;        /* file descriptor */
@@ -81,6 +81,4 @@ namespace ix
 
     const char* inet_ntop(int af, const void* src, char* dst, socklen_t size);
     int inet_pton(int af, const char* src, void* dst);
-
-    unsigned short network_to_host_short(unsigned short value);
 } // namespace ix

ixwebsocket/IXSocketServer.cpp

@@ -351,7 +351,7 @@ namespace ix
                     continue;
                 }
 
-                remotePort = ix::network_to_host_short(client.sin_port);
+                remotePort = client.sin_port;
                 remoteIp = remoteIp4;
             }
             else // AF_INET6
@@ -371,7 +371,7 @@ namespace ix
                     continue;
                 }
 
-                remotePort = ix::network_to_host_short(client.sin_port);
+                remotePort = client.sin_port;
                 remoteIp = remoteIp6;
             }
 
@@ -461,29 +461,4 @@ namespace ix
         // so wake up the thread responsible for that
         _conditionVariableGC.notify_one();
     }
-
-    int  SocketServer::getPort()
-    {
-        return _port;
-    }
-
-    std::string SocketServer::getHost()
-    {
-        return _host;
-    }
-
-    int SocketServer::getBacklog()
-    {
-        return _backlog;
-    }
-
-    std::size_t SocketServer::getMaxConnections()
-    {
-        return _maxConnections;
-    }
-
-    int SocketServer::getAddressFamily()
-    {
-        return _addressFamily;
-    }
 } // namespace ix

ixwebsocket/IXSocketServer.h

@@ -60,11 +60,6 @@ namespace ix
 
         void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
 
-        int  getPort();
-        std::string getHost();
-        int getBacklog();
-        std::size_t getMaxConnections();
-        int getAddressFamily();
     protected:
         // Logging
         void logError(const std::string& str);

ixwebsocket/IXWebSocket.cpp

@@ -385,7 +385,7 @@ namespace ix
                        size_t wireSize,
                        bool decompressionError,
                        WebSocketTransport::MessageKind messageKind) {
-                    WebSocketMessageType webSocketMessageType{WebSocketMessageType::Error};
+                    WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
                         case WebSocketTransport::MessageKind::MSG_TEXT:

ixwebsocket/IXWebSocketServer.cpp

@@ -211,19 +211,4 @@ namespace ix
         start();
         return true;
     }
-
-    int WebSocketServer::getHandshakeTimeoutSecs()
-    {
-        return _handshakeTimeoutSecs;
-    }
-
-    bool WebSocketServer::isPongEnabled()
-    {
-        return _enablePong;
-    }
-
-    bool WebSocketServer::isPerMessageDeflateEnabled()
-    {
-        return _enablePerMessageDeflate;
-    }
 } // namespace ix

ixwebsocket/IXWebSocketServer.h

@@ -52,9 +52,6 @@ namespace ix
 
         const static int kDefaultHandShakeTimeoutSecs;
 
-        int getHandshakeTimeoutSecs();
-        bool isPongEnabled();
-        bool isPerMessageDeflateEnabled();
     private:
         // Member variables
         int _handshakeTimeoutSecs;

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "11.3.2"
+#define IX_WEBSOCKET_VERSION "11.3.1"