move poll wrapper on top of select (only used on Windows) to the ix namespace

.clang-format

@@ -11,7 +11,7 @@ AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
 AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakTemplateDeclarations: true
@@ -42,6 +42,5 @@ NamespaceIndentation: All
 PenaltyReturnTypeOnItsOwnLine: 1000
 PointerAlignment: Left
 SpaceAfterTemplateKeyword: false
-SpaceAfterCStyleCast: true
 Standard: Cpp11
 UseTab: Never

.pre-commit-config.yaml

@@ -5,3 +5,8 @@ repos:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
+
+-   repo: https://github.com/pocc/pre-commit-hooks
+    rev: ''
+    hooks:
+    -   id: clang-format

CMakeLists.txt

@@ -12,7 +12,8 @@ set (CMAKE_CXX_STANDARD 14)
 set (CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-if (UNIX)
+# -Wshorten-64-to-32 does not work with clang
+if (NOT WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
 endif()
 
@@ -114,7 +115,10 @@ endif()
 
 set(USE_OPEN_SSL FALSE)
 if (USE_TLS)
+    add_definitions(-DIXWEBSOCKET_USE_TLS)
+
     if (USE_MBED_TLS)
+        add_definitions(-DIXWEBSOCKET_USE_MBED_TLS)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
     elseif (APPLE)
@@ -124,6 +128,7 @@ if (USE_TLS)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp)
     else()
+        add_definitions(-DIXWEBSOCKET_USE_OPEN_SSL)
         set(USE_OPEN_SSL TRUE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketOpenSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketOpenSSL.cpp)
@@ -135,17 +140,6 @@ add_library( ixwebsocket STATIC
     ${IXWEBSOCKET_HEADERS}
 )
 
-if (USE_TLS)
-    target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_TLS)
-    if (USE_MBED_TLS)
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_MBED_TLS)
-    elseif (APPLE)
-    elseif (WIN32)
-    else()
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_OPEN_SSL)
-    endif()
-endif()
-
 if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
   target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
 endif()
@@ -177,7 +171,7 @@ if (USE_TLS AND USE_MBED_TLS)
     target_link_libraries(ixwebsocket mbedtls)
   else()
     find_package(MbedTLS REQUIRED)
-    target_include_directories(ixwebsocket PUBLIC ${MBEDTLS_INCLUDE_DIRS})
+    include_directories(${MBEDTLS_INCLUDE_DIRS})
     target_link_libraries(ixwebsocket ${MBEDTLS_LIBRARIES})
   endif()
 endif()
@@ -210,15 +204,6 @@ install(TARGETS ixwebsocket
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
 )
 
-if (USE_WS OR USE_TEST)
-  add_subdirectory(ixcore)
-  add_subdirectory(ixcrypto)
-  add_subdirectory(ixcobra)
-
 if (USE_WS)
     add_subdirectory(ws)
 endif()
-  if (USE_TEST)
-      add_subdirectory(test)
-  endif()
-endif()

DOCKER_VERSION

@@ -1 +1 @@
-6.2.1
+6.1.0

appveyor.yml

@@ -2,21 +2,13 @@ image:
 - Visual Studio 2017
 
 install:
-- cd C:\Tools\vcpkg
-- git pull
-- .\bootstrap-vcpkg.bat
-- cd %APPVEYOR_BUILD_FOLDER%
+- ls -al
 - 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
+- cd test
 - 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" ..
+- cmake -G"NMake Makefiles" ..
 - nmake
-- cd ..
-- cd test
-- ..\build\test\ixwebsocket_unittest.exe
-
-cache: c:\tools\vcpkg\installed\
+- ixwebsocket_unittest.exe
 
 build: off

docs/CHANGELOG.md

@@ -1,17 +1,6 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [6.2.1] - 2019-09-17
-
-- On error while doing a client handshake, additionally display port number next to the host name
-
-## [6.2.0] - 2019-09-09
-
-- websocket and http server: server does not close the bound client socket in many cases
-- improve some websocket error messages
-- add a utility function with unittest to parse status line and stop using scanf which triggers warnings on Windows
-- update ws CLI11 (our command line argument parsing library) to the latest, which fix a compiler bug about optional
-
 ## [6.1.0] - 2019-09-08
 
 - move poll wrapper on top of select (only used on Windows) to the ix namespace

docs/build.md

@@ -21,8 +21,6 @@ Options for building:
 * `-DUSE_MBED_TLS=1` will use [mbedlts](https://tls.mbed.org/) for the TLS support (default on Windows)
 * `-DUSE_WS=1` will build the ws interactive command line tool
 
-If you are on Windows, look at the [appveyor](https://github.com/machinezone/IXWebSocket/blob/master/appveyor.yml) file that has instructions for building dependencies.
-
 ### vcpkg
 
 It is possible to get IXWebSocket through Microsoft [vcpkg](https://github.com/microsoft/vcpkg).
@@ -59,3 +57,6 @@ app@ca2340eb9106:~$ ws --help
 ws is a websocket tool
 ...
 ```
+
+
+

ixcobra/CMakeLists.txt

@@ -1,30 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-set (IXCOBRA_SOURCES
-    ixcobra/IXCobraConnection.cpp
-    ixcobra/IXCobraMetricsThreadedPublisher.cpp
-    ixcobra/IXCobraMetricsPublisher.cpp
-)
-
-set (IXCOBRA_HEADERS
-    ixcobra/IXCobraConnection.h
-    ixcobra/IXCobraMetricsThreadedPublisher.h
-    ixcobra/IXCobraMetricsPublisher.h
-)
-
-add_library(ixcobra STATIC
-    ${IXCOBRA_SOURCES}
-    ${IXCOBRA_HEADERS}
-)
-
-set(IXCOBRA_INCLUDE_DIRS
-    .
-    ..
-    ../ixcore
-    ../ixcrypto
-    ../third_party)
-
-target_include_directories( ixcobra PUBLIC ${IXCOBRA_INCLUDE_DIRS} )

ixcore/CMakeLists.txt

@@ -1,19 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-set (IXCORE_SOURCES
-    ixcore/utils/IXCoreLogger.cpp
-)
-
-set (IXCORE_HEADERS
-    ixcore/utils/IXCoreLogger.h
-)
-
-add_library(ixcore STATIC
-    ${IXCORE_SOURCES}
-    ${IXCORE_HEADERS}
-)
-
-target_include_directories( ixcore PUBLIC . )

ixcrypto/CMakeLists.txt

@@ -1,54 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMake;${CMAKE_MODULE_PATH}")
-
-set (IXCRYPTO_SOURCES
-    ixcrypto/IXHMac.cpp
-    ixcrypto/IXBase64.cpp
-    ixcrypto/IXUuid.cpp
-    ixcrypto/IXHash.cpp
-)
-
-set (IXCRYPTO_HEADERS
-    ixcrypto/IXHMac.h
-    ixcrypto/IXBase64.h
-    ixcrypto/IXUuid.h
-    ixcrypto/IXHash.h
-)
-
-add_library(ixcrypto STATIC
-    ${IXCRYPTO_SOURCES}
-    ${IXCRYPTO_HEADERS}
-)
-
-set(IXCRYPTO_INCLUDE_DIRS 
-    .
-    ../ixcore)
-
-target_include_directories( ixcrypto PUBLIC ${IXCRYPTO_INCLUDE_DIRS} )
-
-# hmac computation needs a crypto library
-
-if (WIN32)
-  set(USE_MBED_TLS TRUE)
-endif()
-
-target_compile_definitions(ixcrypto PUBLIC IXCRYPTO_USE_TLS)
-if (USE_MBED_TLS)
-    find_package(MbedTLS REQUIRED)
-    target_include_directories(ixcrypto PUBLIC ${MBEDTLS_INCLUDE_DIRS})
-    target_link_libraries(ixcrypto ${MBEDTLS_LIBRARIES})
-    target_compile_definitions(ixcrypto PUBLIC IXCRYPTO_USE_MBED_TLS)
-elseif (APPLE)
-elseif (WIN32)
-else()
-    find_package(OpenSSL REQUIRED)
-    add_definitions(${OPENSSL_DEFINITIONS})
-    message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
-    include_directories(${OPENSSL_INCLUDE_DIR})
-    target_link_libraries(ixcrypto ${OPENSSL_LIBRARIES})
-    target_compile_definitions(ixcrypto PUBLIC IXCRYPTO_USE_OPEN_SSL)
-endif()
-

ixwebsocket/IXHttp.cpp

@@ -27,36 +27,6 @@ namespace ix
         return out;
     }
 
-    std::pair<std::string, int> Http::parseStatusLine(const std::string& line)
-    {
-        // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-        std::string token;
-        std::stringstream tokenStream(line);
-        std::vector<std::string> tokens;
-
-        // Split by ' '
-        while (std::getline(tokenStream, token, ' '))
-        {
-            tokens.push_back(token);
-        }
-
-        std::string httpVersion;
-        if (tokens.size() >= 1)
-        {
-            httpVersion = trim(tokens[0]);
-        }
-
-        int statusCode = -1;
-        if (tokens.size() >= 2)
-        {
-            std::stringstream ss;
-            ss << trim(tokens[1]);
-            ss >> statusCode;
-        }
-
-        return std::make_pair(httpVersion, statusCode);
-    }
-
     std::tuple<std::string, std::string, std::string> Http::parseRequestLine(const std::string& line)
     {
         // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF

ixwebsocket/IXHttp.h

@@ -115,8 +115,6 @@ namespace ix
             std::shared_ptr<Socket> socket);
         static bool sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket);
 
-        static std::pair<std::string, int> parseStatusLine(
-            const std::string& line);
         static std::tuple<std::string, std::string, std::string> parseRequestLine(
             const std::string& line);
         static std::string trim(const std::string& str);

ixwebsocket/IXHttpServer.cpp

@@ -95,7 +95,6 @@ namespace ix
             }
         }
         connectionState->setTerminated();
-        Socket::closeSocket(fd);
 
         _connectedClientsCount--;
     }

ixwebsocket/IXWebSocketHandshake.cpp

@@ -164,26 +164,23 @@ namespace ix
         }
 
         // Validate status
-        auto statusLine = Http::parseStatusLine(line);
-        std::string httpVersion = statusLine.first;
-        int status = statusLine.second;
+        int status;
 
         // HTTP/1.0 is too old.
-        if (httpVersion != "HTTP/1.1")
+        if (sscanf(line.c_str(), "HTTP/1.0 %d", &status) == 1)
         {
             std::stringstream ss;
-            ss << "Expecting HTTP/1.1, got " << httpVersion << ". "
-               << "Rejecting connection to " << host << ":" << port
+            ss << "Server version is HTTP/1.0. Rejecting connection to " << host
                << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
         }
 
         // We want an 101 HTTP status
-        if (status != 101)
+        if (sscanf(line.c_str(), "HTTP/1.1 %d", &status) != 1 || status != 101)
         {
             std::stringstream ss;
-            ss << "Got bad status connecting to " << host << ":" << port
+            ss << "Got bad status connecting to " << host
                << ", status: " << status
                << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
@@ -298,15 +295,9 @@ namespace ix
             return sendErrorResponse(400, "Missing Sec-WebSocket-Key value");
         }
 
-        if (headers.find("upgrade") == headers.end())
-        {
-            return sendErrorResponse(400, "Missing Upgrade header");
-        }
-
         if (!insensitiveStringCompare(headers["upgrade"], "WebSocket"))
         {
-            return sendErrorResponse(400, "Invalid Upgrade header, "
-                                          "need WebSocket, got " + headers["upgrade"]);
+            return sendErrorResponse(400, "Invalid or missing Upgrade header");
         }
 
         if (headers.find("sec-websocket-version") == headers.end())

ixwebsocket/IXWebSocketServer.cpp

@@ -93,7 +93,7 @@ namespace ix
         else
         {
             std::stringstream ss;
-            ss << "WebSocketServer::handleConnection() HTTP status: "
+            ss << "WebSocketServer::handleConnection() error: "
                << status.http_status
                << " error: "
                << status.errorStr;
@@ -111,8 +111,6 @@ namespace ix
 
         logInfo("WebSocketServer::handleConnection() done");
         connectionState->setTerminated();
-
-        Socket::closeSocket(fd);
     }
 
     std::set<std::shared_ptr<WebSocket>> WebSocketServer::getClients()

ixwebsocket/IXWebSocketTransport.cpp

@@ -681,12 +681,8 @@ namespace ix
                         reason = WebSocketCloseConstants::kInvalidFramePayloadDataMessage;
                     }
 
-                    //
                     // Validate close codes. Autobahn 7.9.*
-                    // 1014, 1015 are debattable. The firefox MSDN has a description for them.
-                    // Full list of status code and status range is defined in the dedicated
-                    // RFC section at https://tools.ietf.org/html/rfc6455#page-45
-                    //
+                    // 1014, 1015 are debattable. The firefox MSDN has a description for them
                     if (code < 1000 || code == 1004 || code == 1006 ||
                         (code > 1013 && code < 3000))
                     {

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "6.2.1"
+#define IX_WEBSOCKET_VERSION "6.1.0"

makefile

@@ -9,7 +9,7 @@ install: brew
 # on osx it is good practice to make /usr/local user writable
 # sudo chown -R `whoami`/staff /usr/local
 brew:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j install)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j install)
 
 ws:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j)
@@ -47,7 +47,7 @@ trail:
 	sh third_party/remote_trailing_whitespaces.sh
 
 format:
-	clang-format -i `find test ixwebsocket ws -name '*.cpp' -o -name '*.h'`
+	find test ixwebsocket ws -name '*.cpp' -o -name '*.h' -exec clang-format -i {} \;
 
 # That target is used to start a node server, but isn't required as we have 
 # a builtin C++ server started in the unittest now
@@ -58,8 +58,7 @@ test_server:
 # env TEST=Websocket_chat make test
 # env TEST=heartbeat make test
 test:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j)
-	(cd test ; python2.7 run.py -r)
+	python2.7 test/run.py
 
 ws_test: ws
 	(cd ws ; env DEBUG=1 PATH=../ws/build:$$PATH bash test_ws.sh)

test/CMakeLists.txt

@@ -15,6 +15,8 @@ if (MAC)
   option(USE_TLS "Add TLS support" ON)
 endif()
 
+add_subdirectory(${PROJECT_SOURCE_DIR}/.. ixwebsocket)
+
 set (WS ../ws)
 
 include_directories(
@@ -34,6 +36,17 @@ set (SOURCES
   ../third_party/msgpack11/msgpack11.cpp
   ../third_party/jsoncpp/jsoncpp.cpp
 
+  ${WS}/ixcore/utils/IXCoreLogger.cpp
+
+  ${WS}/ixcrypto/IXBase64.cpp
+  ${WS}/ixcrypto/IXHash.cpp
+  ${WS}/ixcrypto/IXUuid.cpp
+  ${WS}/ixcrypto/IXHMac.cpp
+
+  ${WS}/ixcobra/IXCobraConnection.cpp
+  ${WS}/ixcobra/IXCobraMetricsPublisher.cpp
+  ${WS}/ixcobra/IXCobraMetricsThreadedPublisher.cpp
+
   ${WS}/snake/IXSnakeServer.cpp
   ${WS}/snake/IXSnakeProtocol.cpp
   ${WS}/snake/IXAppConfig.cpp
@@ -49,17 +62,16 @@ set (SOURCES
   IXHttpClientTest.cpp
   IXHttpServerTest.cpp
   IXUnityBuildsTest.cpp
-  IXHttpTest.cpp
+  IXCobraChatTest.cpp
+  IXCobraMetricsPublisherTest.cpp
 )
 
 # Some unittest don't work on windows yet
 if (UNIX)
   list(APPEND SOURCES
     IXDNSLookupTest.cpp
-    IXWebSocketChatTest.cpp
+    cmd_websocket_chat.cpp
     IXWebSocketCloseTest.cpp
-    IXCobraChatTest.cpp
-    IXCobraMetricsPublisherTest.cpp
   )
 endif()
 
@@ -86,9 +98,5 @@ if (APPLE AND USE_TLS)
     target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security")
 endif()
 
-target_link_libraries(ixwebsocket_unittest ixcore)
-target_link_libraries(ixwebsocket_unittest ixcrypto)
-target_link_libraries(ixwebsocket_unittest ixcobra)
 target_link_libraries(ixwebsocket_unittest ixwebsocket)
-
 install(TARGETS ixwebsocket_unittest DESTINATION bin)

test/IXCobraChatTest.cpp

@@ -309,7 +309,6 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
             timeout -= 10;
             if (timeout <= 0)
             {
-                snakeServer.stop();
                 REQUIRE(false); // timeout
             }
         }
@@ -333,7 +332,6 @@ TEST_CASE("Cobra_chat", "[cobra_chat]")
             timeout -= 10;
             if (timeout <= 0)
             {
-                snakeServer.stop();
                 REQUIRE(false); // timeout
             }
         }

test/IXGetFreePort.cpp

@@ -23,6 +23,7 @@ namespace ix
 
     int getAnyFreePort()
     {
+        int defaultPort = 8090;
         int sockfd;
         if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
         {
@@ -88,3 +89,5 @@ namespace ix
         return -1;
     }
 } // namespace ix
+
+

test/IXHttpTest.cpp

@@ -1,55 +0,0 @@
-/*
- *  IXHttpTest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <ixwebsocket/IXHttp.h>
-
-#include "catch.hpp"
-#include <string.h>
-
-namespace ix
-{
-
-TEST_CASE("http", "[http]")
-{
-    SECTION("Normal case")
-    {
-        std::string line = "HTTP/1.1 200";
-        auto result = Http::parseStatusLine(line);
-
-        REQUIRE(result.first == "HTTP/1.1");
-        REQUIRE(result.second == 200);
-    }
-
-    SECTION("http/1.0 case")
-    {
-        std::string line = "HTTP/1.0 200";
-        auto result = Http::parseStatusLine(line);
-
-        REQUIRE(result.first == "HTTP/1.0");
-        REQUIRE(result.second == 200);
-    }
-
-    SECTION("empty case")
-    {
-        std::string line = "";
-        auto result = Http::parseStatusLine(line);
-
-        REQUIRE(result.first == "");
-        REQUIRE(result.second == -1);
-    }
-
-    SECTION("empty case")
-    {
-        std::string line = "HTTP/1.1";
-        auto result = Http::parseStatusLine(line);
-
-        REQUIRE(result.first == "HTTP/1.1");
-        REQUIRE(result.second == -1);
-    }
-}
-
-}

test/IXWebSocketCloseTest.cpp

@@ -28,6 +28,7 @@ namespace
             void stop();
             void stop(uint16_t code, const std::string& reason);
             bool isReady() const;
+            void sendMessage(const std::string& text);
 
             uint16_t getCloseCode();
             const std::string& getCloseReason();
@@ -170,6 +171,11 @@ namespace
         _webSocket.start();
     }
 
+    void WebSocketClient::sendMessage(const std::string& text)
+    {
+        _webSocket.send(text);
+    }
+
     bool startServer(ix::WebSocketServer& server,
                      uint16_t& receivedCloseCode,
                      std::string& receivedCloseReason,

test/IXWebSocketServerTest.cpp

@@ -112,8 +112,6 @@ TEST_CASE("Websocket_server", "[websocket_server]")
 
         auto lineResult = socket->readLine(isCancellationRequested);
         auto lineValid = lineResult.first;
-        REQUIRE(lineValid);
-
         auto line = lineResult.second;
 
         int status = -1;
@@ -151,8 +149,6 @@ TEST_CASE("Websocket_server", "[websocket_server]")
 
         auto lineResult = socket->readLine(isCancellationRequested);
         auto lineValid = lineResult.first;
-        REQUIRE(lineValid);
-
         auto line = lineResult.second;
 
         int status = -1;
@@ -194,8 +190,6 @@ TEST_CASE("Websocket_server", "[websocket_server]")
 
         auto lineResult = socket->readLine(isCancellationRequested);
         auto lineValid = lineResult.first;
-        REQUIRE(lineValid);
-
         auto line = lineResult.second;
 
         int status = -1;

test/run.py

@@ -350,11 +350,10 @@ def generateXmlOutput(results, xmlOutput, testRunName, runTime):
 
 
 def run(testName, buildDir, sanitizer, xmlOutput,
-        testRunName, buildOnly, useLLDB, cpuCount, runOnly):
+        testRunName, buildOnly, useLLDB, cpuCount):
     '''Main driver. Run cmake, compiles, execute and validate the testsuite.'''
 
     # gen build files with CMake
-    if not runOnly:
     runCMake(sanitizer, buildDir)
 
     if platform.system() == 'Linux':
@@ -455,8 +454,6 @@ def main():
                         help='Validate XML output.')
     parser.add_argument('--build_only', '-b', action='store_true',
                         help='Stop after building. Do not run the unittest.')
-    parser.add_argument('--run_only', '-r', action='store_true',
-                        help='Only run the test, do not build anything.')
     parser.add_argument('--output', '-o', help='Output XML file.')
     parser.add_argument('--lldb', action='store_true',
                         help='Run the test through lldb.')
@@ -495,7 +492,7 @@ def main():
     if platform.system() == 'Windows':
         TEST_EXE_PATH = os.path.join(buildDir, BUILD_TYPE, 'ixwebsocket_unittest.exe')
     else:
-        TEST_EXE_PATH = '../build/test/ixwebsocket_unittest'
+        TEST_EXE_PATH = os.path.join(buildDir, 'ixwebsocket_unittest')
 
     if args.list:
         # catch2 exit with a different error code when requesting the list of files
@@ -514,7 +511,7 @@ def main():
         args.lldb = False
 
     return run(args.test, buildDir, sanitizer, xmlOutput, 
-               testRunName, args.build_only, args.lldb, args.cpu_count, args.run_only)
+               testRunName, args.build_only, args.lldb, args.cpu_count)
 
 
 if __name__ == '__main__':

third_party/jsoncpp/jsoncpp.cpp

@@ -4945,3 +4945,8 @@ std::ostream& operator<<(std::ostream& sout, Value const& root) {
 // //////////////////////////////////////////////////////////////////////
 // End of content of file: src/lib_json/json_writer.cpp
 // //////////////////////////////////////////////////////////////////////
+
+
+
+
+

third_party/mbedtls/crypto/.github/issue_template.md

@@ -41,3 +41,4 @@
     [ ] Question
     [ ] Enhancement
     [ ] Bug
+

third_party/mbedtls/programs/README.md

@@ -120,3 +120,4 @@ In addition to providing options for testing client-side features, the `ssl_clie
 * [`x509/crl_app.c`](x509/crl_app.c): loads and dumps a certificate revocation list (CRL).
 
 * [`x509/req_app.c`](x509/req_app.c): loads and dumps a certificate signing request (CSR).
+

ws/CMakeLists.txt

@@ -35,6 +35,17 @@ add_executable(ws
   ../third_party/jsoncpp/jsoncpp.cpp
   ${STATSD_CLIENT_SOURCES}
 
+  ixcore/utils/IXCoreLogger.cpp
+
+  ixcrypto/IXBase64.cpp
+  ixcrypto/IXHash.cpp
+  ixcrypto/IXUuid.cpp
+  ixcrypto/IXHMac.cpp
+
+  ixcobra/IXCobraConnection.cpp
+  ixcobra/IXCobraMetricsPublisher.cpp
+  ixcobra/IXCobraMetricsThreadedPublisher.cpp
+
   snake/IXSnakeServer.cpp
   snake/IXSnakeProtocol.cpp
   snake/IXAppConfig.cpp
@@ -62,9 +73,6 @@ add_executable(ws
   ws_autobahn.cpp
   ws.cpp)
 
-target_link_libraries(ws ixcore)
-target_link_libraries(ws ixcrypto)
-target_link_libraries(ws ixcobra)
 target_link_libraries(ws ixwebsocket)
 
 if(NOT APPLE AND NOT USE_MBED_TLS)

ws/IXRedisClient.h

@@ -8,7 +8,6 @@
 
 #include <functional>
 #include <memory>
-#include <atomic>
 
 namespace ix
 {

ws/ixcrypto/IXHMac.cpp

@@ -7,14 +7,12 @@
 #include "IXHMac.h"
 #include "IXBase64.h"
 
-#if defined(IXCRYPTO_USE_MBED_TLS)
+#if defined(IXWEBSOCKET_USE_MBED_TLS)
 # include <mbedtls/md.h>
 #elif defined(__APPLE__)
 # include <CommonCrypto/CommonHMAC.h>
-#elif defined(IXCRYPTO_USE_OPEN_SSL)
-# include <openssl/hmac.h>
 #else
-# error "Unsupported configuration"
+# include <openssl/hmac.h>
 #endif
 
 namespace ix
@@ -24,7 +22,7 @@ namespace ix
         constexpr size_t hashSize = 16;
         unsigned char hash[hashSize];
 
-#if defined(IXCRYPTO_USE_MBED_TLS)
+#if defined(IXWEBSOCKET_USE_MBED_TLS)
         mbedtls_md_hmac(mbedtls_md_info_from_type(MBEDTLS_MD_MD5),
                (unsigned char *) key.c_str(), key.size(),
                (unsigned char *) data.c_str(), data.size(),
@@ -34,13 +32,11 @@ namespace ix
                key.c_str(), key.size(),
                data.c_str(), data.size(),
                &hash);
-#elif defined(IXCRYPTO_USE_OPEN_SSL)
+#else
         HMAC(EVP_md5(),
              key.c_str(), (int) key.size(),
              (unsigned char *) data.c_str(), (int) data.size(),
              (unsigned char *) hash, nullptr);
-#else
-#       error "Unsupported configuration"
 #endif
 
         std::string hashString(reinterpret_cast<char*>(hash), hashSize);

ws/ws_autobahn.cpp

@@ -21,7 +21,12 @@
 //  
 //
 // 2 Run the test server (using docker)
-// docker run -it --rm -v "${PWD}/config:/config" -v "${PWD}/reports:/reports" -p 9001:9001 --name fuzzingserver crossbario/autobahn-testsuite
+// docker run -it --rm \
+//     -v "${PWD}/config:/config" \
+//     -v "${PWD}/reports:/reports" \
+//     -p 9001:9001 \
+//     --name fuzzingserver \
+//     crossbario/autobahn-testsuite
 //
 // 3. Run this command
 //    ws autobahn -q --url ws://localhost:9001
@@ -310,3 +315,4 @@ namespace ix
         return generateReport(url) ? 0 : 1;
     }
 }
+