(ws) trim ws dependencies no more ixcrypto and ixcore deps

ws/CMakeLists.txt

@@ -30,7 +30,6 @@ add_executable(ws
 
 # library with the most dependencies come first
 target_link_libraries(ws ixwebsocket)
-target_link_libraries(ws ixcrypto)
 target_link_libraries(ws ixcore)
 
 target_link_libraries(ws spdlog)

ws/docker_build.sh

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
-#
-
-# 'manual' way of building. I cannot get CMake to work to build in a container.
-
-g++ --std=c++14 \
-    -DIXWEBSOCKET_USE_TLS \
-    -g \
-    ../ixwebsocket/IXEventFd.cpp \
-    ../ixwebsocket/IXSocket.cpp \
-    ../ixwebsocket/IXSocketServer.cpp \
-    ../ixwebsocket/IXSocketConnect.cpp \
-    ../ixwebsocket/IXSocketFactory.cpp \
-    ../ixwebsocket/IXDNSLookup.cpp \
-    ../ixwebsocket/IXCancellationRequest.cpp \
-    ../ixwebsocket/IXWebSocket.cpp \
-    ../ixwebsocket/IXWebSocketServer.cpp \
-    ../ixwebsocket/IXWebSocketTransport.cpp \
-    ../ixwebsocket/IXWebSocketHandshake.cpp \
-    ../ixwebsocket/IXWebSocketPerMessageDeflate.cpp \
-    ../ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp \
-    ../ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp \
-    ../ixwebsocket/IXWebSocketHttpHeaders.cpp \
-    ../ixwebsocket/IXHttpClient.cpp \
-    ../ixwebsocket/IXUrlParser.cpp \
-    ../ixwebsocket/IXSocketOpenSSL.cpp \
-    ../ixwebsocket/linux/IXSetThreadName_linux.cpp \
-    ../third_party/msgpack11/msgpack11.cpp \
-    ixcrypto/IXBase64.cpp \
-    ixcrypto/IXHash.cpp \
-    ixcrypto/IXUuid.cpp \
-    ws_http_client.cpp \
-    ws_ping_pong.cpp \
-    ws_broadcast_server.cpp \
-    ws_echo_server.cpp \
-    ws_chat.cpp \
-    ws_connect.cpp \
-    ws_transfer.cpp \
-    ws_send.cpp \
-    ws_receive.cpp \
-    ws.cpp \
-    -I . \
-    -I .. \
-    -I ../third_party \
-    -o ws \
-    -lcrypto -lssl -lz -lpthread

ws/ws.cpp

@@ -15,10 +15,6 @@
 #include <condition_variable>
 #include <fstream>
 #include <iostream>
-#include <ixcore/utils/IXCoreLogger.h>
-#include <ixcrypto/IXBase64.h>
-#include <ixcrypto/IXHash.h>
-#include <ixcrypto/IXUuid.h>
 #include <ixwebsocket/IXBench.h>
 #include <ixwebsocket/IXDNSLookup.h>
 #include <ixwebsocket/IXGzipCodec.h>
@@ -29,6 +25,7 @@
 #include <ixwebsocket/IXSocket.h>
 #include <ixwebsocket/IXSocketTLSOptions.h>
 #include <ixwebsocket/IXUserAgent.h>
+#include <ixwebsocket/IXUuid.h>
 #include <ixwebsocket/IXWebSocket.h>
 #include <ixwebsocket/IXWebSocketHttpHeaders.h>
 #include <ixwebsocket/IXWebSocketProxyServer.h>
@@ -146,6 +143,30 @@ namespace
             return path;
         }
     }
+
+    uint64_t djb2Hash(const std::vector<uint8_t>& data)
+    {
+        uint64_t hashAddress = 5381;
+
+        for (auto&& c : data)
+        {
+            hashAddress = ((hashAddress << 5) + hashAddress) + c;
+        }
+
+        return hashAddress;
+    }
+
+    uint64_t djb2HashStr(const std::string& data)
+    {
+        uint64_t hashAddress = 5381;
+
+        for (size_t i = 0; i < data.size(); ++i)
+        {
+            hashAddress = ((hashAddress << 5) + hashAddress) + data[i];
+        }
+
+        return hashAddress;
+    }
 } // namespace
 
 namespace ix
@@ -988,7 +1009,7 @@ namespace ix
         spdlog::info("gzip input: {} size {} cksum {}",
                      filename,
                      res.second.size(),
-                     ix::djb2HashStr(res.second));
+                     djb2HashStr(res.second));
 
         std::string compressedBytes;
 
@@ -1022,7 +1043,7 @@ namespace ix
         spdlog::info("gzip output: {} size {} cksum {}",
                      outputFilename,
                      compressedBytes.size(),
-                     ix::djb2HashStr(compressedBytes));
+                     djb2HashStr(compressedBytes));
 
         return 0;
     }
@@ -1042,7 +1063,7 @@ namespace ix
         spdlog::info("gunzip input: {} size {} cksum {}",
                      filename,
                      res.second.size(),
-                     ix::djb2HashStr(res.second));
+                     djb2HashStr(res.second));
 
         std::string decompressedBytes;
 
@@ -1070,7 +1091,7 @@ namespace ix
         spdlog::info("gunzip output: {} size {} cksum {}",
                      outputFilename,
                      decompressedBytes.size(),
-                     ix::djb2HashStr(decompressedBytes));
+                     djb2HashStr(decompressedBytes));
 
         return 0;
     }
@@ -1175,7 +1196,7 @@ namespace ix
                 std::stringstream ss;
                 ss << "messages received per second: " << receivedCountPerSecs;
 
-                CoreLogger::info(ss.str());
+                spdlog::info(ss.str());
 
                 receivedCountPerSecs = 0;
 
@@ -1928,7 +1949,7 @@ namespace ix
         spdlog::info("ws_receive: Content size: {}", content.size());
 
         // Validate checksum
-        uint64_t cksum = ix::djb2Hash(content);
+        uint64_t cksum = djb2Hash(content);
         auto cksumRef = data["djb2_hash"].string_value();
 
         spdlog::info("ws_receive: Computed hash: {}", cksum);
@@ -2481,41 +2502,6 @@ int main(int argc, char** argv)
     ix::setThreadName("ws main thread");
     ix::initNetSystem();
 
-    ix::CoreLogger::LogFunc logFunc = [](const char* msg, ix::LogLevel level) {
-        switch (level)
-        {
-            case ix::LogLevel::Debug:
-            {
-                spdlog::debug(msg);
-            }
-            break;
-
-            case ix::LogLevel::Info:
-            {
-                spdlog::info(msg);
-            }
-            break;
-
-            case ix::LogLevel::Warning:
-            {
-                spdlog::warn(msg);
-            }
-            break;
-
-            case ix::LogLevel::Error:
-            {
-                spdlog::error(msg);
-            }
-            break;
-
-            case ix::LogLevel::Critical:
-            {
-                spdlog::critical(msg);
-            }
-            break;
-        }
-    };
-    ix::CoreLogger::setLogFunction(logFunc);
     spdlog::set_level(spdlog::level::debug);
 
 #ifndef _WIN32