Feature/version 11.3.2 (#329)

* mbedls system certs

* missing curly brace ...

* windows uwp for appveyor

* try again uwp

* bump version

* keep using local cacert.pem in unittest

* appveyor back to normal

* remove appveyor file

Co-authored-by: Benjamin Sergeant <bsergeant@mz.com>

appveyor.yml

@@ -1,22 +0,0 @@
-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,6 +2,10 @@
 
 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,4 +226,10 @@ namespace ix
                     200, "OK", HttpErrorCode::Ok, headers, std::string("OK"));
             });
     }
+
+    int HttpServer::getTimeoutSecs()
+    {
+        return _timeoutSecs;
+    }
+
 } // namespace ix

ixwebsocket/IXHttpServer.h

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

ixwebsocket/IXNetSystem.cpp

@@ -5,6 +5,8 @@
  */
 
 #include "IXNetSystem.h"
+#include <cstdint>
+#include <cstdio>
 
 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;
 
-// mingw does not know about poll so mock it
-#if defined(__GNUC__)
+// pollfd is not defined by some versions of mingw64 since _WIN32_WINNT is too low
+#if _WIN32_WINNT < 0x0600
 struct pollfd
 {
     int fd;        /* file descriptor */

ixwebsocket/IXSocketServer.cpp

@@ -461,4 +461,29 @@ 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,6 +60,11 @@ 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 webSocketMessageType{WebSocketMessageType::Error};
                     switch (messageKind)
                     {
                         case WebSocketTransport::MessageKind::MSG_TEXT:

ixwebsocket/IXWebSocketServer.cpp

@@ -211,4 +211,19 @@ 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,6 +52,9 @@ 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.1"
+#define IX_WEBSOCKET_VERSION "11.3.2"