Validate that the close reason is proper utf-8. Autobahn 7.5.1

+ws autobahn / Add code to test websocket client compliance with the autobahn test-suite
+Ping received with a payload too large (> 125 bytes) trigger a connection closure
+cobra / add tracking about published messages
+cobra / publish returns a message id, that can be used when
+cobra / new message type in the message received handler when publish/ok is received (can be used to implement an ack system).

.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

.github/workflows/ccpp.yml

@@ -1,51 +0,0 @@
-name: unittest
-
-on: [push]
-
-# fake comment to trigger an action 1
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: make test
-      run: make test
-
-  mac:
-    runs-on: macOS-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: make test
-      run: make test
-
-      #     We don't need to have redis running anymore, as we have our fake limited one
-      #     - name: install redis
-      #       run: brew install redis
-      # 
-      #     - name: start redis server
-      #       run: brew services start redis
-
-      #  # Windows does not work yet, I'm stuck at getting CMake to run + finding vcpkg
-      #  win:
-      #    runs-on: windows-2016
-      #
-      #    steps:
-      #    - uses: actions/checkout@v1
-      #
-      #    - name: run cmake
-      #      run: |
-      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-      #        mkdir build
-      #        cd build
-      #        cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DUSE_WS=1 -DUSE_TEST=1 -DUSE_TLS=1 -G"NMake Makefiles" ..
-      #    - name: build
-      #      run: |
-      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-      #        cd build
-      #        nmake
-      #    - name: run tests
-      #      run: 
-      #        cd test
-      #        ..\build\test\ixwebsocket_unittest.exe

.gitignore

@@ -1,7 +1,3 @@
 build
 *.pyc
 venv
-ixsnake/ixsnake/.certs/
-site/
-ws/.certs/
-ws/.srl

.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

.travis.yml

@@ -6,26 +6,23 @@ language: bash
 matrix:
   include:
     # macOS
-    # - os: osx
-    #   env:
-    #     - HOMEBREW_NO_AUTO_UPDATE=1
-    #   compiler: clang
-    #   script:
-    #     - brew install redis
-    #     - brew services start redis
-    #     - brew install mbedtls
-    #     - python test/run.py
-    #     - make ws
+    - os: osx
+      env:
+        - HOMEBREW_NO_AUTO_UPDATE=1
+      compiler: clang
+      script:
+        - brew install mbedtls
+        - python test/run.py
+        - make ws
 
-    Linux
+    # Linux
     - os: linux
       dist: bionic
       before_install:
         - sudo apt-get install -y libmbedtls-dev
-        - sudo apt-get install -y redis-server
       script: 
-      - python test/run.py
-      #  - make ws
+        - python test/run.py
+        - make ws
       env:
         - CC=gcc
         - CXX=g++

CMake/FindJsonCpp.cmake

@@ -1,19 +0,0 @@
-# Find package structure taken from libcurl
-
-include(FindPackageHandleStandardArgs)
-
-find_path(JSONCPP_INCLUDE_DIRS json/json.h)
-find_library(JSONCPP_LIBRARY jsoncpp)
-
-find_package_handle_standard_args(JSONCPP
-    FOUND_VAR
-      JSONCPP_FOUND
-    REQUIRED_VARS
-      JSONCPP_LIBRARY
-      JSONCPP_INCLUDE_DIRS
-    FAIL_MESSAGE
-      "Could NOT find jsoncpp"
-)
-
-set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIRS})
-set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})

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()
 
@@ -35,7 +36,6 @@ set( IXWEBSOCKET_SOURCES
     ixwebsocket/IXSocketConnect.cpp
     ixwebsocket/IXSocketFactory.cpp
     ixwebsocket/IXSocketServer.cpp
-    ixwebsocket/IXSocketTLSOptions.cpp
     ixwebsocket/IXUrlParser.cpp
     ixwebsocket/IXUserAgent.cpp
     ixwebsocket/IXWebSocket.cpp
@@ -68,7 +68,6 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXSocketConnect.h
     ixwebsocket/IXSocketFactory.h
     ixwebsocket/IXSocketServer.h
-    ixwebsocket/IXSocketTLSOptions.h
     ixwebsocket/IXUrlParser.h
     ixwebsocket/IXUtf8Validator.h
     ixwebsocket/IXUserAgent.h
@@ -78,7 +77,6 @@ set( IXWEBSOCKET_HEADERS
     ixwebsocket/IXWebSocketErrorInfo.h
     ixwebsocket/IXWebSocketHandshake.h
     ixwebsocket/IXWebSocketHttpHeaders.h
-    ixwebsocket/IXWebSocketInitResult.h
     ixwebsocket/IXWebSocketMessage.h
     ixwebsocket/IXWebSocketMessageQueue.h
     ixwebsocket/IXWebSocketMessageType.h
@@ -105,32 +103,33 @@ if (APPLE)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/apple/IXSetThreadName_apple.cpp)
 elseif (WIN32)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/windows/IXSetThreadName_windows.cpp)
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/freebsd/IXSetThreadName_freebsd.cpp)
 else()
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/linux/IXSetThreadName_linux.cpp)
     list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSelectInterruptEventFd.cpp)
     list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSelectInterruptEventFd.h)
 endif()
 
-option(USE_TLS "Enable TLS support" FALSE)
+if (WIN32)
+  set(USE_MBED_TLS TRUE)
+endif()
 
+set(USE_OPEN_SSL FALSE)
 if (USE_TLS)
-    if (WIN32)
-        option(USE_MBED_TLS "Use Mbed TLS" ON)
-    else()
-        option(USE_MBED_TLS "Use Mbed TLS" OFF)
-    endif()
-    option(USE_OPEN_SSL "Use OpenSSL" OFF)
-    
+    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 AND NOT USE_OPEN_SSL)
+    elseif (APPLE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp)
+    elseif (WIN32)
+        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h)
+        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp)
     else()
-        set(USE_OPEN_SSL ON)
+        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)
     endif()
@@ -141,21 +140,12 @@ 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 (USE_OPEN_SSL)
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_OPEN_SSL)
-    endif()
-endif()
-
-if (APPLE AND USE_TLS AND NOT USE_MBED_TLS AND NOT USE_OPEN_SSL)
+if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
   target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
 endif()
 
 if (WIN32)
-  target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
+  target_link_libraries(ixwebsocket wsock32 ws2_32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
@@ -165,16 +155,7 @@ if (UNIX)
 endif()
 
 if (USE_TLS AND USE_OPEN_SSL)
-
-  # Help finding Homebrew's OpenSSL on macOS
-  if (APPLE)
-    set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/local/opt/openssl/lib)
-    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr/local/opt/openssl/include)
-  endif()
-
-  if(NOT OPENSSL_FOUND)
-    find_package(OpenSSL REQUIRED)
-  endif()
+  find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})
   message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
   include_directories(${OPENSSL_INCLUDE_DIR})
@@ -182,7 +163,6 @@ if (USE_TLS AND USE_OPEN_SSL)
 endif()
 
 if (USE_TLS AND USE_MBED_TLS)
-  # FIXME I'm not too sure that this USE_VENDORED_THIRD_PARTY thing works
   if (USE_VENDORED_THIRD_PARTY)
     set (ENABLE_PROGRAMS OFF)
     add_subdirectory(third_party/mbedtls)
@@ -191,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()
@@ -201,13 +181,13 @@ if (ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIRS})
   target_link_libraries(ixwebsocket ${ZLIB_LIBRARIES})
 else()
-  include_directories(third_party/zlib ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
   add_subdirectory(third_party/zlib)
+  include_directories(third_party/zlib ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
   target_link_libraries(ixwebsocket zlibstatic)
 endif()
 
 set( IXWEBSOCKET_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    .
 )
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
@@ -224,20 +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)
-  add_subdirectory(ixsnake)
-  add_subdirectory(ixsentry)
-
-  add_subdirectory(third_party/spdlog spdlog)
-  add_subdirectory(third_party/sentry-native sentry-native)
-
-  if (USE_WS)
-      add_subdirectory(ws)
-  endif()
-  if (USE_TEST)
-      add_subdirectory(test)
-  endif()
+if (USE_WS)
+    add_subdirectory(ws)
 endif()

DOCKER_VERSION

@@ -0,0 +1 @@
+5.1.6

Dockerfile

@@ -1 +1 @@
-docker/Dockerfile.centos
+docker/Dockerfile.alpine

README.md

@@ -1,47 +1,13 @@
 ## Hello world
 
-![Build status](https://github.com/machinezone/IXWebSocket/workflows/unittest/badge.svg)
+![Alt text](https://travis-ci.org/machinezone/IXWebSocket.svg?branch=master) 
 
 IXWebSocket is a C++ library for WebSocket client and server development. It has minimal dependencies (no boost), is very simple to use and support everything you'll likely need for websocket dev (SSL, deflate compression, compiles on most platforms, etc...). HTTP client and server code is also available, but it hasn't received as much testing.
 
-It is been used on big mobile video game titles sending and receiving tons of messages since 2017 (iOS and Android). It was tested on macOS, iOS, Linux, Android, Windows and FreeBSD. Two important design goals are simplicity and correctness.
+It is been used on big mobile video game titles sending and receiving tons of messages since 2017 (iOS and Android).
 
-```cpp
-// Required on Windows
-ix::initNetSystem();
+Interested ? Go read the [docs](https://bsergean.github.io/IXWebSocket/site/) ! If things don't work as expected, please create an issue in github, or even better a pull request if you know how to fix your problem.
 
-// Our websocket object
-ix::WebSocket webSocket;
+IXWebSocket is actively being developed, check out the [changelog](CHANGELOG.md) to know what's cooking. If you are looking for a real time messaging service (the chat-like 'server' your websocket code will talk to) with many features such as history, backed by Redis, look at [cobra](https://github.com/machinezone/cobra).
 
-std::string url("ws://localhost:8080/");
-webSocket.setUrl(url);
-
-// Setup a callback to be fired (in a background thread, watch out for race conditions !)
-// when a message or an event (open, close, error) is received
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
-    {
-        if (msg->type == ix::WebSocketMessageType::Message)
-        {
-            std::cout << msg->str << std::endl;
-        }
-    }
-);
-
-// Now that our callback is setup, we can start our background thread and receive messages
-webSocket.start();
-
-// Send a message to the server (default to TEXT mode)
-webSocket.send("hello world");
-```
-
-Interested? Go read the [docs](https://machinezone.github.io/IXWebSocket/)! If things don't work as expected, please create an issue on GitHub, or even better a pull request if you know how to fix your problem.
-
-IXWebSocket is actively being developed, check out the [changelog](https://machinezone.github.io/IXWebSocket/CHANGELOG/) to know what's cooking. If you are looking for a real time messaging service (the chat-like 'server' your websocket code will talk to) with many features such as history, backed by Redis, look at [cobra](https://github.com/machinezone/cobra).
-
-IXWebSocket client code is autobahn compliant beginning with the 6.0.0 version. See the current [test results](https://bsergean.github.io/autobahn/reports/clients/index.html). Some tests are still failing in the server code.
-
-## Users
-
-If your company or project is using this library, feel free to open an issue or PR to amend this list.
-
-- [Machine Zone](https://www.mz.com)
+IXWebSocket is not yet autobahn compliant, but we are working on changing this. See the current compliance [test results](https://bsergean.github.io/IXWebSocket/autobahn/index.html).

SECURITY.md

@@ -1,11 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 7.x.x   | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-Users should send an email to bsergean@gmail.com to report a vulnerability.

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

docker-compose.yml

@@ -1,67 +1,43 @@
 version: "3"
 services:
-  # snake:
-  #   image: bsergean/ws:build
-  #   entrypoint: ws snake --port 8767 --host 0.0.0.0 --redis_hosts redis1
-  #   ports:
-  #     - "8767:8767"
-  #   networks:
-  #     - ws-net
-  #   depends_on:
-  #     - redis1
+  snake:
+    image: bsergean/ws:build
+    entrypoint: ws snake --port 8765 --host 0.0.0.0 --redis_hosts redis1
+    ports:
+      - "8765:8765"
+    networks:
+      - ws-net
+    depends_on:
+      - redis1
 
-  # proxy:
-  #   image: bsergean/ws:build
-  #   entrypoint: strace ws proxy_server --remote_host 'wss://cobra.addsrv.com' --host 0.0.0.0 --port 8765 -v
-  #   ports:
-  #     - "8765:8765"
-  #   networks:
-  #     - ws-net
-
-  #pyproxy:
-  #  image: bsergean/ws_proxy:build
-  #  entrypoint: /usr/bin/ws_proxy.py --remote_url 'wss://cobra.addsrv.com' --host 0.0.0.0 --port 8765
-  #  ports:
-  #    - "8765:8765"
-  #  networks:
-  #    - ws-net
-
-  #      #  ws:
-  #      #    security_opt:
-  #      #    - seccomp:unconfined
-  #      #    cap_add:
-  #      #    - SYS_PTRACE
-  #      #    stdin_open: true
-  #      #    tty: true
-  #      #    image: bsergean/ws:build
-  #      #    entrypoint: sh
-  #      #    networks:
-  #      #      - ws-net
-  #      #    depends_on:
-  #      #      - redis1
-  #      #
-  #      #  redis1:
-  #      #    image: redis:alpine
-  #      #    networks:
-  #      #      - ws-net
-  #      #
-  #      #  statsd:
-  #      #    image: jaconel/statsd
-  #      #    ports:
-  #      #      - "8125:8125"
-  #      #    environment:
-  #      #      - STATSD_DUMP_MSG=true
-  #      #      - GRAPHITE_HOST=127.0.0.1
-  #      #    networks:
-  #      #      - ws-net
-
-  compile:
-    image: alpine
-    entrypoint: sh
+  ws:
+    security_opt:
+    - seccomp:unconfined
+    cap_add:
+    - SYS_PTRACE
     stdin_open: true
     tty: true
-    volumes:
-      - /Users/bsergeant/src/foss:/home/bsergean/src/foss
+    image: bsergean/ws:build
+    entrypoint: bash
+    networks:
+      - ws-net
+    depends_on:
+      - redis1
+
+  redis1:
+    image: redis:alpine
+    networks:
+      - ws-net
+
+  statsd:
+    image: jaconel/statsd
+    ports:
+      - "8125:8125"
+    environment:
+      - STATSD_DUMP_MSG=true
+      - GRAPHITE_HOST=127.0.0.1
+    networks:
+      - ws-net
 
 networks:
   ws-net:

docker/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.11 as build
+FROM alpine as build
 
 RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
 RUN apk add --no-cache make
@@ -14,26 +14,20 @@ COPY --chown=app:app . /opt
 WORKDIR /opt
 
 USER app
-RUN [ "make", "ws_install" ]
-RUN [ "rm", "-rf", "build" ]
+RUN [ "make" ]
 
-FROM alpine:3.11 as runtime
+FROM alpine as runtime
 
 RUN apk add --no-cache libstdc++
-RUN apk add --no-cache strace
-RUN apk add --no-cache gdb
 
 RUN addgroup -S app && adduser -S -G app app 
 COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
 RUN chmod +x /usr/local/bin/ws
 RUN ldd /usr/local/bin/ws
 
-# Copy source code for gcc
-COPY --chown=app:app --from=build /opt /opt
-
 # Now run in usermode
 USER app
 WORKDIR /home/app
 
 ENTRYPOINT ["ws"]
-EXPOSE 8008
+CMD ["--help"]

docker/Dockerfile.centos

@@ -1,35 +0,0 @@
-FROM centos:8 as build
-
-RUN yum install -y gcc-c++ make cmake zlib-devel openssl-devel redhat-rpm-config 
-
-RUN groupadd app && useradd -g app app
-RUN chown -R app:app /opt
-RUN chown -R app:app /usr/local
-
-# There is a bug in CMake where we cannot build from the root top folder
-# So we build from /opt
-COPY --chown=app:app . /opt
-WORKDIR /opt
-
-USER app
-RUN [ "make", "ws_install" ]
-RUN [ "rm", "-rf", "build" ]
-
-FROM centos:8 as runtime
-
-RUN yum install -y gdb strace
-
-RUN groupadd app && useradd -g app app
-COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
-RUN chmod +x /usr/local/bin/ws
-RUN ldd /usr/local/bin/ws
-
-# Copy source code for gcc
-COPY --chown=app:app --from=build /opt /opt
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-ENTRYPOINT ["ws"]
-EXPOSE 8008

docker/Dockerfile.ubuntu_disco

@@ -20,5 +20,4 @@ COPY . .
 ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
 ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
 
-# RUN ["make", "test"]
-CMD ["sh"]
+RUN ["make", "test"]

docs/CHANGELOG.md

@@ -1,405 +1,11 @@
 # Changelog
-All changes to this project will be documented in this file.
-
-## [8.1.8] - 2020-03-02
-
-(websocket server) fix regression with disabling zlib extension on the server side. If a client does not support this extension the server will handle it fine. We still need to figure out how to disable the option.
-
-## [8.1.7] - 2020-02-26
-
-(websocket) traffic tracker received bytes is message size while it should be wire size
-
-## [8.1.6] - 2020-02-26
-
-(ws_connect) display sent/received bytes statistics on exit
-
-## [8.1.5] - 2020-02-23
-
-(server) give thread name to some usual worker threads / unittest is broken !!
-
-## [8.1.4] - 2020-02-22
-
-(websocket server) fix regression from 8.1.2, where per-deflate message compression was always disabled
-
-## [8.1.3] - 2020-02-21
-
-(client + server) Fix #155 / http header parser should treat the space(s) after the : delimiter as optional. Fixing this bug made us discover that websocket sub-protocols are not properly serialiazed, but start with a ,
-
-## [8.1.2] - 2020-02-18
-
-(WebSocketServer) add option to disable deflate compression, exposed with the -x option to ws echo_server
-
-## [8.1.1] - 2020-02-18
-
-(ws cobra to statsd and sentry sender) exit if no messages are received for one minute, which is a sign that something goes wrong on the server side. That should be changed to be configurable in the future
-
-## [8.1.0] - 2020-02-13
-
-(http client + sentry minidump upload) Multipart stream closing boundary is invalid + mark some options as mandatory in the command line tools
-
-## [8.0.7] - 2020-02-12
-
-(build) remove the unused subtree which was causing some way of installing to break
-
-## [8.0.6] - 2020-01-31
-
-(snake) add an option to disable answering pongs as response to pings, to test cobra client behavior with hanged connections 
-
-## [8.0.5] - 2020-01-31
-
-(IXCobraConnection) set a ping timeout of 90 seconds. If no pong messages are received as responses to ping for a while, give up and close the connection
-
-## [8.0.4] - 2020-01-31
-
-(cobra to sentry) remove noisy logging
-
-## [8.0.3] - 2020-01-30
-
-(ixcobra) check if we are authenticated in publishNext before trying to publish a message
-
-## [8.0.2] - 2020-01-28
-
-Extract severity level when emitting messages to sentry
-
-## [8.0.1] - 2020-01-28
-
-Fix bug #151 - If a socket connection is interrupted, calling stop() on the IXWebSocket object blocks until the next retry
-
-## [8.0.0] - 2020-01-26
-
-(SocketServer) add ability to bind on an ipv6 address
-
-## [7.9.6] - 2020-01-22
-
-(ws) add a dnslookup sub-command, to get the ip address of a remote host
-
-## [7.9.5] - 2020-01-14
-
-(windows) fix #144, get rid of stubbed/un-implemented windows schannel ssl backend
-
-## [7.9.4] - 2020-01-12
-
-(openssl + mbedssl) fix #140, can send large files with ws send over ssl / still broken with apple ssl
-
-## [7.9.3] - 2020-01-10
-
-(apple ssl) model write method after the OpenSSL one for consistency
-
-## [7.9.2] - 2020-01-06
-
-(apple ssl) unify read and write ssl utility code
-
-## [7.9.1] - 2020-01-06
-
-(websocket client) better error propagation when errors are detected while sending data
-(ws send) detect failures to send big files, terminate in those cases and report error
-
-## [7.9.0] - 2020-01-04
-
-(ws send) add option (-x) to disable per message deflate compression
-
-## [7.8.9] - 2020-01-04
-
-(ws send + receive) handle all message types (ping + pong + fragment) / investigate #140
-
-## [7.8.8] - 2019-12-28
-
-(mbedtls) fix related to private key file parsing and initialization
-
-## [7.8.6] - 2019-12-28
-
-(ws cobra to sentry/statsd) fix for handling null events properly for empty queues + use queue to send data to statsd
-
-## [7.8.5] - 2019-12-28
-
-(ws cobra to sentry) handle null events for empty queues
-
-## [7.8.4] - 2019-12-27
-
-(ws cobra to sentry) game is picked in a fair manner, so that all games get the same share of sent events
-
-## [7.8.3] - 2019-12-27
-
-(ws cobra to sentry) refactor queue related code into a class
-
-## [7.8.2] - 2019-12-25
-
-(ws cobra to sentry) bound the queue size used to hold up cobra messages before they are sent to sentry. Default queue size is a 100 messages. Without such limit the program runs out of memory when a subscriber receive a lot of messages that cannot make it to sentry
-
-## [7.8.1] - 2019-12-25
-
-(ws client) use correct compilation defines so that spdlog is not used as a header only library (reduce binary size and increase compilation speed)
-
-## [7.8.0] - 2019-12-24
-
-(ws client) all commands use spdlog instead of std::cerr or std::cout for logging
-
-## [7.6.5] - 2019-12-24
-
-(cobra client) send a websocket ping every 30s to keep the connection opened
-
-## [7.6.4] - 2019-12-22
-
-(client) error handling, quote url in error case when failing to parse one
-(ws) ws_cobra_publish: register callbacks before connecting
-(doc) mention mbedtls in supported ssl server backend
-
-## [7.6.3] - 2019-12-20
-
-(tls) add a simple description of the TLS configuration routine for debugging
-
-## [7.6.2] - 2019-12-20
-
-(mbedtls) correct support for using own certificate and private key
-
-## [7.6.1] - 2019-12-20
-
-(ws commands) in websocket proxy, disable automatic reconnections + in Dockerfile, use alpine 3.11
-
-## [7.6.0] - 2019-12-19
-
-(cobra) Add TLS options to all cobra commands and classes. Add example to the doc.
-
-## [7.5.8] - 2019-12-18
-
-(cobra-to-sentry) capture application version from device field
-
-## [7.5.7] - 2019-12-18
-
-(tls) Experimental TLS server support with mbedtls (windows) + process cert tlsoption (client + server)
-
-## [7.5.6] - 2019-12-18
-
-(tls servers) Make it clear that apple ssl and mbedtls backends do not support SSL in server mode
-
-## [7.5.5] - 2019-12-17
-
-(tls options client) TLSOptions struct _validated member should be initialized to false
-
-## [7.5.4] - 2019-12-16
-
-(websocket client) improve the error message when connecting to a non websocket server
-
-Before:
-
-```
-Connection error: Got bad status connecting to example.com:443, status: 200, HTTP Status line: HTTP/1.1 200 OK
-```
-
-After:
-
-```
-Connection error: Expecting status 101 (Switching Protocol), got 200 status connecting to example.com:443, HTTP Status line: HTTP/1.1 200 OK
-```
-
-## [7.5.3] - 2019-12-12
-
-(server) attempt at fixing #131 by using blocking writes in server mode
-
-## [7.5.2] - 2019-12-11
-
-(ws) cobra to sentry - created events with sentry tags based on tags present in the cobra messages
-
-## [7.5.1] - 2019-12-06
-
-(mac) convert SSL errors to utf8
-
-## [7.5.0] - 2019-12-05
-
-- (ws) cobra to sentry. Handle Error 429 Too Many Requests and politely wait before sending more data to sentry.
-
-In the example below sentry we are sending data too fast, sentry asks us to slow down which we do. Notice how the sent count stop increasing, while we are waiting for 41 seconds.
-
-```
-[2019-12-05 15:50:33.759] [info] messages received 2449 sent 3
-[2019-12-05 15:50:34.759] [info] messages received 5533 sent 7
-[2019-12-05 15:50:35.759] [info] messages received 8612 sent 11
-[2019-12-05 15:50:36.759] [info] messages received 11562 sent 15
-[2019-12-05 15:50:37.759] [info] messages received 14410 sent 19
-[2019-12-05 15:50:38.759] [info] messages received 17236 sent 23
-[2019-12-05 15:50:39.282] [error] Error sending data to sentry: 429
-[2019-12-05 15:50:39.282] [error] Body: {"exception":[{"stacktrace":{"frames":[{"filename":"WorldScene.lua","function":"WorldScene.lua:1935","lineno":1958},{"filename":"WorldScene.lua","function":"onUpdate_WorldCam","lineno":1921},{"filename":"WorldMapTile.lua","function":"__index","lineno":239}]},"value":"noisytypes: Attempt to call nil(nil,2224139838)!"}],"platform":"python","sdk":{"name":"ws","version":"1.0.0"},"tags":[["game","niso"],["userid","107638363"],["environment","live"]],"timestamp":"2019-12-05T23:50:39Z"}
-
-[2019-12-05 15:50:39.282] [error] Response: {"error_name":"rate_limit","error":"Creation of this event was denied due to rate limiting"}
-[2019-12-05 15:50:39.282] [warning] Error 429 - Too Many Requests. ws will sleep and retry after 41 seconds
-[2019-12-05 15:50:39.760] [info] messages received 18839 sent 25
-[2019-12-05 15:50:40.760] [info] messages received 18839 sent 25
-[2019-12-05 15:50:41.760] [info] messages received 18839 sent 25
-[2019-12-05 15:50:42.761] [info] messages received 18839 sent 25
-[2019-12-05 15:50:43.762] [info] messages received 18839 sent 25
-[2019-12-05 15:50:44.763] [info] messages received 18839 sent 25
-[2019-12-05 15:50:45.768] [info] messages received 18839 sent 25
-```
-
-## [7.4.5] - 2019-12-03
-
-- (ws) #125 / fix build problem when jsoncpp is not installed locally
-
-## [7.4.4] - 2019-12-03
-
-- (ws) #125 / cmake detects an already installed jsoncpp and will try to use this one if present
-
-## [7.4.3] - 2019-12-03
-
-- (http client) use std::unordered_map instead of std::map for HttpParameters and HttpFormDataParameters class aliases
-
-## [7.4.2] - 2019-12-02
-
-- (client) internal IXDNSLookup class requires a valid cancellation request function callback to be passed in
-
-## [7.4.1] - 2019-12-02
-
-- (client) fix an overflow in the exponential back off code
-
-## [7.4.0] - 2019-11-25
-
-- (http client) Add support for multipart HTTP POST upload
-- (ixsentry) Add support for uploading a minidump to sentry
-
-## [7.3.5] - 2019-11-20
-
-- On Darwin SSL, add ability to skip peer verification.
-
-## [7.3.4] - 2019-11-20
-
-- 32-bits compile fix, courtesy of @fcojavmc
-
-## [7.3.1] - 2019-11-16
-
-- ws proxy_server / remote server close not forwarded to the client
-
-## [7.3.0] - 2019-11-15
-
-- New ws command: `ws proxy_server`.
-
-## [7.2.2] - 2019-11-01
-
-- Tag a release + minor reformating.
-
-## [7.2.1] - 2019-10-26
-
-- Add unittest to IXSentryClient to lua backtrace parsing code
-
-## [7.2.0] - 2019-10-24
-
-- Add cobra_metrics_to_redis sub-command to create streams for each cobra metric event being received.
-
-## [7.1.0] - 2019-10-13
-
-- Add client support for websocket subprotocol. Look for the new addSubProtocol method for details.
-
-## [7.0.0] - 2019-10-01
-
-- TLS support in server code, only implemented for the OpenSSL SSL backend for now.
-
-## [6.3.4] - 2019-09-30
-
-- all ws subcommands propagate tls options to servers (unimplemented) or ws or http client (implemented) (contributed by Matt DeBoer)
-
-## [6.3.3] - 2019-09-30
-
-- ws has a --version option
-
-## [6.3.2] - 2019-09-29
-
-- (http + websocket clients) can specify cacert and some other tls options (not implemented on all backend). This makes it so that server certs can finally be validated on windows.
-
-## [6.3.1] - 2019-09-29
-
-- Add ability to use OpenSSL on apple platforms.
-
-## [6.3.0] - 2019-09-28
-
-- ixcobra / fix crash in CobraConnection::publishNext when the queue is empty + handle CobraConnection_PublishMode_Batch in CobraMetricsThreadedPublisher
-
-## [6.2.9] - 2019-09-27
-
-- mbedtls fixes / the unittest now pass on macOS, and hopefully will on Windows/AppVeyor as well.
-
-## [6.2.8] - 2019-09-26
-
-- Http server: add options to ws https to redirect all requests to a given url. POST requests will get a 200 and an empty response.
-
-```
-ws httpd -L --redirect_url https://www.google.com
-```
-
-## [6.2.7] - 2019-09-25
-
-- Stop having ws send subcommand send a binary message in text mode, which would cause error in `make ws_test` shell script test.
-
-## [6.2.6] - 2019-09-24
-
-- Fix 2 race conditions detected with TSan, one in CobraMetricsPublisher::push and another one in WebSocketTransport::sendData (that one was bad).
-
-## [6.2.5] - 2019-09-23
-
-- Add simple Redis Server which is only capable of doing publish / subscribe. New ws redis_server sub-command to use it. The server is used in the unittest, so that we can run on CI in environment where redis isn not available like github actions env.
-
-## [6.2.4] - 2019-09-22
-
-- Add options to configure TLS ; contributed by Matt DeBoer. Only implemented for OpenSSL TLS backend for now.
-
-## [6.2.3] - 2019-09-21
-
-- Fix crash in the Linux unittest in the HTTP client code, in Socket::readBytes
-- Cobra Metrics Publisher code returns the message id of the message that got published, to be used to validated that it got sent properly when receiving an ack.
-
-## [6.2.2] - 2019-09-19
-
-- In DNS lookup code, make sure the weak pointer we use lives through the expected scope (if branch)
-
-## [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
-
-## [6.0.1] - 2019-09-05
-
-- add cobra metrics publisher + server unittest
-- add cobra client + server unittest
-- ws snake (cobra simple server) add basic support for unsubscription + subscribe send the proper subscription data + redis client subscription can be cancelled
-- IXCobraConnection / pdu handlers can crash if they receive json data which is not an object
-
-## [6.0.0] - 2019-09-04
-
-- all client autobahn test should pass !
-- zlib/deflate has a bug with windowsbits == 8, so we silently upgrade it to 9/ (fix autobahn test 13.X which uses 8 for the windows size)
-
-## [5.2.0] - 2019-09-04
-
-- Fragmentation: for sent messages which are compressed, the continuation fragments should not have the rsv1 bit set (fix all autobahn tests for zlib compression 12.X)
-- Websocket Server / do a case insensitive string search when looking for an Upgrade header whose value is websocket. (some client use WebSocket with some upper-case characters)
-
-## [5.1.9] - 2019-09-03
-
-- ws autobahn / report progress with spdlog::info to get timing info
-- ws autobahn / use condition variables for stopping test case + add more logging on errors
-
-## [5.1.8] - 2019-09-03
-
-- Per message deflate/compression: handle fragmented messages (fix autobahn test: 12.1.X and probably others)
-
-## [5.1.7] - 2019-09-03
-
-- Receiving invalid UTF-8 TEXT message should fail and close the connection (fix remaining autobahn test: 6.X UTF-8 Handling)
+All notable changes to this project will be documented in this file.
 
 ## [5.1.6] - 2019-09-03
 
 - Sending invalid UTF-8 TEXT message should fail and close the connection (fix remaining autobahn test: 6.X UTF-8 Handling)
 - Fix failing unittest which was sending binary data in text mode with WebSocket::send to call properly call WebSocket::sendBinary instead.
 - Validate that the reason is proper utf-8. (fix autobahn test 7.5.1)
-- Validate close codes. Autobahn 7.9.*
 
 ## [5.1.5] - 2019-09-03
 
@@ -427,7 +33,7 @@ Close connections when reserved bits are used (fix autobahn test: 3.X Reserved B
 - add utf-8 validation code, not hooked up properly yet
 - Ping received with a payload too large (> 125 bytes) trigger a connection closure
 - cobra / add tracking about published messages
-- cobra / publish returns a message id, that can be used when
+- cobra / publish returns a message id, that can be used when 
 - cobra / new message type in the message received handler when publish/ok is received (can be used to implement an ack system).
 
 ## [5.0.9] - 2019-08-30
@@ -441,7 +47,7 @@ ws connect --max_wait 5000 ws://example.com # will only wait 5 seconds max betwe
 
 ## [5.0.7] - 2019-08-23
 - WebSocket: add new option to pass in extra HTTP headers when connecting.
-- `ws connect` add new option (-H, works like [curl](https://stackoverflow.com/questions/356705/how-to-send-a-header-using-a-http-request-through-a-curl-call)) to pass in extra HTTP headers when connecting
+- `ws connect` add new option (-H, works like [curl](https://stackoverflow.com/questions/356705/how-to-send-a-header-using-a-http-request-through-a-curl-call)) to pass in extra HTTP headers when connecting 
 
 If you run against `ws echo_server` you will see the headers being received printed in the terminal.
 ```

docs/build.md

@@ -21,18 +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.
-
-It is also possible to externally include the project, so that everything is fetched over the wire when you build like so:
-
-```
-    ExternalProject_Add(
-        IXWebSocket
-        GIT_REPOSITORY https://github.com/machinezone/IXWebSocket.git
-        ...
-    )
-```
-
 ### vcpkg
 
 It is possible to get IXWebSocket through Microsoft [vcpkg](https://github.com/microsoft/vcpkg).
@@ -43,16 +31,11 @@ vcpkg install ixwebsocket
 
 ### Conan
 
-[ ![Download](https://api.bintray.com/packages/conan/conan-center/ixwebsocket%3A_/images/download.svg) ](https://bintray.com/conan/conan-center/ixwebsocket%3A_/_latestVersion)
+Support for building with conan was contributed by Olivia Zoe (thanks !). The package name to reference is `IXWebSocket/5.0.0@LunarWatcher/stable`. The package is in the process to be published to the official conan package repo, but in the meantime, it can be accessed by adding a new remote 
 
-Conan is currently supported through a recipe in [Conan Center](https://github.com/conan-io/conan-center-index/tree/master/recipes/ixwebsocket) ([Bintray entry](https://bintray.com/conan/conan-center/ixwebsocket%3A_)).
-
-Package reference 
-
-* Conan 1.21.0 and up: `ixwebsocket/7.9.2`
-* Earlier versions: `ixwebsocket/7.9.2@_/_`
-
-Note that the version listed here might not be the latest one. See Bintray or the recipe itself for the latest version. If you're migrating from the previous, custom Bintray remote, note that the package reference _has_ to be lower-case.  
+```
+conan remote add remote_name_here https://api.bintray.com/conan/oliviazoe0/conan-packages
+```
 
 ### Docker
 
@@ -74,3 +57,6 @@ app@ca2340eb9106:~$ ws --help
 ws is a websocket tool
 ...
 ```
+
+
+

docs/cobra.md

@@ -1,81 +0,0 @@
-## General
-
-[cobra](https://github.com/machinezone/cobra) is a real time messaging server. The `ws` utility can run a cobra server (named snake), and has client to publish and subscribe to a cobra server.
-
-Bring up 3 terminals and run a server, a publisher and a subscriber in each one. As you publish data you should see it being received by the subscriber. You can run `redis-cli MONITOR` too to see how redis is being used.
-
-### Server
-
-You will need to have a redis server running locally. To run the server:
-
-```bash
-$ cd <ixwebsocket-top-level-folder>/ixsnake/ixsnake
-$ ws snake
-{
-  "apps": {
-    "FC2F10139A2BAc53BB72D9db967b024f": {
-      "roles": {
-        "_sub": {
-          "secret": "66B1dA3ED5fA074EB5AE84Dd8CE3b5ba"
-        },
-        "_pub": {
-          "secret": "1c04DB8fFe76A4EeFE3E318C72d771db"
-        }
-      }
-    }
-  }
-}
-
-redis host: 127.0.0.1
-redis password:
-redis port: 6379
-```
-
-### Publisher
-
-```bash
-$ cd <ixwebsocket-top-level-folder>/ws
-$ ws cobra_publish --appkey FC2F10139A2BAc53BB72D9db967b024f --endpoint ws://127.0.0.1:8008 --rolename _pub --rolesecret 1c04DB8fFe76A4EeFE3E318C72d771db test_channel cobraMetricsSample.json
-[2019-11-27 09:06:12.980] [info] Publisher connected
-[2019-11-27 09:06:12.980] [info] Connection: Upgrade
-[2019-11-27 09:06:12.980] [info] Sec-WebSocket-Accept: zTtQKMKbvwjdivURplYXwCVUCWM=
-[2019-11-27 09:06:12.980] [info] Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-[2019-11-27 09:06:12.980] [info] Server: ixwebsocket/7.4.0 macos ssl/DarwinSSL zlib 1.2.11
-[2019-11-27 09:06:12.980] [info] Upgrade: websocket
-[2019-11-27 09:06:12.982] [info] Publisher authenticated
-[2019-11-27 09:06:12.982] [info] Published msg 3
-[2019-11-27 09:06:12.982] [info] Published message id 3 acked
-```
-
-### Subscriber
-
-```bash
-$ ws cobra_subscribe --appkey FC2F10139A2BAc53BB72D9db967b024f --endpoint ws://127.0.0.1:8008 --rolename _pub --rolesecret 1c04DB8fFe76A4EeFE3E318C72d771db test_channel
-#messages 0 msg/s 0
-[2019-11-27 09:07:39.341] [info] Subscriber connected
-[2019-11-27 09:07:39.341] [info] Connection: Upgrade
-[2019-11-27 09:07:39.341] [info] Sec-WebSocket-Accept: 9vkQWofz49qMCUlTSptCCwHWm+Q=
-[2019-11-27 09:07:39.341] [info] Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-[2019-11-27 09:07:39.341] [info] Server: ixwebsocket/7.4.0 macos ssl/DarwinSSL zlib 1.2.11
-[2019-11-27 09:07:39.341] [info] Upgrade: websocket
-[2019-11-27 09:07:39.342] [info] Subscriber authenticated
-[2019-11-27 09:07:39.345] [info] Subscriber: subscribed to channel test_channel
-#messages 0 msg/s 0
-#messages 0 msg/s 0
-#messages 0 msg/s 0
-{"baz":123,"foo":"bar"}
-
-#messages 1 msg/s 1
-#messages 1 msg/s 0
-#messages 1 msg/s 0
-{"baz":123,"foo":"bar"}
-
-{"baz":123,"foo":"bar"}
-
-#messages 3 msg/s 2
-#messages 3 msg/s 0
-{"baz":123,"foo":"bar"}
-
-#messages 4 msg/s 1
-^C
-```

docs/design.md

@@ -24,13 +24,13 @@ Large frames are broken up into smaller chunks or messages to avoid filling up t
 
 The library has an interactive tool which is handy for testing compatibility ith other libraries. We have tested our client against Python, Erlang, Node.js, and C++ websocket server libraries.
 
-The unittest tries to be comprehensive, and has been running on multiple platforms, with different sanitizers such as a thread sanitizer to catch data races or the undefined behavior sanitizer.
+The unittest tries to be comprehensive, and has been running on multiple platoform, with different sanitizers such as thread sanitizer to catch data races or the undefined behavior sanitizer.
 
 The regression test is running after each commit on travis.
 
 ## Limitations
 
-* On Windows and Android certificate validation needs to be setup so that SocketTLSOptions.caFile point to a pem file, such as the one distributed by Firefox. Unless that setup is done connecting to a wss endpoint will display an error. On Windows with mbedtls the message will contain `error in handshake : X509 - Certificate verification failed, e.g. CRL, CA or signature check failed`.
+* On Windows TLS is not setup yet to validate certificates.
 * There is no convenient way to embed a ca cert.
 * Automatic reconnection works at the TCP socket level, and will detect remote end disconnects. However, if the device/computer network become unreachable (by turning off wifi), it is quite hard to reliably and timely detect it at the socket level using `recv` and `send` error codes. [Here](https://stackoverflow.com/questions/14782143/linux-socket-how-to-detect-disconnected-network-in-a-client-program) is a good discussion on the subject. This behavior is consistent with other runtimes such as node.js. One way to detect a disconnected device with low level C code is to do a name resolution with DNS but this can be expensive. Mobile devices have good and reliable API to do that.
 * The server code is using select to detect incoming data, and creates one OS thread per connection. This is not as scalable as strategies using epoll or kqueue.

docs/index.md

@@ -9,15 +9,14 @@
 * Linux
 * Android
 * Windows
-* FreeBSD
 
 ## Example code
 
-```cpp
-// Required on Windows
+```
+# Required on Windows
 ix::initNetSystem();
 
-// Our websocket object
+# Our websocket object
 ix::WebSocket webSocket;
 
 std::string url("ws://localhost:8080/");
@@ -40,12 +39,8 @@ webSocket.start();
 webSocket.send("hello world");
 ```
 
-## Why another library?
+## Why another library ?
 
 There are 2 main reasons that explain why IXWebSocket got written. First, we needed a C++ cross-platform client library, which should have few dependencies. What looked like the most solid one, [websocketpp](https://github.com/zaphoyd/websocketpp) did depend on boost and this was not an option for us. Secondly, there were other available libraries with fewer dependencies (C ones), but they required calling an explicit poll routine periodically to know if a client had received data from a server, which was not elegant.
 
 We started by solving those 2 problems, then we added server websocket code, then an HTTP client, and finally a very simple HTTP server.
-
-## Contributing
-
-IXWebSocket is developed on [GitHub](https://github.com/machinezone/IXWebSocket). We'd love to hear about how you use it; opening up an issue on GitHub is ok for that. If things don't work as expected, please create an issue on GitHub, or even better a pull request if you know how to fix your problem.

docs/usage.md

@@ -6,7 +6,7 @@ The [*ws*](https://github.com/machinezone/IXWebSocket/tree/master/ws) folder cou
 
 To use the network system on Windows, you need to initialize it once with *WSAStartup()* and clean it up with *WSACleanup()*. We have helpers for that which you can use, see below. This init would typically take place in your main function.
 
-```cpp
+```
 #include <ixwebsocket/IXNetSystem.h>
 
 int main()
@@ -22,12 +22,12 @@ int main()
 
 ## WebSocket client API
 
-```cpp
+```
 #include <ixwebsocket/IXWebSocket.h>
 
 ...
 
-// Our websocket object
+# Our websocket object
 ix::WebSocket webSocket;
 
 std::string url("ws://localhost:8080/");
@@ -82,9 +82,9 @@ If the connection was closed and sending failed, the return value will be set to
 
 ### Open and Close notifications
 
-The onMessage event will be fired when the connection is opened or closed. This is similar to the [JavaScript browser API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket), which has `open` and `close` events notification that can be registered with the browser `addEventListener`.
+The onMessage event will be fired when the connection is opened or closed. This is similar to the [Javascript browser API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket), which has `open` and `close` events notification that can be registered with the browser `addEventListener`.
 
-```cpp
+```
 webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
     {
         if (msg->type == ix::WebSocketMessageType::Open)
@@ -115,7 +115,7 @@ webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
 
 A message will be fired when there is an error with the connection. The message type will be `ix::WebSocketMessageType::Error`. Multiple fields will be available on the event to describe the error.
 
-```cpp
+```
 webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
     {
         if (msg->type == ix::WebSocketMessageType::Error)
@@ -140,7 +140,7 @@ webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
 
 The url can be set and queried after a websocket object has been created. You will have to call `stop` and `start` if you want to disconnect and connect to that new url.
 
-```cpp
+```
 std::string url("wss://example.com");
 websocket.configure(url);
 ```
@@ -149,7 +149,7 @@ websocket.configure(url);
 
 Ping/pong messages are used to implement keep-alive. 2 message types exists to identify ping and pong messages. Note that when a ping message is received, a pong is instantly send back as requested by the WebSocket spec.
 
-```cpp
+```
 webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
     {
         if (msg->type == ix::WebSocketMessageType::Ping ||
@@ -163,7 +163,7 @@ webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
 
 A ping message can be sent to the server, with an optional data string.
 
-```cpp
+```
 websocket.ping("ping data, optional (empty string is ok): limited to 125 bytes long");
 ```
 
@@ -173,7 +173,7 @@ You can configure an optional heart beat / keep-alive, sent every 45 seconds
 when there is no any traffic to make sure that load balancers do not kill an
 idle connection.
 
-```cpp
+```
 webSocket.setHeartBeatPeriod(45);
 ```
 
@@ -181,32 +181,17 @@ webSocket.setHeartBeatPeriod(45);
 
 You can set extra HTTP headers to be sent during the WebSocket handshake.
 
-```cpp
+```
 WebSocketHttpHeaders headers;
 headers["foo"] = "bar";
 webSocket.setExtraHeaders(headers);
 ```
 
-### Subprotocols
-
-You can specify subprotocols to be set during the WebSocket handshake. For more info you can refer to [this doc](https://hpbn.co/websocket/#subprotocol-negotiation).
-
-```cpp
-webSocket.addSubprotocol("appProtocol-v1");
-webSocket.addSubprotocol("appProtocol-v2");
-```
-
-The protocol that the server did accept is available in the open info `protocol` field.
-
-```cpp
-std::cout << "protocol: " << msg->openInfo.protocol << std::endl;
-```
-
 ### Automatic reconnection
 
 Automatic reconnection kicks in when the connection is disconnected without the user consent. This feature is on by default and can be turned off.
 
-```cpp
+```
 webSocket.enableAutomaticReconnection();  // turn on
 webSocket.disableAutomaticReconnection(); // turn off
 bool enabled = webSocket.isAutomaticReconnectionEnabled(); // query state
@@ -239,47 +224,14 @@ Wait time(ms): 10000
 
 The waiting time is capped by default at 10s between 2 attempts, but that value can be changed and queried.
 
-```cpp
-webSocket.setMaxWaitBetweenReconnectionRetries(5 * 1000); // 5000ms = 5s
+```
+webSocket.setMaxWaitBetweenReconnectionRetries(5 * 1000); // 5000ms = 5s 
 uint32_t m = webSocket.getMaxWaitBetweenReconnectionRetries();
 ```
 
-### TLS support and configuration
-
-To leverage TLS features, the library must be compiled with the option `USE_TLS=1`.
-
-Then, secure sockets are automatically used when connecting to a `wss://*` url.
-
-Additional TLS options can be configured by passing a `ix::SocketTLSOptions` instance to the
-`setTLSOptions` on `ix::WebSocket` (or `ix::WebSocketServer` or `ix::HttpServer`)
-
-```cpp
-webSocket.setTLSOptions({
-    .certFile = "path/to/cert/file.pem",
-    .keyFile = "path/to/key/file.pem",
-    .caFile = "path/to/trust/bundle/file.pem"
-});
-```
-
-Specifying `certFile` and `keyFile` configures the certificate that will be used to communicate with TLS peers.
-
-On a client, this is only necessary for connecting to servers that require a client certificate.
-
-On a server, this is necessary for TLS support.
-
-Specifying `caFile` configures the trusted roots bundle file (in PEM format) that will be used to verify peer certificates.
- - The special value of `SYSTEM` (the default) indicates that the system-configured trust bundle should be used; this is generally what you want when connecting to any publicly exposed API/server.
- - The special value of `NONE` can be used to disable peer verification; this is only recommended to rule out certificate verification when testing connectivity.
-
-For a client, specifying `caFile` can be used if connecting to a server that uses a self-signed cert, or when using a custom CA in an internal environment.
-
-For a server, specifying `caFile` implies that:
-1. You require clients to present a certificate
-1. It must be signed by one of the trusted roots in the file
-
 ## WebSocket server API
 
-```cpp
+```
 #include <ixwebsocket/IXWebSocketServer.h>
 
 ...
@@ -344,7 +296,7 @@ server.wait();
 
 ## HTTP client API
 
-```cpp
+```
 #include <ixwebsocket/IXHttpClient.h>
 
 ...
@@ -427,7 +379,7 @@ bool ok = httpClient.performRequest(args, [](const HttpResponsePtr& response)
 
 ## HTTP server API
 
-```cpp
+```
 #include <ixwebsocket/IXHttpServer.h>
 
 ix::HttpServer server(port, hostname);
@@ -445,7 +397,7 @@ server.wait();
 
 If you want to handle how requests are processed, implement the setOnConnectionCallback callback, which takes an HttpRequestPtr as input, and returns an HttpResponsePtr. You can look at HttpServer::setDefaultConnectionCallback for a slightly more advanced callback example.
 
-```cpp
+```
 setOnConnectionCallback(
     [this](HttpRequestPtr request,
            std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr

docs/ws.md

@@ -29,181 +29,6 @@ Subcommands:
   httpd                       HTTP server
 ```
 
-## curl
-
-The curl subcommand try to be compatible with the curl syntax, to fetch http pages.
-
-Making a HEAD request with the -I parameter.
-
-```
-$ ws curl -I https://www.google.com/
-
-Accept-Ranges: none
-Alt-Svc: quic=":443"; ma=2592000; v="46,43",h3-Q048=":443"; ma=2592000,h3-Q046=":443"; ma=2592000,h3-Q043=":443"; ma=2592000
-Cache-Control: private, max-age=0
-Content-Type: text/html; charset=ISO-8859-1
-Date: Tue, 08 Oct 2019 21:36:57 GMT
-Expires: -1
-P3P: CP="This is not a P3P policy! See g.co/p3phelp for more info."
-Server: gws
-Set-Cookie: NID=188=ASwfz8GrXQrHCLqAz-AndLOMLcz0rC9yecnf3h0yXZxRL3rTufTU_GDDwERp7qQL7LZ_EB8gCRyPXGERyOSAgaqgnrkoTmvWrwFemRLMaOZ896GrHobi5fV7VLklnSG2w48Gj8xMlwxfP7Z-bX-xR9UZxep1tHM6UmFQdD_GkBE; expires=Wed, 08-Apr-2020 21:36:57 GMT; path=/; domain=.google.com; HttpOnly
-Transfer-Encoding: chunked
-Vary: Accept-Encoding
-X-Frame-Options: SAMEORIGIN
-X-XSS-Protection: 0
-Upload size: 143
-Download size: 0
-Status: 200
-```
-
-Making a POST request with the -F parameter.
-
-```
-$ ws curl -F foo=bar https://httpbin.org/post
-foo: bar
-Downloaded 438 bytes out of 438
-Access-Control-Allow-Credentials: true
-Access-Control-Allow-Origin: *
-Connection: keep-alive
-Content-Encoding:
-Content-Length: 438
-Content-Type: application/json
-Date: Tue, 08 Oct 2019 21:47:54 GMT
-Referrer-Policy: no-referrer-when-downgrade
-Server: nginx
-X-Content-Type-Options: nosniff
-X-Frame-Options: DENY
-X-XSS-Protection: 1; mode=block
-Upload size: 219
-Download size: 438
-Status: 200
-payload: {
-  "args": {},
-  "data": "",
-  "files": {},
-  "form": {
-    "foo": "bar"
-  },
-  "headers": {
-    "Accept": "*/*",
-    "Content-Length": "7",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Host": "httpbin.org",
-    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
-  },
-  "json": null,
-  "origin": "155.94.127.118, 155.94.127.118",
-  "url": "https://httpbin.org/post"
-}
-```
-
-Passing in a custom header with -H.
-
-```
-$ ws curl -F foo=bar -H 'my_custom_header: baz' https://httpbin.org/post
-my_custom_header:  baz
-foo: bar
-Downloaded 470 bytes out of 470
-Access-Control-Allow-Credentials: true
-Access-Control-Allow-Origin: *
-Connection: keep-alive
-Content-Encoding:
-Content-Length: 470
-Content-Type: application/json
-Date: Tue, 08 Oct 2019 21:50:25 GMT
-Referrer-Policy: no-referrer-when-downgrade
-Server: nginx
-X-Content-Type-Options: nosniff
-X-Frame-Options: DENY
-X-XSS-Protection: 1; mode=block
-Upload size: 243
-Download size: 470
-Status: 200
-payload: {
-  "args": {},
-  "data": "",
-  "files": {},
-  "form": {
-    "foo": "bar"
-  },
-  "headers": {
-    "Accept": "*/*",
-    "Content-Length": "7",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Host": "httpbin.org",
-    "My-Custom-Header": "baz",
-    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
-  },
-  "json": null,
-  "origin": "155.94.127.118, 155.94.127.118",
-  "url": "https://httpbin.org/post"
-}
-```
-
-## connect
-
-The connect command connects to a websocket endpoint, and starts an interactive prompt. Line editing, such as using the direction keys to fetch the last thing you tried to type) is provided. That command is pretty useful to try to send random data to an endpoint and verify that the service handles it with grace (such as sending invalid json).
-
-```
-ws connect wss://echo.websocket.org
-Type Ctrl-D to exit prompt...
-Connecting to url: wss://echo.websocket.org
-> ws_connect: connected
-Uri: /
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:38:44 GMT
-Sec-WebSocket-Accept: 2j6LBScZveqrMx1W/GJkCWvZo3M=
-sec-websocket-extensions:
-Server: Kaazing Gateway
-Upgrade: websocket
-Received ping
-Received ping
-Received ping
-Hello world !
-> Received 13 bytes
-ws_connect: received message: Hello world !
-> Hello world !
-> Received 13 bytes
-ws_connect: received message: Hello world !
-```
-
-```
-ws connect 'ws://jeanserge.com/v2?appkey=_pubsub'
-Type Ctrl-D to exit prompt...
-Connecting to url: ws://jeanserge.com/v2?appkey=_pubsub
-> ws_connect: connected
-Uri: /v2?appkey=_pubsub
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:45:28 GMT
-Sec-WebSocket-Accept: LYHmjh9Gsu/Yw7aumQqyPObOEV4=
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Server: Python/3.7 websockets/8.0.2
-Upgrade: websocket
-bababababababab
-> ws_connect: connection closed: code 1000 reason
-
-ws_connect: connected
-Uri: /v2?appkey=_pubsub
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:45:44 GMT
-Sec-WebSocket-Accept: I1rqxdLgTU+opPi5/zKPBTuXdLw=
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Server: Python/3.7 websockets/8.0.2
-Upgrade: websocket
-```
-
-## Websocket proxy
-
-```
-ws proxy_server --remote_host ws://127.0.0.1:9000 -v
-Listening on 127.0.0.1:8008
-```
-
-If you connect to ws://127.0.0.1:8008, the proxy will connect to ws://127.0.0.1:9000 and pass all traffic to this server.
-
 ## File transfer
 
 ```
@@ -243,127 +68,6 @@ Options:
   --transfer-timeout INT      Transfer timeout
 ```
 
-## Cobra client and server
+## Cobra Client
 
-[cobra](https://github.com/machinezone/cobra) is a real time messenging server. ws has several sub-command to interact with cobra. There is also a minimal cobra compatible server named snake available.
-
-Below are examples on running a snake server and clients with TLS enabled (the server only works with the OpenSSL and the Mbed TLS backend for now).
-
-First, generate certificates.
-
-```
-$ cd /path/to/IXWebSocket
-$ cd ixsnake/ixsnake
-$ bash ../../ws/generate_certs.sh
-Generating RSA private key, 2048 bit long modulus
-.....+++
-.................+++
-e is 65537 (0x10001)
-generated ./.certs/trusted-ca-key.pem
-generated ./.certs/trusted-ca-crt.pem
-Generating RSA private key, 2048 bit long modulus
-..+++
-.......................................+++
-e is 65537 (0x10001)
-generated ./.certs/trusted-server-key.pem
-Signature ok
-subject=/O=machinezone/O=IXWebSocket/CN=trusted-server
-Getting CA Private Key
-generated ./.certs/trusted-server-crt.pem
-Generating RSA private key, 2048 bit long modulus
-...................................+++
-..................................................+++
-e is 65537 (0x10001)
-generated ./.certs/trusted-client-key.pem
-Signature ok
-subject=/O=machinezone/O=IXWebSocket/CN=trusted-client
-Getting CA Private Key
-generated ./.certs/trusted-client-crt.pem
-Generating RSA private key, 2048 bit long modulus
-..............+++
-.......................................+++
-e is 65537 (0x10001)
-generated ./.certs/untrusted-ca-key.pem
-generated ./.certs/untrusted-ca-crt.pem
-Generating RSA private key, 2048 bit long modulus
-..........+++
-................................................+++
-e is 65537 (0x10001)
-generated ./.certs/untrusted-client-key.pem
-Signature ok
-subject=/O=machinezone/O=IXWebSocket/CN=untrusted-client
-Getting CA Private Key
-generated ./.certs/untrusted-client-crt.pem
-Generating RSA private key, 2048 bit long modulus
-.....................................................................................+++
-...........+++
-e is 65537 (0x10001)
-generated ./.certs/selfsigned-client-key.pem
-Signature ok
-subject=/O=machinezone/O=IXWebSocket/CN=selfsigned-client
-Getting Private key
-generated ./.certs/selfsigned-client-crt.pem
-```
-
-Now run the snake server.
-
-```
-$ export certs=.certs
-$ ws snake --tls --port 8765 --cert-file ${certs}/trusted-server-crt.pem --key-file ${certs}/trusted-server-key.pem --ca-file ${certs}/trusted-ca-crt.pem
-{
-  "apps": {
-    "FC2F10139A2BAc53BB72D9db967b024f": {
-      "roles": {
-        "_sub": {
-          "secret": "66B1dA3ED5fA074EB5AE84Dd8CE3b5ba"
-        },
-        "_pub": {
-          "secret": "1c04DB8fFe76A4EeFE3E318C72d771db"
-        }
-      }
-    }
-  }
-}
-
-redis host: 127.0.0.1
-redis password:
-redis port: 6379
-```
-
-As a new connection comes in, such output should be printed
-
-```
-[2019-12-19 20:27:19.724] [info] New connection
-id: 0
-Uri: /v2?appkey=_health
-Headers:
-Connection: Upgrade
-Host: 127.0.0.1:8765
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Sec-WebSocket-Key: d747B0fE61Db73f7Eh47c0==
-Sec-WebSocket-Protocol: json
-Sec-WebSocket-Version: 13
-Upgrade: websocket
-User-Agent: ixwebsocket/7.5.8 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11
-```
-
-To connect and publish a message, do:
-
-```
-$ export certs=.certs
-$ cd /path/to/ws/folder
-$ ls cobraMetricsSample.json
-cobraMetricsSample.json
-$ ws cobra_publish --endpoint wss://127.0.0.1:8765 --appkey FC2F10139A2BAc53BB72D9db967b024f --rolename _pub --rolesecret 1c04DB8fFe76A4EeFE3E318C72d771db --channel foo --cert-file ${certs}/trusted-client-crt.pem --key-file ${certs}/trusted-client-key.pem --ca-file ${certs}/trusted-ca-crt.pem cobraMetricsSample.json
-[2019-12-19 20:46:42.656] [info] Publisher connected
-[2019-12-19 20:46:42.657] [info] Connection: Upgrade
-[2019-12-19 20:46:42.657] [info] Sec-WebSocket-Accept: rs99IFThoBrhSg+k8G4ixH9yaq4=
-[2019-12-19 20:46:42.657] [info] Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-[2019-12-19 20:46:42.657] [info] Server: ixwebsocket/7.5.8 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11
-[2019-12-19 20:46:42.657] [info] Upgrade: websocket
-[2019-12-19 20:46:42.658] [info] Publisher authenticated
-[2019-12-19 20:46:42.658] [info] Published msg 3
-[2019-12-19 20:46:42.659] [info] Published message id 3 acked
-```
-
-To use OpenSSL on macOS, compile with `make ws_openssl`. First you will have to install OpenSSL libraries, which can be done with Homebrew. Use `make ws_mbedtls` accordingly to use MbedTLS.
+[cobra](https://github.com/machinezone/cobra) is a real time messenging server. ws has sub-command to interacti with cobra.

ixcobra/CMakeLists.txt

@@ -1,35 +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}
-)
-
-find_package(JsonCpp)
-if (NOT JSONCPP_FOUND)
-  set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp)
-endif()
-
-set(IXCOBRA_INCLUDE_DIRS
-    .
-    ..
-    ../ixcore
-    ../ixcrypto
-    ${JSONCPP_INCLUDE_DIRS})
-
-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()
-

ixsentry/CMakeLists.txt

@@ -1,30 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-set (IXSENTRY_SOURCES
-    ixsentry/IXSentryClient.cpp
-)
-
-set (IXSENTRY_HEADERS
-    ixsentry/IXSentryClient.h
-)
-
-add_library(ixsentry STATIC
-  ${IXSENTRY_SOURCES}
-  ${IXSENTRY_HEADERS}
-)
-
-find_package(JsonCpp)
-if (NOT JSONCPP_FOUND)
-  set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp)
-endif()
-
-set(IXSENTRY_INCLUDE_DIRS
-    .
-    ..
-    ../ixcore
-    ${JSONCPP_INCLUDE_DIRS})
-
-target_include_directories( ixsentry PUBLIC ${IXSENTRY_INCLUDE_DIRS} )

ixsnake/CMakeLists.txt

@@ -1,35 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-set (IXSNAKE_SOURCES
-    ixsnake/IXSnakeServer.cpp
-    ixsnake/IXSnakeProtocol.cpp
-    ixsnake/IXAppConfig.cpp
-    ixsnake/IXRedisClient.cpp
-    ixsnake/IXRedisServer.cpp
-)
-
-set (IXSNAKE_HEADERS
-    ixsnake/IXSnakeServer.h
-    ixsnake/IXSnakeProtocol.h
-    ixsnake/IXAppConfig.h
-    ixsnake/IXRedisClient.h
-    ixsnake/IXRedisServer.h
-)
-
-add_library(ixsnake STATIC
-    ${IXSNAKE_SOURCES}
-    ${IXSNAKE_HEADERS}
-)
-
-set(IXSNAKE_INCLUDE_DIRS
-    .
-    ..
-    ../ixcore
-    ../ixcrypto
-    ../ixwebsocket
-    ../third_party)
-
-target_include_directories( ixsnake PUBLIC ${IXSNAKE_INCLUDE_DIRS} )

ixsnake/ixsnake/IXRedisServer.cpp

@@ -1,299 +0,0 @@
-/*
- *  IXRedisServer.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXRedisServer.h"
-
-#include <ixwebsocket/IXNetSystem.h>
-#include <ixwebsocket/IXSocketConnect.h>
-#include <ixwebsocket/IXSocket.h>
-#include <ixwebsocket/IXCancellationRequest.h>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <vector>
-
-namespace ix
-{
-    RedisServer::RedisServer(int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
-        : SocketServer(port, host, backlog, maxConnections, addressFamily)
-        , _connectedClientsCount(0)
-        , _stopHandlingConnections(false)
-    {
-        ;
-    }
-
-    RedisServer::~RedisServer()
-    {
-        stop();
-    }
-
-    void RedisServer::stop()
-    {
-        stopAcceptingConnections();
-
-        _stopHandlingConnections = true;
-        while (_connectedClientsCount != 0)
-        {
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        }
-        _stopHandlingConnections = false;
-
-        SocketServer::stop();
-    }
-
-    void RedisServer::handleConnection(std::shared_ptr<Socket> socket,
-                                       std::shared_ptr<ConnectionState> connectionState)
-    {
-        _connectedClientsCount++;
-
-        while (!_stopHandlingConnections)
-        {
-            std::vector<std::string> tokens;
-            if (!parseRequest(socket, tokens))
-            {
-                if (_stopHandlingConnections)
-                {
-                    logError("Cancellation requested");
-                }
-                else
-                {
-                    logError("Error parsing request");
-                }
-                break;
-            }
-
-            bool success = false;
-
-            // publish
-            if (tokens[0] == "COMMAND")
-            {
-                success = handleCommand(socket, tokens);
-            }
-            else if (tokens[0] == "PUBLISH")
-            {
-                success = handlePublish(socket, tokens);
-            }
-            else if (tokens[0] == "SUBSCRIBE")
-            {
-                success = handleSubscribe(socket, tokens);
-            }
-
-            if (!success)
-            {
-                if (_stopHandlingConnections)
-                {
-                    logError("Cancellation requested");
-                }
-                else
-                {
-                    logError("Error processing request for command: " + tokens[0]);
-                }
-                break;
-            }
-        }
-
-        cleanupSubscribers(socket);
-
-        logInfo("Connection closed for connection id " + connectionState->getId());
-        connectionState->setTerminated();
-
-        _connectedClientsCount--;
-    }
-
-    void RedisServer::cleanupSubscribers(std::shared_ptr<Socket> socket)
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        for (auto&& it : _subscribers)
-        {
-            it.second.erase(socket);
-        }
-
-        for (auto it : _subscribers)
-        {
-            std::stringstream ss;
-            ss << "Subscription id: " << it.first
-               << " #subscribers: " << it.second.size();
-
-            logInfo(ss.str());
-        }
-    }
-
-    size_t RedisServer::getConnectedClientsCount()
-    {
-        return _connectedClientsCount;
-    }
-
-    bool RedisServer::startsWith(const std::string& str,
-                                 const std::string& start)
-    {
-        return str.compare(0, start.length(), start) == 0;
-    }
-
-    std::string RedisServer::writeString(const std::string& str)
-    {
-        std::stringstream ss;
-        ss << "$";
-        ss << str.size();
-        ss << "\r\n";
-        ss << str;
-        ss << "\r\n";
-
-        return ss.str();
-    }
-
-    bool RedisServer::parseRequest(
-        std::shared_ptr<Socket> socket,
-        std::vector<std::string>& tokens)
-    {
-        // Parse first line
-        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
-        auto lineResult = socket->readLine(cb);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid) return false;
-
-        std::string str = line.substr(1);
-        std::stringstream ss;
-        ss << str;
-        int count;
-        ss >> count;
-
-        for (int i = 0; i < count; ++i)
-        {
-            auto lineResult = socket->readLine(cb);
-            auto lineValid = lineResult.first;
-            auto line = lineResult.second;
-
-            if (!lineValid) return false;
-
-            int stringSize;
-            std::stringstream ss;
-            ss << line.substr(1, line.size() - 1);
-            ss >> stringSize;
-
-            auto readResult = socket->readBytes(stringSize, nullptr, nullptr);
-
-            if (!readResult.first) return false;
-
-            // read last 2 bytes (\r\n)
-            char c;
-            socket->readByte(&c, nullptr);
-            socket->readByte(&c, nullptr);
-
-            tokens.push_back(readResult.second);
-        }
-
-        for (auto&& token : tokens)
-        {
-            std::cerr << token << " ";
-        }
-        std::cerr << std::endl;
-
-        return true;
-    }
-
-    bool RedisServer::handleCommand(
-        std::shared_ptr<Socket> socket,
-        const std::vector<std::string>& tokens)
-    {
-        if (tokens.size() != 1) return false;
-
-        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
-        std::stringstream ss;
-
-        // return 2 nested arrays
-        ss << "*2\r\n";
-
-        //
-        // publish
-        //
-        ss << "*6\r\n";
-        ss << writeString("publish"); // 1
-        ss << ":3\r\n"; // 2
-        ss << "*0\r\n"; // 3
-        ss << ":1\r\n"; // 4
-        ss << ":2\r\n"; // 5
-        ss << ":1\r\n"; // 6
-
-        //
-        // subscribe
-        //
-        ss << "*6\r\n";
-        ss << writeString("subscribe"); // 1
-        ss << ":2\r\n"; // 2
-        ss << "*0\r\n"; // 3
-        ss << ":1\r\n"; // 4
-        ss << ":1\r\n"; // 5
-        ss << ":1\r\n"; // 6
-
-        socket->writeBytes(ss.str(), cb);
-
-        return true;
-    }
-
-    bool RedisServer::handleSubscribe(
-        std::shared_ptr<Socket> socket,
-        const std::vector<std::string>& tokens)
-    {
-        if (tokens.size() != 2) return false;
-
-        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
-        std::string channel = tokens[1];
-
-        // Respond
-        socket->writeBytes("*3\r\n", cb);
-        socket->writeBytes(writeString("subscribe"), cb);
-        socket->writeBytes(writeString(channel), cb);
-        socket->writeBytes(":1\r\n", cb);
-
-        std::lock_guard<std::mutex> lock(_mutex);
-        _subscribers[channel].insert(socket);
-
-        return true;
-    }
-
-    bool RedisServer::handlePublish(
-        std::shared_ptr<Socket> socket,
-        const std::vector<std::string>& tokens)
-    {
-        if (tokens.size() != 3) return false;
-
-        auto cb = makeCancellationRequestWithTimeout(30, _stopHandlingConnections);
-        std::string channel = tokens[1];
-        std::string data = tokens[2];
-
-        // now dispatch the message to subscribers (write custom method)
-        std::lock_guard<std::mutex> lock(_mutex);
-        auto it = _subscribers.find(channel);
-        if (it == _subscribers.end())
-        {
-            // return the number of clients that received the message, 0 in that case
-            socket->writeBytes(":0\r\n", cb);
-            return true;
-        }
-
-        auto subscribers = it->second;
-        for (auto jt : subscribers)
-        {
-            jt->writeBytes("*3\r\n", cb);
-            jt->writeBytes(writeString("message"), cb);
-            jt->writeBytes(writeString(channel), cb);
-            jt->writeBytes(writeString(data), cb);
-        }
-
-        // return the number of clients that received the message.
-        std::stringstream ss;
-        ss << ":"
-           << std::to_string(subscribers.size())
-           << "\r\n";
-        socket->writeBytes(ss.str(), cb);
-
-        return true;
-    }
-
-} // namespace ix

ixsnake/ixsnake/IXRedisServer.h

@@ -1,68 +0,0 @@
-/*
- *  IXRedisServer.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSocketServer.h"
-#include "IXSocket.h"
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <map>
-#include <string>
-#include <thread>
-#include <utility> // pair
-
-namespace ix
-{
-    class RedisServer final : public SocketServer
-    {
-    public:
-        RedisServer(int port = SocketServer::kDefaultPort,
-                    const std::string& host = SocketServer::kDefaultHost,
-                    int backlog = SocketServer::kDefaultTcpBacklog,
-                    size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                    int addressFamily = SocketServer::kDefaultAddressFamily);
-        virtual ~RedisServer();
-        virtual void stop() final;
-
-    private:
-        // Member variables
-        std::atomic<int> _connectedClientsCount;
-
-        // Subscribers
-        // We could store connection states in there, to add better debugging
-        // since a connection state has a readable ID
-        std::map<std::string, std::set<std::shared_ptr<Socket>>> _subscribers;
-        std::mutex _mutex;
-
-        std::atomic<bool> _stopHandlingConnections;
-
-        // Methods
-        virtual void handleConnection(std::shared_ptr<Socket>,
-                                      std::shared_ptr<ConnectionState> connectionState) final;
-        virtual size_t getConnectedClientsCount() final;
-
-        bool startsWith(const std::string& str, const std::string& start);
-        std::string writeString(const std::string& str);
-
-        bool parseRequest(
-            std::shared_ptr<Socket> socket,
-            std::vector<std::string>& tokens);
-
-        bool handlePublish(std::shared_ptr<Socket> socket,
-                           const std::vector<std::string>& tokens);
-
-        bool handleSubscribe(std::shared_ptr<Socket> socket,
-                             const std::vector<std::string>& tokens);
-
-        bool handleCommand(std::shared_ptr<Socket> socket,
-                           const std::vector<std::string>& tokens);
-
-        void cleanupSubscribers(std::shared_ptr<Socket> socket);
-    };
-} // namespace ix

ixsnake/ixsnake/IXSnakeConnectionState.h

@@ -1,61 +0,0 @@
-/*
- *  IXSnakeConnectionState.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXRedisClient.h"
-#include <future>
-#include <ixwebsocket/IXConnectionState.h>
-#include <string>
-
-namespace snake
-{
-    class SnakeConnectionState : public ix::ConnectionState
-    {
-    public:
-        std::string getNonce()
-        {
-            return _nonce;
-        }
-
-        void setNonce(const std::string& nonce)
-        {
-            _nonce = nonce;
-        }
-
-        std::string appkey()
-        {
-            return _appkey;
-        }
-        void setAppkey(const std::string& appkey)
-        {
-            _appkey = appkey;
-        }
-
-        std::string role()
-        {
-            return _role;
-        }
-        void setRole(const std::string& role)
-        {
-            _role = role;
-        }
-
-        ix::RedisClient& redisClient()
-        {
-            return _redisClient;
-        }
-
-        std::future<void> fut;
-
-    private:
-        std::string _nonce;
-        std::string _role;
-        std::string _appkey;
-
-        ix::RedisClient _redisClient;
-    };
-} // namespace snake

ixwebsocket/IXCancellationRequest.cpp

@@ -10,13 +10,14 @@
 
 namespace ix
 {
-    CancellationRequest makeCancellationRequestWithTimeout(
-        int secs, std::atomic<bool>& requestInitCancellation)
+    CancellationRequest makeCancellationRequestWithTimeout(int secs,
+                                                           std::atomic<bool>& requestInitCancellation)
     {
         auto start = std::chrono::system_clock::now();
         auto timeout = std::chrono::seconds(secs);
 
-        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool {
+        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool
+        {
             // Was an explicit cancellation requested ?
             if (requestInitCancellation) return true;
 
@@ -29,4 +30,4 @@ namespace ix
 
         return isCancellationRequested;
     }
-} // namespace ix
+}

ixwebsocket/IXConnectionState.cpp

@@ -10,8 +10,7 @@ namespace ix
 {
     std::atomic<uint64_t> ConnectionState::_globalId(0);
 
-    ConnectionState::ConnectionState()
-        : _terminated(false)
+    ConnectionState::ConnectionState() : _terminated(false)
     {
         computeId();
     }
@@ -40,4 +39,5 @@ namespace ix
     {
         _terminated = true;
     }
-} // namespace ix
+}
+

ixwebsocket/IXDNSLookup.cpp

@@ -5,22 +5,22 @@
  */
 
 #include "IXDNSLookup.h"
-
 #include "IXNetSystem.h"
-#include <chrono>
+
 #include <string.h>
+#include <chrono>
 #include <thread>
 
 namespace ix
 {
     const int64_t DNSLookup::kDefaultWait = 1; // ms
 
-    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait)
-        : _hostname(hostname)
-        , _port(port)
-        , _wait(wait)
-        , _res(nullptr)
-        , _done(false)
+    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait) :
+        _hostname(hostname),
+        _port(port),
+        _wait(wait),
+        _res(nullptr),
+        _done(false)
     {
         ;
     }
@@ -38,7 +38,8 @@ namespace ix
         std::string sport = std::to_string(port);
 
         struct addrinfo* res;
-        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(), &hints, &res);
+        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(),
+                                             &hints, &res);
         if (getaddrinfo_result)
         {
             errMsg = gai_strerror(getaddrinfo_result);
@@ -55,13 +56,13 @@ namespace ix
                            : resolveUnCancellable(errMsg, isCancellationRequested);
     }
 
-    struct addrinfo* DNSLookup::resolveUnCancellable(
-        std::string& errMsg, const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveUnCancellable(std::string& errMsg,
+                                                     const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
         // Maybe a cancellation request got in before the background thread terminated ?
-        if (isCancellationRequested())
+        if (isCancellationRequested && isCancellationRequested())
         {
             errMsg = "cancellation requested";
             return nullptr;
@@ -70,8 +71,8 @@ namespace ix
         return getAddrInfo(_hostname, _port, errMsg);
     }
 
-    struct addrinfo* DNSLookup::resolveCancellable(
-        std::string& errMsg, const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveCancellable(std::string& errMsg,
+                                                   const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -93,7 +94,7 @@ namespace ix
         int port = _port;
         std::string hostname(_hostname);
 
-        // We make the background thread doing the work a shared pointer
+        // We make the background thread doing the work a shared pointer 
         // instead of a member variable, because it can keep running when
         // this object goes out of scope, in case of cancellation
         auto t = std::make_shared<std::thread>(&DNSLookup::run, this, self, hostname, port);
@@ -107,7 +108,7 @@ namespace ix
             std::this_thread::sleep_for(std::chrono::milliseconds(_wait));
 
             // Were we cancelled ?
-            if (isCancellationRequested())
+            if (isCancellationRequested && isCancellationRequested())
             {
                 errMsg = "cancellation requested";
                 return nullptr;
@@ -115,7 +116,7 @@ namespace ix
         }
 
         // Maybe a cancellation request got in before the bg terminated ?
-        if (isCancellationRequested())
+        if (isCancellationRequested && isCancellationRequested())
         {
             errMsg = "cancellation requested";
             return nullptr;
@@ -125,9 +126,7 @@ namespace ix
         return getRes();
     }
 
-    void DNSLookup::run(std::weak_ptr<DNSLookup> self,
-                        std::string hostname,
-                        int port) // thread runner
+    void DNSLookup::run(std::weak_ptr<DNSLookup> self, std::string hostname, int port) // thread runner
     {
         // We don't want to read or write into members variables of an object that could be
         // gone, so we use temporary variables (res) or we pass in by copy everything that
@@ -135,7 +134,7 @@ namespace ix
         std::string errMsg;
         struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
 
-        if (auto lock = self.lock())
+        if (self.lock())
         {
             // Copy result into the member variables
             setRes(res);
@@ -168,4 +167,4 @@ namespace ix
         std::lock_guard<std::mutex> lock(_resMutex);
         return _res;
     }
-} // namespace ix
+}

ixwebsocket/IXExponentialBackoff.cpp

@@ -10,10 +10,11 @@
 
 namespace ix
 {
-    uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,
-                                            uint32_t maxWaitBetweenReconnectionRetries)
+    uint32_t calculateRetryWaitMilliseconds(
+        uint32_t retry_count,
+        uint32_t maxWaitBetweenReconnectionRetries)
     {
-        uint32_t wait_time = (retry_count < 26) ? (std::pow(2, retry_count) * 100) : 0;
+        uint32_t wait_time = std::pow(2, retry_count) * 100;
 
         if (wait_time > maxWaitBetweenReconnectionRetries || wait_time == 0)
         {
@@ -22,4 +23,4 @@ namespace ix
 
         return wait_time;
     }
-} // namespace ix
+}

ixwebsocket/IXExponentialBackoff.h

@@ -10,6 +10,7 @@
 
 namespace ix
 {
-    uint32_t calculateRetryWaitMilliseconds(uint32_t retry_count,
-                                            uint32_t maxWaitBetweenReconnectionRetries);
+    uint32_t calculateRetryWaitMilliseconds(
+        uint32_t retry_count,
+        uint32_t maxWaitBetweenReconnectionRetries);
 } // namespace ix

ixwebsocket/IXHttp.cpp

@@ -5,9 +5,9 @@
  */
 
 #include "IXHttp.h"
-
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
+
 #include <sstream>
 #include <vector>
 
@@ -27,38 +27,7 @@ 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)
+    std::tuple<std::string, std::string, std::string> Http::parseRequestLine(const std::string& line)
     {
         // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
         std::string token;
@@ -115,8 +84,8 @@ namespace ix
 
         // Parse request line (GET /foo HTTP/1.1\r\n)
         auto requestLine = Http::parseRequestLine(line);
-        auto method = std::get<0>(requestLine);
-        auto uri = std::get<1>(requestLine);
+        auto method      = std::get<0>(requestLine);
+        auto uri         = std::get<1>(requestLine);
         auto httpVersion = std::get<2>(requestLine);
 
         // Retrieve and validate HTTP headers
@@ -162,6 +131,8 @@ namespace ix
             return false;
         }
 
-        return response->payload.empty() ? true : socket->writeBytes(response->payload, nullptr);
+        return response->payload.empty()
+            ? true
+            : socket->writeBytes(response->payload, nullptr);
     }
-} // namespace ix
+}

ixwebsocket/IXHttp.h

@@ -9,7 +9,6 @@
 #include "IXProgressCallback.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <tuple>
-#include <unordered_map>
 
 namespace ix
 {
@@ -66,8 +65,7 @@ namespace ix
     };
 
     using HttpResponsePtr = std::shared_ptr<HttpResponse>;
-    using HttpParameters = std::unordered_map<std::string, std::string>;
-    using HttpFormDataParameters = std::unordered_map<std::string, std::string>;
+    using HttpParameters = std::map<std::string, std::string>;
     using Logger = std::function<void(const std::string&)>;
     using OnResponseCallback = std::function<void(const HttpResponsePtr&)>;
 
@@ -77,7 +75,6 @@ namespace ix
         std::string verb;
         WebSocketHttpHeaders extraHeaders;
         std::string body;
-        std::string multipartBoundary;
         int connectTimeout;
         int transferTimeout;
         bool followRedirects;
@@ -118,7 +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/IXHttpClient.cpp

@@ -5,17 +5,17 @@
  */
 
 #include "IXHttpClient.h"
-
-#include "IXSocketFactory.h"
 #include "IXUrlParser.h"
 #include "IXUserAgent.h"
 #include "IXWebSocketHttpHeaders.h"
-#include <assert.h>
-#include <cstring>
-#include <iomanip>
-#include <random>
+#include "IXSocketFactory.h"
+
 #include <sstream>
+#include <iomanip>
 #include <vector>
+#include <cstring>
+
+#include <assert.h>
 #include <zlib.h>
 
 namespace ix
@@ -26,9 +26,7 @@ namespace ix
     const std::string HttpClient::kDel = "DEL";
     const std::string HttpClient::kPut = "PUT";
 
-    HttpClient::HttpClient(bool async)
-        : _async(async)
-        , _stop(false)
+    HttpClient::HttpClient(bool async) : _async(async), _stop(false)
     {
         if (!_async) return;
 
@@ -44,12 +42,8 @@ namespace ix
         _thread.join();
     }
 
-    void HttpClient::setTLSOptions(const SocketTLSOptions& tlsOptions)
-    {
-        _tlsOptions = tlsOptions;
-    }
-
-    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url, const std::string& verb)
+    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url,
+                                                 const std::string& verb)
     {
         auto request = std::make_shared<HttpRequestArgs>();
         request->url = url;
@@ -112,11 +106,12 @@ namespace ix
         }
     }
 
-    HttpResponsePtr HttpClient::request(const std::string& url,
-                                        const std::string& verb,
-                                        const std::string& body,
-                                        HttpRequestArgsPtr args,
-                                        int redirects)
+    HttpResponsePtr HttpClient::request(
+        const std::string& url,
+        const std::string& verb,
+        const std::string& body,
+        HttpRequestArgsPtr args,
+        int redirects)
     {
         // We only have one socket connection, so we cannot
         // make multiple requests concurrently.
@@ -136,30 +131,20 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::UrlMalformed,
-                                                  headers,
-                                                  payload,
-                                                  ss.str(),
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::UrlMalformed,
+                                                  headers, payload, ss.str(),
+                                                  uploadSize, downloadSize);
         }
 
         bool tls = protocol == "https";
         std::string errorMsg;
-        _socket = createSocket(tls, -1, errorMsg, _tlsOptions);
+        _socket = createSocket(tls, errorMsg);
 
         if (!_socket)
         {
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::CannotCreateSocket,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotCreateSocket,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         // Build request string
@@ -169,8 +154,7 @@ namespace ix
 
         if (args->compress)
         {
-            ss << "Accept-Encoding: gzip"
-               << "\r\n";
+            ss << "Accept-Encoding: gzip" << "\r\n";
         }
 
         // Append extra headers
@@ -182,8 +166,7 @@ namespace ix
         // Set a default Accept header if none is present
         if (headers.find("Accept") == headers.end())
         {
-            ss << "Accept: */*"
-               << "\r\n";
+            ss << "Accept: */*" << "\r\n";
         }
 
         // Set a default User agent if none is present
@@ -199,16 +182,7 @@ namespace ix
             // Set default Content-Type if unspecified
             if (args->extraHeaders.find("Content-Type") == args->extraHeaders.end())
             {
-                if (args->multipartBoundary.empty())
-                {
-                    ss << "Content-Type: application/x-www-form-urlencoded"
-                       << "\r\n";
-                }
-                else
-                {
-                    ss << "Content-Type: multipart/form-data; boundary=" << args->multipartBoundary
-                       << "\r\n";
-                }
+                ss << "Content-Type: application/x-www-form-urlencoded" << "\r\n";
             }
             ss << "\r\n";
             ss << body;
@@ -231,14 +205,9 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::CannotConnect,
-                                                  headers,
-                                                  payload,
-                                                  ss.str(),
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotConnect,
+                                                  headers, payload, ss.str(),
+                                                  uploadSize, downloadSize);
         }
 
         // Make a new cancellation object dealing with transfer timeout
@@ -252,7 +221,8 @@ namespace ix
                << "to " << host << ":" << port << std::endl
                << "request size: " << req.size() << " bytes" << std::endl
                << "=============" << std::endl
-               << req << "=============" << std::endl
+               << req
+               << "=============" << std::endl
                << std::endl;
 
             log(ss.str(), args);
@@ -261,14 +231,9 @@ namespace ix
         if (!_socket->writeBytes(req, isCancellationRequested))
         {
             std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::SendError,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::SendError,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         uploadSize = req.size();
@@ -280,14 +245,9 @@ namespace ix
         if (!lineValid)
         {
             std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::CannotReadStatusLine,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadStatusLine,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         if (args->verbose)
@@ -300,14 +260,9 @@ namespace ix
         if (sscanf(line.c_str(), "HTTP/1.1 %d", &code) != 1)
         {
             std::string errorMsg("Cannot parse response code from status line");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::MissingStatus,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::MissingStatus,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         auto result = parseHttpHeaders(_socket, isCancellationRequested);
@@ -317,14 +272,9 @@ namespace ix
         if (!headersValid)
         {
             std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::HeaderParsingError,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::HeaderParsingError,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         // Redirect ?
@@ -333,45 +283,30 @@ namespace ix
             if (headers.find("Location") == headers.end())
             {
                 std::string errorMsg("Missing location header for redirect");
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      HttpErrorCode::MissingLocation,
-                                                      headers,
-                                                      payload,
-                                                      errorMsg,
-                                                      uploadSize,
-                                                      downloadSize);
+                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::MissingLocation,
+                                                      headers, payload, errorMsg,
+                                                      uploadSize, downloadSize);
             }
 
             if (redirects >= args->maxRedirects)
             {
                 std::stringstream ss;
                 ss << "Too many redirects: " << redirects;
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      HttpErrorCode::TooManyRedirects,
-                                                      headers,
-                                                      payload,
-                                                      ss.str(),
-                                                      uploadSize,
-                                                      downloadSize);
+                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::TooManyRedirects,
+                                                      headers, payload, ss.str(),
+                                                      uploadSize, downloadSize);
             }
 
             // Recurse
             std::string location = headers["Location"];
-            return request(location, verb, body, args, redirects + 1);
+            return request(location, verb, body, args, redirects+1);
         }
 
         if (verb == "HEAD")
         {
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::Ok,
-                                                  headers,
-                                                  payload,
-                                                  std::string(),
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
+                                                  headers, payload, std::string(),
+                                                  uploadSize, downloadSize);
         }
 
         // Parse response:
@@ -384,19 +319,15 @@ namespace ix
 
             payload.reserve(contentLength);
 
-            auto chunkResult = _socket->readBytes(
-                contentLength, args->onProgressCallback, isCancellationRequested);
+            auto chunkResult = _socket->readBytes(contentLength,
+                                                  args->onProgressCallback,
+                                                  isCancellationRequested);
             if (!chunkResult.first)
             {
                 errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      HttpErrorCode::ChunkReadError,
-                                                      headers,
-                                                      payload,
-                                                      errorMsg,
-                                                      uploadSize,
-                                                      downloadSize);
+                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                                                      headers, payload, errorMsg,
+                                                      uploadSize, downloadSize);
             }
             payload += chunkResult.second;
         }
@@ -412,14 +343,9 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          HttpErrorCode::ChunkReadError,
-                                                          headers,
-                                                          payload,
-                                                          errorMsg,
-                                                          uploadSize,
-                                                          downloadSize);
+                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                                                          headers, payload, errorMsg,
+                                                          uploadSize, downloadSize);
                 }
 
                 uint64_t chunkSize;
@@ -430,26 +356,23 @@ namespace ix
                 if (args->verbose)
                 {
                     std::stringstream oss;
-                    oss << "Reading " << chunkSize << " bytes" << std::endl;
+                    oss << "Reading " << chunkSize << " bytes"
+                        << std::endl;
                     log(oss.str(), args);
                 }
 
                 payload.reserve(payload.size() + (size_t) chunkSize);
 
                 // Read a chunk
-                auto chunkResult = _socket->readBytes(
-                    (size_t) chunkSize, args->onProgressCallback, isCancellationRequested);
+                auto chunkResult = _socket->readBytes((size_t) chunkSize,
+                                                      args->onProgressCallback,
+                                                      isCancellationRequested);
                 if (!chunkResult.first)
                 {
                     errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          HttpErrorCode::ChunkReadError,
-                                                          headers,
-                                                          payload,
-                                                          errorMsg,
-                                                          uploadSize,
-                                                          downloadSize);
+                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                                                          headers, payload, errorMsg,
+                                                          uploadSize, downloadSize);
                 }
                 payload += chunkResult.second;
 
@@ -458,14 +381,9 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          HttpErrorCode::ChunkReadError,
-                                                          headers,
-                                                          payload,
-                                                          errorMsg,
-                                                          uploadSize,
-                                                          downloadSize);
+                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                                                          headers, payload, errorMsg,
+                                                          uploadSize, downloadSize);
                 }
 
                 if (chunkSize == 0) break;
@@ -478,14 +396,9 @@ namespace ix
         else
         {
             std::string errorMsg("Cannot read http body");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::CannotReadBody,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
+            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadBody,
+                                                  headers, payload, errorMsg,
+                                                  uploadSize, downloadSize);
         }
 
         downloadSize = payload.size();
@@ -497,39 +410,32 @@ namespace ix
             if (!gzipInflate(payload, decompressedPayload))
             {
                 std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      HttpErrorCode::Gzip,
-                                                      headers,
-                                                      payload,
-                                                      errorMsg,
-                                                      uploadSize,
-                                                      downloadSize);
+                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Gzip,
+                                                      headers, payload, errorMsg,
+                                                      uploadSize, downloadSize);
             }
             payload = decompressedPayload;
         }
 
-        return std::make_shared<HttpResponse>(code,
-                                              description,
-                                              HttpErrorCode::Ok,
-                                              headers,
-                                              payload,
-                                              std::string(),
-                                              uploadSize,
-                                              downloadSize);
+        return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
+                                              headers, payload, std::string(),
+                                              uploadSize, downloadSize);
     }
 
-    HttpResponsePtr HttpClient::get(const std::string& url, HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::get(const std::string& url,
+                                    HttpRequestArgsPtr args)
     {
         return request(url, kGet, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::head(const std::string& url, HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::head(const std::string& url,
+                                     HttpRequestArgsPtr args)
     {
         return request(url, kHead, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::del(const std::string& url, HttpRequestArgsPtr args)
+    HttpResponsePtr HttpClient::del(const std::string& url,
+                                    HttpRequestArgsPtr args)
     {
         return request(url, kDel, std::string(), args);
     }
@@ -568,7 +474,8 @@ namespace ix
         escaped.fill('0');
         escaped << std::hex;
 
-        for (std::string::const_iterator i = value.begin(), n = value.end(); i != n; ++i)
+        for (std::string::const_iterator i = value.begin(), n = value.end();
+             i != n; ++i)
         {
             std::string::value_type c = (*i);
 
@@ -596,64 +503,21 @@ namespace ix
 
         for (auto&& it : httpParameters)
         {
-            ss << urlEncode(it.first) << "=" << urlEncode(it.second);
+            ss << urlEncode(it.first)
+               << "="
+               << urlEncode(it.second);
 
-            if (i++ < (count - 1))
+            if (i++ < (count-1))
             {
-                ss << "&";
+               ss << "&";
             }
         }
         return ss.str();
     }
 
-    std::string HttpClient::serializeHttpFormDataParameters(
-        const std::string& multipartBoundary,
-        const HttpFormDataParameters& httpFormDataParameters,
-        const HttpParameters& httpParameters)
-    {
-        //
-        // --AaB03x
-        // Content-Disposition: form-data; name="submit-name"
-
-        // Larry
-        // --AaB03x
-        // Content-Disposition: form-data; name="foo.txt"; filename="file1.txt"
-        // Content-Type: text/plain
-
-        // ... contents of file1.txt ...
-        // --AaB03x--
-        //
-        std::stringstream ss;
-
-        for (auto&& it : httpFormDataParameters)
-        {
-            ss << "--" << multipartBoundary << "\r\n"
-               << "Content-Disposition:"
-               << " form-data; name=\"" << it.first << "\";"
-               << " filename=\"" << it.first << "\""
-               << "\r\n"
-               << "Content-Type: application/octet-stream"
-               << "\r\n"
-               << "\r\n"
-               << it.second << "\r\n";
-        }
-
-        for (auto&& it : httpParameters)
-        {
-            ss << "--" << multipartBoundary << "\r\n"
-               << "Content-Disposition:"
-               << " form-data; name=\"" << it.first << "\";"
-               << "\r\n"
-               << "\r\n"
-               << it.second << "\r\n";
-        }
-
-        ss << "--" << multipartBoundary << "--\r\n";
-
-        return ss.str();
-    }
-
-    bool HttpClient::gzipInflate(const std::string& in, std::string& out)
+    bool HttpClient::gzipInflate(
+        const std::string& in,
+        std::string& out)
     {
         z_stream inflateState;
         std::memset(&inflateState, 0, sizeof(inflateState));
@@ -664,13 +528,13 @@ namespace ix
         inflateState.avail_in = 0;
         inflateState.next_in = Z_NULL;
 
-        if (inflateInit2(&inflateState, 16 + MAX_WBITS) != Z_OK)
+        if (inflateInit2(&inflateState, 16+MAX_WBITS) != Z_OK)
         {
             return false;
         }
 
         inflateState.avail_in = (uInt) in.size();
-        inflateState.next_in = (unsigned char*) (const_cast<char*>(in.data()));
+        inflateState.next_in = (unsigned char *)(const_cast<char *>(in.data()));
 
         const int kBufferSize = 1 << 14;
 
@@ -690,31 +554,22 @@ namespace ix
                 return false;
             }
 
-            out.append(reinterpret_cast<char*>(compressBuffer.get()),
-                       kBufferSize - inflateState.avail_out);
+            out.append(
+                reinterpret_cast<char *>(compressBuffer.get()),
+                kBufferSize - inflateState.avail_out
+            );
         } while (inflateState.avail_out == 0);
 
         inflateEnd(&inflateState);
         return true;
     }
 
-    void HttpClient::log(const std::string& msg, HttpRequestArgsPtr args)
+    void HttpClient::log(const std::string& msg,
+                         HttpRequestArgsPtr args)
     {
         if (args->logger)
         {
             args->logger(msg);
         }
     }
-
-    std::string HttpClient::generateMultipartBoundary()
-    {
-        std::string str("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
-
-        static std::random_device rd;
-        static std::mt19937 generator(rd());
-
-        std::shuffle(str.begin(), str.end(), generator);
-
-        return str;
-    }
-} // namespace ix
+}

ixwebsocket/IXHttpClient.h

@@ -8,7 +8,6 @@
 
 #include "IXHttp.h"
 #include "IXSocket.h"
-#include "IXSocketTLSOptions.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <algorithm>
 #include <atomic>
@@ -59,18 +58,8 @@ namespace ix
         bool performRequest(HttpRequestArgsPtr request,
                             const OnResponseCallback& onResponseCallback);
 
-        // TLS
-        void setTLSOptions(const SocketTLSOptions& tlsOptions);
-
         std::string serializeHttpParameters(const HttpParameters& httpParameters);
 
-        std::string serializeHttpFormDataParameters(
-            const std::string& multipartBoundary,
-            const HttpFormDataParameters& httpFormDataParameters,
-            const HttpParameters& httpParameters = HttpParameters());
-
-        std::string generateMultipartBoundary();
-
         std::string urlEncode(const std::string& value);
 
         const static std::string kPost;
@@ -97,7 +86,5 @@ namespace ix
 
         std::shared_ptr<Socket> _socket;
         std::mutex _mutex; // to protect accessing the _socket (only one socket per client)
-
-        SocketTLSOptions _tlsOptions;
     };
 } // namespace ix

ixwebsocket/IXHttpServer.cpp

@@ -5,12 +5,13 @@
  */
 
 #include "IXHttpServer.h"
-
-#include "IXNetSystem.h"
 #include "IXSocketConnect.h"
-#include "IXUserAgent.h"
-#include <fstream>
+#include "IXSocketFactory.h"
+#include "IXNetSystem.h"
+
+#include <iostream>
 #include <sstream>
+#include <fstream>
 #include <vector>
 
 namespace
@@ -27,7 +28,7 @@ namespace
         file.seekg(0, file.beg);
 
         memblock.resize((size_t) size);
-        file.read((char*) &memblock.front(), static_cast<std::streamsize>(size));
+        file.read((char*)&memblock.front(), static_cast<std::streamsize>(size));
 
         return std::make_pair(true, memblock);
     }
@@ -38,14 +39,15 @@ namespace
         auto vec = res.second;
         return std::make_pair(res.first, std::string(vec.begin(), vec.end()));
     }
-} // namespace
+}
 
 namespace ix
 {
-    HttpServer::HttpServer(
-        int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
-        : SocketServer(port, host, backlog, maxConnections, addressFamily)
-        , _connectedClientsCount(0)
+    HttpServer::HttpServer(int port,
+                           const std::string& host,
+                           int backlog,
+                           size_t maxConnections) : SocketServer(port, host, backlog, maxConnections),
+        _connectedClientsCount(0)
     {
         setDefaultConnectionCallback();
     }
@@ -69,11 +71,18 @@ namespace ix
         _onConnectionCallback = callback;
     }
 
-    void HttpServer::handleConnection(std::shared_ptr<Socket> socket,
-                                      std::shared_ptr<ConnectionState> connectionState)
+    void HttpServer::handleConnection(
+        int fd,
+        std::shared_ptr<ConnectionState> connectionState)
     {
         _connectedClientsCount++;
 
+        std::string errorMsg;
+        auto socket = createSocket(fd, errorMsg);
+
+        // Set the socket to non blocking mode + other tweaks
+        SocketConnect::configure(fd);
+
         auto ret = Http::parseRequest(socket);
         // FIXME: handle errors in parseRequest
 
@@ -99,33 +108,39 @@ namespace ix
     {
         setOnConnectionCallback(
             [this](HttpRequestPtr request,
-                   std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr {
+                   std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr
+            {
                 std::string uri(request->uri);
                 if (uri.empty() || uri == "/")
                 {
                     uri = "/index.html";
                 }
 
-                WebSocketHttpHeaders headers;
-                headers["Server"] = userAgent();
-
                 std::string path("." + uri);
                 auto res = readAsString(path);
                 bool found = res.first;
                 if (!found)
                 {
-                    return std::make_shared<HttpResponse>(
-                        404, "Not Found", HttpErrorCode::Ok, WebSocketHttpHeaders(), std::string());
+                    return std::make_shared<HttpResponse>(404, "Not Found",
+                                                          HttpErrorCode::Ok,
+                                                          WebSocketHttpHeaders(),
+                                                          std::string());
                 }
 
                 std::string content = res.second;
 
                 // Log request
                 std::stringstream ss;
-                ss << request->method << " " << request->headers["User-Agent"] << " "
-                   << request->uri << " " << content.size();
+                ss << request->method
+                   << " "
+                   << request->headers["User-Agent"]
+                   << " "
+                   << request->uri
+                   << " "
+                   << content.size();
                 logInfo(ss.str());
 
+                WebSocketHttpHeaders headers;
                 // FIXME: check extensions to set the content type
                 // headers["Content-Type"] = "application/octet-stream";
                 headers["Accept-Ranges"] = "none";
@@ -135,39 +150,11 @@ namespace ix
                     headers[it.first] = it.second;
                 }
 
-                return std::make_shared<HttpResponse>(
-                    200, "OK", HttpErrorCode::Ok, headers, content);
-            });
+                return std::make_shared<HttpResponse>(200, "OK",
+                                                      HttpErrorCode::Ok,
+                                                      headers,
+                                                      content);
+            }
+        );
     }
-
-    void HttpServer::makeRedirectServer(const std::string& redirectUrl)
-    {
-        //
-        // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Redirections
-        //
-        setOnConnectionCallback(
-            [this,
-             redirectUrl](HttpRequestPtr request,
-                          std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr {
-                WebSocketHttpHeaders headers;
-                headers["Server"] = userAgent();
-
-                // Log request
-                std::stringstream ss;
-                ss << request->method << " " << request->headers["User-Agent"] << " "
-                   << request->uri;
-                logInfo(ss.str());
-
-                if (request->method == "POST")
-                {
-                    return std::make_shared<HttpResponse>(
-                        200, "OK", HttpErrorCode::Ok, headers, std::string());
-                }
-
-                headers["Location"] = redirectUrl;
-
-                return std::make_shared<HttpResponse>(
-                    301, "OK", HttpErrorCode::Ok, headers, std::string());
-            });
-    }
-} // namespace ix
+}

ixwebsocket/IXHttpServer.h

@@ -28,22 +28,19 @@ namespace ix
         HttpServer(int port = SocketServer::kDefaultPort,
                    const std::string& host = SocketServer::kDefaultHost,
                    int backlog = SocketServer::kDefaultTcpBacklog,
-                   size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                   int addressFamily = SocketServer::kDefaultAddressFamily);
+                   size_t maxConnections = SocketServer::kDefaultMaxConnections);
         virtual ~HttpServer();
         virtual void stop() final;
 
         void setOnConnectionCallback(const OnConnectionCallback& callback);
 
-        void makeRedirectServer(const std::string& redirectUrl);
-
     private:
         // Member variables
         OnConnectionCallback _onConnectionCallback;
         std::atomic<int> _connectedClientsCount;
 
         // Methods
-        virtual void handleConnection(std::shared_ptr<Socket>,
+        virtual void handleConnection(int fd,
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
 

ixwebsocket/IXNetSystem.cpp

@@ -34,7 +34,10 @@ namespace ix
         return true;
 #endif
     }
+}
 
+// This function should be in the global namespace
+#ifdef _WIN32
     //
     // That function could 'return WSAPoll(pfd, nfds, timeout);'
     // but WSAPoll is said to have weird behaviors on the internet
@@ -42,9 +45,8 @@ namespace ix
     //
     // So we make it a select wrapper
     //
-    int poll(struct pollfd* fds, nfds_t nfds, int timeout)
+    int poll(struct pollfd *fds, nfds_t nfds, int timeout)
     {
-#ifdef _WIN32
         int maxfd = 0;
         fd_set readfds, writefds, errorfds;
         FD_ZERO(&readfds);
@@ -53,7 +55,7 @@ namespace ix
 
         for (nfds_t i = 0; i < nfds; ++i)
         {
-            struct pollfd* fd = &fds[i];
+            struct pollfd *fd = &fds[i];
 
             if (fd->fd > maxfd)
             {
@@ -77,16 +79,17 @@ 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(maxfd + 1, &readfds, &writefds, &errorfds,
+                         timeout != -1 ? &tv : NULL);
 
-        if (ret < 0)
+        if (ret < 0) 
         {
             return ret;
         }
 
         for (nfds_t i = 0; i < nfds; ++i)
         {
-            struct pollfd* fd = &fds[i];
+            struct pollfd *fd = &fds[i];
             fd->revents = 0;
 
             if (FD_ISSET(fd->fd, &readfds))
@@ -104,9 +107,5 @@ namespace ix
         }
 
         return ret;
-#else
-        return ::poll(fds, nfds, timeout);
-#endif
     }
-
-} // namespace ix
+#endif

ixwebsocket/IXNetSystem.h

@@ -13,15 +13,15 @@
 #include <io.h>
 #include <ws2def.h>
 
-// Define our own poll on Windows, as a wrapper on top of select
+// Define our own poll on Windows
 typedef unsigned long int nfds_t;
 
+int poll(struct pollfd* fds, nfds_t nfds, int timeout);
+
 #else
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <poll.h>
 #include <sys/select.h>
@@ -35,6 +35,4 @@ namespace ix
 {
     bool initNetSystem();
     bool uninitNetSystem();
-
-    int poll(struct pollfd* fds, nfds_t nfds, int timeout);
 } // namespace ix

ixwebsocket/IXSelectInterrupt.cpp

@@ -42,4 +42,5 @@ namespace ix
     {
         return -1;
     }
-} // namespace ix
+}
+

ixwebsocket/IXSelectInterruptEventFd.cpp

@@ -26,13 +26,14 @@
 
 #include "IXSelectInterruptEventFd.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sstream>
-#include <string.h> // for strerror
 #include <sys/eventfd.h>
+
 #include <unistd.h> // for write
+#include <string.h> // for strerror
+#include <fcntl.h>
+#include <errno.h>
+#include <assert.h>
+#include <sstream>
 
 namespace ix
 {
@@ -112,4 +113,4 @@ namespace ix
     {
         return _eventfd;
     }
-} // namespace ix
+}

ixwebsocket/IXSelectInterruptFactory.cpp

@@ -7,9 +7,9 @@
 #include "IXSelectInterruptFactory.h"
 
 #if defined(__linux__) || defined(__APPLE__)
-#include "IXSelectInterruptPipe.h"
+# include <ixwebsocket/IXSelectInterruptPipe.h>
 #else
-#include "IXSelectInterrupt.h"
+# include <ixwebsocket/IXSelectInterrupt.h>
 #endif
 
 namespace ix
@@ -22,4 +22,4 @@ namespace ix
         return std::make_shared<SelectInterrupt>();
 #endif
     }
-} // namespace ix
+}

ixwebsocket/IXSelectInterruptPipe.cpp

@@ -10,12 +10,12 @@
 
 #include "IXSelectInterruptPipe.h"
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sstream>
-#include <string.h> // for strerror
 #include <unistd.h> // for write
+#include <string.h> // for strerror
+#include <fcntl.h>
+#include <errno.h>
+#include <assert.h>
+#include <sstream>
 
 namespace ix
 {
@@ -143,4 +143,4 @@ namespace ix
 
         return _fildes[kPipeReadIndex];
     }
-} // namespace ix
+}

ixwebsocket/IXSocket.cpp

@@ -5,20 +5,21 @@
  */
 
 #include "IXSocket.h"
-
+#include "IXSocketConnect.h"
 #include "IXNetSystem.h"
 #include "IXSelectInterrupt.h"
 #include "IXSelectInterruptFactory.h"
-#include "IXSocketConnect.h"
-#include <algorithm>
-#include <assert.h>
-#include <fcntl.h>
-#include <stdint.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
+#include <stdint.h>
+#include <fcntl.h>
 #include <sys/types.h>
 
+#include <algorithm>
+
 #ifdef min
 #undef min
 #endif
@@ -31,9 +32,9 @@ namespace ix
     const uint64_t Socket::kCloseRequest = 2;
     constexpr size_t Socket::kChunkSize;
 
-    Socket::Socket(int fd)
-        : _sockfd(fd)
-        , _selectInterrupt(createSelectInterrupt())
+    Socket::Socket(int fd) :
+        _sockfd(fd),
+        _selectInterrupt(createSelectInterrupt())
     {
         ;
     }
@@ -49,22 +50,19 @@ namespace ix
                                 std::shared_ptr<SelectInterrupt> selectInterrupt)
     {
         //
-        // We used to use ::select to poll but on Android 9 we get large fds out of
-        // ::connect which crash in FD_SET as they are larger than FD_SETSIZE. Switching
-        // to ::poll does fix that.
+        // We used to use ::select to poll but on Android 9 we get large fds out of ::connect
+        // which crash in FD_SET as they are larger than FD_SETSIZE.
+        // Switching to ::poll does fix that.
         //
-        // However poll isn't as portable as select and has bugs on Windows, so we
-        // have a shim to fallback to select on those platforms. See
-        // https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
+        // However poll isn't as portable as select and has bugs on Windows, so we should write a 
+        // shim to fallback to select on those platforms.
+        // See https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
         //
         nfds_t nfds = 1;
         struct pollfd fds[2];
-        memset(fds, 0, sizeof(fds));
 
         fds[0].fd = sockfd;
         fds[0].events = (readyToRead) ? POLLIN : POLLOUT;
-
-        // this is ignored by poll, but our select based poll wrapper on Windows needs it
         fds[0].events |= POLLERR;
 
         // File descriptor used to interrupt select when needed
@@ -81,7 +79,7 @@ namespace ix
             }
         }
 
-        int ret = ix::poll(fds, nfds, timeoutMs);
+        int ret = ::poll(fds, nfds, timeoutMs);
 
         PollResultType pollResult = PollResultType::ReadyForRead;
         if (ret < 0)
@@ -125,7 +123,8 @@ namespace ix
 
             // getsockopt() puts the errno value for connect into optval so 0
             // means no-error.
-            if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 || optval != 0)
+            if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 ||
+                optval != 0)
             {
                 pollResult = PollResultType::Error;
 
@@ -135,11 +134,6 @@ namespace ix
             }
 #endif
         }
-        else if (sockfd != -1 && (fds[0].revents & POLLERR || fds[0].revents & POLLHUP ||
-                                  fds[0].revents & POLLNVAL))
-        {
-            pollResult = PollResultType::Error;
-        }
 
         return pollResult;
     }
@@ -172,16 +166,6 @@ namespace ix
         return _selectInterrupt->notify(wakeUpCode);
     }
 
-    bool Socket::accept(std::string& errMsg)
-    {
-        if (_sockfd == -1)
-        {
-            errMsg = "Socket is uninitialized";
-            return false;
-        }
-        return true;
-    }
-
     bool Socket::connect(const std::string& host,
                          int port,
                          std::string& errMsg,
@@ -217,7 +201,7 @@ namespace ix
 
     ssize_t Socket::send(const std::string& buffer)
     {
-        return send((char*) &buffer[0], buffer.size());
+        return send((char*)&buffer[0], buffer.size());
     }
 
     ssize_t Socket::recv(void* buffer, size_t length)
@@ -279,7 +263,7 @@ namespace ix
         {
             if (isCancellationRequested && isCancellationRequested()) return false;
 
-            ssize_t ret = send((char*) &str[offset], len);
+            ssize_t ret = send((char*)&str[offset], len);
 
             // We wrote some bytes, as needed, all good.
             if (ret > 0)
@@ -308,7 +292,8 @@ namespace ix
         }
     }
 
-    bool Socket::readByte(void* buffer, const CancellationRequest& isCancellationRequested)
+    bool Socket::readByte(void* buffer,
+                          const CancellationRequest& isCancellationRequested)
     {
         while (true)
         {
@@ -347,7 +332,7 @@ namespace ix
         std::string line;
         line.reserve(64);
 
-        for (int i = 0; i < 2 || (line[i - 2] != '\r' && line[i - 1] != '\n'); ++i)
+        for (int i = 0; i < 2 || (line[i-2] != '\r' && line[i-1] != '\n'); ++i)
         {
             if (!readByte(&c, isCancellationRequested))
             {
@@ -380,16 +365,19 @@ namespace ix
             }
 
             size_t size = std::min(kChunkSize, length - output.size());
-            ssize_t ret = recv((char*) &_readBuffer[0], size);
+            ssize_t ret = recv((char*)&_readBuffer[0], size);
 
-            if (ret > 0)
-            {
-                output.insert(output.end(), _readBuffer.begin(), _readBuffer.begin() + ret);
-            }
-            else if (ret <= 0 && !Socket::isWaitNeeded())
+            if (ret <= 0 && !Socket::isWaitNeeded())
             {
+                // Error
                 return std::make_pair(false, std::string());
             }
+            else
+            {
+                output.insert(output.end(),
+                              _readBuffer.begin(),
+                              _readBuffer.begin() + ret);
+            }
 
             if (onProgressCallback) onProgressCallback((int) output.size(), (int) length);
 
@@ -401,6 +389,7 @@ namespace ix
             }
         }
 
-        return std::make_pair(true, std::string(output.begin(), output.end()));
+        return std::make_pair(true, std::string(output.begin(),
+                                                output.end()));
     }
-} // namespace ix
+}

ixwebsocket/IXSocket.h

@@ -64,8 +64,6 @@ namespace ix
         PollResultType isReadyToRead(int timeoutMs);
 
         // Virtual methods
-        virtual bool accept(std::string& errMsg);
-
         virtual bool connect(const std::string& url,
                              int port,
                              std::string& errMsg,
@@ -73,7 +71,7 @@ namespace ix
         virtual void close();
 
         virtual ssize_t send(char* buffer, size_t length);
-        ssize_t send(const std::string& buffer);
+        virtual ssize_t send(const std::string& buffer);
         virtual ssize_t recv(void* buffer, size_t length);
 
         // Blocking and cancellable versions, working with socket that can be set

ixwebsocket/IXSocketAppleSSL.cpp

@@ -6,13 +6,11 @@
  *  Adapted from Satori SDK Apple SSL code.
  */
 #include "IXSocketAppleSSL.h"
-
 #include "IXSocketConnect.h"
-#include <errno.h>
+
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -20,16 +18,131 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdint.h>
+
+#include <errno.h>
 #define socketerrno errno
 
 #include <Security/SecureTransport.h>
 
+namespace {
+
+OSStatus read_from_socket(SSLConnectionRef connection, void *data, size_t *len)
+{
+    int fd = (int) (long) connection;
+    if (fd < 0)
+        return errSSLInternal;
+
+    assert(data != nullptr);
+    assert(len != nullptr);
+
+    size_t requested_sz = *len;
+
+    ssize_t status = read(fd, data, requested_sz);
+
+    if (status > 0)
+    {
+        *len = (size_t) status;
+        if (requested_sz > *len)
+            return errSSLWouldBlock;
+        else
+            return noErr;
+    }
+    else if (0 == status)
+    {
+        *len = 0;
+        return errSSLClosedGraceful;
+    }
+    else
+    {
+        *len = 0;
+        switch (errno) {
+            case ENOENT:
+                return errSSLClosedGraceful;
+
+            case EAGAIN:
+                return errSSLWouldBlock;
+
+            case ECONNRESET:
+                return errSSLClosedAbort;
+
+            default:
+                return errSecIO;
+        }
+    }
+}
+
+OSStatus write_to_socket(SSLConnectionRef connection, const void *data, size_t *len)
+{
+    int fd = (int) (long) connection;
+    if (fd < 0)
+        return errSSLInternal;
+
+    assert(data != nullptr);
+    assert(len != nullptr);
+
+    size_t to_write_sz = *len;
+    ssize_t status = write(fd, data, to_write_sz);
+
+    if (status > 0)
+    {
+        *len = (size_t) status;
+        if (to_write_sz > *len)
+            return errSSLWouldBlock;
+        else
+            return noErr;
+    }
+    else if (0 == status)
+    {
+        *len = 0;
+        return errSSLClosedGraceful;
+    }
+    else
+    {
+        *len = 0;
+        if (EAGAIN == errno)
+        {
+            return errSSLWouldBlock;
+        }
+        else
+        {
+            return errSecIO;
+        }
+    }
+}
+
+std::string getSSLErrorDescription(OSStatus status)
+{
+    std::string errMsg("Unknown SSL error.");
+
+    CFErrorRef error = CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainOSStatus, status, NULL);
+    if (error)
+    {
+        CFStringRef message = CFErrorCopyDescription(error);
+        if (message)
+        {
+            char localBuffer[128];
+            Boolean success;
+            success = CFStringGetCString(message, localBuffer, 128,
+                                         CFStringGetSystemEncoding());
+            if (success)
+            {
+                errMsg = localBuffer;
+            }
+            CFRelease(message);
+        }
+        CFRelease(error);
+    }
+
+    return errMsg;
+}
+
+} // anonymous namespace
+
 namespace ix
 {
-    SocketAppleSSL::SocketAppleSSL(const SocketTLSOptions& tlsOptions, int fd)
-        : Socket(fd)
-        , _sslContext(nullptr)
-        , _tlsOptions(tlsOptions)
+    SocketAppleSSL::SocketAppleSSL(int fd) : Socket(fd),
+        _sslContext(nullptr)
     {
         ;
     }
@@ -39,131 +152,6 @@ namespace ix
         SocketAppleSSL::close();
     }
 
-    std::string SocketAppleSSL::getSSLErrorDescription(OSStatus status)
-    {
-        std::string errMsg("Unknown SSL error.");
-
-        CFErrorRef error = CFErrorCreate(kCFAllocatorDefault, kCFErrorDomainOSStatus, status, NULL);
-        if (error)
-        {
-            CFStringRef message = CFErrorCopyDescription(error);
-            if (message)
-            {
-                char localBuffer[128];
-                Boolean success;
-                success = CFStringGetCString(message, localBuffer, 128, kCFStringEncodingUTF8);
-                if (success)
-                {
-                    errMsg = localBuffer;
-                }
-                CFRelease(message);
-            }
-            CFRelease(error);
-        }
-
-        return errMsg;
-    }
-
-    OSStatus SocketAppleSSL::readFromSocket(SSLConnectionRef connection, void* data, size_t* len)
-    {
-        int fd = (int) (long) connection;
-        if (fd < 0) return errSSLInternal;
-
-        assert(data != nullptr);
-        assert(len != nullptr);
-
-        size_t requested_sz = *len;
-
-        ssize_t status = read(fd, data, requested_sz);
-
-        if (status > 0)
-        {
-            *len = (size_t) status;
-            if (requested_sz > *len)
-            {
-                return errSSLWouldBlock;
-            }
-            else
-            {
-                return noErr;
-            }
-        }
-        else if (status == 0)
-        {
-            *len = 0;
-            return errSSLClosedGraceful;
-        }
-        else
-        {
-            *len = 0;
-            switch (errno)
-            {
-                case ENOENT: return errSSLClosedGraceful;
-
-                case EAGAIN: return errSSLWouldBlock; // EWOULDBLOCK is a define for EAGAIN on osx
-                case EINPROGRESS: return errSSLWouldBlock;
-
-                case ECONNRESET: return errSSLClosedAbort;
-
-                default: return errSecIO;
-            }
-        }
-    }
-
-    OSStatus SocketAppleSSL::writeToSocket(SSLConnectionRef connection,
-                                           const void* data,
-                                           size_t* len)
-    {
-        int fd = (int) (long) connection;
-        if (fd < 0) return errSSLInternal;
-
-        assert(data != nullptr);
-        assert(len != nullptr);
-
-        size_t to_write_sz = *len;
-        ssize_t status = write(fd, data, to_write_sz);
-
-        if (status > 0)
-        {
-            *len = (size_t) status;
-            if (to_write_sz > *len)
-            {
-                return errSSLWouldBlock;
-            }
-            else
-            {
-                return noErr;
-            }
-        }
-        else if (status == 0)
-        {
-            *len = 0;
-            return errSSLClosedGraceful;
-        }
-        else
-        {
-            *len = 0;
-            switch (errno)
-            {
-                case ENOENT: return errSSLClosedGraceful;
-
-                case EAGAIN: return errSSLWouldBlock; // EWOULDBLOCK is a define for EAGAIN on osx
-                case EINPROGRESS: return errSSLWouldBlock;
-
-                case ECONNRESET: return errSSLClosedAbort;
-
-                default: return errSecIO;
-            }
-        }
-    }
-
-
-    bool SocketAppleSSL::accept(std::string& errMsg)
-    {
-        errMsg = "TLS not supported yet in server mode with apple ssl backend";
-        return false;
-    }
-
     // No wait support
     bool SocketAppleSSL::connect(const std::string& host,
                                  int port,
@@ -179,41 +167,18 @@ namespace ix
 
             _sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLClientSide, kSSLStreamType);
 
-            SSLSetIOFuncs(
-                _sslContext, SocketAppleSSL::readFromSocket, SocketAppleSSL::writeToSocket);
-            SSLSetConnection(_sslContext, (SSLConnectionRef)(long) _sockfd);
+            SSLSetIOFuncs(_sslContext, read_from_socket, write_to_socket);
+            SSLSetConnection(_sslContext, (SSLConnectionRef) (long) _sockfd);
             SSLSetProtocolVersionMin(_sslContext, kTLSProtocol12);
             SSLSetPeerDomainName(_sslContext, host.c_str(), host.size());
 
-            if (_tlsOptions.isPeerVerifyDisabled())
-            {
-                Boolean option(1);
-                SSLSetSessionOption(_sslContext, kSSLSessionOptionBreakOnServerAuth, option);
-
-                do
-                {
-                    status = SSLHandshake(_sslContext);
-                } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
-
-                if (status == errSSLServerAuthCompleted)
-                {
-                    // proceed with the handshake
-                    do
-                    {
-                        status = SSLHandshake(_sslContext);
-                    } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
-                }
-            }
-            else
-            {
-                do
-                {
-                    status = SSLHandshake(_sslContext);
-                } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
-            }
+            do {
+                status = SSLHandshake(_sslContext);
+            } while (errSSLWouldBlock == status ||
+                     errSSLServerAuthCompleted == status);
         }
 
-        if (status != noErr)
+        if (noErr != status)
         {
             errMsg = getSSLErrorDescription(status);
             close();
@@ -238,48 +203,44 @@ namespace ix
 
     ssize_t SocketAppleSSL::send(char* buf, size_t nbyte)
     {
-        OSStatus status = errSSLWouldBlock;
-        while (status == errSSLWouldBlock)
-        {
+        ssize_t ret = 0;
+        OSStatus status;
+        do {
             size_t processed = 0;
             std::lock_guard<std::mutex> lock(_mutex);
             status = SSLWrite(_sslContext, buf, nbyte, &processed);
+            ret += processed;
+            buf += processed;
+            nbyte -= processed;
+        } while (nbyte > 0 && errSSLWouldBlock == status);
 
-            if (processed > 0) return (ssize_t) processed;
+        if (ret == 0 && errSSLClosedAbort != status)
+            ret = -1;
+        return ret;
+    }
 
-            // The connection was reset, inform the caller that this
-            // Socket should close
-            if (status == errSSLClosedGraceful || status == errSSLClosedNoNotify ||
-                status == errSSLClosedAbort)
-            {
-                errno = ECONNRESET;
-                return -1;
-            }
-
-            if (status == errSSLWouldBlock)
-            {
-                errno = EWOULDBLOCK;
-                return -1;
-            }
-        }
-        return -1;
+    ssize_t SocketAppleSSL::send(const std::string& buffer)
+    {
+        return send((char*)&buffer[0], buffer.size());
     }
 
     // No wait support
     ssize_t SocketAppleSSL::recv(void* buf, size_t nbyte)
     {
         OSStatus status = errSSLWouldBlock;
-        while (status == errSSLWouldBlock)
+        while (errSSLWouldBlock == status)
         {
             size_t processed = 0;
             std::lock_guard<std::mutex> lock(_mutex);
             status = SSLRead(_sslContext, buf, nbyte, &processed);
 
-            if (processed > 0) return (ssize_t) processed;
+            if (processed > 0)
+                return (ssize_t) processed;
 
             // The connection was reset, inform the caller that this
             // Socket should close
-            if (status == errSSLClosedGraceful || status == errSSLClosedNoNotify ||
+            if (status == errSSLClosedGraceful ||
+                status == errSSLClosedNoNotify ||
                 status == errSSLClosedAbort)
             {
                 errno = ECONNRESET;
@@ -295,4 +256,4 @@ namespace ix
         return -1;
     }
 
-} // namespace ix
+}

ixwebsocket/IXSocketAppleSSL.h

@@ -8,7 +8,6 @@
 
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include "IXSocketTLSOptions.h"
 #include <Security/SecureTransport.h>
 #include <Security/Security.h>
 #include <mutex>
@@ -18,11 +17,9 @@ namespace ix
     class SocketAppleSSL final : public Socket
     {
     public:
-        SocketAppleSSL(const SocketTLSOptions& tlsOptions, int fd = -1);
+        SocketAppleSSL(int fd = -1);
         ~SocketAppleSSL();
 
-        virtual bool accept(std::string& errMsg) final;
-
         virtual bool connect(const std::string& host,
                              int port,
                              std::string& errMsg,
@@ -30,17 +27,12 @@ namespace ix
         virtual void close() final;
 
         virtual ssize_t send(char* buffer, size_t length) final;
+        virtual ssize_t send(const std::string& buffer) final;
         virtual ssize_t recv(void* buffer, size_t length) final;
 
     private:
-        static std::string getSSLErrorDescription(OSStatus status);
-        static OSStatus writeToSocket(SSLConnectionRef connection, const void* data, size_t* len);
-        static OSStatus readFromSocket(SSLConnectionRef connection, void* data, size_t* len);
-
         SSLContextRef _sslContext;
         mutable std::mutex _mutex; // AppleSSL routines are not thread-safe
-
-        SocketTLSOptions _tlsOptions;
     };
 
 } // namespace ix

ixwebsocket/IXSocketConnect.cpp

@@ -5,35 +5,36 @@
  */
 
 #include "IXSocketConnect.h"
-
 #include "IXDNSLookup.h"
 #include "IXNetSystem.h"
 #include "IXSocket.h"
-#include <fcntl.h>
+
 #include <string.h>
+#include <fcntl.h>
 #include <sys/types.h>
 
 // Android needs extra headers for TCP_NODELAY and IPPROTO_TCP
 #ifdef ANDROID
-#include <linux/in.h>
-#include <linux/tcp.h>
+# include <linux/in.h>
+# include <linux/tcp.h>
 #endif
 
 namespace ix
 {
     //
     // This function can be cancelled every 50 ms
-    // This is important so that we don't block the main UI thread when shutting down a
-    // connection which is already trying to reconnect, and can be blocked waiting for
-    // ::connect to respond.
+    // This is important so that we don't block the main UI thread when shutting down a connection which is
+    // already trying to reconnect, and can be blocked waiting for ::connect to respond.
     //
-    int SocketConnect::connectToAddress(const struct addrinfo* address,
+    int SocketConnect::connectToAddress(const struct addrinfo *address,
                                         std::string& errMsg,
                                         const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
-        int fd = socket(address->ai_family, address->ai_socktype, address->ai_protocol);
+        int fd = socket(address->ai_family,
+                        address->ai_socktype,
+                        address->ai_protocol);
         if (fd < 0)
         {
             errMsg = "Cannot create a socket";
@@ -73,7 +74,8 @@ namespace ix
             else if (pollResult == PollResultType::Error)
             {
                 Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") + strerror(Socket::getErrno());
+                errMsg = std::string("Connect error: ") +
+                            strerror(Socket::getErrno());
                 return -1;
             }
             else if (pollResult == PollResultType::ReadyForWrite)
@@ -83,7 +85,8 @@ namespace ix
             else
             {
                 Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") + strerror(Socket::getErrno());
+                errMsg = std::string("Connect error: ") +
+                            strerror(Socket::getErrno());
                 return -1;
             }
         }
@@ -102,7 +105,7 @@ namespace ix
         // First do DNS resolution
         //
         auto dnsLookup = std::make_shared<DNSLookup>(hostname, port);
-        struct addrinfo* res = dnsLookup->resolve(errMsg, isCancellationRequested);
+        struct addrinfo *res = dnsLookup->resolve(errMsg, isCancellationRequested);
         if (res == nullptr)
         {
             return -1;
@@ -111,7 +114,7 @@ namespace ix
         int sockfd = -1;
 
         // iterate through the records to find a working peer
-        struct addrinfo* address;
+        struct addrinfo *address;
         for (address = res; address != nullptr; address = address->ai_next)
         {
             //
@@ -146,7 +149,8 @@ namespace ix
         // 3. (apple) prevent SIGPIPE from being emitted when the remote end disconnect
 #ifdef SO_NOSIGPIPE
         int value = 1;
-        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void*) &value, sizeof(value));
+        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE,
+                   (void *)&value, sizeof(value));
 #endif
     }
-} // namespace ix
+}

ixwebsocket/IXSocketFactory.cpp

@@ -8,45 +8,46 @@
 
 #ifdef IXWEBSOCKET_USE_TLS
 
-#ifdef IXWEBSOCKET_USE_MBED_TLS
-#include "IXSocketMbedTLS.h"
-#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-#include "IXSocketOpenSSL.h"
-#elif __APPLE__
-#include "IXSocketAppleSSL.h"
-#endif
+# ifdef IXWEBSOCKET_USE_MBED_TLS
+#  include <ixwebsocket/IXSocketMbedTLS.h>
+# elif __APPLE__
+#  include <ixwebsocket/IXSocketAppleSSL.h>
+# elif defined(_WIN32)
+#  include <ixwebsocket/IXSocketSChannel.h>
+# elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+#  include <ixwebsocket/IXSocketOpenSSL.h>
+# endif
 
 #else
 
-#include "IXSocket.h"
+#include <ixwebsocket/IXSocket.h>
 
 #endif
 
 namespace ix
 {
     std::shared_ptr<Socket> createSocket(bool tls,
-                                         int fd,
-                                         std::string& errorMsg,
-                                         const SocketTLSOptions& tlsOptions)
+                                         std::string& errorMsg)
     {
-        (void) tlsOptions;
         errorMsg.clear();
         std::shared_ptr<Socket> socket;
 
         if (!tls)
         {
-            socket = std::make_shared<Socket>(fd);
+            socket = std::make_shared<Socket>();
         }
         else
         {
 #ifdef IXWEBSOCKET_USE_TLS
-#if defined(IXWEBSOCKET_USE_MBED_TLS)
-            socket = std::make_shared<SocketMbedTLS>(tlsOptions, fd);
-#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-            socket = std::make_shared<SocketOpenSSL>(tlsOptions, fd);
-#elif defined(__APPLE__)
-            socket = std::make_shared<SocketAppleSSL>(tlsOptions, fd);
-#endif
+# if defined(IXWEBSOCKET_USE_MBED_TLS)
+            socket = std::make_shared<SocketMbedTLS>();
+# elif defined(__APPLE__)
+            socket = std::make_shared<SocketAppleSSL>();
+# elif defined(_WIN32)
+            socket = std::make_shared<SocketSChannel>();
+# else
+            socket = std::make_shared<SocketOpenSSL>();
+# endif
 #else
             errorMsg = "TLS support is not enabled on this platform.";
             return nullptr;
@@ -60,4 +61,18 @@ namespace ix
 
         return socket;
     }
-} // namespace ix
+
+    std::shared_ptr<Socket> createSocket(int fd,
+                                         std::string& errorMsg)
+    {
+        errorMsg.clear();
+
+        std::shared_ptr<Socket> socket = std::make_shared<Socket>(fd);
+        if (!socket->init(errorMsg))
+        {
+            socket.reset();
+        }
+
+        return socket;
+    }
+}

ixwebsocket/IXSocketFactory.h

@@ -7,15 +7,13 @@
 
 #pragma once
 
-#include "IXSocketTLSOptions.h"
 #include <memory>
 #include <string>
 
 namespace ix
 {
     class Socket;
-    std::shared_ptr<Socket> createSocket(bool tls,
-                                         int fd,
-                                         std::string& errorMsg,
-                                         const SocketTLSOptions& tlsOptions);
+    std::shared_ptr<Socket> createSocket(bool tls, std::string& errorMsg);
+
+    std::shared_ptr<Socket> createSocket(int fd, std::string& errorMsg);
 } // namespace ix

ixwebsocket/IXSocketMbedTLS.cpp

@@ -9,50 +9,34 @@
  */
 
 #include "IXSocketMbedTLS.h"
-
+#include "IXSocketConnect.h"
 #include "IXNetSystem.h"
 #include "IXSocket.h"
-#include "IXSocketConnect.h"
+
 #include <string.h>
 
 namespace ix
 {
-    SocketMbedTLS::SocketMbedTLS(const SocketTLSOptions& tlsOptions, int fd)
-        : Socket(fd)
-        , _tlsOptions(tlsOptions)
-    {
-        initMBedTLS();
-    }
-
     SocketMbedTLS::~SocketMbedTLS()
     {
-        SocketMbedTLS::close();
+        close();
     }
 
-    void SocketMbedTLS::initMBedTLS()
+    bool SocketMbedTLS::init(const std::string& host, std::string& errMsg)
     {
         std::lock_guard<std::mutex> lock(_mutex);
 
         mbedtls_ssl_init(&_ssl);
         mbedtls_ssl_config_init(&_conf);
         mbedtls_ctr_drbg_init(&_ctr_drbg);
+
+        const char *pers = "IXSocketMbedTLS";
+
         mbedtls_entropy_init(&_entropy);
-        mbedtls_x509_crt_init(&_cacert);
-        mbedtls_x509_crt_init(&_cert);
-        mbedtls_pk_init(&_pkey);
-    }
-
-    bool SocketMbedTLS::init(const std::string& host, bool isClient, std::string& errMsg)
-    {
-        initMBedTLS();
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        const char* pers = "IXSocketMbedTLS";
-
         if (mbedtls_ctr_drbg_seed(&_ctr_drbg,
                                   mbedtls_entropy_func,
                                   &_entropy,
-                                  (const unsigned char*) pers,
+                                  (const unsigned char *) pers,
                                   strlen(pers)) != 0)
         {
             errMsg = "Setting entropy seed failed";
@@ -60,9 +44,9 @@ namespace ix
         }
 
         if (mbedtls_ssl_config_defaults(&_conf,
-                                        (isClient) ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER,
+                                        MBEDTLS_SSL_IS_CLIENT,
                                         MBEDTLS_SSL_TRANSPORT_STREAM,
-                                        MBEDTLS_SSL_PRESET_DEFAULT) != 0)
+                                        MBEDTLS_SSL_PRESET_DEFAULT ) != 0)
         {
             errMsg = "Setting config default failed";
             return false;
@@ -70,47 +54,8 @@ namespace ix
 
         mbedtls_ssl_conf_rng(&_conf, mbedtls_ctr_drbg_random, &_ctr_drbg);
 
-        if (_tlsOptions.hasCertAndKey())
-        {
-            if (mbedtls_x509_crt_parse_file(&_cert, _tlsOptions.certFile.c_str()) < 0)
-            {
-                errMsg = "Cannot parse cert file '" + _tlsOptions.certFile + "'";
-                return false;
-            }
-            if (mbedtls_pk_parse_keyfile(&_pkey, _tlsOptions.keyFile.c_str(), "") < 0)
-            {
-                errMsg = "Cannot parse key file '" + _tlsOptions.keyFile + "'";
-                return false;
-            }
-            if (mbedtls_ssl_conf_own_cert(&_conf, &_cert, &_pkey) < 0)
-            {
-                errMsg = "Problem configuring cert '" + _tlsOptions.certFile + "'";
-                return false;
-            }
-        }
-
-        if (_tlsOptions.isPeerVerifyDisabled())
-        {
-            mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_NONE);
-        }
-        else
-        {
-            mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_REQUIRED);
-
-            // FIXME: should we call mbedtls_ssl_conf_verify ?
-
-            if (_tlsOptions.isUsingSystemDefaults())
-            {
-                ; // FIXME
-            }
-            else if (mbedtls_x509_crt_parse_file(&_cacert, _tlsOptions.caFile.c_str()) < 0)
-            {
-                errMsg = "Cannot parse CA file '" + _tlsOptions.caFile + "'";
-                return false;
-            }
-
-            mbedtls_ssl_conf_ca_chain(&_conf, &_cacert, NULL);
-        }
+        // FIXME: cert verification is disabled
+        mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_NONE);
 
         if (mbedtls_ssl_setup(&_ssl, &_conf) != 0)
         {
@@ -118,7 +63,7 @@ namespace ix
             return false;
         }
 
-        if (!host.empty() && mbedtls_ssl_set_hostname(&_ssl, host.c_str()) != 0)
+        if (mbedtls_ssl_set_hostname(&_ssl, host.c_str()) != 0)
         {
             errMsg = "SNI setup failed";
             return false;
@@ -127,50 +72,6 @@ namespace ix
         return true;
     }
 
-    bool SocketMbedTLS::accept(std::string& errMsg)
-    {
-        bool isClient = false;
-        bool initialized = init(std::string(), isClient, errMsg);
-        if (!initialized)
-        {
-            close();
-            return false;
-        }
-
-        mbedtls_ssl_set_bio(&_ssl, &_sockfd, mbedtls_net_send, mbedtls_net_recv, NULL);
-
-        int res;
-        do
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-            res = mbedtls_ssl_handshake(&_ssl);
-        } while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
-
-        if (res != 0)
-        {
-            char buf[256];
-            mbedtls_strerror(res, buf, sizeof(buf));
-
-            errMsg = "error in handshake : ";
-            errMsg += buf;
-
-            if (res == MBEDTLS_ERR_X509_CERT_VERIFY_FAILED)
-            {
-                char verifyBuf[512];
-                uint32_t flags = mbedtls_ssl_get_verify_result(&_ssl);
-
-                mbedtls_x509_crt_verify_info(verifyBuf, sizeof(verifyBuf), "  ! ", flags);
-                errMsg += " : ";
-                errMsg += verifyBuf;
-            }
-
-            close();
-            return false;
-        }
-
-        return true;
-    }
-
     bool SocketMbedTLS::connect(const std::string& host,
                                 int port,
                                 std::string& errMsg,
@@ -182,9 +83,7 @@ namespace ix
             if (_sockfd == -1) return false;
         }
 
-        bool isClient = true;
-        bool initialized = init(host, isClient, errMsg);
-        if (!initialized)
+        if (!init(host, errMsg))
         {
             close();
             return false;
@@ -197,7 +96,8 @@ namespace ix
         {
             std::lock_guard<std::mutex> lock(_mutex);
             res = mbedtls_ssl_handshake(&_ssl);
-        } while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
+        }
+        while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
 
         if (res != 0)
         {
@@ -222,31 +122,36 @@ namespace ix
         mbedtls_ssl_config_free(&_conf);
         mbedtls_ctr_drbg_free(&_ctr_drbg);
         mbedtls_entropy_free(&_entropy);
-        mbedtls_x509_crt_free(&_cacert);
-        mbedtls_x509_crt_free(&_cert);
 
         Socket::close();
     }
 
     ssize_t SocketMbedTLS::send(char* buf, size_t nbyte)
     {
-        std::lock_guard<std::mutex> lock(_mutex);
+        ssize_t sent = 0;
 
-        ssize_t res = mbedtls_ssl_write(&_ssl, (unsigned char*) buf, nbyte);
+        while (nbyte > 0)
+        {
+            std::lock_guard<std::mutex> lock(_mutex);
 
-        if (res > 0)
-        {
-            return res;
-        }
-        else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE)
-        {
-            errno = EWOULDBLOCK;
-            return -1;
-        }
-        else
-        {
-            return -1;
+            ssize_t res = mbedtls_ssl_write(&_ssl, (unsigned char*) buf, nbyte);
+
+            if (res > 0) {
+                nbyte -= res;
+                sent += res;
+            } else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE) {
+                errno = EWOULDBLOCK;
+                return -1;
+            } else {
+                return -1;
+            }
         }
+        return sent;
+    }
+
+    ssize_t SocketMbedTLS::send(const std::string& buffer)
+    {
+        return send((char*)&buffer[0], buffer.size());
     }
 
     ssize_t SocketMbedTLS::recv(void* buf, size_t nbyte)
@@ -270,4 +175,4 @@ namespace ix
         }
     }
 
-} // namespace ix
+}

ixwebsocket/IXSocketMbedTLS.h

@@ -7,15 +7,12 @@
 #pragma once
 
 #include "IXSocket.h"
-#include "IXSocketTLSOptions.h"
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/debug.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
 #include <mbedtls/net.h>
 #include <mbedtls/platform.h>
-#include <mbedtls/x509.h>
-#include <mbedtls/x509_crt.h>
 #include <mutex>
 
 namespace ix
@@ -23,11 +20,9 @@ namespace ix
     class SocketMbedTLS final : public Socket
     {
     public:
-        SocketMbedTLS(const SocketTLSOptions& tlsOptions, int fd = -1);
+        SocketMbedTLS() = default;
         ~SocketMbedTLS();
 
-        virtual bool accept(std::string& errMsg) final;
-
         virtual bool connect(const std::string& host,
                              int port,
                              std::string& errMsg,
@@ -35,6 +30,7 @@ namespace ix
         virtual void close() final;
 
         virtual ssize_t send(char* buffer, size_t length) final;
+        virtual ssize_t send(const std::string& buffer) final;
         virtual ssize_t recv(void* buffer, size_t length) final;
 
     private:
@@ -42,15 +38,10 @@ namespace ix
         mbedtls_ssl_config _conf;
         mbedtls_entropy_context _entropy;
         mbedtls_ctr_drbg_context _ctr_drbg;
-        mbedtls_x509_crt _cacert;
-        mbedtls_x509_crt _cert;
-        mbedtls_pk_context _pkey;
 
         std::mutex _mutex;
-        SocketTLSOptions _tlsOptions;
 
-        bool init(const std::string& host, bool isClient, std::string& errMsg);
-        void initMBedTLS();
+        bool init(const std::string& host, std::string& errMsg);
     };
 
 } // namespace ix

ixwebsocket/IXSocketOpenSSL.cpp

@@ -1,44 +1,30 @@
 /*
  *  IXSocketOpenSSL.cpp
- *  Author: Benjamin Sergeant, Matt DeBoer
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  *
  *  Adapted from Satori SDK OpenSSL code.
  */
 
 #include "IXSocketOpenSSL.h"
-
 #include "IXSocketConnect.h"
+
 #include <cassert>
-#include <errno.h>
-#ifdef _WIN32
-#include <Shlwapi.h>
-#else
-#include <fnmatch.h>
-#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+
 #include <openssl/x509v3.h>
-#endif
+
+#include <fnmatch.h>
+#include <errno.h>
 #define socketerrno errno
 
 namespace ix
 {
-    const std::string kDefaultCiphers =
-        "ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-SHA "
-        "ECDHE-ECDSA-AES256-SHA ECDHE-ECDSA-AES128-SHA256 ECDHE-ECDSA-AES256-SHA384 "
-        "ECDHE-RSA-AES128-GCM-SHA256 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES128-SHA "
-        "ECDHE-RSA-AES256-SHA ECDHE-RSA-AES128-SHA256 ECDHE-RSA-AES256-SHA384 "
-        "DHE-RSA-AES128-GCM-SHA256 DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES128-SHA "
-        "DHE-RSA-AES256-SHA DHE-RSA-AES128-SHA256 DHE-RSA-AES256-SHA256 AES128-SHA";
-
     std::atomic<bool> SocketOpenSSL::_openSSLInitializationSuccessful(false);
     std::once_flag SocketOpenSSL::_openSSLInitFlag;
 
-    SocketOpenSSL::SocketOpenSSL(const SocketTLSOptions& tlsOptions, int fd)
-        : Socket(fd)
-        , _ssl_connection(nullptr)
-        , _ssl_context(nullptr)
-        , _tlsOptions(tlsOptions)
+    SocketOpenSSL::SocketOpenSSL(int fd) : Socket(fd),
+        _ssl_connection(nullptr),
+        _ssl_context(nullptr)
     {
         std::call_once(_openSSLInitFlag, &SocketOpenSSL::openSSLInitialize, this);
     }
@@ -128,11 +114,15 @@ namespace ix
         SSL_CTX* ctx = SSL_CTX_new(_ssl_method);
         if (ctx)
         {
-            SSL_CTX_set_mode(ctx,
-                             SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+            // To skip verification, pass in SSL_VERIFY_NONE
+            SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER,
+                               [](int preverify, X509_STORE_CTX*) -> int
+                               {
+                                   return preverify;
+                               });
 
-            SSL_CTX_set_options(
-                ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_CIPHER_SERVER_PREFERENCE);
+            SSL_CTX_set_verify_depth(ctx, 4);
+            SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
         }
         return ctx;
     }
@@ -140,20 +130,16 @@ namespace ix
     /**
      * Check whether a hostname matches a pattern
      */
-    bool SocketOpenSSL::checkHost(const std::string& host, const char* pattern)
+    bool SocketOpenSSL::checkHost(const std::string& host, const char *pattern)
     {
-#ifdef _WIN32
-        return PathMatchSpecA(host.c_str(), pattern);
-#else
         return fnmatch(pattern, host.c_str(), 0) != FNM_NOMATCH;
-#endif
     }
 
-    bool SocketOpenSSL::openSSLCheckServerCert(SSL* ssl,
+    bool SocketOpenSSL::openSSLCheckServerCert(SSL *ssl,
                                                const std::string& hostname,
                                                std::string& errMsg)
     {
-        X509* server_cert = SSL_get_peer_certificate(ssl);
+        X509 *server_cert = SSL_get_peer_certificate(ssl);
         if (server_cert == nullptr)
         {
             errMsg = "OpenSSL failed - peer didn't present a X509 certificate.";
@@ -163,17 +149,18 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
         // Check server name
         bool hostname_verifies_ok = false;
-        STACK_OF(GENERAL_NAME)* san_names = (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i(
-            (X509*) server_cert, NID_subject_alt_name, NULL, NULL);
+        STACK_OF(GENERAL_NAME) *san_names =
+            (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i((X509 *)server_cert,
+                                                       NID_subject_alt_name, NULL, NULL);
         if (san_names)
         {
-            for (int i = 0; i < sk_GENERAL_NAME_num(san_names); i++)
+            for (int i=0; i<sk_GENERAL_NAME_num(san_names); i++)
             {
-                const GENERAL_NAME* sk_name = sk_GENERAL_NAME_value(san_names, i);
+                const GENERAL_NAME *sk_name = sk_GENERAL_NAME_value(san_names, i);
                 if (sk_name->type == GEN_DNS)
                 {
-                    char* name = (char*) ASN1_STRING_data(sk_name->d.dNSName);
-                    if ((size_t) ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
+                    char *name = (char *)ASN1_STRING_data(sk_name->d.dNSName);
+                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
                         checkHost(hostname, name))
                     {
                         hostname_verifies_ok = true;
@@ -186,20 +173,20 @@ namespace ix
 
         if (!hostname_verifies_ok)
         {
-            int cn_pos = X509_NAME_get_index_by_NID(
-                X509_get_subject_name((X509*) server_cert), NID_commonName, -1);
+            int cn_pos = X509_NAME_get_index_by_NID(X509_get_subject_name((X509 *)server_cert),
+                                                    NID_commonName, -1);
             if (cn_pos)
             {
-                X509_NAME_ENTRY* cn_entry =
-                    X509_NAME_get_entry(X509_get_subject_name((X509*) server_cert), cn_pos);
+                X509_NAME_ENTRY *cn_entry = X509_NAME_get_entry(
+                    X509_get_subject_name((X509 *)server_cert), cn_pos);
 
                 if (cn_entry)
                 {
-                    ASN1_STRING* cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
-                    char* cn = (char*) ASN1_STRING_data(cn_asn1);
+                    ASN1_STRING *cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
+                    char *cn = (char *)ASN1_STRING_data(cn_asn1);
 
-                    if ((size_t) ASN1_STRING_length(cn_asn1) == strlen(cn) &&
-                        checkHost(hostname, cn))
+                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) &&
+                       checkHost(hostname, cn))
                     {
                         hostname_verifies_ok = true;
                     }
@@ -218,7 +205,7 @@ namespace ix
         return true;
     }
 
-    bool SocketOpenSSL::openSSLClientHandshake(const std::string& host, std::string& errMsg)
+    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg)
     {
         while (true)
         {
@@ -253,274 +240,6 @@ namespace ix
         }
     }
 
-    bool SocketOpenSSL::openSSLServerHandshake(std::string& errMsg)
-    {
-        while (true)
-        {
-            if (_ssl_connection == nullptr || _ssl_context == nullptr)
-            {
-                return false;
-            }
-
-            ERR_clear_error();
-            int accept_result = SSL_accept(_ssl_connection);
-            if (accept_result == 1)
-            {
-                return true;
-            }
-            int reason = SSL_get_error(_ssl_connection, accept_result);
-
-            bool rc = false;
-            if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
-            {
-                rc = true;
-            }
-            else
-            {
-                errMsg = getSSLError(accept_result);
-                rc = false;
-            }
-
-            if (!rc)
-            {
-                return false;
-            }
-        }
-    }
-
-    bool SocketOpenSSL::handleTLSOptions(std::string& errMsg)
-    {
-        ERR_clear_error();
-        if (_tlsOptions.hasCertAndKey())
-        {
-            if (SSL_CTX_use_certificate_chain_file(_ssl_context, _tlsOptions.certFile.c_str()) != 1)
-            {
-                auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
-                         _tlsOptions.certFile + "\") failed: ";
-                errMsg += ERR_error_string(sslErr, nullptr);
-            }
-            else if (SSL_CTX_use_PrivateKey_file(
-                         _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
-            {
-                auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" + _tlsOptions.keyFile +
-                         "\") failed: ";
-                errMsg += ERR_error_string(sslErr, nullptr);
-            }
-            else if (!SSL_CTX_check_private_key(_ssl_context))
-            {
-                auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - cert/key mismatch(\"" + _tlsOptions.certFile + ", " +
-                         _tlsOptions.keyFile + "\")";
-                errMsg += ERR_error_string(sslErr, nullptr);
-            }
-        }
-
-        ERR_clear_error();
-        if (!_tlsOptions.isPeerVerifyDisabled())
-        {
-            if (_tlsOptions.isUsingSystemDefaults())
-            {
-                if (SSL_CTX_set_default_verify_paths(_ssl_context) == 0)
-                {
-                    auto sslErr = ERR_get_error();
-                    errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
-                    errMsg += ERR_error_string(sslErr, nullptr);
-                    return false;
-                }
-            }
-            else if (SSL_CTX_load_verify_locations(
-                         _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
-            {
-                auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + _tlsOptions.caFile +
-                         "\") failed: ";
-                errMsg += ERR_error_string(sslErr, nullptr);
-                return false;
-            }
-
-            SSL_CTX_set_verify(_ssl_context,
-                               SSL_VERIFY_PEER,
-                               [](int preverify, X509_STORE_CTX*) -> int { return preverify; });
-            SSL_CTX_set_verify_depth(_ssl_context, 4);
-        }
-        else
-        {
-            SSL_CTX_set_verify(_ssl_context, SSL_VERIFY_NONE, nullptr);
-        }
-
-        if (_tlsOptions.isUsingDefaultCiphers())
-        {
-            if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
-            {
-                auto sslErr = ERR_get_error();
-                errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + kDefaultCiphers +
-                         "\") failed: ";
-                errMsg += ERR_error_string(sslErr, nullptr);
-                return false;
-            }
-        }
-        else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
-        {
-            auto sslErr = ERR_get_error();
-            errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + _tlsOptions.ciphers +
-                     "\") failed: ";
-            errMsg += ERR_error_string(sslErr, nullptr);
-            return false;
-        }
-
-        return true;
-    }
-
-    bool SocketOpenSSL::accept(std::string& errMsg)
-    {
-        bool handshakeSuccessful = false;
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            if (!_openSSLInitializationSuccessful)
-            {
-                errMsg = "OPENSSL_init_ssl failure";
-                return false;
-            }
-
-            if (_sockfd == -1)
-            {
-                return false;
-            }
-
-            {
-                const SSL_METHOD* method = SSLv23_server_method();
-                if (method == nullptr)
-                {
-                    errMsg = "SSLv23_server_method failure";
-                    _ssl_context = nullptr;
-                }
-                else
-                {
-                    _ssl_method = method;
-
-                    _ssl_context = SSL_CTX_new(_ssl_method);
-                    if (_ssl_context)
-                    {
-                        SSL_CTX_set_mode(_ssl_context, SSL_MODE_ENABLE_PARTIAL_WRITE);
-                        SSL_CTX_set_mode(_ssl_context, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
-                        SSL_CTX_set_options(_ssl_context,
-                                            SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-                    }
-                }
-            }
-
-            if (_ssl_context == nullptr)
-            {
-                return false;
-            }
-
-            ERR_clear_error();
-            if (_tlsOptions.hasCertAndKey())
-            {
-                if (SSL_CTX_use_certificate_chain_file(_ssl_context,
-                                                       _tlsOptions.certFile.c_str()) != 1)
-                {
-                    auto sslErr = ERR_get_error();
-                    errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
-                             _tlsOptions.certFile + "\") failed: ";
-                    errMsg += ERR_error_string(sslErr, nullptr);
-                }
-                else if (SSL_CTX_use_PrivateKey_file(
-                             _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
-                {
-                    auto sslErr = ERR_get_error();
-                    errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" +
-                             _tlsOptions.keyFile + "\") failed: ";
-                    errMsg += ERR_error_string(sslErr, nullptr);
-                }
-            }
-
-
-            ERR_clear_error();
-            if (!_tlsOptions.isPeerVerifyDisabled())
-            {
-                if (_tlsOptions.isUsingSystemDefaults())
-                {
-                    if (SSL_CTX_set_default_verify_paths(_ssl_context) == 0)
-                    {
-                        auto sslErr = ERR_get_error();
-                        errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
-                        errMsg += ERR_error_string(sslErr, nullptr);
-                    }
-                }
-                else
-                {
-                    const char* root_ca_file = _tlsOptions.caFile.c_str();
-                    STACK_OF(X509_NAME) * rootCAs;
-                    rootCAs = SSL_load_client_CA_file(root_ca_file);
-                    if (rootCAs == NULL)
-                    {
-                        auto sslErr = ERR_get_error();
-                        errMsg = "OpenSSL failed - SSL_load_client_CA_file('" + _tlsOptions.caFile +
-                                 "') failed: ";
-                        errMsg += ERR_error_string(sslErr, nullptr);
-                    }
-                    else
-                    {
-                        SSL_CTX_set_client_CA_list(_ssl_context, rootCAs);
-                        if (SSL_CTX_load_verify_locations(_ssl_context, root_ca_file, nullptr) != 1)
-                        {
-                            auto sslErr = ERR_get_error();
-                            errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" +
-                                     _tlsOptions.caFile + "\") failed: ";
-                            errMsg += ERR_error_string(sslErr, nullptr);
-                        }
-                    }
-                }
-
-                SSL_CTX_set_verify(
-                    _ssl_context, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
-                SSL_CTX_set_verify_depth(_ssl_context, 4);
-            }
-            else
-            {
-                SSL_CTX_set_verify(_ssl_context, SSL_VERIFY_NONE, nullptr);
-            }
-            if (_tlsOptions.isUsingDefaultCiphers())
-            {
-                if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
-                {
-                    return false;
-                }
-            }
-            else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
-            {
-                return false;
-            }
-
-            _ssl_connection = SSL_new(_ssl_context);
-            if (_ssl_connection == nullptr)
-            {
-                errMsg = "OpenSSL failed to connect";
-                SSL_CTX_free(_ssl_context);
-                _ssl_context = nullptr;
-                return false;
-            }
-
-            SSL_set_ecdh_auto(_ssl_connection, 1);
-
-            SSL_set_fd(_ssl_connection, _sockfd);
-
-            handshakeSuccessful = openSSLServerHandshake(errMsg);
-        }
-
-        if (!handshakeSuccessful)
-        {
-            close();
-            return false;
-        }
-
-        return true;
-    }
-
     bool SocketOpenSSL::connect(const std::string& host,
                                 int port,
                                 std::string& errMsg,
@@ -545,9 +264,13 @@ namespace ix
                 return false;
             }
 
-            if (!handleTLSOptions(errMsg))
+            ERR_clear_error();
+            int cert_load_result = SSL_CTX_set_default_verify_paths(_ssl_context);
+            if (cert_load_result == 0)
             {
-                return false;
+                unsigned long ssl_err = ERR_get_error();
+                errMsg = "OpenSSL failed - SSL_CTX_default_verify_paths loading failed: ";
+                errMsg += ERR_error_string(ssl_err, nullptr);
             }
 
             _ssl_connection = SSL_new(_ssl_context);
@@ -566,12 +289,13 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
             // Support for server name verification
             // (The docs say that this should work from 1.0.2, and is the default from
-            // 1.1.0, but it does not. To be on the safe side, the manual test
-            // below is enabled for all versions prior to 1.1.0.)
-            X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection);
+            // 1.1.0, but it does not. To be on the safe side, the manual test below is
+            // enabled for all versions prior to 1.1.0.)
+            X509_VERIFY_PARAM *param = SSL_get0_param(_ssl_connection);
             X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
 #endif
-            handshakeSuccessful = openSSLClientHandshake(host, errMsg);
+
+            handshakeSuccessful = openSSLHandshake(host, errMsg);
         }
 
         if (!handshakeSuccessful)
@@ -603,30 +327,37 @@ namespace ix
 
     ssize_t SocketOpenSSL::send(char* buf, size_t nbyte)
     {
-        std::lock_guard<std::mutex> lock(_mutex);
+        ssize_t sent = 0;
 
-        if (_ssl_connection == nullptr || _ssl_context == nullptr)
+        while (nbyte > 0)
         {
-            return 0;
-        }
+            std::lock_guard<std::mutex> lock(_mutex);
 
-        ERR_clear_error();
-        ssize_t write_result = SSL_write(_ssl_connection, buf, (int) nbyte);
-        int reason = SSL_get_error(_ssl_connection, (int) write_result);
+            if (_ssl_connection == nullptr || _ssl_context == nullptr)
+            {
+                return 0;
+            }
 
-        if (reason == SSL_ERROR_NONE)
-        {
-            return write_result;
-        }
-        else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
-        {
-            errno = EWOULDBLOCK;
-            return -1;
-        }
-        else
-        {
-            return -1;
+            ERR_clear_error();
+            ssize_t write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte);
+            int reason = SSL_get_error(_ssl_connection, (int) write_result);
+
+            if (reason == SSL_ERROR_NONE) {
+                nbyte -= write_result;
+                sent += write_result;
+            } else if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE) {
+                errno = EWOULDBLOCK;
+                return -1;
+            } else {
+                return -1;
+            }
         }
+        return sent;
+    }
+
+    ssize_t SocketOpenSSL::send(const std::string& buffer)
+    {
+        return send((char*)&buffer[0], buffer.size());
     }
 
     ssize_t SocketOpenSSL::recv(void* buf, size_t nbyte)
@@ -658,4 +389,4 @@ namespace ix
         }
     }
 
-} // namespace ix
+}

ixwebsocket/IXSocketOpenSSL.h

@@ -1,14 +1,13 @@
 /*
  *  IXSocketOpenSSL.h
- *  Author: Benjamin Sergeant, Matt DeBoer
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  */
 
 #pragma once
 
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include "IXSocketTLSOptions.h"
 #include <mutex>
 #include <openssl/bio.h>
 #include <openssl/conf.h>
@@ -21,11 +20,9 @@ namespace ix
     class SocketOpenSSL final : public Socket
     {
     public:
-        SocketOpenSSL(const SocketTLSOptions& tlsOptions, int fd = -1);
+        SocketOpenSSL(int fd = -1);
         ~SocketOpenSSL();
 
-        virtual bool accept(std::string& errMsg) final;
-
         virtual bool connect(const std::string& host,
                              int port,
                              std::string& errMsg,
@@ -33,23 +30,20 @@ namespace ix
         virtual void close() final;
 
         virtual ssize_t send(char* buffer, size_t length) final;
+        virtual ssize_t send(const std::string& buffer) final;
         virtual ssize_t recv(void* buffer, size_t length) final;
 
     private:
         void openSSLInitialize();
         std::string getSSLError(int ret);
         SSL_CTX* openSSLCreateContext(std::string& errMsg);
-        bool openSSLClientHandshake(const std::string& hostname, std::string& errMsg);
+        bool openSSLHandshake(const std::string& hostname, std::string& errMsg);
         bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
         bool checkHost(const std::string& host, const char* pattern);
-        bool handleTLSOptions(std::string& errMsg);
-        bool openSSLServerHandshake(std::string& errMsg);
 
         SSL* _ssl_connection;
         SSL_CTX* _ssl_context;
         const SSL_METHOD* _ssl_method;
-        SocketTLSOptions _tlsOptions;
-
         mutable std::mutex _mutex; // OpenSSL routines are not thread-safe
 
         static std::once_flag _openSSLInitFlag;

ixwebsocket/IXSocketSChannel.cpp

@@ -0,0 +1,106 @@
+/*
+ *  IXSocketSChannel.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ *
+ *  See https://docs.microsoft.com/en-us/windows/desktop/WinSock/using-secure-socket-extensions
+ *
+ *  https://github.com/pauldotknopf/WindowsSDK7-Samples/blob/master/netds/winsock/securesocket/stcpclient/tcpclient.c
+ *
+ *  This is the right example to look at:
+ *  https://www.codeproject.com/Articles/1000189/A-Working-TCP-Client-and-Server-With-SSL
+ */
+#include "IXSocketSChannel.h"
+
+#ifdef _WIN32
+# include <basetsd.h>
+# include <WinSock2.h>
+# include <ws2def.h>
+# include <WS2tcpip.h>
+# include <schannel.h>
+# include <io.h>
+
+#define WIN32_LEAN_AND_MEAN
+
+#ifndef UNICODE
+#define UNICODE
+#endif
+
+#include <windows.h>
+#include <winsock2.h>
+#include <mstcpip.h>
+#include <ws2tcpip.h>
+#include <rpc.h>
+#include <ntdsapi.h>
+#include <stdio.h>
+#include <tchar.h>
+
+#define RECV_DATA_BUF_SIZE 256
+
+// Link with ws2_32.lib
+#pragma comment(lib, "Ws2_32.lib")
+
+// link with fwpuclnt.lib for Winsock secure socket extensions
+#pragma comment(lib, "fwpuclnt.lib")
+
+// link with ntdsapi.lib for DsMakeSpn function
+#pragma comment(lib, "ntdsapi.lib")
+
+// The following function assumes that Winsock
+// has already been initialized
+
+
+
+
+
+
+#else
+# error("This file should only be built on Windows")
+#endif
+
+namespace ix
+{
+    SocketSChannel::SocketSChannel()
+    {
+        ;
+    }
+
+    SocketSChannel::~SocketSChannel()
+    {
+
+    }
+
+    bool SocketSChannel::connect(const std::string& host,
+                                 int port,
+                                 std::string& errMsg)
+    {
+        return Socket::connect(host, port, errMsg, nullptr);
+    }
+
+
+    void SocketSChannel::secureSocket()
+    {
+        // there will be a lot to do here ...
+    }
+
+    void SocketSChannel::close()
+    {
+        Socket::close();
+    }
+
+    ssize_t SocketSChannel::send(char* buf, size_t nbyte)
+    {
+        return Socket::send(buf, nbyte);
+    }
+
+    ssize_t SocketSChannel::send(const std::string& buffer)
+    {
+        return Socket::send(buffer);
+    }
+
+    ssize_t SocketSChannel::recv(void* buf, size_t nbyte)
+    {
+        return Socket::recv(buf, nbyte);
+    }
+
+}

ixwebsocket/IXSocketSChannel.h

@@ -0,0 +1,32 @@
+/*
+ *  IXSocketSChannel.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+#include "IXSocket.h"
+
+namespace ix
+{
+    class SocketSChannel final : public Socket
+    {
+    public:
+        SocketSChannel();
+        ~SocketSChannel();
+
+        virtual bool connect(const std::string& host, int port, std::string& errMsg) final;
+        virtual void close() final;
+
+        // The important override
+        virtual void secureSocket() final;
+
+        virtual ssize_t send(char* buffer, size_t length) final;
+        virtual ssize_t send(const std::string& buffer) final;
+        virtual ssize_t recv(void* buffer, size_t length) final;
+
+    private:
+    };
+
+} // namespace ix

ixwebsocket/IXSocketServer.cpp

@@ -5,16 +5,14 @@
  */
 
 #include "IXSocketServer.h"
-
-#include "IXNetSystem.h"
-#include "IXSetThreadName.h"
 #include "IXSocket.h"
 #include "IXSocketConnect.h"
-#include "IXSocketFactory.h"
-#include <assert.h>
+#include "IXNetSystem.h"
+
+#include <iostream>
 #include <sstream>
-#include <stdio.h>
 #include <string.h>
+#include <assert.h>
 
 namespace ix
 {
@@ -22,20 +20,21 @@ namespace ix
     const std::string SocketServer::kDefaultHost("127.0.0.1");
     const int SocketServer::kDefaultTcpBacklog(5);
     const size_t SocketServer::kDefaultMaxConnections(32);
-    const int SocketServer::kDefaultAddressFamily(AF_INET);
 
-    SocketServer::SocketServer(
-        int port, const std::string& host, int backlog, size_t maxConnections, int addressFamily)
-        : _port(port)
-        , _host(host)
-        , _backlog(backlog)
-        , _maxConnections(maxConnections)
-        , _addressFamily(addressFamily)
-        , _serverFd(-1)
-        , _stop(false)
-        , _stopGc(false)
-        , _connectionStateFactory(&ConnectionState::createConnectionState)
+    SocketServer::SocketServer(int port,
+                               const std::string& host,
+                               int backlog,
+                               size_t maxConnections) :
+        _port(port),
+        _host(host),
+        _backlog(backlog),
+        _maxConnections(maxConnections),
+        _serverFd(-1),
+        _stop(false),
+        _stopGc(false),
+        _connectionStateFactory(&ConnectionState::createConnectionState)
     {
+
     }
 
     SocketServer::~SocketServer()
@@ -46,102 +45,65 @@ namespace ix
     void SocketServer::logError(const std::string& str)
     {
         std::lock_guard<std::mutex> lock(_logMutex);
-        fprintf(stderr, "%s\n", str.c_str());
+        std::cerr << str << std::endl;
     }
 
     void SocketServer::logInfo(const std::string& str)
     {
         std::lock_guard<std::mutex> lock(_logMutex);
-        fprintf(stdout, "%s\n", str.c_str());
+        std::cout << str << std::endl;
     }
 
     std::pair<bool, std::string> SocketServer::listen()
     {
-        if (_addressFamily != AF_INET && _addressFamily != AF_INET6)
-        {
-            std::string errMsg("SocketServer::listen() AF_INET and AF_INET6 are currently "
-                               "the only supported address families");
-            return std::make_pair(false, errMsg);
-        }
+        struct sockaddr_in server; // server address information
 
         // Get a socket for accepting connections.
-        if ((_serverFd = socket(_addressFamily, SOCK_STREAM, 0)) < 0)
+        if ((_serverFd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
         {
             std::stringstream ss;
-            ss << "SocketServer::listen() error creating socket): " << strerror(Socket::getErrno());
+            ss << "SocketServer::listen() error creating socket): "
+               << strerror(Socket::getErrno());
 
             return std::make_pair(false, ss.str());
         }
 
         // Make that socket reusable. (allow restarting this server at will)
         int enable = 1;
-        if (setsockopt(_serverFd, SOL_SOCKET, SO_REUSEADDR, (char*) &enable, sizeof(enable)) < 0)
+        if (setsockopt(_serverFd, SOL_SOCKET, SO_REUSEADDR,
+                       (char*) &enable, sizeof(enable)) < 0)
         {
             std::stringstream ss;
             ss << "SocketServer::listen() error calling setsockopt(SO_REUSEADDR) "
-               << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+               << "at address " << _host << ":" << _port
+               << " : " << strerror(Socket::getErrno());
 
             Socket::closeSocket(_serverFd);
             return std::make_pair(false, ss.str());
         }
 
-        if (_addressFamily == AF_INET)
+        // Bind the socket to the server address.
+        server.sin_family = AF_INET;
+        server.sin_port   = htons(_port);
+
+        // Using INADDR_ANY trigger a pop-up box as binding to any address is detected
+        // by the osx firewall. We need to codesign the binary with a self-signed cert
+        // to allow that, but this is a bit of a pain. (this is what node or python would do).
+        //
+        // Using INADDR_LOOPBACK also does not work ... while it should.
+        // We default to 127.0.0.1 (localhost)
+        //
+        server.sin_addr.s_addr = inet_addr(_host.c_str());
+
+        if (bind(_serverFd, (struct sockaddr *)&server, sizeof(server)) < 0)
         {
-            struct sockaddr_in server;
-            server.sin_family = _addressFamily;
-            server.sin_port = htons(_port);
+            std::stringstream ss;
+            ss << "SocketServer::listen() error calling bind "
+               << "at address " << _host << ":" << _port
+               << " : " << strerror(Socket::getErrno());
 
-            if (inet_pton(_addressFamily, _host.c_str(), &server.sin_addr.s_addr) <= 0)
-            {
-                std::stringstream ss;
-                ss << "SocketServer::listen() error calling inet_pton "
-                   << "at address " << _host << ":" << _port << " : "
-                   << strerror(Socket::getErrno());
-
-                Socket::closeSocket(_serverFd);
-                return std::make_pair(false, ss.str());
-            }
-
-            // Bind the socket to the server address.
-            if (bind(_serverFd, (struct sockaddr*) &server, sizeof(server)) < 0)
-            {
-                std::stringstream ss;
-                ss << "SocketServer::listen() error calling bind "
-                   << "at address " << _host << ":" << _port << " : "
-                   << strerror(Socket::getErrno());
-
-                Socket::closeSocket(_serverFd);
-                return std::make_pair(false, ss.str());
-            }
-        }
-        else // AF_INET6
-        {
-            struct sockaddr_in6 server;
-            server.sin6_family = _addressFamily;
-            server.sin6_port = htons(_port);
-
-            if (inet_pton(_addressFamily, _host.c_str(), &server.sin6_addr) <= 0)
-            {
-                std::stringstream ss;
-                ss << "SocketServer::listen() error calling inet_pton "
-                   << "at address " << _host << ":" << _port << " : "
-                   << strerror(Socket::getErrno());
-
-                Socket::closeSocket(_serverFd);
-                return std::make_pair(false, ss.str());
-            }
-
-            // Bind the socket to the server address.
-            if (bind(_serverFd, (struct sockaddr*) &server, sizeof(server)) < 0)
-            {
-                std::stringstream ss;
-                ss << "SocketServer::listen() error calling bind "
-                   << "at address " << _host << ":" << _port << " : "
-                   << strerror(Socket::getErrno());
-
-                Socket::closeSocket(_serverFd);
-                return std::make_pair(false, ss.str());
-            }
+            Socket::closeSocket(_serverFd);
+            return std::make_pair(false, ss.str());
         }
 
         //
@@ -151,7 +113,8 @@ namespace ix
         {
             std::stringstream ss;
             ss << "SocketServer::listen() error calling listen "
-               << "at address " << _host << ":" << _port << " : " << strerror(Socket::getErrno());
+               << "at address " << _host << ":" << _port
+               << " : " << strerror(Socket::getErrno());
 
             Socket::closeSocket(_serverFd);
             return std::make_pair(false, ss.str());
@@ -162,8 +125,6 @@ namespace ix
 
     void SocketServer::start()
     {
-        _stop = false;
-
         if (!_thread.joinable())
         {
             _thread = std::thread(&SocketServer::run, this);
@@ -225,7 +186,7 @@ namespace ix
     {
         std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
         auto it = _connectionsThreads.begin();
-        auto itEnd = _connectionsThreads.end();
+        auto itEnd  = _connectionsThreads.end();
 
         while (it != itEnd)
         {
@@ -248,8 +209,6 @@ namespace ix
         // Set the socket to non blocking mode, so that accept calls are not blocking
         SocketConnect::configure(_serverFd);
 
-        setThreadName("SocketServer::listen");
-
         for (;;)
         {
             if (_stop) return;
@@ -262,7 +221,8 @@ namespace ix
             if (pollResult == PollResultType::Error)
             {
                 std::stringstream ss;
-                ss << "SocketServer::run() error in select: " << strerror(Socket::getErrno());
+                ss << "SocketServer::run() error in select: "
+                   << strerror(Socket::getErrno());
                 logError(ss.str());
                 continue;
             }
@@ -278,15 +238,15 @@ namespace ix
             socklen_t addressLen = sizeof(client);
             memset(&client, 0, sizeof(client));
 
-            if ((clientFd = accept(_serverFd, (struct sockaddr*) &client, &addressLen)) < 0)
+            if ((clientFd = accept(_serverFd, (struct sockaddr *)&client, &addressLen)) < 0)
             {
                 if (!Socket::isWaitNeeded())
                 {
                     // FIXME: that error should be propagated
                     int err = Socket::getErrno();
                     std::stringstream ss;
-                    ss << "SocketServer::run() error accepting connection: " << err << ", "
-                       << strerror(err);
+                    ss << "SocketServer::run() error accepting connection: "
+                       << err << ", " << strerror(err);
                     logError(ss.str());
                 }
                 continue;
@@ -295,7 +255,8 @@ namespace ix
             if (getConnectedClientsCount() >= _maxConnections)
             {
                 std::stringstream ss;
-                ss << "SocketServer::run() reached max connections = " << _maxConnections << ". "
+                ss << "SocketServer::run() reached max connections = "
+                   << _maxConnections << ". "
                    << "Not accepting connection";
                 logError(ss.str());
 
@@ -312,33 +273,14 @@ namespace ix
 
             if (_stop) return;
 
-            // create socket
-            std::string errorMsg;
-            bool tls = _socketTLSOptions.tls;
-            auto socket = createSocket(tls, clientFd, errorMsg, _socketTLSOptions);
-
-            if (socket == nullptr)
-            {
-                logError("SocketServer::run() cannot create socket: " + errorMsg);
-                Socket::closeSocket(clientFd);
-                continue;
-            }
-
-            // Set the socket to non blocking mode + other tweaks
-            SocketConnect::configure(clientFd);
-
-            if (!socket->accept(errorMsg))
-            {
-                logError("SocketServer::run() tls accept failed: " + errorMsg);
-                Socket::closeSocket(clientFd);
-                continue;
-            }
-
             // Launch the handleConnection work asynchronously in its own thread.
             std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
             _connectionsThreads.push_back(std::make_pair(
-                connectionState,
-                std::thread(&SocketServer::handleConnection, this, socket, connectionState)));
+                    connectionState,
+                    std::thread(&SocketServer::handleConnection,
+                                this,
+                                clientFd,
+                                connectionState)));
         }
     }
 
@@ -350,8 +292,6 @@ namespace ix
 
     void SocketServer::runGC()
     {
-        setThreadName("SocketServer::GC");
-
         for (;;)
         {
             // Garbage collection to shutdown/join threads for closed connections.
@@ -368,9 +308,5 @@ namespace ix
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
         }
     }
+}
 
-    void SocketServer::setTLSOptions(const SocketTLSOptions& socketTLSOptions)
-    {
-        _socketTLSOptions = socketTLSOptions;
-    }
-} // namespace ix

ixwebsocket/IXSocketServer.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include "IXConnectionState.h"
-#include "IXSocketTLSOptions.h"
 #include <atomic>
 #include <condition_variable>
 #include <functional>
@@ -21,8 +20,6 @@
 
 namespace ix
 {
-    class Socket;
-
     class SocketServer
     {
     public:
@@ -36,8 +33,7 @@ namespace ix
         SocketServer(int port = SocketServer::kDefaultPort,
                      const std::string& host = SocketServer::kDefaultHost,
                      int backlog = SocketServer::kDefaultTcpBacklog,
-                     size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                     int addressFamily = SocketServer::kDefaultAddressFamily);
+                     size_t maxConnections = SocketServer::kDefaultMaxConnections);
         virtual ~SocketServer();
         virtual void stop();
 
@@ -50,14 +46,11 @@ namespace ix
         const static std::string kDefaultHost;
         const static int kDefaultTcpBacklog;
         const static size_t kDefaultMaxConnections;
-        const static int kDefaultAddressFamily;
 
         void start();
         std::pair<bool, std::string> listen();
         void wait();
 
-        void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
-
     protected:
         // Logging
         void logError(const std::string& str);
@@ -71,16 +64,14 @@ namespace ix
         std::string _host;
         int _backlog;
         size_t _maxConnections;
-        int _addressFamily;
 
         // socket for accepting connections
         int _serverFd;
 
-        std::atomic<bool> _stop;
-
         std::mutex _logMutex;
 
         // background thread to wait for incoming connections
+        std::atomic<bool> _stop;
         std::thread _thread;
         void run();
 
@@ -101,14 +92,11 @@ namespace ix
         // the factory to create ConnectionState objects
         ConnectionStateFactory _connectionStateFactory;
 
-        virtual void handleConnection(std::shared_ptr<Socket>,
-                                      std::shared_ptr<ConnectionState> connectionState) = 0;
+        virtual void handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState) = 0;
         virtual size_t getConnectedClientsCount() = 0;
 
         // Returns true if all connection threads are joined
         void closeTerminatedThreads();
         size_t getConnectionsThreadsCount();
-
-        SocketTLSOptions _socketTLSOptions;
     };
 } // namespace ix

ixwebsocket/IXSocketTLSOptions.cpp

@@ -1,87 +0,0 @@
-/*
- *  IXSocketTLSOptions.h
- *  Author: Matt DeBoer
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSocketTLSOptions.h"
-
-#include <assert.h>
-#include <fstream>
-#include <sstream>
-
-namespace ix
-{
-    const char* kTLSCAFileUseSystemDefaults = "SYSTEM";
-    const char* kTLSCAFileDisableVerify = "NONE";
-    const char* kTLSCiphersUseDefault = "DEFAULT";
-
-    bool SocketTLSOptions::isValid() const
-    {
-        if (!_validated)
-        {
-            if (!certFile.empty() && !std::ifstream(certFile))
-            {
-                _errMsg = "certFile not found: " + certFile;
-                return false;
-            }
-            if (!keyFile.empty() && !std::ifstream(keyFile))
-            {
-                _errMsg = "keyFile not found: " + keyFile;
-                return false;
-            }
-            if (!caFile.empty() && caFile != kTLSCAFileDisableVerify &&
-                caFile != kTLSCAFileUseSystemDefaults && !std::ifstream(caFile))
-            {
-                _errMsg = "caFile not found: " + caFile;
-                return false;
-            }
-
-            if (certFile.empty() != keyFile.empty())
-            {
-                _errMsg = "certFile and keyFile must be both present, or both absent";
-                return false;
-            }
-
-            _validated = true;
-        }
-        return true;
-    }
-
-    bool SocketTLSOptions::hasCertAndKey() const
-    {
-        return !certFile.empty() && !keyFile.empty();
-    }
-
-    bool SocketTLSOptions::isUsingSystemDefaults() const
-    {
-        return caFile == kTLSCAFileUseSystemDefaults;
-    }
-
-    bool SocketTLSOptions::isPeerVerifyDisabled() const
-    {
-        return caFile == kTLSCAFileDisableVerify;
-    }
-
-    bool SocketTLSOptions::isUsingDefaultCiphers() const
-    {
-        return ciphers.empty() || ciphers == kTLSCiphersUseDefault;
-    }
-
-    const std::string& SocketTLSOptions::getErrorMsg() const
-    {
-        return _errMsg;
-    }
-
-    std::string SocketTLSOptions::getDescription() const
-    {
-        std::stringstream ss;
-        ss << "TLS Options:" << std::endl;
-        ss << "  certFile = " << certFile << std::endl;
-        ss << "  keyFile  = " << keyFile << std::endl;
-        ss << "  caFile   = " << caFile << std::endl;
-        ss << "  ciphers  = " << ciphers << std::endl;
-        ss << "  ciphers  = " << ciphers << std::endl;
-        return ss.str();
-    }
-} // namespace ix

ixwebsocket/IXSocketTLSOptions.h

@@ -1,52 +0,0 @@
-/*
- *  IXSocketTLSOptions.h
- *  Author: Matt DeBoer
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    struct SocketTLSOptions
-    {
-    public:
-        // check validity of the object
-        bool isValid() const;
-
-        // the certificate presented to peers
-        std::string certFile;
-
-        // the key used for signing/encryption
-        std::string keyFile;
-
-        // the ca certificate (or certificate bundle) file containing
-        // certificates to be trusted by peers; use 'SYSTEM' to
-        // leverage the system defaults, use 'NONE' to disable peer verification
-        std::string caFile = "SYSTEM";
-
-        // list of ciphers (rsa, etc...)
-        std::string ciphers = "DEFAULT";
-
-        // whether tls is enabled, used for server code
-        bool tls = false;
-
-        bool hasCertAndKey() const;
-
-        bool isUsingSystemDefaults() const;
-
-        bool isPeerVerifyDisabled() const;
-
-        bool isUsingDefaultCiphers() const;
-
-        const std::string& getErrorMsg() const;
-
-        std::string getDescription() const;
-
-    private:
-        mutable std::string _errMsg;
-        mutable bool _validated = false;
-    };
-} // namespace ix

ixwebsocket/IXUrlParser.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "IXUrlParser.h"
-
 #include "LUrlParser.h"
 
 namespace ix
@@ -25,9 +24,9 @@ namespace ix
         }
 
         protocol = res.m_Scheme;
-        host = res.m_Host;
-        path = res.m_Path;
-        query = res.m_Query;
+        host     = res.m_Host;
+        path     = res.m_Path;
+        query    = res.m_Query;
 
         if (!res.GetPort(&port))
         {
@@ -65,4 +64,4 @@ namespace ix
         return true;
     }
 
-} // namespace ix
+}

ixwebsocket/IXUserAgent.cpp

@@ -5,50 +5,48 @@
  */
 
 #include "IXUserAgent.h"
-
 #include "IXWebSocketVersion.h"
+
 #include <sstream>
 #include <zlib.h>
 
 // Platform name
 #if defined(_WIN32)
-#define PLATFORM_NAME "windows" // Windows
+    #define PLATFORM_NAME "windows" // Windows
 #elif defined(_WIN64)
-#define PLATFORM_NAME "windows" // Windows
+    #define PLATFORM_NAME "windows" // Windows
 #elif defined(__CYGWIN__) && !defined(_WIN32)
-#define PLATFORM_NAME "windows" // Windows (Cygwin POSIX under Microsoft Window)
+    #define PLATFORM_NAME "windows" // Windows (Cygwin POSIX under Microsoft Window)
 #elif defined(__ANDROID__)
-#define PLATFORM_NAME "android" // Android (implies Linux, so it must come first)
+    #define PLATFORM_NAME "android" // Android (implies Linux, so it must come first)
 #elif defined(__linux__)
-#define PLATFORM_NAME "linux" // Debian, Ubuntu, Gentoo, Fedora, openSUSE, RedHat, Centos and other
+    #define PLATFORM_NAME "linux" // Debian, Ubuntu, Gentoo, Fedora, openSUSE, RedHat, Centos and other
 #elif defined(__unix__) || !defined(__APPLE__) && defined(__MACH__)
-#include <sys/param.h>
-#if defined(BSD)
-#define PLATFORM_NAME "bsd" // FreeBSD, NetBSD, OpenBSD, DragonFly BSD
-#endif
+    #include <sys/param.h>
+    #if defined(BSD)
+        #define PLATFORM_NAME "bsd" // FreeBSD, NetBSD, OpenBSD, DragonFly BSD
+    #endif
 #elif defined(__hpux)
-#define PLATFORM_NAME "hp-ux" // HP-UX
+    #define PLATFORM_NAME "hp-ux" // HP-UX
 #elif defined(_AIX)
-#define PLATFORM_NAME "aix"                   // IBM AIX
+    #define PLATFORM_NAME "aix" // IBM AIX
 #elif defined(__APPLE__) && defined(__MACH__) // Apple OSX and iOS (Darwin)
-#include <TargetConditionals.h>
-#if TARGET_IPHONE_SIMULATOR == 1
-#define PLATFORM_NAME "ios" // Apple iOS
-#elif TARGET_OS_IPHONE == 1
-#define PLATFORM_NAME "ios" // Apple iOS
-#elif TARGET_OS_MAC == 1
-#define PLATFORM_NAME "macos" // Apple OSX
-#endif
+    #include <TargetConditionals.h>
+    #if TARGET_IPHONE_SIMULATOR == 1
+        #define PLATFORM_NAME "ios" // Apple iOS
+    #elif TARGET_OS_IPHONE == 1
+        #define PLATFORM_NAME "ios" // Apple iOS
+    #elif TARGET_OS_MAC == 1
+        #define PLATFORM_NAME "macos" // Apple OSX
+    #endif
 #elif defined(__sun) && defined(__SVR4)
-#define PLATFORM_NAME "solaris" // Oracle Solaris, Open Indiana
+    #define PLATFORM_NAME "solaris" // Oracle Solaris, Open Indiana
 #else
-#define PLATFORM_NAME "unknown platform"
+    #define PLATFORM_NAME "unknown platform"
 #endif
 
 // SSL
-#ifdef IXWEBSOCKET_USE_MBED_TLS
-#include <mbedtls/version.h>
-#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+#if defined(IXWEBSOCKET_USE_OPEN_SSL)
 #include <openssl/opensslv.h>
 #endif
 
@@ -67,11 +65,11 @@ namespace ix
         // TLS
 #ifdef IXWEBSOCKET_USE_TLS
 #ifdef IXWEBSOCKET_USE_MBED_TLS
-        ss << " ssl/mbedtls " << MBEDTLS_VERSION_STRING;
-#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-        ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT;
+        ss << " ssl/mbedtls";
 #elif __APPLE__
         ss << " ssl/DarwinSSL";
+#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+        ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT;
 #endif
 #else
         ss << " nossl";
@@ -82,4 +80,4 @@ namespace ix
 
         return ss.str();
     }
-} // namespace ix
+}

ixwebsocket/IXUtf8Validator.h

@@ -24,7 +24,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+*/
 
 /*
  *  IXUtf8Validator.h
@@ -48,31 +48,20 @@ namespace ix
 
     /// Lookup table for the UTF8 decode state machine
     static uint8_t const utf8d[] = {
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 00..1f
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20..3f
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 40..5f
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 60..7f
-        1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-        9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9, // 80..9f
-        7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
-        7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7, // a0..bf
-        8,   8,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
-        2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   // c0..df
-        0xa, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // e0..ef
-        0xb, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // f0..ff
-        0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-        1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-        1,   0,   1,   1,   1,   1,   1,   0,   1,   0,   1,   1,   1,   1,   1,   1, // s1..s2
-        1,   2,   1,   1,   1,   1,   1,   2,   1,   2,   1,   1,   1,   1,   1,   1,
-        1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,   1,   1, // s3..s4
-        1,   2,   1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,
-        1,   1,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1, // s5..s6
-        1,   3,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1,
-        1,   3,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1, // s7..s8
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
+      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
+      7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
+      8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
+      0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
+      0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
+      0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
+      1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
+      1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
+      1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
+      1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
     };
 
     /// Decode the next byte of a UTF8 sequence
@@ -82,14 +71,16 @@ namespace ix
      * @param [in] byte The byte to input
      * @return The ending state of the decode operation
      */
-    inline uint32_t decodeNextByte(uint32_t* state, uint32_t* codep, uint8_t byte)
+    inline uint32_t decodeNextByte(uint32_t * state, uint32_t * codep, uint8_t byte)
     {
-        uint32_t type = utf8d[byte];
+      uint32_t type = utf8d[byte];
 
-        *codep = (*state != utf8_accept) ? (byte & 0x3fu) | (*codep << 6) : (0xff >> type) & (byte);
+      *codep = (*state != utf8_accept) ?
+        (byte & 0x3fu) | (*codep << 6) :
+        (0xff >> type) & (byte);
 
-        *state = utf8d[256 + *state * 16 + type];
-        return *state;
+      *state = utf8d[256 + *state*16 + type];
+      return *state;
     }
 
     /// Provides streaming UTF8 validation functionality
@@ -97,11 +88,7 @@ namespace ix
     {
     public:
         /// Construct and initialize the validator
-        Utf8Validator()
-            : m_state(utf8_accept)
-            , m_codepoint(0)
-        {
-        }
+        Utf8Validator() : m_state(utf8_accept),m_codepoint(0) {}
 
         /// Advance the state of the validator with the next input byte
         /**
@@ -110,7 +97,7 @@ namespace ix
          */
         bool consume(uint8_t byte)
         {
-            if (decodeNextByte(&m_state, &m_codepoint, byte) == utf8_reject)
+            if (decodeNextByte(&m_state,&m_codepoint,byte) == utf8_reject)
             {
                 return false;
             }
@@ -123,13 +110,16 @@ namespace ix
          * @param end Input iterator to the end of the input range
          * @return Whether or not decoding the bytes resulted in a validation error.
          */
-        template<typename iterator_type>
+        template <typename iterator_type>
         bool decode(iterator_type begin, iterator_type end)
         {
             for (iterator_type it = begin; it != end; ++it)
             {
-                unsigned int result =
-                    decodeNextByte(&m_state, &m_codepoint, static_cast<uint8_t>(*it));
+                unsigned int result = decodeNextByte(
+                    &m_state,
+                    &m_codepoint,
+                    static_cast<uint8_t>(*it)
+                );
 
                 if (result == utf8_reject)
                 {
@@ -154,10 +144,9 @@ namespace ix
             m_state = utf8_accept;
             m_codepoint = 0;
         }
-
     private:
-        uint32_t m_state;
-        uint32_t m_codepoint;
+        uint32_t    m_state;
+        uint32_t    m_codepoint;
     };
 
     /// Validate a UTF8 string
@@ -165,10 +154,10 @@ namespace ix
      * convenience function that creates a Validator, validates a complete string
      * and returns the result.
      */
-    inline bool validateUtf8(std::string const& s)
+    inline bool validateUtf8(std::string const & s)
     {
         Utf8Validator v;
-        if (!v.decode(s.begin(), s.end()))
+        if (!v.decode(s.begin(),s.end()))
         {
             return false;
         }

ixwebsocket/IXWebSocket.cpp

@@ -5,13 +5,14 @@
  */
 
 #include "IXWebSocket.h"
-
-#include "IXExponentialBackoff.h"
 #include "IXSetThreadName.h"
-#include "IXUtf8Validator.h"
 #include "IXWebSocketHandshake.h"
-#include <cassert>
+#include "IXExponentialBackoff.h"
+#include "IXUtf8Validator.h"
+
 #include <cmath>
+#include <cassert>
+#include <iostream>
 
 
 namespace ix
@@ -23,26 +24,26 @@ namespace ix
     const bool WebSocket::kDefaultEnablePong(true);
     const uint32_t WebSocket::kDefaultMaxWaitBetweenReconnectionRetries(10 * 1000); // 10s
 
-    WebSocket::WebSocket()
-        : _onMessageCallback(OnMessageCallback())
-        , _stop(false)
-        , _automaticReconnection(true)
-        , _maxWaitBetweenReconnectionRetries(kDefaultMaxWaitBetweenReconnectionRetries)
-        , _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs)
-        , _enablePong(kDefaultEnablePong)
-        , _pingIntervalSecs(kDefaultPingIntervalSecs)
-        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+    WebSocket::WebSocket() :
+        _onMessageCallback(OnMessageCallback()),
+        _stop(false),
+        _automaticReconnection(true),
+        _maxWaitBetweenReconnectionRetries(kDefaultMaxWaitBetweenReconnectionRetries),
+        _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs),
+        _enablePong(kDefaultEnablePong),
+        _pingIntervalSecs(kDefaultPingIntervalSecs),
+        _pingTimeoutSecs(kDefaultPingTimeoutSecs)
     {
         _ws.setOnCloseCallback(
-            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote) {
+            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
+            {
                 _onMessageCallback(
-                    std::make_shared<WebSocketMessage>(WebSocketMessageType::Close,
-                                                       "",
-                                                       wireSize,
-                                                       WebSocketErrorInfo(),
-                                                       WebSocketOpenInfo(),
-                                                       WebSocketCloseInfo(code, reason, remote)));
-            });
+                    std::make_shared<WebSocketMessage>(
+                        WebSocketMessageType::Close, "", wireSize,
+                        WebSocketErrorInfo(), WebSocketOpenInfo(),
+                        WebSocketCloseInfo(code, reason, remote)));
+            }
+        );
     }
 
     WebSocket::~WebSocket()
@@ -67,19 +68,12 @@ namespace ix
         return _url;
     }
 
-    void WebSocket::setPerMessageDeflateOptions(
-        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
+    void WebSocket::setPerMessageDeflateOptions(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
     {
         std::lock_guard<std::mutex> lock(_configMutex);
         _perMessageDeflateOptions = perMessageDeflateOptions;
     }
 
-    void WebSocket::setTLSOptions(const SocketTLSOptions& socketTLSOptions)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _socketTLSOptions = socketTLSOptions;
-    }
-
     const WebSocketPerMessageDeflateOptions& WebSocket::getPerMessageDeflateOptions() const
     {
         std::lock_guard<std::mutex> lock(_configMutex);
@@ -134,13 +128,6 @@ namespace ix
         _enablePong = false;
     }
 
-    void WebSocket::enablePerMessageDeflate()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        WebSocketPerMessageDeflateOptions perMessageDeflateOptions(true);
-        _perMessageDeflateOptions = perMessageDeflateOptions;
-    }
-
     void WebSocket::disablePerMessageDeflate()
     {
         std::lock_guard<std::mutex> lock(_configMutex);
@@ -167,7 +154,8 @@ namespace ix
         _thread = std::thread(&WebSocket::run, this);
     }
 
-    void WebSocket::stop(uint16_t code, const std::string& reason)
+    void WebSocket::stop(uint16_t code,
+                         const std::string& reason)
     {
         close(code, reason);
 
@@ -176,7 +164,6 @@ namespace ix
             // wait until working thread will exit
             // it will exit after close operation is finished
             _stop = true;
-            _sleepCondition.notify_one();
             _thread.join();
             _stop = false;
         }
@@ -187,75 +174,48 @@ namespace ix
         {
             std::lock_guard<std::mutex> lock(_configMutex);
             _ws.configure(_perMessageDeflateOptions,
-                          _socketTLSOptions,
                           _enablePong,
                           _pingIntervalSecs,
                           _pingTimeoutSecs);
         }
 
-        WebSocketHttpHeaders headers(_extraHeaders);
-        std::string subProtocolsHeader;
-        auto subProtocols = getSubProtocols();
-        if (!subProtocols.empty())
-        {
-            //
-            // Sub Protocol strings are comma separated.
-            // Python code to do that is:
-            // >>> ','.join(['json', 'msgpack'])
-            // 'json,msgpack'
-            //
-            int i = 0;
-            for (auto subProtocol : subProtocols)
-            {
-                if (i++ != 0)
-                {
-                    subProtocolsHeader += ",";
-                }
-                subProtocolsHeader += subProtocol;
-            }
-            headers["Sec-WebSocket-Protocol"] = subProtocolsHeader;
-        }
-
-        WebSocketInitResult status = _ws.connectToUrl(_url, headers, timeoutSecs);
-        if (!status.success)
-        {
-            return status;
-        }
-
-        _onMessageCallback(std::make_shared<WebSocketMessage>(
-            WebSocketMessageType::Open,
-            "",
-            0,
-            WebSocketErrorInfo(),
-            WebSocketOpenInfo(status.uri, status.headers, status.protocol),
-            WebSocketCloseInfo()));
-        return status;
-    }
-
-    WebSocketInitResult WebSocket::connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs)
-    {
-        {
-            std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
-                          _socketTLSOptions,
-                          _enablePong,
-                          _pingIntervalSecs,
-                          _pingTimeoutSecs);
-        }
-
-        WebSocketInitResult status = _ws.connectToSocket(socket, timeoutSecs);
+        WebSocketInitResult status = _ws.connectToUrl(_url, _extraHeaders, timeoutSecs);
         if (!status.success)
         {
             return status;
         }
 
         _onMessageCallback(
-            std::make_shared<WebSocketMessage>(WebSocketMessageType::Open,
-                                               "",
-                                               0,
-                                               WebSocketErrorInfo(),
-                                               WebSocketOpenInfo(status.uri, status.headers),
-                                               WebSocketCloseInfo()));
+            std::make_shared<WebSocketMessage>(
+                WebSocketMessageType::Open, "", 0,
+                WebSocketErrorInfo(),
+                WebSocketOpenInfo(status.uri, status.headers),
+                WebSocketCloseInfo()));
+        return status;
+    }
+
+    WebSocketInitResult WebSocket::connectToSocket(int fd, int timeoutSecs)
+    {
+        {
+            std::lock_guard<std::mutex> lock(_configMutex);
+            _ws.configure(_perMessageDeflateOptions,
+                          _enablePong,
+                          _pingIntervalSecs,
+                          _pingTimeoutSecs);
+        }
+
+        WebSocketInitResult status = _ws.connectToSocket(fd, timeoutSecs);
+        if (!status.success)
+        {
+            return status;
+        }
+
+        _onMessageCallback(
+                std::make_shared<WebSocketMessage>(
+                    WebSocketMessageType::Open, "", 0,
+                    WebSocketErrorInfo(),
+                    WebSocketOpenInfo(status.uri, status.headers),
+                    WebSocketCloseInfo()));
         return status;
     }
 
@@ -269,7 +229,8 @@ namespace ix
         return getReadyState() == ReadyState::Closing;
     }
 
-    void WebSocket::close(uint16_t code, const std::string& reason)
+    void WebSocket::close(uint16_t code,
+                          const std::string& reason)
     {
         _ws.close(code, reason);
     }
@@ -300,13 +261,8 @@ namespace ix
             // Only sleep if we are retrying
             if (duration.count() > 0)
             {
-                std::unique_lock<std::mutex> lock(_sleepMutex);
-                _sleepCondition.wait_for(lock, duration);
-            }
-
-            if (_stop)
-            {
-                break;
+                // to do: make sleeping conditional
+                std::this_thread::sleep_for(duration);
             }
 
             // Try to connect synchronously
@@ -318,22 +274,20 @@ namespace ix
 
                 if (_automaticReconnection)
                 {
-                    duration = millis(calculateRetryWaitMilliseconds(
-                        retries++, _maxWaitBetweenReconnectionRetries));
+                    duration = millis(calculateRetryWaitMilliseconds(retries++, _maxWaitBetweenReconnectionRetries));
 
                     connectErr.wait_time = duration.count();
                     connectErr.retries = retries;
                 }
 
-                connectErr.reason = status.errorStr;
+                connectErr.reason      = status.errorStr;
                 connectErr.http_status = status.http_status;
 
-                _onMessageCallback(std::make_shared<WebSocketMessage>(WebSocketMessageType::Error,
-                                                                      "",
-                                                                      0,
-                                                                      connectErr,
-                                                                      WebSocketOpenInfo(),
-                                                                      WebSocketCloseInfo()));
+                _onMessageCallback(
+                     std::make_shared<WebSocketMessage>(
+                        WebSocketMessageType::Error, "", 0,
+                        connectErr, WebSocketOpenInfo(),
+                        WebSocketCloseInfo()));
             }
         }
     }
@@ -369,7 +323,8 @@ namespace ix
                 [this](const std::string& msg,
                        size_t wireSize,
                        bool decompressionError,
-                       WebSocketTransport::MessageKind messageKind) {
+                       WebSocketTransport::MessageKind messageKind)
+                {
                     WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
@@ -377,26 +332,22 @@ namespace ix
                         case WebSocketTransport::MessageKind::MSG_BINARY:
                         {
                             webSocketMessageType = WebSocketMessageType::Message;
-                        }
-                        break;
+                        } break;
 
                         case WebSocketTransport::MessageKind::PING:
                         {
                             webSocketMessageType = WebSocketMessageType::Ping;
-                        }
-                        break;
+                        } break;
 
                         case WebSocketTransport::MessageKind::PONG:
                         {
                             webSocketMessageType = WebSocketMessageType::Pong;
-                        }
-                        break;
+                        } break;
 
                         case WebSocketTransport::MessageKind::FRAGMENT:
                         {
                             webSocketMessageType = WebSocketMessageType::Fragment;
-                        }
-                        break;
+                        } break;
                     }
 
                     WebSocketErrorInfo webSocketErrorInfo;
@@ -404,15 +355,13 @@ namespace ix
 
                     bool binary = messageKind == WebSocketTransport::MessageKind::MSG_BINARY;
 
-                    _onMessageCallback(std::make_shared<WebSocketMessage>(webSocketMessageType,
-                                                                          msg,
-                                                                          wireSize,
-                                                                          webSocketErrorInfo,
-                                                                          WebSocketOpenInfo(),
-                                                                          WebSocketCloseInfo(),
-                                                                          binary));
+                    _onMessageCallback(
+                         std::make_shared<WebSocketMessage>(
+                            webSocketMessageType, msg, wireSize,
+                            webSocketErrorInfo, WebSocketOpenInfo(),
+                            WebSocketCloseInfo(), binary));
 
-                    WebSocket::invokeTrafficTrackerCallback(wireSize, true);
+                    WebSocket::invokeTrafficTrackerCallback(msg.size(), true);
                 });
         }
     }
@@ -497,20 +446,17 @@ namespace ix
             case SendMessageKind::Text:
             {
                 webSocketSendInfo = _ws.sendText(text, onProgressCallback);
-            }
-            break;
+            } break;
 
             case SendMessageKind::Binary:
             {
                 webSocketSendInfo = _ws.sendBinary(text, onProgressCallback);
-            }
-            break;
+            } break;
 
             case SendMessageKind::Ping:
             {
                 webSocketSendInfo = _ws.sendPing(text);
-            }
-            break;
+            } break;
         }
 
         WebSocket::invokeTrafficTrackerCallback(webSocketSendInfo.wireSize, false);
@@ -522,10 +468,10 @@ namespace ix
     {
         switch (_ws.getReadyState())
         {
-            case ix::WebSocketTransport::ReadyState::OPEN: return ReadyState::Open;
+            case ix::WebSocketTransport::ReadyState::OPEN      : return ReadyState::Open;
             case ix::WebSocketTransport::ReadyState::CONNECTING: return ReadyState::Connecting;
-            case ix::WebSocketTransport::ReadyState::CLOSING: return ReadyState::Closing;
-            case ix::WebSocketTransport::ReadyState::CLOSED: return ReadyState::Closed;
+            case ix::WebSocketTransport::ReadyState::CLOSING   : return ReadyState::Closing;
+            case ix::WebSocketTransport::ReadyState::CLOSED    : return ReadyState::Closed;
             default: return ReadyState::Closed;
         }
     }
@@ -534,10 +480,10 @@ namespace ix
     {
         switch (readyState)
         {
-            case ReadyState::Open: return "OPEN";
+            case ReadyState::Open      : return "OPEN";
             case ReadyState::Connecting: return "CONNECTING";
-            case ReadyState::Closing: return "CLOSING";
-            case ReadyState::Closed: return "CLOSED";
+            case ReadyState::Closing   : return "CLOSING";
+            case ReadyState::Closed    : return "CLOSED";
             default: return "UNKNOWN";
         }
     }
@@ -561,16 +507,4 @@ namespace ix
     {
         return _ws.bufferedAmount();
     }
-
-    void WebSocket::addSubProtocol(const std::string& subProtocol)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _subProtocols.push_back(subProtocol);
-    }
-
-    const std::vector<std::string>& WebSocket::getSubProtocols()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _subProtocols;
-    }
-} // namespace ix
+}

ixwebsocket/IXWebSocket.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include "IXProgressCallback.h"
-#include "IXSocketTLSOptions.h"
 #include "IXWebSocketCloseConstants.h"
 #include "IXWebSocketErrorInfo.h"
 #include "IXWebSocketHttpHeaders.h"
@@ -19,7 +18,6 @@
 #include "IXWebSocketSendInfo.h"
 #include "IXWebSocketTransport.h"
 #include <atomic>
-#include <condition_variable>
 #include <mutex>
 #include <string>
 #include <thread>
@@ -51,15 +49,12 @@ namespace ix
         void setExtraHeaders(const WebSocketHttpHeaders& headers);
         void setPerMessageDeflateOptions(
             const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
-        void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
         void setHeartBeatPeriod(int heartBeatPeriodSecs);
         void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
         void setPingTimeout(int pingTimeoutSecs);
         void enablePong();
         void disablePong();
-        void enablePerMessageDeflate();
         void disablePerMessageDeflate();
-        void addSubProtocol(const std::string& subProtocol);
 
         // Run asynchronously, by calling start and stop.
         void start();
@@ -72,7 +67,7 @@ namespace ix
         WebSocketInitResult connect(int timeoutSecs);
         void run();
 
-        // send is in text mode by default
+        // send is in binary mode by default
         WebSocketSendInfo send(const std::string& data,
                                bool binary = false,
                                const OnProgressCallback& onProgressCallback = nullptr);
@@ -104,7 +99,6 @@ namespace ix
         bool isAutomaticReconnectionEnabled() const;
         void setMaxWaitBetweenReconnectionRetries(uint32_t maxWaitBetweenReconnectionRetries);
         uint32_t getMaxWaitBetweenReconnectionRetries() const;
-        const std::vector<std::string>& getSubProtocols();
 
     private:
         WebSocketSendInfo sendMessage(const std::string& text,
@@ -117,7 +111,7 @@ namespace ix
         static void invokeTrafficTrackerCallback(size_t size, bool incoming);
 
         // Server
-        WebSocketInitResult connectToSocket(std::shared_ptr<Socket>, int timeoutSecs);
+        WebSocketInitResult connectToSocket(int fd, int timeoutSecs);
 
         WebSocketTransport _ws;
 
@@ -125,9 +119,6 @@ namespace ix
         WebSocketHttpHeaders _extraHeaders;
 
         WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
-
-        SocketTLSOptions _socketTLSOptions;
-
         mutable std::mutex _configMutex; // protect all config variables access
 
         OnMessageCallback _onMessageCallback;
@@ -142,10 +133,6 @@ namespace ix
         static const uint32_t kDefaultMaxWaitBetweenReconnectionRetries;
         uint32_t _maxWaitBetweenReconnectionRetries;
 
-        // Make the sleeping in the automatic reconnection cancellable
-        std::mutex _sleepMutex;
-        std::condition_variable _sleepCondition;
-
         std::atomic<int> _handshakeTimeoutSecs;
         static const int kDefaultHandShakeTimeoutSecs;
 
@@ -159,9 +146,6 @@ namespace ix
         static const int kDefaultPingIntervalSecs;
         static const int kDefaultPingTimeoutSecs;
 
-        // Subprotocols
-        std::vector<std::string> _subProtocols;
-
         friend class WebSocketServer;
     };
 } // namespace ix

ixwebsocket/IXWebSocketCloseConstants.cpp

@@ -22,15 +22,9 @@ namespace ix
     const std::string WebSocketCloseConstants::kProtocolErrorMessage("Protocol error");
     const std::string WebSocketCloseConstants::kNoStatusCodeErrorMessage("No status code");
     const std::string WebSocketCloseConstants::kProtocolErrorReservedBitUsed("Reserved bit used");
-    const std::string WebSocketCloseConstants::kProtocolErrorPingPayloadOversized(
-        "Ping reason control frame with payload length > 125 octets");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented(
-        "Control message fragmented");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeDataOpcodeOutOfSequence(
-        "Fragmentation: data message out of sequence");
-    const std::string WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence(
-        "Fragmentation: continuation opcode out of sequence");
-    const std::string WebSocketCloseConstants::kInvalidFramePayloadDataMessage(
-        "Invalid frame payload data");
-    const std::string WebSocketCloseConstants::kInvalidCloseCodeMessage("Invalid close code");
-} // namespace ix
+    const std::string WebSocketCloseConstants::kProtocolErrorPingPayloadOversized("Ping reason control frame with payload length > 125 octets");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented("Control message fragmented");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeDataOpcodeOutOfSequence("Fragmentation: data message out of sequence");
+    const std::string WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence("Fragmentation: continuation opcode out of sequence");
+    const std::string WebSocketCloseConstants::kInvalidFramePayloadDataMessage("Invalid frame payload data");
+}

ixwebsocket/IXWebSocketCloseConstants.h

@@ -32,6 +32,5 @@ namespace ix
         static const std::string kProtocolErrorCodeDataOpcodeOutOfSequence;
         static const std::string kProtocolErrorCodeContinuationOpCodeOutOfSequence;
         static const std::string kInvalidFramePayloadDataMessage;
-        static const std::string kInvalidCloseCodeMessage;
     };
 } // namespace ix

ixwebsocket/IXWebSocketHandshake.cpp

@@ -5,46 +5,50 @@
  */
 
 #include "IXWebSocketHandshake.h"
-
-#include "IXHttp.h"
 #include "IXSocketConnect.h"
 #include "IXUrlParser.h"
+#include "IXHttp.h"
 #include "IXUserAgent.h"
+
 #include "libwshandshake.hpp"
-#include <algorithm>
-#include <iostream>
-#include <random>
+
 #include <sstream>
+#include <random>
+#include <algorithm>
 
 
 namespace ix
 {
-    WebSocketHandshake::WebSocketHandshake(
-        std::atomic<bool>& requestInitCancellation,
-        std::shared_ptr<Socket> socket,
-        WebSocketPerMessageDeflate& perMessageDeflate,
-        WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-        std::atomic<bool>& enablePerMessageDeflate)
-        : _requestInitCancellation(requestInitCancellation)
-        , _socket(socket)
-        , _perMessageDeflate(perMessageDeflate)
-        , _perMessageDeflateOptions(perMessageDeflateOptions)
-        , _enablePerMessageDeflate(enablePerMessageDeflate)
+    WebSocketHandshake::WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
+                                           std::shared_ptr<Socket> socket,
+                                           WebSocketPerMessageDeflate& perMessageDeflate,
+                                           WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
+                                           std::atomic<bool>& enablePerMessageDeflate) :
+        _requestInitCancellation(requestInitCancellation),
+        _socket(socket),
+        _perMessageDeflate(perMessageDeflate),
+        _perMessageDeflateOptions(perMessageDeflateOptions),
+        _enablePerMessageDeflate(enablePerMessageDeflate)
     {
+
     }
 
     bool WebSocketHandshake::insensitiveStringCompare(const std::string& a, const std::string& b)
     {
-        return std::equal(a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) {
-            return tolower(a) == tolower(b);
-        });
+        return std::equal(a.begin(), a.end(),
+                          b.begin(), b.end(),
+                          [](char a, char b)
+                          {
+                              return tolower(a) == tolower(b);
+                          });
     }
 
     std::string WebSocketHandshake::genRandomString(const int len)
     {
-        std::string alphanum = "0123456789"
-                               "ABCDEFGH"
-                               "abcdefgh";
+        std::string alphanum =
+            "0123456789"
+            "ABCDEFGH"
+            "abcdefgh";
 
         std::random_device r;
         std::default_random_engine e1(r());
@@ -70,7 +74,6 @@ namespace ix
         ss << " ";
         ss << reason;
         ss << "\r\n";
-        ss << "Server: " << userAgent() << "\r\n";
 
         // Socket write can only be cancelled through a timeout here, not manually.
         static std::atomic<bool> requestInitCancellation(false);
@@ -85,13 +88,12 @@ namespace ix
         return WebSocketInitResult(false, code, reason);
     }
 
-    WebSocketInitResult WebSocketHandshake::clientHandshake(
-        const std::string& url,
-        const WebSocketHttpHeaders& extraHeaders,
-        const std::string& host,
-        const std::string& path,
-        int port,
-        int timeoutSecs)
+    WebSocketInitResult WebSocketHandshake::clientHandshake(const std::string& url,
+                                                            const WebSocketHttpHeaders& extraHeaders,
+                                                            const std::string& host,
+                                                            const std::string& path,
+                                                            int port,
+                                                            int timeoutSecs)
     {
         _requestInitCancellation = false;
 
@@ -103,7 +105,9 @@ namespace ix
         if (!success)
         {
             std::stringstream ss;
-            ss << "Unable to connect to " << host << " on port " << port << ", error: " << errMsg;
+            ss << "Unable to connect to " << host
+               << " on port " << port
+               << ", error: " << errMsg;
             return WebSocketInitResult(false, 0, ss.str());
         }
 
@@ -119,7 +123,7 @@ namespace ix
 
         std::stringstream ss;
         ss << "GET " << path << " HTTP/1.1\r\n";
-        ss << "Host: " << host << ":" << port << "\r\n";
+        ss << "Host: "<< host << ":" << port << "\r\n";
         ss << "Upgrade: websocket\r\n";
         ss << "Connection: Upgrade\r\n";
         ss << "Sec-WebSocket-Version: 13\r\n";
@@ -145,8 +149,7 @@ namespace ix
 
         if (!_socket->writeBytes(ss.str(), isCancellationRequested))
         {
-            return WebSocketInitResult(
-                false, 0, std::string("Failed sending GET request to ") + url);
+            return WebSocketInitResult(false, 0, std::string("Failed sending GET request to ") + url);
         }
 
         // Read HTTP status line
@@ -156,31 +159,30 @@ namespace ix
 
         if (!lineValid)
         {
-            return WebSocketInitResult(
-                false, 0, std::string("Failed reading HTTP status line from ") + url);
+            return WebSocketInitResult(false, 0,
+                                       std::string("Failed reading HTTP status line from ") + url);
         }
 
         // 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 << ", status: " << status
+            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 << "Expecting status 101 (Switching Protocol), got " << status
-               << " status connecting to " << host << ":" << port << ", HTTP Status line: " << line;
+            ss << "Got bad status connecting to " << host
+               << ", status: " << status
+               << ", HTTP Status line: " << line;
             return WebSocketInitResult(false, status, ss.str());
         }
 
@@ -240,13 +242,18 @@ namespace ix
         return WebSocketInitResult(true, status, "", headers, path);
     }
 
-    WebSocketInitResult WebSocketHandshake::serverHandshake(int timeoutSecs)
+    WebSocketInitResult WebSocketHandshake::serverHandshake(int fd, int timeoutSecs)
     {
         _requestInitCancellation = false;
 
+        // Set the socket to non blocking mode + other tweaks
+        SocketConnect::configure(fd);
+
         auto isCancellationRequested =
             makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
 
+        std::string remote = std::string("remote fd ") + std::to_string(fd);
+
         // Read first line
         auto lineResult = _socket->readLine(isCancellationRequested);
         auto lineValid = lineResult.first;
@@ -259,8 +266,8 @@ namespace ix
 
         // Validate request line (GET /foo HTTP/1.1\r\n)
         auto requestLine = Http::parseRequestLine(line);
-        auto method = std::get<0>(requestLine);
-        auto uri = std::get<1>(requestLine);
+        auto method      = std::get<0>(requestLine);
+        auto uri         = std::get<1>(requestLine);
         auto httpVersion = std::get<2>(requestLine);
 
         if (method != "GET")
@@ -270,8 +277,7 @@ namespace ix
 
         if (httpVersion != "HTTP/1.1")
         {
-            return sendErrorResponse(400,
-                                     "Invalid HTTP version, need HTTP/1.1, got: " + httpVersion);
+            return sendErrorResponse(400, "Invalid HTTP version, need HTTP/1.1, got: " + httpVersion);
         }
 
         // Retrieve and validate HTTP headers
@@ -289,17 +295,9 @@ namespace ix
             return sendErrorResponse(400, "Missing Sec-WebSocket-Key value");
         }
 
-        if (headers.find("upgrade") == headers.end())
+        if (headers["upgrade"] != "websocket")
         {
-            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())
@@ -315,10 +313,8 @@ namespace ix
 
             if (version != 13)
             {
-                return sendErrorResponse(400,
-                                         "Invalid Sec-WebSocket-Version, "
-                                         "need 13, got " +
-                                             ss.str());
+                return sendErrorResponse(400, "Invalid Sec-WebSocket-Version, "
+                                              "need 13, got" + ss.str());
             }
         }
 
@@ -330,13 +326,12 @@ namespace ix
         ss << "Sec-WebSocket-Accept: " << std::string(output) << "\r\n";
         ss << "Upgrade: websocket\r\n";
         ss << "Connection: Upgrade\r\n";
-        ss << "Server: " << userAgent() << "\r\n";
 
         // Parse the client headers. Does it support deflate ?
         std::string header = headers["sec-websocket-extensions"];
         WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
 
-        // If the client has requested that extension,
+        // If the client has requested that extension, enable it.
         if (webSocketPerMessageDeflateOptions.enabled())
         {
             _enablePerMessageDeflate = true;
@@ -344,7 +339,7 @@ namespace ix
             if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
             {
                 return WebSocketInitResult(
-                    false, 0, "Failed to initialize per message deflate engine");
+                    false, 0,"Failed to initialize per message deflate engine");
             }
             ss << webSocketPerMessageDeflateOptions.generateHeader();
         }
@@ -353,10 +348,9 @@ namespace ix
 
         if (!_socket->writeBytes(ss.str(), isCancellationRequested))
         {
-            return WebSocketInitResult(
-                false, 0, std::string("Failed sending response to remote end"));
+            return WebSocketInitResult(false, 0, std::string("Failed sending response to ") + remote);
         }
 
         return WebSocketInitResult(true, 200, "", headers, uri);
     }
-} // namespace ix
+}

ixwebsocket/IXWebSocketHandshake.h

@@ -9,7 +9,6 @@
 #include "IXCancellationRequest.h"
 #include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketInitResult.h"
 #include "IXWebSocketPerMessageDeflate.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
 #include <atomic>
@@ -19,6 +18,28 @@
 
 namespace ix
 {
+    struct WebSocketInitResult
+    {
+        bool success;
+        int http_status;
+        std::string errorStr;
+        WebSocketHttpHeaders headers;
+        std::string uri;
+
+        WebSocketInitResult(bool s = false,
+                            int status = 0,
+                            const std::string& e = std::string(),
+                            WebSocketHttpHeaders h = WebSocketHttpHeaders(),
+                            const std::string& u = std::string())
+        {
+            success = s;
+            http_status = status;
+            errorStr = e;
+            headers = h;
+            uri = u;
+        }
+    };
+
     class WebSocketHandshake
     {
     public:
@@ -28,14 +49,15 @@ namespace ix
                            WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
                            std::atomic<bool>& enablePerMessageDeflate);
 
-        WebSocketInitResult clientHandshake(const std::string& url,
-                                            const WebSocketHttpHeaders& extraHeaders,
-                                            const std::string& host,
-                                            const std::string& path,
-                                            int port,
-                                            int timeoutSecs);
+        WebSocketInitResult clientHandshake(
+            const std::string& url,
+            const WebSocketHttpHeaders& extraHeaders,
+            const std::string& host,
+            const std::string& path,
+            int port,
+            int timeoutSecs);
 
-        WebSocketInitResult serverHandshake(int timeoutSecs);
+        WebSocketInitResult serverHandshake(int fd, int timeoutSecs);
 
     private:
         std::string genRandomString(const int len);

ixwebsocket/IXWebSocketHttpHeaders.cpp

@@ -5,15 +5,13 @@
  */
 
 #include "IXWebSocketHttpHeaders.h"
-
 #include "IXSocket.h"
 #include <algorithm>
 #include <locale>
 
 namespace ix
 {
-    bool CaseInsensitiveLess::NocaseCompare::operator()(const unsigned char& c1,
-                                                        const unsigned char& c2) const
+    bool CaseInsensitiveLess::NocaseCompare::operator()(const unsigned char & c1, const unsigned char & c2) const
     {
 #ifdef _WIN32
         return std::tolower(c1, std::locale()) < std::tolower(c2, std::locale());
@@ -22,17 +20,17 @@ namespace ix
 #endif
     }
 
-    bool CaseInsensitiveLess::operator()(const std::string& s1, const std::string& s2) const
+    bool CaseInsensitiveLess::operator()(const std::string & s1, const std::string & s2) const
     {
-        return std::lexicographical_compare(s1.begin(),
-                                            s1.end(), // source range
-                                            s2.begin(),
-                                            s2.end(),         // dest range
-                                            NocaseCompare()); // comparison
+        return std::lexicographical_compare
+                (s1.begin(), s1.end(),   // source range
+                 s2.begin(), s2.end(),   // dest range
+                 NocaseCompare());       // comparison
     }
 
     std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested)
+        std::shared_ptr<Socket> socket,
+        const CancellationRequest& isCancellationRequested)
     {
         WebSocketHttpHeaders headers;
 
@@ -43,9 +41,11 @@ namespace ix
         {
             int colon = 0;
 
-            for (i = 0; i < 2 || (i < 1023 && line[i - 2] != '\r' && line[i - 1] != '\n'); ++i)
+            for (i = 0;
+                 i < 2 || (i < 1023 && line[i-2] != '\r' && line[i-1] != '\n');
+                 ++i)
             {
-                if (!socket->readByte(line + i, isCancellationRequested))
+                if (!socket->readByte(line+i, isCancellationRequested))
                 {
                     return std::make_pair(false, headers);
                 }
@@ -66,23 +66,12 @@ namespace ix
             {
                 line[i] = '\0';
                 std::string lineStr(line);
-                // colon is ':', usually colon+1 is ' ', and colon+2 is the start of the value.
-                // some webservers do not put a space after the colon character, so
-                // the start of the value might be farther than colon+2.
-                // The spec says that space after the : should be discarded.
+                // colon is ':', colon+1 is ' ', colon+2 is the start of the value.
                 // i is end of string (\0), i-colon is length of string minus key;
                 // subtract 1 for '\0', 1 for '\n', 1 for '\r',
                 // 1 for the ' ' after the ':', and total is -4
-                // since we use an std::string later on and don't account for '\0',
-                // plus the optional first space, total is -2
-                int start = colon + 1;
-                while (lineStr[start] == ' ')
-                {
-                    start++;
-                }
-
                 std::string name(lineStr.substr(0, colon));
-                std::string value(lineStr.substr(start, lineStr.size() - start - 2));
+                std::string value(lineStr.substr(colon + 2, i - colon - 4));
 
                 headers[name] = value;
             }
@@ -90,4 +79,4 @@ namespace ix
 
         return std::make_pair(true, headers);
     }
-} // namespace ix
+}

ixwebsocket/IXWebSocketInitResult.h

@@ -1,36 +0,0 @@
-/*
- *  IXWebSocketInitResult.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXWebSocketHttpHeaders.h"
-
-namespace ix
-{
-    struct WebSocketInitResult
-    {
-        bool success;
-        int http_status;
-        std::string errorStr;
-        WebSocketHttpHeaders headers;
-        std::string uri;
-        std::string protocol;
-
-        WebSocketInitResult(bool s = false,
-                            int status = 0,
-                            const std::string& e = std::string(),
-                            WebSocketHttpHeaders h = WebSocketHttpHeaders(),
-                            const std::string& u = std::string())
-        {
-            success = s;
-            http_status = status;
-            errorStr = e;
-            headers = h;
-            uri = u;
-            protocol = h["Sec-WebSocket-Protocol"];
-        }
-    };
-} // namespace ix

ixwebsocket/IXWebSocketMessageQueue.cpp

@@ -8,6 +8,7 @@
 
 namespace ix
 {
+
     WebSocketMessageQueue::WebSocketMessageQueue(WebSocket* websocket)
     {
         bindWebsocket(websocket);
@@ -23,7 +24,7 @@ namespace ix
         bindWebsocket(nullptr);
     }
 
-    void WebSocketMessageQueue::bindWebsocket(WebSocket* websocket)
+    void WebSocketMessageQueue::bindWebsocket(WebSocket * websocket)
     {
         if (_websocket == websocket) return;
 
@@ -39,7 +40,8 @@ namespace ix
         // bind new
         if (_websocket)
         {
-            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg) {
+            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg)
+            {
                 std::lock_guard<std::mutex> lock(_messagesMutex);
                 _messages.emplace_back(std::move(msg));
             });
@@ -72,7 +74,8 @@ namespace ix
 
     void WebSocketMessageQueue::poll(int count)
     {
-        if (!_onMessageUserCallback) return;
+        if (!_onMessageUserCallback)
+            return;
 
         WebSocketMessagePtr message;
 
@@ -83,4 +86,4 @@ namespace ix
         }
     }
 
-} // namespace ix
+}

ixwebsocket/IXWebSocketOpenInfo.h

@@ -12,14 +12,11 @@ namespace ix
     {
         std::string uri;
         WebSocketHttpHeaders headers;
-        std::string protocol;
 
         WebSocketOpenInfo(const std::string& u = std::string(),
-                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders(),
-                          const std::string& p = std::string())
+                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
             : uri(u)
             , headers(h)
-            , protocol(p)
         {
             ;
         }

ixwebsocket/IXWebSocketPerMessageDeflate.cpp

@@ -41,21 +41,19 @@
  *  - Added more documentation.
  *
  *  Per message Deflate RFC: https://tools.ietf.org/html/rfc7692
- *  Chrome websocket ->
- * https://github.com/chromium/chromium/tree/2ca8c5037021c9d2ecc00b787d58a31ed8fc8bcb/net/websockets
+ *  Chrome websocket -> https://github.com/chromium/chromium/tree/2ca8c5037021c9d2ecc00b787d58a31ed8fc8bcb/net/websockets
  *
  */
 
 #include "IXWebSocketPerMessageDeflate.h"
-
-#include "IXWebSocketPerMessageDeflateCodec.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXWebSocketPerMessageDeflateCodec.h"
 
 namespace ix
 {
-    WebSocketPerMessageDeflate::WebSocketPerMessageDeflate()
-        : _compressor(std::make_unique<WebSocketPerMessageDeflateCompressor>())
-        , _decompressor(std::make_unique<WebSocketPerMessageDeflateDecompressor>())
+    WebSocketPerMessageDeflate::WebSocketPerMessageDeflate() :
+        _compressor(std::make_unique<WebSocketPerMessageDeflateCompressor>()),
+        _decompressor(std::make_unique<WebSocketPerMessageDeflateDecompressor>())
     {
         ;
     }
@@ -65,10 +63,10 @@ namespace ix
         ;
     }
 
-    bool WebSocketPerMessageDeflate::init(
-        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
+    bool WebSocketPerMessageDeflate::init(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
     {
-        bool clientNoContextTakeover = perMessageDeflateOptions.getClientNoContextTakeover();
+        bool clientNoContextTakeover =
+            perMessageDeflateOptions.getClientNoContextTakeover();
 
         uint8_t deflateBits = perMessageDeflateOptions.getClientMaxWindowBits();
         uint8_t inflateBits = perMessageDeflateOptions.getServerMaxWindowBits();
@@ -77,14 +75,16 @@ namespace ix
                _decompressor->init(inflateBits, clientNoContextTakeover);
     }
 
-    bool WebSocketPerMessageDeflate::compress(const std::string& in, std::string& out)
+    bool WebSocketPerMessageDeflate::compress(const std::string& in,
+                                              std::string& out)
     {
         return _compressor->compress(in, out);
     }
 
-    bool WebSocketPerMessageDeflate::decompress(const std::string& in, std::string& out)
+    bool WebSocketPerMessageDeflate::decompress(const std::string& in,
+                                                std::string &out)
     {
         return _decompressor->decompress(in, out);
     }
 
-} // namespace ix
+}

ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp

@@ -5,8 +5,8 @@
  */
 
 #include "IXWebSocketPerMessageDeflateCodec.h"
-
 #include "IXWebSocketPerMessageDeflateOptions.h"
+
 #include <cassert>
 #include <string.h>
 
@@ -18,7 +18,7 @@ namespace
     const std::string kEmptyUncompressedBlock = std::string("\x00\x00\xff\xff", 4);
 
     const int kBufferSize = 1 << 14;
-} // namespace
+}
 
 namespace ix
 {
@@ -26,7 +26,7 @@ namespace ix
     // Compressor
     //
     WebSocketPerMessageDeflateCompressor::WebSocketPerMessageDeflateCompressor()
-        : _compressBufferSize(kBufferSize)
+      : _compressBufferSize(kBufferSize)
     {
         memset(&_deflateState, 0, sizeof(_deflateState));
 
@@ -43,18 +43,22 @@ namespace ix
     bool WebSocketPerMessageDeflateCompressor::init(uint8_t deflateBits,
                                                     bool clientNoContextTakeOver)
     {
-        int ret = deflateInit2(&_deflateState,
-                               Z_DEFAULT_COMPRESSION,
-                               Z_DEFLATED,
-                               -1 * deflateBits,
-                               4, // memory level 1-9
-                               Z_DEFAULT_STRATEGY);
+        int ret = deflateInit2(
+            &_deflateState,
+            Z_DEFAULT_COMPRESSION,
+            Z_DEFLATED,
+            -1*deflateBits,
+            4, // memory level 1-9
+            Z_DEFAULT_STRATEGY
+        );
 
         if (ret != Z_OK) return false;
 
         _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
 
-        _flush = (clientNoContextTakeOver) ? Z_FULL_FLUSH : Z_SYNC_FLUSH;
+        _flush = (clientNoContextTakeOver)
+                 ? Z_FULL_FLUSH
+                 : Z_SYNC_FLUSH;
 
         return true;
     }
@@ -66,7 +70,8 @@ namespace ix
         return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
     }
 
-    bool WebSocketPerMessageDeflateCompressor::compress(const std::string& in, std::string& out)
+    bool WebSocketPerMessageDeflateCompressor::compress(const std::string& in,
+                                                        std::string& out)
     {
         //
         // 7.2.1.  Compression
@@ -90,7 +95,7 @@ namespace ix
         if (in.empty())
         {
             uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
-            out.append((char*) (buf), 6);
+            out.append((char *)(buf), 6);
             return true;
         }
 
@@ -107,7 +112,7 @@ namespace ix
 
             output = _compressBufferSize - _deflateState.avail_out;
 
-            out.append((char*) (_compressBuffer.get()), output);
+            out.append((char *)(_compressBuffer.get()),output);
         } while (_deflateState.avail_out == 0);
 
         if (endsWith(out, kEmptyUncompressedBlock))
@@ -122,7 +127,7 @@ namespace ix
     // Decompressor
     //
     WebSocketPerMessageDeflateDecompressor::WebSocketPerMessageDeflateDecompressor()
-        : _compressBufferSize(kBufferSize)
+      : _compressBufferSize(kBufferSize)
     {
         memset(&_inflateState, 0, sizeof(_inflateState));
 
@@ -141,18 +146,24 @@ namespace ix
     bool WebSocketPerMessageDeflateDecompressor::init(uint8_t inflateBits,
                                                       bool clientNoContextTakeOver)
     {
-        int ret = inflateInit2(&_inflateState, -1 * inflateBits);
+        int ret = inflateInit2(
+            &_inflateState,
+            -1*inflateBits
+        );
 
         if (ret != Z_OK) return false;
 
         _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
 
-        _flush = (clientNoContextTakeOver) ? Z_FULL_FLUSH : Z_SYNC_FLUSH;
+        _flush = (clientNoContextTakeOver)
+                 ? Z_FULL_FLUSH
+                 : Z_SYNC_FLUSH;
 
         return true;
     }
 
-    bool WebSocketPerMessageDeflateDecompressor::decompress(const std::string& in, std::string& out)
+    bool WebSocketPerMessageDeflateDecompressor::decompress(const std::string& in,
+                                                            std::string& out)
     {
         //
         // 7.2.2.  Decompression
@@ -168,7 +179,7 @@ namespace ix
         inFixed += kEmptyUncompressedBlock;
 
         _inflateState.avail_in = (uInt) inFixed.size();
-        _inflateState.next_in = (unsigned char*) (const_cast<char*>(inFixed.data()));
+        _inflateState.next_in = (unsigned char *)(const_cast<char *>(inFixed.data()));
 
         do
         {
@@ -182,10 +193,13 @@ namespace ix
                 return false; // zlib error
             }
 
-            out.append(reinterpret_cast<char*>(_compressBuffer.get()),
-                       _compressBufferSize - _inflateState.avail_out);
+            out.append(
+                reinterpret_cast<char *>(_compressBuffer.get()),
+                _compressBufferSize - _inflateState.avail_out
+            );
         } while (_inflateState.avail_out == 0);
 
         return true;
     }
-} // namespace ix
+}
+

ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp

@@ -6,9 +6,9 @@
 
 #include "IXWebSocketPerMessageDeflateOptions.h"
 
+#include <sstream>
 #include <algorithm>
 #include <cctype>
-#include <sstream>
 
 namespace ix
 {
@@ -33,8 +33,6 @@ namespace ix
         _serverNoContextTakeover = serverNoContextTakeover;
         _clientMaxWindowBits = clientMaxWindowBits;
         _serverMaxWindowBits = serverMaxWindowBits;
-
-        sanitizeClientMaxWindowBits();
     }
 
     //
@@ -48,8 +46,7 @@ namespace ix
     //
     // Server response could look like that:
     //
-    // Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover;
-    // server_no_context_takeover
+    // Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover; server_no_context_takeover
     //
     WebSocketPerMessageDeflateOptions::WebSocketPerMessageDeflateOptions(std::string extension)
     {
@@ -93,7 +90,8 @@ namespace ix
                 // Sanitize values to be in the proper range [8, 15] in
                 // case a server would give us bogus values
                 _serverMaxWindowBits =
-                    std::min(maxServerMaxWindowBits, std::max(x, minServerMaxWindowBits));
+                    std::min(maxServerMaxWindowBits,
+                        std::max(x, minServerMaxWindowBits));
             }
 
             if (startsWith(token, "client_max_window_bits="))
@@ -107,23 +105,12 @@ namespace ix
                 // Sanitize values to be in the proper range [8, 15] in
                 // case a server would give us bogus values
                 _clientMaxWindowBits =
-                    std::min(maxClientMaxWindowBits, std::max(x, minClientMaxWindowBits));
-
-                sanitizeClientMaxWindowBits();
+                    std::min(maxClientMaxWindowBits,
+                        std::max(x, minClientMaxWindowBits));
             }
         }
     }
 
-    void WebSocketPerMessageDeflateOptions::sanitizeClientMaxWindowBits()
-    {
-        // zlib/deflate has a bug with windowsbits == 8, so we silently upgrade it to 9
-        // See https://bugs.chromium.org/p/chromium/issues/detail?id=691074
-        if (_clientMaxWindowBits == 8)
-        {
-            _clientMaxWindowBits = 9;
-        }
-    }
-
     std::string WebSocketPerMessageDeflateOptions::generateHeader()
     {
         std::stringstream ss;
@@ -174,10 +161,11 @@ namespace ix
     std::string WebSocketPerMessageDeflateOptions::removeSpaces(const std::string& str)
     {
         std::string out(str);
-        out.erase(
-            std::remove_if(out.begin(), out.end(), [](unsigned char x) { return std::isspace(x); }),
-            out.end());
+        out.erase(std::remove_if(out.begin(),
+                                 out.end(),
+                                 [](unsigned char x){ return std::isspace(x); }),
+                  out.end());
 
         return out;
     }
-} // namespace ix
+}

ixwebsocket/IXWebSocketPerMessageDeflateOptions.h

@@ -41,7 +41,5 @@ namespace ix
         bool _serverNoContextTakeover;
         int _clientMaxWindowBits;
         int _serverMaxWindowBits;
-
-        void sanitizeClientMaxWindowBits();
     };
 } // namespace ix

ixwebsocket/IXWebSocketServer.cpp

@@ -5,14 +5,13 @@
  */
 
 #include "IXWebSocketServer.h"
-
-#include "IXNetSystem.h"
-#include "IXSetThreadName.h"
-#include "IXSocketConnect.h"
-#include "IXWebSocket.h"
 #include "IXWebSocketTransport.h"
-#include <future>
+#include "IXWebSocket.h"
+#include "IXSocketConnect.h"
+#include "IXNetSystem.h"
+
 #include <sstream>
+#include <future>
 #include <string.h>
 
 namespace ix
@@ -24,13 +23,11 @@ namespace ix
                                      const std::string& host,
                                      int backlog,
                                      size_t maxConnections,
-                                     int handshakeTimeoutSecs,
-                                     int addressFamily)
-        : SocketServer(port, host, backlog, maxConnections, addressFamily)
-        , _handshakeTimeoutSecs(handshakeTimeoutSecs)
-        , _enablePong(kDefaultEnablePong)
-        , _enablePerMessageDeflate(true)
+                                     int handshakeTimeoutSecs) : SocketServer(port, host, backlog, maxConnections),
+        _handshakeTimeoutSecs(handshakeTimeoutSecs),
+        _enablePong(kDefaultEnablePong)
     {
+
     }
 
     WebSocketServer::~WebSocketServer()
@@ -61,34 +58,24 @@ namespace ix
         _enablePong = false;
     }
 
-    void WebSocketServer::disablePerMessageDeflate()
-    {
-        _enablePerMessageDeflate = false;
-    }
-
     void WebSocketServer::setOnConnectionCallback(const OnConnectionCallback& callback)
     {
         _onConnectionCallback = callback;
     }
 
-    void WebSocketServer::handleConnection(std::shared_ptr<Socket> socket,
-                                           std::shared_ptr<ConnectionState> connectionState)
+    void WebSocketServer::handleConnection(
+        int fd,
+        std::shared_ptr<ConnectionState> connectionState)
     {
-        setThreadName("WebSocketServer::" + connectionState->getId());
-
         auto webSocket = std::make_shared<WebSocket>();
         _onConnectionCallback(webSocket, connectionState);
 
         webSocket->disableAutomaticReconnection();
 
         if (_enablePong)
-        {
             webSocket->enablePong();
-        }
         else
-        {
             webSocket->disablePong();
-        }
 
         // Add this client to our client set
         {
@@ -96,7 +83,7 @@ namespace ix
             _clients.insert(webSocket);
         }
 
-        auto status = webSocket->connectToSocket(socket, _handshakeTimeoutSecs);
+        auto status = webSocket->connectToSocket(fd, _handshakeTimeoutSecs);
         if (status.success)
         {
             // Process incoming messages and execute callbacks
@@ -106,8 +93,10 @@ namespace ix
         else
         {
             std::stringstream ss;
-            ss << "WebSocketServer::handleConnection() HTTP status: " << status.http_status
-               << " error: " << status.errorStr;
+            ss << "WebSocketServer::handleConnection() error: "
+               << status.http_status
+               << " error: "
+               << status.errorStr;
             logError(ss.str());
         }
 
@@ -120,6 +109,7 @@ namespace ix
             }
         }
 
+        logInfo("WebSocketServer::handleConnection() done");
         connectionState->setTerminated();
     }
 
@@ -134,4 +124,4 @@ namespace ix
         std::lock_guard<std::mutex> lock(_clientsMutex);
         return _clients.size();
     }
-} // namespace ix
+}

ixwebsocket/IXWebSocketServer.h

@@ -29,37 +29,33 @@ namespace ix
                         const std::string& host = SocketServer::kDefaultHost,
                         int backlog = SocketServer::kDefaultTcpBacklog,
                         size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                        int handshakeTimeoutSecs = WebSocketServer::kDefaultHandShakeTimeoutSecs,
-                        int addressFamily = SocketServer::kDefaultAddressFamily);
+                        int handshakeTimeoutSecs = WebSocketServer::kDefaultHandShakeTimeoutSecs);
         virtual ~WebSocketServer();
         virtual void stop() final;
 
         void enablePong();
         void disablePong();
-        void disablePerMessageDeflate();
 
         void setOnConnectionCallback(const OnConnectionCallback& callback);
 
         // Get all the connected clients
         std::set<std::shared_ptr<WebSocket>> getClients();
 
-        const static int kDefaultHandShakeTimeoutSecs;
-
     private:
         // Member variables
         int _handshakeTimeoutSecs;
         bool _enablePong;
-        bool _enablePerMessageDeflate;
 
         OnConnectionCallback _onConnectionCallback;
 
         std::mutex _clientsMutex;
         std::set<std::shared_ptr<WebSocket>> _clients;
 
+        const static int kDefaultHandShakeTimeoutSecs;
         const static bool kDefaultEnablePong;
 
         // Methods
-        virtual void handleConnection(std::shared_ptr<Socket> socket,
+        virtual void handleConnection(int fd,
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
     };

ixwebsocket/IXWebSocketTransport.cpp

@@ -33,22 +33,22 @@
 //
 
 #include "IXWebSocketTransport.h"
-
-#include "IXSocketFactory.h"
-#include "IXSocketTLSOptions.h"
-#include "IXUrlParser.h"
-#include "IXUtf8Validator.h"
 #include "IXWebSocketHandshake.h"
 #include "IXWebSocketHttpHeaders.h"
-#include <chrono>
-#include <cstdarg>
-#include <cstdlib>
-#include <sstream>
-#include <stdlib.h>
+#include "IXUrlParser.h"
+#include "IXSocketFactory.h"
+#include "IXUtf8Validator.h"
+
 #include <string.h>
-#include <string>
-#include <thread>
+#include <stdlib.h>
+
+#include <cstdlib>
 #include <vector>
+#include <string>
+#include <cstdarg>
+#include <sstream>
+#include <chrono>
+#include <thread>
 
 
 namespace
@@ -64,7 +64,7 @@ namespace
 
         return a;
     }
-} // namespace
+}
 
 namespace ix
 {
@@ -75,25 +75,23 @@ namespace ix
     const int WebSocketTransport::kClosingMaximumWaitingDelayInMs(300);
     constexpr size_t WebSocketTransport::kChunkSize;
 
-    WebSocketTransport::WebSocketTransport()
-        : _useMask(true)
-        , _blockingSend(false)
-        , _compressedMessage(false)
-        , _readyState(ReadyState::CLOSED)
-        , _closeCode(WebSocketCloseConstants::kInternalErrorCode)
-        , _closeReason(WebSocketCloseConstants::kInternalErrorMessage)
-        , _closeWireSize(0)
-        , _closeRemote(false)
-        , _enablePerMessageDeflate(false)
-        , _requestInitCancellation(false)
-        , _closingTimePoint(std::chrono::steady_clock::now())
-        , _enablePong(kDefaultEnablePong)
-        , _pingIntervalSecs(kDefaultPingIntervalSecs)
-        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
-        , _pingIntervalOrTimeoutGCDSecs(-1)
-        , _nextGCDTimePoint(std::chrono::steady_clock::now())
-        , _lastSendPingTimePoint(std::chrono::steady_clock::now())
-        , _lastReceivePongTimePoint(std::chrono::steady_clock::now())
+    WebSocketTransport::WebSocketTransport() :
+        _useMask(true),
+        _readyState(ReadyState::CLOSED),
+        _closeCode(WebSocketCloseConstants::kInternalErrorCode),
+        _closeReason(WebSocketCloseConstants::kInternalErrorMessage),
+        _closeWireSize(0),
+        _closeRemote(false),
+        _enablePerMessageDeflate(false),
+        _requestInitCancellation(false),
+        _closingTimePoint(std::chrono::steady_clock::now()),
+        _enablePong(kDefaultEnablePong),
+        _pingIntervalSecs(kDefaultPingIntervalSecs),
+        _pingTimeoutSecs(kDefaultPingTimeoutSecs),
+        _pingIntervalOrTimeoutGCDSecs(-1),
+        _nextGCDTimePoint(std::chrono::steady_clock::now()),
+        _lastSendPingTimePoint(std::chrono::steady_clock::now()),
+        _lastReceivePongTimePoint(std::chrono::steady_clock::now())
     {
         _readbuf.resize(kChunkSize);
     }
@@ -103,24 +101,21 @@ namespace ix
         ;
     }
 
-    void WebSocketTransport::configure(
-        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-        const SocketTLSOptions& socketTLSOptions,
-        bool enablePong,
-        int pingIntervalSecs,
-        int pingTimeoutSecs)
+    void WebSocketTransport::configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
+                                       bool enablePong,
+                                       int pingIntervalSecs,
+                                       int pingTimeoutSecs)
     {
         _perMessageDeflateOptions = perMessageDeflateOptions;
         _enablePerMessageDeflate = _perMessageDeflateOptions.enabled();
-        _socketTLSOptions = socketTLSOptions;
         _enablePong = enablePong;
         _pingIntervalSecs = pingIntervalSecs;
         _pingTimeoutSecs = pingTimeoutSecs;
 
         if (pingIntervalSecs > 0 && pingTimeoutSecs > 0)
         {
-            _pingIntervalOrTimeoutGCDSecs =
-                greatestCommonDivisor(pingIntervalSecs, pingTimeoutSecs);
+            _pingIntervalOrTimeoutGCDSecs = greatestCommonDivisor(pingIntervalSecs,
+                                                                  pingTimeoutSecs);
         }
         else if (_pingTimeoutSecs > 0)
         {
@@ -133,9 +128,10 @@ namespace ix
     }
 
     // Client
-    WebSocketInitResult WebSocketTransport::connectToUrl(const std::string& url,
-                                                         const WebSocketHttpHeaders& headers,
-                                                         int timeoutSecs)
+    WebSocketInitResult WebSocketTransport::connectToUrl(
+        const std::string& url,
+        const WebSocketHttpHeaders& headers,
+        int timeoutSecs)
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
 
@@ -144,14 +140,13 @@ namespace ix
 
         if (!UrlParser::parse(url, protocol, host, path, query, port))
         {
-            std::stringstream ss;
-            ss << "Could not parse url: '" << url << "'";
-            return WebSocketInitResult(false, 0, ss.str());
+            return WebSocketInitResult(false, 0,
+                                       std::string("Could not parse URL ") + url);
         }
 
         std::string errorMsg;
         bool tls = protocol == "wss";
-        _socket = createSocket(tls, -1, errorMsg, _socketTLSOptions);
+        _socket = createSocket(tls, errorMsg);
 
         if (!_socket)
         {
@@ -164,8 +159,8 @@ namespace ix
                                               _perMessageDeflateOptions,
                                               _enablePerMessageDeflate);
 
-        auto result =
-            webSocketHandshake.clientHandshake(url, headers, host, path, port, timeoutSecs);
+        auto result = webSocketHandshake.clientHandshake(url, headers, host, path,
+                                                         port, timeoutSecs);
         if (result.success)
         {
             setReadyState(ReadyState::OPEN);
@@ -174,16 +169,20 @@ namespace ix
     }
 
     // Server
-    WebSocketInitResult WebSocketTransport::connectToSocket(std::shared_ptr<Socket> socket,
-                                                            int timeoutSecs)
+    WebSocketInitResult WebSocketTransport::connectToSocket(int fd, int timeoutSecs)
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
 
         // Server should not mask the data it sends to the client
         _useMask = false;
-        _blockingSend = true;
 
-        _socket = socket;
+        std::string errorMsg;
+        _socket = createSocket(fd, errorMsg);
+
+        if (!_socket)
+        {
+            return WebSocketInitResult(false, 0, errorMsg);
+        }
 
         WebSocketHandshake webSocketHandshake(_requestInitCancellation,
                                               _socket,
@@ -191,7 +190,7 @@ namespace ix
                                               _perMessageDeflateOptions,
                                               _enablePerMessageDeflate);
 
-        auto result = webSocketHandshake.serverHandshake(timeoutSecs);
+        auto result = webSocketHandshake.serverHandshake(fd, timeoutSecs);
         if (result.success)
         {
             setReadyState(ReadyState::OPEN);
@@ -244,15 +243,15 @@ namespace ix
 
         if (_pingIntervalOrTimeoutGCDSecs > 0)
         {
-            _nextGCDTimePoint = std::chrono::steady_clock::now() +
-                                std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
+            _nextGCDTimePoint = std::chrono::steady_clock::now() + std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
         }
     }
 
     // Only consider send PING time points for that computation.
     bool WebSocketTransport::pingIntervalExceeded()
     {
-        if (_pingIntervalSecs <= 0) return false;
+        if (_pingIntervalSecs <= 0)
+            return false;
 
         std::lock_guard<std::mutex> lock(_lastSendPingTimePointMutex);
         auto now = std::chrono::steady_clock::now();
@@ -261,7 +260,8 @@ namespace ix
 
     bool WebSocketTransport::pingTimeoutExceeded()
     {
-        if (_pingTimeoutSecs <= 0) return false;
+        if (_pingTimeoutSecs <= 0)
+            return false;
 
         std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
         auto now = std::chrono::steady_clock::now();
@@ -298,8 +298,7 @@ namespace ix
 
         // No timeout if state is not OPEN, otherwise computed
         // pingIntervalOrTimeoutGCD (equals to -1 if no ping and no ping timeout are set)
-        int lastingTimeoutDelayInMs =
-            (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;
+        int lastingTimeoutDelayInMs = (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;
 
         if (_pingIntervalOrTimeoutGCDSecs > 0)
         {
@@ -314,10 +313,7 @@ namespace ix
             }
             else
             {
-                lastingTimeoutDelayInMs =
-                    (int) std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint -
-                                                                                now)
-                        .count();
+                lastingTimeoutDelayInMs = (int)std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint - now).count();
             }
         }
 
@@ -343,16 +339,49 @@ namespace ix
         // there can be a lot of it for large messages.
         if (pollResult == PollResultType::SendRequest)
         {
-            if (!flushSendBuffer())
+            while (!isSendBufferEmpty() && !_requestInitCancellation)
             {
-                return PollResult::CannotFlushSendBuffer;
+                // Wait with a 10ms timeout until the socket is ready to write.
+                // This way we are not busy looping
+                PollResultType result = _socket->isReadyToWrite(10);
+
+                if (result == PollResultType::Error)
+                {
+                    closeSocket();
+                    setReadyState(ReadyState::CLOSED);
+                    break;
+                }
+                else if (result == PollResultType::ReadyForWrite)
+                {
+                    sendOnSocket();
+                }
             }
         }
         else if (pollResult == PollResultType::ReadyForRead)
         {
-            if (!receiveFromSocket())
+            while (true)
             {
-                return PollResult::AbnormalClose;
+                ssize_t ret = _socket->recv((char*)&_readbuf[0], _readbuf.size());
+
+                if (ret < 0 && Socket::isWaitNeeded())
+                {
+                    break;
+                }
+                else if (ret <= 0)
+                {
+                    // if there are received data pending to be processed, then delay the abnormal closure
+                    // to after dispatch (other close code/reason could be read from the buffer)
+
+                    closeSocket();
+
+                    return PollResult::AbnormalClose;
+                }
+                else
+                {
+                    _rxbuf.insert(_rxbuf.end(),
+                                  _readbuf.begin(),
+                                  _readbuf.begin() + ret);
+                }
             }
         }
         else if (pollResult == PollResultType::Error)
@@ -396,7 +425,7 @@ namespace ix
         {
             for (size_t i = 0; i != (size_t) message_size; ++i)
             {
-                *(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i & 0x3];
+                *(_txbuf.end() - (size_t) message_size + i) ^= masking_key[i&0x3];
             }
         }
     }
@@ -407,7 +436,7 @@ namespace ix
         {
             for (size_t j = 0; j != ws.N; ++j)
             {
-                _rxbuf[j + ws.header_size] ^= ws.masking_key[j & 0x3];
+                _rxbuf[j+ws.header_size] ^= ws.masking_key[j&0x3];
             }
         }
     }
@@ -440,17 +469,16 @@ namespace ix
         while (true)
         {
             wsheader_type ws;
-            if (_rxbuf.size() < 2) break;                /* Need at least 2 */
-            const uint8_t* data = (uint8_t*) &_rxbuf[0]; // peek, but don't consume
+            if (_rxbuf.size() < 2) break; /* Need at least 2 */
+            const uint8_t * data = (uint8_t *) &_rxbuf[0]; // peek, but don't consume
             ws.fin = (data[0] & 0x80) == 0x80;
             ws.rsv1 = (data[0] & 0x40) == 0x40;
             ws.rsv2 = (data[0] & 0x20) == 0x20;
             ws.rsv3 = (data[0] & 0x10) == 0x10;
-            ws.opcode = (wsheader_type::opcode_type)(data[0] & 0x0f);
+            ws.opcode = (wsheader_type::opcode_type) (data[0] & 0x0f);
             ws.mask = (data[1] & 0x80) == 0x80;
             ws.N0 = (data[1] & 0x7f);
-            ws.header_size =
-                2 + (ws.N0 == 126 ? 2 : 0) + (ws.N0 == 127 ? 8 : 0) + (ws.mask ? 4 : 0);
+            ws.header_size = 2 + (ws.N0 == 126? 2 : 0) + (ws.N0 == 127? 8 : 0) + (ws.mask? 4 : 0);
             if (_rxbuf.size() < ws.header_size) break; /* Need: ws.header_size - _rxbuf.size() */
 
             if ((ws.rsv1 && !_enablePerMessageDeflate) || ws.rsv2 || ws.rsv3)
@@ -501,10 +529,10 @@ namespace ix
 
             if (ws.mask)
             {
-                ws.masking_key[0] = ((uint8_t) data[i + 0]) << 0;
-                ws.masking_key[1] = ((uint8_t) data[i + 1]) << 0;
-                ws.masking_key[2] = ((uint8_t) data[i + 2]) << 0;
-                ws.masking_key[3] = ((uint8_t) data[i + 3]) << 0;
+                ws.masking_key[0] = ((uint8_t) data[i+0]) << 0;
+                ws.masking_key[1] = ((uint8_t) data[i+1]) << 0;
+                ws.masking_key[2] = ((uint8_t) data[i+2]) << 0;
+                ws.masking_key[3] = ((uint8_t) data[i+3]) << 0;
             }
             else
             {
@@ -514,43 +542,36 @@ namespace ix
                 ws.masking_key[3] = 0;
             }
 
-            // Prevent integer overflow in the next conditional
-            const uint64_t maxFrameSize(1ULL << 63);
-            if (ws.N > maxFrameSize)
-            {
-                return;
-            }
-
-            if (_rxbuf.size() < ws.header_size + ws.N)
+            if (_rxbuf.size() < ws.header_size+ws.N)
             {
                 return; /* Need: ws.header_size+ws.N - _rxbuf.size() */
             }
 
-            if (!ws.fin && (ws.opcode == wsheader_type::PING || ws.opcode == wsheader_type::PONG ||
-                            ws.opcode == wsheader_type::CLOSE))
-            {
+            if (!ws.fin && (
+                   ws.opcode == wsheader_type::PING
+                || ws.opcode == wsheader_type::PONG
+                || ws.opcode == wsheader_type::CLOSE
+            )){
                 // Control messages should not be fragmented
                 close(WebSocketCloseConstants::kProtocolErrorCode,
                       WebSocketCloseConstants::kProtocolErrorCodeControlMessageFragmented);
                 return;
             }
 
-            unmaskReceiveBuffer(ws);
-            std::string frameData(_rxbuf.begin() + ws.header_size,
-                                  _rxbuf.begin() + ws.header_size + (size_t) ws.N);
-
             // We got a whole message, now do something with it:
-            if (ws.opcode == wsheader_type::TEXT_FRAME ||
-                ws.opcode == wsheader_type::BINARY_FRAME ||
-                ws.opcode == wsheader_type::CONTINUATION)
-            {
+            if (
+                   ws.opcode == wsheader_type::TEXT_FRAME
+                || ws.opcode == wsheader_type::BINARY_FRAME
+                || ws.opcode == wsheader_type::CONTINUATION
+            ) {
+                unmaskReceiveBuffer(ws);
+
                 if (ws.opcode != wsheader_type::CONTINUATION)
                 {
-                    _fragmentedMessageKind = (ws.opcode == wsheader_type::TEXT_FRAME)
-                                                 ? MessageKind::MSG_TEXT
-                                                 : MessageKind::MSG_BINARY;
-
-                    _compressedMessage = _enablePerMessageDeflate && ws.rsv1;
+                    _fragmentedMessageKind =
+                        (ws.opcode == wsheader_type::TEXT_FRAME)
+                        ? MessageKind::MSG_TEXT
+                        : MessageKind::MSG_BINARY;
 
                     // Continuation message needs to follow a non-fin TEXT or BINARY message
                     if (!_chunks.empty())
@@ -562,9 +583,8 @@ namespace ix
                 else if (_chunks.empty())
                 {
                     // Continuation message need to follow a non-fin TEXT or BINARY message
-                    close(
-                        WebSocketCloseConstants::kProtocolErrorCode,
-                        WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence);
+                    close(WebSocketCloseConstants::kProtocolErrorCode,
+                          WebSocketCloseConstants::kProtocolErrorCodeContinuationOpCodeOutOfSequence);
                 }
 
                 //
@@ -572,10 +592,11 @@ namespace ix
                 //
                 if (ws.fin && _chunks.empty())
                 {
-                    emitMessage(
-                        _fragmentedMessageKind, frameData, _compressedMessage, onMessageCallback);
-
-                    _compressedMessage = false;
+                    emitMessage(_fragmentedMessageKind,
+                                std::string(_rxbuf.begin()+ws.header_size,
+                                            _rxbuf.begin()+ws.header_size+(size_t) ws.N),
+                                ws,
+                                onMessageCallback);
                 }
                 else
                 {
@@ -586,28 +607,30 @@ namespace ix
                     // the internal buffer which is slow and can let the internal OS
                     // receive buffer fill out.
                     //
-                    _chunks.emplace_back(frameData);
-
+                    _chunks.emplace_back(
+                        std::vector<uint8_t>(_rxbuf.begin()+ws.header_size,
+                                             _rxbuf.begin()+ws.header_size+(size_t)ws.N));
                     if (ws.fin)
                     {
-                        emitMessage(_fragmentedMessageKind,
-                                    getMergedChunks(),
-                                    _compressedMessage,
-                                    onMessageCallback);
-
+                        emitMessage(_fragmentedMessageKind, getMergedChunks(),
+                                    ws, onMessageCallback);
                         _chunks.clear();
-                        _compressedMessage = false;
                     }
                     else
                     {
-                        emitMessage(MessageKind::FRAGMENT, std::string(), false, onMessageCallback);
+                        emitMessage(MessageKind::FRAGMENT, std::string(), ws, onMessageCallback);
                     }
                 }
             }
             else if (ws.opcode == wsheader_type::PING)
             {
+                unmaskReceiveBuffer(ws);
+
+                std::string pingData(_rxbuf.begin()+ws.header_size,
+                                     _rxbuf.begin()+ws.header_size + (size_t) ws.N);
+
                 // too large
-                if (frameData.size() > 125)
+                if (pingData.size() > 125)
                 {
                     // Unexpected frame type
                     close(WebSocketCloseConstants::kProtocolErrorCode,
@@ -619,33 +642,40 @@ namespace ix
                 {
                     // Reply back right away
                     bool compress = false;
-                    sendData(wsheader_type::PONG, frameData, compress);
+                    sendData(wsheader_type::PONG, pingData, compress);
                 }
 
-                emitMessage(MessageKind::PING, frameData, false, onMessageCallback);
+                emitMessage(MessageKind::PING, pingData, ws, onMessageCallback);
             }
             else if (ws.opcode == wsheader_type::PONG)
             {
+                unmaskReceiveBuffer(ws);
+                std::string pongData(_rxbuf.begin()+ws.header_size,
+                                     _rxbuf.begin()+ws.header_size + (size_t) ws.N);
+
                 std::lock_guard<std::mutex> lck(_lastReceivePongTimePointMutex);
                 _lastReceivePongTimePoint = std::chrono::steady_clock::now();
 
-                emitMessage(MessageKind::PONG, frameData, false, onMessageCallback);
+                emitMessage(MessageKind::PONG, pongData, ws, onMessageCallback);
             }
             else if (ws.opcode == wsheader_type::CLOSE)
             {
                 std::string reason;
                 uint16_t code = 0;
 
+                unmaskReceiveBuffer(ws);
+
                 if (ws.N >= 2)
                 {
                     // Extract the close code first, available as the first 2 bytes
-                    code |= ((uint64_t) _rxbuf[ws.header_size]) << 8;
-                    code |= ((uint64_t) _rxbuf[ws.header_size + 1]) << 0;
+                    code |= ((uint64_t) _rxbuf[ws.header_size])   << 8;
+                    code |= ((uint64_t) _rxbuf[ws.header_size+1]) << 0;
 
                     // Get the reason.
                     if (ws.N > 2)
                     {
-                        reason = frameData.substr(2, frameData.size());
+                        reason.assign(_rxbuf.begin()+ws.header_size + 2,
+                                      _rxbuf.begin()+ws.header_size + (size_t) ws.N);
                     }
 
                     // Validate that the reason is proper utf-8. Autobahn 7.5.1
@@ -654,22 +684,6 @@ namespace ix
                         code = WebSocketCloseConstants::kInvalidFramePayloadData;
                         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
-                    //
-                    if (code < 1000 || code == 1004 || code == 1006 || (code > 1013 && code < 3000))
-                    {
-                        // build up an error message containing the bad error code
-                        std::stringstream ss;
-                        ss << WebSocketCloseConstants::kInvalidCloseCodeMessage << ": " << code;
-                        reason = ss.str();
-
-                        code = WebSocketCloseConstants::kProtocolErrorCode;
-                    }
                 }
                 else
                 {
@@ -691,8 +705,8 @@ namespace ix
                 }
                 else
                 {
-                    // we got the CLOSE frame answer from our close, so we can close the connection
-                    // if the code/reason are the same
+                    // we got the CLOSE frame answer from our close, so we can close the connection if
+                    // the code/reason are the same
                     bool identicalReason;
                     {
                         std::lock_guard<std::mutex> lock(_closeDataMutex);
@@ -715,17 +729,17 @@ namespace ix
             }
 
             // Erase the message that has been processed from the input/read buffer
-            _rxbuf.erase(_rxbuf.begin(), _rxbuf.begin() + ws.header_size + (size_t) ws.N);
+            _rxbuf.erase(_rxbuf.begin(),
+                         _rxbuf.begin() + ws.header_size + (size_t) ws.N);
         }
 
         // if an abnormal closure was raised in poll, and nothing else triggered a CLOSED state in
         // the received and processed data then close the connection
-        if (pollResult != PollResult::Succeeded)
+        if (pollResult == PollResult::AbnormalClose)
         {
             _rxbuf.clear();
 
-            // if we previously closed the connection (CLOSING state), then set state to CLOSED
-            // (code/reason were set before)
+            // if we previously closed the connection (CLOSING state), then set state to CLOSED (code/reason were set before)
             if (_readyState == ReadyState::CLOSING)
             {
                 closeSocket();
@@ -736,8 +750,7 @@ namespace ix
             {
                 closeSocketAndSwitchToClosedState(WebSocketCloseConstants::kAbnormalCloseCode,
                                                   WebSocketCloseConstants::kAbnormalCloseMessage,
-                                                  0,
-                                                  false);
+                                                  0, false);
             }
         }
     }
@@ -755,7 +768,8 @@ namespace ix
 
         for (auto&& chunk : _chunks)
         {
-            msg += chunk;
+            std::string str(chunk.begin(), chunk.end());
+            msg += str;
         }
 
         return msg;
@@ -763,38 +777,21 @@ namespace ix
 
     void WebSocketTransport::emitMessage(MessageKind messageKind,
                                          const std::string& message,
-                                         bool compressedMessage,
+                                         const wsheader_type& ws,
                                          const OnMessageCallback& onMessageCallback)
     {
         size_t wireSize = message.size();
 
         // When the RSV1 bit is 1 it means the message is compressed
-        if (compressedMessage && messageKind != MessageKind::FRAGMENT)
+        if (_enablePerMessageDeflate && ws.rsv1 && messageKind != MessageKind::FRAGMENT)
         {
             std::string decompressedMessage;
             bool success = _perMessageDeflate.decompress(message, decompressedMessage);
-
-            if (messageKind == MessageKind::MSG_TEXT && !validateUtf8(decompressedMessage))
-            {
-                close(WebSocketCloseConstants::kInvalidFramePayloadData,
-                      WebSocketCloseConstants::kInvalidFramePayloadDataMessage);
-            }
-            else
-            {
-                onMessageCallback(decompressedMessage, wireSize, !success, messageKind);
-            }
+            onMessageCallback(decompressedMessage, wireSize, !success, messageKind);
         }
         else
         {
-            if (messageKind == MessageKind::MSG_TEXT && !validateUtf8(message))
-            {
-                close(WebSocketCloseConstants::kInvalidFramePayloadData,
-                      WebSocketCloseConstants::kInvalidFramePayloadDataMessage);
-            }
-            else
-            {
-                onMessageCallback(message, wireSize, false, messageKind);
-            }
+            onMessageCallback(message, wireSize, false, messageKind);
         }
     }
 
@@ -802,14 +799,16 @@ namespace ix
     {
         auto now = std::chrono::system_clock::now();
         auto seconds =
-            std::chrono::duration_cast<std::chrono::seconds>(now.time_since_epoch()).count();
+            std::chrono::duration_cast<std::chrono::seconds>(
+                now.time_since_epoch()).count();
         return static_cast<unsigned>(seconds);
     }
 
-    WebSocketSendInfo WebSocketTransport::sendData(wsheader_type::opcode_type type,
-                                                   const std::string& message,
-                                                   bool compress,
-                                                   const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendData(
+        wsheader_type::opcode_type type,
+        const std::string& message,
+        bool compress,
+        const OnProgressCallback& onProgressCallback)
     {
         if (_readyState != ReadyState::OPEN && _readyState != ReadyState::CLOSING)
         {
@@ -841,17 +840,10 @@ namespace ix
             message_end = compressedMessage.end();
         }
 
-        {
-            std::lock_guard<std::mutex> lock(_txbufMutex);
-            _txbuf.reserve(wireSize);
-        }
-
-        bool success = true;
-
         // Common case for most message. No fragmentation required.
         if (wireSize < kChunkSize)
         {
-            success = sendFragment(type, true, message_begin, message_end, compress);
+            sendFragment(type, true, message_begin, message_end, compress);
         }
         else
         {
@@ -868,10 +860,10 @@ namespace ix
             std::string::const_iterator begin = message_begin;
             std::string::const_iterator end = message_end;
 
-            for (uint64_t i = 0; i < steps; ++i)
+            for (uint64_t i = 0 ; i < steps; ++i)
             {
                 bool firstStep = i == 0;
-                bool lastStep = (i + 1) == steps;
+                bool lastStep = (i+1) == steps;
                 bool fin = lastStep;
 
                 end = begin + kChunkSize;
@@ -887,12 +879,9 @@ namespace ix
                 }
 
                 // Send message
-                if (!sendFragment(opcodeType, fin, begin, end, compress))
-                {
-                    return WebSocketSendInfo(false);
-                }
+                sendFragment(opcodeType, fin, begin, end, compress);
 
-                if (onProgressCallback && !onProgressCallback((int) i, (int) steps))
+                if (onProgressCallback && !onProgressCallback((int)i, (int) steps))
                 {
                     break;
                 }
@@ -905,18 +894,12 @@ namespace ix
         if (!isSendBufferEmpty())
         {
             _socket->wakeUpFromPoll(Socket::kSendRequest);
-
-            // FIXME: we should have a timeout when sending large messages: see #131
-            if (_blockingSend && !flushSendBuffer())
-            {
-                success = false;
-            }
         }
 
-        return WebSocketSendInfo(success, compressionError, payloadSize, wireSize);
+        return WebSocketSendInfo(true, compressionError, payloadSize, wireSize);
     }
 
-    bool WebSocketTransport::sendFragment(wsheader_type::opcode_type type,
+    void WebSocketTransport::sendFragment(wsheader_type::opcode_type type,
                                           bool fin,
                                           std::string::const_iterator message_begin,
                                           std::string::const_iterator message_end,
@@ -928,13 +911,14 @@ namespace ix
         uint8_t masking_key[4] = {};
         masking_key[0] = (x >> 24);
         masking_key[1] = (x >> 16) & 0xff;
-        masking_key[2] = (x >> 8) & 0xff;
-        masking_key[3] = (x) &0xff;
+        masking_key[2] = (x >> 8)  & 0xff;
+        masking_key[3] = (x)       & 0xff;
 
         std::vector<uint8_t> header;
-        header.assign(2 + (message_size >= 126 ? 2 : 0) + (message_size >= 65536 ? 6 : 0) +
-                          (_useMask ? 4 : 0),
-                      0);
+        header.assign(2 +
+                      (message_size >= 126 ? 2 : 0) +
+                      (message_size >= 65536 ? 6 : 0) +
+                      (_useMask ? 4 : 0), 0);
         header[0] = type;
 
         // The fin bit indicate that this is the last fragment. Fin is French for end.
@@ -943,9 +927,8 @@ namespace ix
             header[0] |= 0x80;
         }
 
-        // The rsv1 bit indicate that the frame is compressed
-        // continuation opcodes should not set it. Autobahn 12.2.10 and others 12.X
-        if (compress && type != wsheader_type::CONTINUATION)
+        // This bit indicate that the frame is compressed
+        if (compress)
         {
             header[0] |= 0x40;
         }
@@ -985,8 +968,8 @@ namespace ix
             header[5] = (message_size >> 32) & 0xff;
             header[6] = (message_size >> 24) & 0xff;
             header[7] = (message_size >> 16) & 0xff;
-            header[8] = (message_size >> 8) & 0xff;
-            header[9] = (message_size >> 0) & 0xff;
+            header[8] = (message_size >>  8) & 0xff;
+            header[9] = (message_size >>  0) & 0xff;
 
             if (_useMask)
             {
@@ -998,10 +981,11 @@ namespace ix
         }
 
         // _txbuf will keep growing until it can be transmitted over the socket:
-        appendToSendBuffer(header, message_begin, message_end, message_size, masking_key);
+        appendToSendBuffer(header, message_begin, message_end,
+                           message_size, masking_key);
 
         // Now actually send this data
-        return sendOnSocket();
+        sendOnSocket();
     }
 
     WebSocketSendInfo WebSocketTransport::sendPing(const std::string& message)
@@ -1018,33 +1002,37 @@ namespace ix
         return info;
     }
 
-    WebSocketSendInfo WebSocketTransport::sendBinary(const std::string& message,
-                                                     const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendBinary(
+        const std::string& message,
+        const OnProgressCallback& onProgressCallback)
 
     {
-        return sendData(
-            wsheader_type::BINARY_FRAME, message, _enablePerMessageDeflate, onProgressCallback);
+        return sendData(wsheader_type::BINARY_FRAME, message,
+                        _enablePerMessageDeflate, onProgressCallback);
     }
 
-    WebSocketSendInfo WebSocketTransport::sendText(const std::string& message,
-                                                   const OnProgressCallback& onProgressCallback)
+    WebSocketSendInfo WebSocketTransport::sendText(
+        const std::string& message,
+        const OnProgressCallback& onProgressCallback)
 
     {
-        return sendData(
-            wsheader_type::TEXT_FRAME, message, _enablePerMessageDeflate, onProgressCallback);
+        return sendData(wsheader_type::TEXT_FRAME, message,
+                        _enablePerMessageDeflate, onProgressCallback);
     }
 
-    bool WebSocketTransport::sendOnSocket()
+    ssize_t WebSocketTransport::send()
+    {
+        std::lock_guard<std::mutex> lock(_socketMutex);
+        return _socket->send((char*)&_txbuf[0], _txbuf.size());
+    }
+
+    void WebSocketTransport::sendOnSocket()
     {
         std::lock_guard<std::mutex> lock(_txbufMutex);
 
         while (_txbuf.size())
         {
-            ssize_t ret = 0;
-            {
-                std::lock_guard<std::mutex> lock(_socketMutex);
-                ret = _socket->send((char*) &_txbuf[0], _txbuf.size());
-            }
+            ssize_t ret = send();
 
             if (ret < 0 && Socket::isWaitNeeded())
             {
@@ -1054,43 +1042,13 @@ namespace ix
             {
                 closeSocket();
                 setReadyState(ReadyState::CLOSED);
-                return false;
+                break;
             }
             else
             {
                 _txbuf.erase(_txbuf.begin(), _txbuf.begin() + ret);
             }
         }
-
-        return true;
-    }
-
-    bool WebSocketTransport::receiveFromSocket()
-    {
-        while (true)
-        {
-            ssize_t ret = _socket->recv((char*) &_readbuf[0], _readbuf.size());
-
-            if (ret < 0 && Socket::isWaitNeeded())
-            {
-                break;
-            }
-            else if (ret <= 0)
-            {
-                // if there are received data pending to be processed, then delay the abnormal
-                // closure to after dispatch (other close code/reason could be read from the
-                // buffer)
-
-                closeSocket();
-                return false;
-            }
-            else
-            {
-                _rxbuf.insert(_rxbuf.end(), _readbuf.begin(), _readbuf.begin() + ret);
-            }
-        }
-
-        return true;
     }
 
     void WebSocketTransport::sendCloseFrame(uint16_t code, const std::string& reason)
@@ -1102,7 +1060,7 @@ namespace ix
         {
             // See list of close events here:
             // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
-            std::string closure {(char) (code >> 8), (char) (code & 0xff)};
+            std::string closure{(char)(code >> 8), (char)(code & 0xff)};
 
             // copy reason after code
             closure.append(reason);
@@ -1122,10 +1080,8 @@ namespace ix
         _socket->close();
     }
 
-    void WebSocketTransport::closeSocketAndSwitchToClosedState(uint16_t code,
-                                                               const std::string& reason,
-                                                               size_t closeWireSize,
-                                                               bool remote)
+    void WebSocketTransport::closeSocketAndSwitchToClosedState(
+        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
     {
         closeSocket();
 
@@ -1141,10 +1097,8 @@ namespace ix
         _requestInitCancellation = false;
     }
 
-    void WebSocketTransport::close(uint16_t code,
-                                   const std::string& reason,
-                                   size_t closeWireSize,
-                                   bool remote)
+    void WebSocketTransport::close(
+        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
     {
         _requestInitCancellation = true;
 
@@ -1179,30 +1133,4 @@ namespace ix
         return _txbuf.size();
     }
 
-    bool WebSocketTransport::flushSendBuffer()
-    {
-        while (!isSendBufferEmpty() && !_requestInitCancellation)
-        {
-            // Wait with a 10ms timeout until the socket is ready to write.
-            // This way we are not busy looping
-            PollResultType result = _socket->isReadyToWrite(10);
-
-            if (result == PollResultType::Error)
-            {
-                closeSocket();
-                setReadyState(ReadyState::CLOSED);
-                return false;
-            }
-            else if (result == PollResultType::ReadyForWrite)
-            {
-                if (!sendOnSocket())
-                {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
 } // namespace ix

ixwebsocket/IXWebSocketTransport.h

@@ -12,7 +12,6 @@
 
 #include "IXCancellationRequest.h"
 #include "IXProgressCallback.h"
-#include "IXSocketTLSOptions.h"
 #include "IXWebSocketCloseConstants.h"
 #include "IXWebSocketHandshake.h"
 #include "IXWebSocketHttpHeaders.h"
@@ -25,6 +24,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
+
 #include <vector>
 
 namespace ix
@@ -61,8 +61,7 @@ namespace ix
         enum class PollResult
         {
             Succeeded,
-            AbnormalClose,
-            CannotFlushSendBuffer
+            AbnormalClose
         };
 
         using OnMessageCallback =
@@ -73,18 +72,16 @@ namespace ix
         ~WebSocketTransport();
 
         void configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                       const SocketTLSOptions& socketTLSOptions,
                        bool enablePong,
                        int pingIntervalSecs,
                        int pingTimeoutSecs);
 
-        // Client
-        WebSocketInitResult connectToUrl(const std::string& url,
-                                         const WebSocketHttpHeaders& headers,
-                                         int timeoutSecs);
-
-        // Server
-        WebSocketInitResult connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs);
+        WebSocketInitResult connectToUrl( // Client
+            const std::string& url,
+            const WebSocketHttpHeaders& headers,
+            int timeoutSecs);
+        WebSocketInitResult connectToSocket(int fd, // Server
+                                            int timeoutSecs);
 
         PollResult poll();
         WebSocketSendInfo sendBinary(const std::string& message,
@@ -99,6 +96,7 @@ namespace ix
                    bool remote = false);
 
         void closeSocket();
+        ssize_t send();
 
         ReadyState getReadyState() const;
         void setReadyState(ReadyState readyState);
@@ -135,10 +133,6 @@ namespace ix
         // client should mask but server should not
         std::atomic<bool> _useMask;
 
-        // Tells whether we should flush the send buffer before
-        // saying that a send is complete. This is the mode for server code.
-        std::atomic<bool> _blockingSend;
-
         // Buffer for reading from our socket. That buffer is never resized.
         std::vector<uint8_t> _readbuf;
 
@@ -155,16 +149,13 @@ namespace ix
         // messages (tested messages up to 700M) and we cannot put them in a single
         // buffer that is resized, as this operation can be slow when a buffer has its
         // size increased 2 fold, while appending to a list has a fixed cost.
-        std::list<std::string> _chunks;
+        std::list<std::vector<uint8_t>> _chunks;
 
         // Record the message kind (will be TEXT or BINARY) for a fragmented
         // message, present in the first chunk, since the final chunk will be a
         // CONTINUATION opcode and doesn't tell the full message kind
         MessageKind _fragmentedMessageKind;
 
-        // Ditto for whether a message is compressed
-        bool _compressedMessage;
-
         // Fragments are 32K long
         static constexpr size_t kChunkSize = 1 << 15;
 
@@ -187,9 +178,6 @@ namespace ix
         WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
         std::atomic<bool> _enablePerMessageDeflate;
 
-        // Used to control TLS connection behavior
-        SocketTLSOptions _socketTLSOptions;
-
         // Used to cancel dns lookup + socket connect + http upgrade
         std::atomic<bool> _requestInitCancellation;
 
@@ -242,16 +230,13 @@ namespace ix
                                                size_t closeWireSize,
                                                bool remote);
 
-        bool flushSendBuffer();
-        bool sendOnSocket();
-        bool receiveFromSocket();
-
+        void sendOnSocket();
         WebSocketSendInfo sendData(wsheader_type::opcode_type type,
                                    const std::string& message,
                                    bool compress,
                                    const OnProgressCallback& onProgressCallback = nullptr);
 
-        bool sendFragment(wsheader_type::opcode_type type,
+        void sendFragment(wsheader_type::opcode_type type,
                           bool fin,
                           std::string::const_iterator begin,
                           std::string::const_iterator end,
@@ -259,7 +244,7 @@ namespace ix
 
         void emitMessage(MessageKind messageKind,
                          const std::string& message,
-                         bool compressedMessage,
+                         const wsheader_type& ws,
                          const OnMessageCallback& onMessageCallback);
 
         bool isSendBufferEmpty() const;

ixwebsocket/IXWebSocketVersion.h

@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "8.1.7"
+#define IX_WEBSOCKET_VERSION "5.1.6"

ixwebsocket/LUrlParser.cpp

@@ -32,249 +32,232 @@
 #include <stdlib.h>
 
 // check if the scheme name is valid
-static bool IsSchemeValid(const std::string& SchemeName)
+static bool IsSchemeValid( const std::string& SchemeName )
 {
-    for (auto c : SchemeName)
-    {
-        if (!isalpha(c) && c != '+' && c != '-' && c != '.') return false;
-    }
+	for ( auto c : SchemeName  )
+	{
+		if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
+	}
 
-    return true;
+	return true;
 }
 
-bool LUrlParser::clParseURL::GetPort(int* OutPort) const
+bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
 {
-    if (!IsValid())
-    {
-        return false;
-    }
+	if ( !IsValid() ) { return false; }
 
-    int Port = atoi(m_Port.c_str());
+	int Port = atoi( m_Port.c_str() );
 
-    if (Port <= 0 || Port > 65535)
-    {
-        return false;
-    }
+	if ( Port <= 0 || Port > 65535 ) { return false; }
 
-    if (OutPort)
-    {
-        *OutPort = Port;
-    }
+	if ( OutPort ) { *OutPort = Port; }
 
-    return true;
+	return true;
 }
 
 // based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL(const std::string& URL)
+LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
 {
-    LUrlParser::clParseURL Result;
+	LUrlParser::clParseURL Result;
 
-    const char* CurrentString = URL.c_str();
+	const char* CurrentString = URL.c_str();
 
-    /*
-     *	<scheme>:<scheme-specific-part>
-     *	<scheme> := [a-z\+\-\.]+
-     *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to
-     *lower case in scheme names
-     */
+	/*
+	 *	<scheme>:<scheme-specific-part>
+	 *	<scheme> := [a-z\+\-\.]+
+	 *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
+	 */
 
-    // try to read scheme
-    {
-        const char* LocalString = strchr(CurrentString, ':');
+	// try to read scheme
+	{
+		const char* LocalString = strchr( CurrentString, ':' );
 
-        if (!LocalString)
-        {
-            return clParseURL(LUrlParserError_NoUrlCharacter);
-        }
+		if ( !LocalString )
+		{
+			return clParseURL( LUrlParserError_NoUrlCharacter );
+		}
 
-        // save the scheme name
-        Result.m_Scheme = std::string(CurrentString, LocalString - CurrentString);
+		// save the scheme name
+		Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
 
-        if (!IsSchemeValid(Result.m_Scheme))
-        {
-            return clParseURL(LUrlParserError_InvalidSchemeName);
-        }
+		if ( !IsSchemeValid( Result.m_Scheme ) )
+		{
+			return clParseURL( LUrlParserError_InvalidSchemeName );
+		}
 
-        // scheme should be lowercase
-        std::transform(
-            Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower);
+		// scheme should be lowercase
+		std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
 
-        // skip ':'
-        CurrentString = LocalString + 1;
-    }
+		// skip ':'
+		CurrentString = LocalString+1;
+	}
 
-    /*
-     *	//<user>:<password>@<host>:<port>/<url-path>
-     *	any ":", "@" and "/" must be normalized
-     */
+	/*
+	 *	//<user>:<password>@<host>:<port>/<url-path>
+	 *	any ":", "@" and "/" must be normalized
+	 */
 
-    // skip "//"
-    if (*CurrentString++ != '/') return clParseURL(LUrlParserError_NoDoubleSlash);
-    if (*CurrentString++ != '/') return clParseURL(LUrlParserError_NoDoubleSlash);
+	// skip "//"
+	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
 
-    // check if the user name and password are specified
-    bool bHasUserName = false;
+	// check if the user name and password are specified
+	bool bHasUserName = false;
 
-    const char* LocalString = CurrentString;
+	const char* LocalString = CurrentString;
 
-    while (*LocalString)
-    {
-        if (*LocalString == '@')
-        {
-            // user name and password are specified
-            bHasUserName = true;
-            break;
-        }
-        else if (*LocalString == '/')
-        {
-            // end of <host>:<port> specification
-            bHasUserName = false;
-            break;
-        }
+	while ( *LocalString )
+	{
+		if ( *LocalString == '@' )
+		{
+			// user name and password are specified
+			bHasUserName = true;
+			break;
+		}
+		else if ( *LocalString == '/' )
+		{
+			// end of <host>:<port> specification
+			bHasUserName = false;
+			break;
+		}
 
-        LocalString++;
-    }
+		LocalString++;
+	}
 
-    // user name and password
-    LocalString = CurrentString;
+	// user name and password
+	LocalString = CurrentString;
 
-    if (bHasUserName)
-    {
-        // read user name
-        while (*LocalString && *LocalString != ':' && *LocalString != '@')
-            LocalString++;
+	if ( bHasUserName )
+	{
+		// read user name
+		while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
 
-        Result.m_UserName = std::string(CurrentString, LocalString - CurrentString);
+		Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
 
-        // proceed with the current pointer
-        CurrentString = LocalString;
+		// proceed with the current pointer
+		CurrentString = LocalString;
 
-        if (*CurrentString == ':')
-        {
-            // skip ':'
-            CurrentString++;
+		if ( *CurrentString == ':' )
+		{
+			// skip ':'
+			CurrentString++;
 
-            // read password
-            LocalString = CurrentString;
+			// read password
+			LocalString = CurrentString;
 
-            while (*LocalString && *LocalString != '@')
-                LocalString++;
+			while ( *LocalString && *LocalString != '@' ) LocalString++;
 
-            Result.m_Password = std::string(CurrentString, LocalString - CurrentString);
+			Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
 
-            CurrentString = LocalString;
-        }
+			CurrentString = LocalString;
+		}
 
-        // skip '@'
-        if (*CurrentString != '@')
-        {
-            return clParseURL(LUrlParserError_NoAtSign);
-        }
+		// skip '@'
+		if ( *CurrentString != '@' )
+		{
+			return clParseURL( LUrlParserError_NoAtSign );
+		}
 
-        CurrentString++;
-    }
+		CurrentString++;
+	}
 
-    bool bHasBracket = (*CurrentString == '[');
+	bool bHasBracket = ( *CurrentString == '[' );
 
-    // go ahead, read the host name
-    LocalString = CurrentString;
+	// go ahead, read the host name
+	LocalString = CurrentString;
 
-    while (*LocalString)
-    {
-        if (bHasBracket && *LocalString == ']')
-        {
-            // end of IPv6 address
-            LocalString++;
-            break;
-        }
-        else if (!bHasBracket && (*LocalString == ':' || *LocalString == '/'))
-        {
-            // port number is specified
-            break;
-        }
+	while ( *LocalString )
+	{
+		if ( bHasBracket && *LocalString == ']' )
+		{
+			// end of IPv6 address
+			LocalString++;
+			break;
+		}
+		else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
+		{
+			// port number is specified
+			break;
+		}
 
-        LocalString++;
-    }
+		LocalString++;
+	}
 
-    Result.m_Host = std::string(CurrentString, LocalString - CurrentString);
+	Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
 
-    CurrentString = LocalString;
+	CurrentString = LocalString;
 
-    // is port number specified?
-    if (*CurrentString == ':')
-    {
-        CurrentString++;
+	// is port number specified?
+	if ( *CurrentString == ':' )
+	{
+		CurrentString++;
 
-        // read port number
-        LocalString = CurrentString;
+		// read port number
+		LocalString = CurrentString;
 
-        while (*LocalString && *LocalString != '/')
-            LocalString++;
+		while ( *LocalString && *LocalString != '/' ) LocalString++;
 
-        Result.m_Port = std::string(CurrentString, LocalString - CurrentString);
+		Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
 
-        CurrentString = LocalString;
-    }
+		CurrentString = LocalString;
+	}
 
-    // end of string
-    if (!*CurrentString)
-    {
-        Result.m_ErrorCode = LUrlParserError_Ok;
+	// end of string
+	if ( !*CurrentString )
+	{
+		Result.m_ErrorCode = LUrlParserError_Ok;
 
-        return Result;
-    }
+		return Result;
+	}
 
-    // skip '/'
-    if (*CurrentString != '/')
-    {
-        return clParseURL(LUrlParserError_NoSlash);
-    }
+	// skip '/'
+	if ( *CurrentString != '/' )
+	{
+		return clParseURL( LUrlParserError_NoSlash );
+	}
 
-    CurrentString++;
+	CurrentString++;
 
-    // parse the path
-    LocalString = CurrentString;
+	// parse the path
+	LocalString = CurrentString;
 
-    while (*LocalString && *LocalString != '#' && *LocalString != '?')
-        LocalString++;
+	while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
 
-    Result.m_Path = std::string(CurrentString, LocalString - CurrentString);
+	Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
 
-    CurrentString = LocalString;
+	CurrentString = LocalString;
 
-    // check for query
-    if (*CurrentString == '?')
-    {
-        // skip '?'
-        CurrentString++;
+	// check for query
+	if ( *CurrentString == '?' )
+	{
+		// skip '?'
+		CurrentString++;
 
-        // read query
-        LocalString = CurrentString;
+		// read query
+		LocalString = CurrentString;
 
-        while (*LocalString && *LocalString != '#')
-            LocalString++;
+		while ( *LocalString && *LocalString != '#' ) LocalString++;
 
-        Result.m_Query = std::string(CurrentString, LocalString - CurrentString);
+		Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
 
-        CurrentString = LocalString;
-    }
+		CurrentString = LocalString;
+	}
 
-    // check for fragment
-    if (*CurrentString == '#')
-    {
-        // skip '#'
-        CurrentString++;
+	// check for fragment
+	if ( *CurrentString == '#' )
+	{
+		// skip '#'
+		CurrentString++;
 
-        // read fragment
-        LocalString = CurrentString;
+		// read fragment
+		LocalString = CurrentString;
 
-        while (*LocalString)
-            LocalString++;
+		while ( *LocalString ) LocalString++;
 
-        Result.m_Fragment = std::string(CurrentString, LocalString - CurrentString);
-    }
+		Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
+	}
 
-    Result.m_ErrorCode = LUrlParserError_Ok;
+	Result.m_ErrorCode = LUrlParserError_Ok;
 
-    return Result;
+	return Result;
 }

ixwebsocket/LUrlParser.h

@@ -62,10 +62,7 @@ namespace LUrlParser
         }
 
         /// return 'true' if the parsing was successful
-        bool IsValid() const
-        {
-            return m_ErrorCode == LUrlParserError_Ok;
-        }
+        bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
 
         /// helper to convert the port number to int, return 'true' if the port is valid (within the
         /// 0..65535 range)

ixwebsocket/apple/IXSetThreadName_apple.cpp

@@ -17,4 +17,4 @@ namespace ix
         //
         pthread_setname_np(name.substr(0, 63).c_str());
     }
-} // namespace ix
+}

ixwebsocket/freebsd/IXSetThreadName_freebsd.cpp

@@ -1,16 +0,0 @@
-/*
- *  IXSetThreadName_freebsd.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-#include "../IXSetThreadName.h"
-#include <pthread.h>
-#include <pthread_np.h>
-
-namespace ix
-{
-    void setThreadName(const std::string& name)
-    {
-        pthread_set_name_np(pthread_self(), name.substr(0, 15).c_str());
-    }
-} // namespace ix

ixwebsocket/linux/IXSetThreadName_linux.cpp

@@ -15,6 +15,7 @@ namespace ix
         // See prctl and PR_SET_NAME property in
         // http://man7.org/linux/man-pages/man2/prctl.2.html
         //
-        pthread_setname_np(pthread_self(), name.substr(0, 15).c_str());
+        pthread_setname_np(pthread_self(),
+                           name.substr(0, 15).c_str());
     }
-} // namespace ix
+}

ixwebsocket/windows/IXSetThreadName_windows.cpp

@@ -4,14 +4,13 @@
  *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
  */
 #include "../IXSetThreadName.h"
-
 #include <Windows.h>
 
 namespace ix
 {
     const DWORD MS_VC_EXCEPTION = 0x406D1388;
 
-#pragma pack(push, 8)
+#pragma pack(push,8)
     typedef struct tagTHREADNAME_INFO
     {
         DWORD dwType;     // Must be 0x1000.
@@ -31,8 +30,7 @@ namespace ix
 
         __try
         {
-            RaiseException(
-                MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*) &info);
+            RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)& info);
         }
         __except (EXCEPTION_EXECUTE_HANDLER)
         {
@@ -43,4 +41,4 @@ namespace ix
     {
         SetThreadName(-1, name.c_str());
     }
-} // namespace ix
+}

makefile

@@ -9,61 +9,35 @@ 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 4 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 .. ; make -j 4)
-
-ws_install:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4 install)
-
-ws_openssl:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_OPEN_SSL=1 .. ; make -j 4)
-
-ws_mbedtls:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j 4)
-
-ws_no_ssl:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_WS=1 .. ; make -j 4)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j)
 
 uninstall:
 	xargs rm -fv < build/install_manifest.txt
 
 tag:
-	git tag v"`sh tools/extract_version.sh`"
-
-xcode:
-	cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 -GXcode && open ixwebsocket.xcodeproj
-
-xcode_openssl:
-	cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 -GXcode && open ixwebsocket.xcodeproj
+	git tag v"`cat DOCKER_VERSION`"
 
 .PHONY: docker
 
-NAME   := ${DOCKER_REPO}/ws
-TAG    := $(shell sh tools/extract_version.sh)
+NAME   := bsergean/ws
+TAG    := $(shell cat DOCKER_VERSION)
 IMG    := ${NAME}:${TAG}
 LATEST := ${NAME}:latest
 BUILD  := ${NAME}:build
 
-print_version:
-	@echo 'IXWebSocket version =>' ${TAG}
-
-set_version:
-	sh tools/update_version.sh ${VERSION}
-
 docker_test:
 	docker build -f docker/Dockerfile.debian -t bsergean/ixwebsocket_test:build .
 
 docker:
-	git clean -dfx
 	docker build -t ${IMG} .
 	docker tag ${IMG} ${BUILD}
 
 docker_push:
 	docker tag ${IMG} ${LATEST}
 	docker push ${LATEST}
-	docker push ${IMG}
 
 run:
 	docker run --cap-add sys_ptrace --entrypoint=sh -it bsergean/ws:build
@@ -73,9 +47,9 @@ 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
+# 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
 test_server:
 	(cd test && npm i ws && node broadcast-server.js)
@@ -84,27 +58,11 @@ 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 4)
-	(cd test ; python2.7 run.py -r)
-
-test_openssl:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_OPEN_SSL=1 -DUSE_TEST=1 .. ; make -j 4)
-	(cd test ; python2.7 run.py -r)
-
-test_mbedtls:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_MBED_TLS=1 -DUSE_TEST=1 .. ; make -j 4)
-	(cd test ; python2.7 run.py -r)
-
-test_no_ssl:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TEST=1 .. ; make -j 4)
-	(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)
 
-autobahn_report:
-	cp -rvf ~/sandbox/reports/clients/* ../bsergean.github.io/IXWebSocket/autobahn/
-
 # For the fork that is configured with appveyor
 rebase_upstream:
 	git fetch upstream
@@ -120,7 +78,7 @@ install_cmake_for_linux:
 #  source venv/bin/activate
 #  pip install mkdocs
 doc:
-	mkdocs gh-deploy
+	./venv/bin/mkdocs build -d ../bsergean.github.io/IXWebSocket/site
 
 .PHONY: test
 .PHONY: build

sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeDebug

@@ -1,10 +0,0 @@
-# Generated by CMake, DO NOT EDIT
-# Custom rules for ALL_BUILD
-.SUFFIXES: 
-all: \
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
-
-
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
-	echo ""
-	echo Build\ all\ projects

sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeMinSizeRel

@@ -1,10 +0,0 @@
-# Generated by CMake, DO NOT EDIT
-# Custom rules for ALL_BUILD
-.SUFFIXES: 
-all: \
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
-
-
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
-	echo ""
-	echo Build\ all\ projects

sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelWithDebInfo

@@ -1,10 +0,0 @@
-# Generated by CMake, DO NOT EDIT
-# Custom rules for ALL_BUILD
-.SUFFIXES: 
-all: \
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
-
-
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
-	echo ""
-	echo Build\ all\ projects

sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelease

@@ -1,10 +0,0 @@
-# Generated by CMake, DO NOT EDIT
-# Custom rules for ALL_BUILD
-.SUFFIXES: 
-all: \
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
-
-
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
-	echo ""
-	echo Build\ all\ projects

sentry-native/CMakeScripts/ReRunCMake.make

@@ -1,18 +0,0 @@
-# Generated by CMake, DO NOT EDIT
-
-TARGETS:= 
-empty:= 
-space:= $(empty) $(empty)
-spaceplus:= $(empty)\ $(empty)
-
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/CMakeASMInformation.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/AppleClang-ASM.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/Clang-ASM.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/Clang.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Platform/Apple-clang.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/CMakeFiles/3.12.3/CMakeASMCompiler.cmake))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/third_party/sentry-native/CMakeLists.txt))
-TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/third_party/sentry-native/src/CMakeLists.txt))
-
-/Users/bsergeant/src/foss/IXWebSocket/CMakeFiles/cmake.check_cache: $(TARGETS)
-	/Applications/CMake.app/Contents/bin/cmake -H/Users/bsergeant/src/foss/IXWebSocket -B/Users/bsergeant/src/foss/IXWebSocket

sentry-native/CMakeScripts/XCODE_DEPEND_HELPER.make

@@ -1,139 +0,0 @@
-# DO NOT EDIT
-# This makefile makes sure all linkable targets are
-# up-to-date with anything they link to
-default:
-	echo "Do not invoke directly"
-
-# Rules to remove targets that are older than anything to which they
-# link.  This forces Xcode to relink the targets from scratch.  It
-# does not seem to check these dependencies itself.
-PostBuild.example.Debug:
-PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
-
-
-PostBuild.example_crashpad.Debug:
-PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
-
-
-PostBuild.sentry.Debug:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-
-
-PostBuild.sentry_test_integration.Debug:
-PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
-
-
-PostBuild.sentry_test_unit.Debug:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit
-
-
-PostBuild.example.Release:
-PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
-
-
-PostBuild.example_crashpad.Release:
-PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
-
-
-PostBuild.sentry.Release:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-
-
-PostBuild.sentry_test_integration.Release:
-PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
-
-
-PostBuild.sentry_test_unit.Release:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit
-
-
-PostBuild.example.MinSizeRel:
-PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example
-
-
-PostBuild.example_crashpad.MinSizeRel:
-PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad
-
-
-PostBuild.sentry.MinSizeRel:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
-
-
-PostBuild.sentry_test_integration.MinSizeRel:
-PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration
-
-
-PostBuild.sentry_test_unit.MinSizeRel:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_unit:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_unit
-
-
-PostBuild.example.RelWithDebInfo:
-PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example
-
-
-PostBuild.example_crashpad.RelWithDebInfo:
-PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad
-
-
-PostBuild.sentry.RelWithDebInfo:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
-
-
-PostBuild.sentry_test_integration.RelWithDebInfo:
-PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration:\
-	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration
-
-
-PostBuild.sentry_test_unit.RelWithDebInfo:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_unit:
-	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_unit
-
-
-
-
-# For each target create a dummy ruleso the target does not have to exist
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a:
-/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a: