v2.14.4

Repair compilation with Clang 9.0.0

CHANGELOG.md

@@ -1,12 +1,10 @@
-# v2.15.1-beta
-- [#1007](https://github.com/xmrig/xmrig/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser).
-- [#257](https://github.com/xmrig/xmrig-nvidia/pull/257) New logging subsystem, file and syslog now always without colors.
+# v2.14.4
+- [#992](https://github.com/xmrig/xmrig/pull/992)  Fixed compilation with Clang 3.5.
+- [#1012](https://github.com/xmrig/xmrig/pull/1012) Fixed compilation with Clang 9.0.
+- In HTTP API for unknown hashrate now used `null` instead of `0.0`.
+- Fixed MSVC 2019 version detection.
+- Removed obsolete automatic variants.
 
-# v2.15.0-beta
-- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature.
-  - Added new option `donate-over-proxy`.
-  - Added real graceful exit.
-  
 # v2.14.1
 * [#975](https://github.com/xmrig/xmrig/issues/975) Fixed crash on Linux if double thread mode used.
 

CMakeLists.txt

@@ -16,29 +16,57 @@ option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 
 include (CheckIncludeFile)
 include (cmake/cpu.cmake)
-include (src/base/base.cmake)
 
 
 set(HEADERS
-    "${HEADERS_BASE}"
-    "${HEADERS_BASE_HTTP}"
-    src/api/interfaces/IApiListener.h
+    src/api/NetworkState.h
     src/App.h
+    src/base/io/Json.h
+    src/base/io/Watcher.h
+    src/base/kernel/interfaces/IConfigListener.h
+    src/base/kernel/interfaces/ISignalListener.h
+    src/base/kernel/interfaces/IWatcherListener.h
+    src/base/kernel/Entry.h
+    src/base/kernel/Process.h
+    src/base/kernel/Signals.h
+    src/base/net/Pool.h
+    src/base/net/Pools.h
+    src/base/tools/Arguments.h
+    src/base/tools/Handle.h
+    src/base/tools/String.h
     src/common/config/CommonConfig.h
     src/common/config/ConfigLoader.h
     src/common/config/ConfigWatcher.h
+    src/common/Console.h
     src/common/cpu/Cpu.h
     src/common/crypto/Algorithm.h
     src/common/crypto/keccak.h
+    src/common/interfaces/IClientListener.h
     src/common/interfaces/IConfig.h
+    src/common/interfaces/IConfigCreator.h
+    src/common/interfaces/IConsoleListener.h
+    src/common/interfaces/IControllerListener.h
     src/common/interfaces/ICpuInfo.h
+    src/common/interfaces/ILogBackend.h
+    src/common/interfaces/IStrategy.h
+    src/common/interfaces/IStrategyListener.h
+    src/common/log/BasicLog.h
+    src/common/log/ConsoleLog.h
+    src/common/log/FileLog.h
+    src/common/log/Log.h
+    src/common/net/Client.h
+    src/common/net/Id.h
+    src/common/net/Job.h
+    src/common/net/Storage.h
+    src/common/net/strategies/FailoverStrategy.h
+    src/common/net/strategies/SinglePoolStrategy.h
+    src/common/net/SubmitResult.h
     src/common/Platform.h
+    src/common/utils/c_str.h
     src/common/utils/mm_malloc.h
     src/common/xmrig.h
-    src/core/config/Config.h
-    src/core/config/ConfigLoader_default.h
-    src/core/config/ConfigLoader_platform.h
-    src/core/config/usage.h
+    src/core/ConfigLoader_platform.h
+    src/core/ConfigLoader_default.h
     src/core/Controller.h
     src/interfaces/IJobResultListener.h
     src/interfaces/IThread.h
@@ -46,14 +74,13 @@ set(HEADERS
     src/Mem.h
     src/net/JobResult.h
     src/net/Network.h
-    src/net/NetworkState.h
     src/net/strategies/DonateStrategy.h
     src/Summary.h
     src/version.h
     src/workers/CpuThread.h
+    src/workers/Handle.h
     src/workers/Hashrate.h
     src/workers/MultiWorker.h
-    src/workers/ThreadHandle.h
     src/workers/Worker.h
     src/workers/Workers.h
    )
@@ -81,26 +108,44 @@ else()
 endif()
 
 set(SOURCES
-    "${SOURCES_BASE}"
-    "${SOURCES_BASE_HTTP}"
+    src/api/NetworkState.cpp
     src/App.cpp
+    src/base/io/Json.cpp
+    src/base/io/Watcher.cpp
+    src/base/kernel/Entry.cpp
+    src/base/kernel/Process.cpp
+    src/base/kernel/Signals.cpp
+    src/base/net/Pool.cpp
+    src/base/net/Pools.cpp
+    src/base/tools/Arguments.cpp
+    src/base/tools/Handle.cpp
+    src/base/tools/String.cpp
     src/common/config/CommonConfig.cpp
     src/common/config/ConfigLoader.cpp
     src/common/config/ConfigWatcher.cpp
+    src/common/Console.cpp
     src/common/crypto/Algorithm.cpp
     src/common/crypto/keccak.cpp
+    src/common/log/BasicLog.cpp
+    src/common/log/ConsoleLog.cpp
+    src/common/log/FileLog.cpp
+    src/common/log/Log.cpp
+    src/common/net/Client.cpp
+    src/common/net/Job.cpp
+    src/common/net/strategies/FailoverStrategy.cpp
+    src/common/net/strategies/SinglePoolStrategy.cpp
+    src/common/net/SubmitResult.cpp
     src/common/Platform.cpp
-    src/core/config/Config.cpp
+    src/core/Config.cpp
     src/core/Controller.cpp
     src/Mem.cpp
     src/net/Network.cpp
-    src/net/NetworkState.cpp
     src/net/strategies/DonateStrategy.cpp
     src/Summary.cpp
     src/workers/CpuThread.cpp
+    src/workers/Handle.cpp
     src/workers/Hashrate.cpp
     src/workers/MultiWorker.cpp
-    src/workers/ThreadHandle.cpp
     src/workers/Worker.cpp
     src/workers/Workers.cpp
     src/xmrig.cpp
@@ -115,9 +160,9 @@ set(SOURCES_CRYPTO
 
 if (WIN32)
     set(SOURCES_OS
-        "${SOURCES_OS}"
         res/app.rc
         src/App_win.cpp
+        src/base/io/Json_win.cpp
         src/common/Platform_win.cpp
         src/Mem_win.cpp
         )
@@ -126,15 +171,15 @@ if (WIN32)
     set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
 elseif (APPLE)
     set(SOURCES_OS
-        "${SOURCES_OS}"
         src/App_unix.cpp
+        src/base/io/Json_unix.cpp
         src/common/Platform_mac.cpp
         src/Mem_unix.cpp
         )
 else()
     set(SOURCES_OS
-        "${SOURCES_OS}"
         src/App_unix.cpp
+        src/base/io/Json_unix.cpp
         src/common/Platform_unix.cpp
         src/Mem_unix.cpp
         )
@@ -183,6 +228,12 @@ include(cmake/OpenSSL.cmake)
 include(cmake/asm.cmake)
 include(cmake/cn-gpu.cmake)
 
+CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
+if (HAVE_SYSLOG_H)
+    add_definitions(/DHAVE_SYSLOG_H)
+    set(SOURCES_SYSLOG src/common/log/SysLog.h src/common/log/SysLog.cpp)
+endif()
+
 if (NOT WITH_AEON)
     add_definitions(/DXMRIG_NO_AEON)
 endif()
@@ -204,21 +255,30 @@ if (WITH_EMBEDDED_CONFIG)
 endif()
 
 if (WITH_HTTPD)
-    set(HTTPD_SOURCES
-        src/api/Api.cpp
-        src/api/Api.h
-        src/api/Httpd.cpp
-        src/api/Httpd.h
-        src/api/interfaces/IApiRequest.h
-        src/api/requests/ApiRequest.cpp
-        src/api/requests/ApiRequest.h
-        src/api/requests/HttpApiRequest.cpp
-        src/api/requests/HttpApiRequest.h
-        src/api/v1/ApiRouter.cpp
-        src/api/v1/ApiRouter.h
-        )
+    find_package(MHD)
+
+    if (MHD_FOUND)
+        include_directories(${MHD_INCLUDE_DIRS})
+        set(HTTPD_SOURCES
+            src/api/Api.h
+            src/api/ApiRouter.h
+            src/common/api/HttpBody.h
+            src/common/api/Httpd.h
+            src/common/api/HttpReply.h
+            src/common/api/HttpRequest.h
+            src/api/Api.cpp
+            src/api/ApiRouter.cpp
+            src/common/api/Httpd.cpp
+            src/common/api/HttpRequest.cpp
+            )
+    else()
+        message(FATAL_ERROR "microhttpd NOT found: use `-DWITH_HTTPD=OFF` to build without http deamon support")
+    endif()
 else()
     set(HTTPD_SOURCES "")
+    set(MHD_LIBRARY "")
+    add_definitions(/DXMRIG_NO_HTTPD)
+    add_definitions(/DXMRIG_NO_API)
 endif()
 
 include_directories(src)
@@ -234,4 +294,4 @@ if (WITH_DEBUG_LOG)
 endif()
 
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})

README.md

@@ -13,7 +13,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
 * This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd).
 * [Roadmap](https://github.com/xmrig/xmrig/issues/106) for next releases.
 
-<img src="http://i.imgur.com/OKZRVDh.png" width="619" >
+<img src="http://i.imgur.com/Ymumes5.png" width="670" >
 
 #### Table of contents
 * [Features](#features)

cmake/FindMHD.cmake

@@ -0,0 +1,49 @@
+# - Try to find MHD
+# Once done this will define
+#
+#  MHD_FOUND - system has MHD
+#  MHD_INCLUDE_DIRS - the MHD include directory
+#  MHD_LIBRARY - Link these to use MHD
+
+find_path(
+    MHD_INCLUDE_DIR
+    NAMES microhttpd.h
+    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+    PATH_SUFFIXES "include"
+    DOC "microhttpd include dir"
+    NO_DEFAULT_PATH
+)
+
+find_path(MHD_INCLUDE_DIR NAMES microhttpd.h)
+
+find_library(
+    MHD_LIBRARY
+    NAMES libmicrohttpd.a microhttpd libmicrohttpd
+    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
+    PATH_SUFFIXES "lib"
+    DOC "microhttpd library"
+    NO_DEFAULT_PATH
+)
+
+find_library(MHD_LIBRARY NAMES microhttpd libmicrohttpd)
+
+set(MHD_INCLUDE_DIRS ${MHD_INCLUDE_DIR})
+set(MHD_LIBRARIES ${MHD_LIBRARY})
+
+# debug library on windows
+# same naming convention as in qt (appending debug library with d)
+# boost is using the same "hack" as us with "optimized" and "debug"
+# official MHD project actually uses _d suffix
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+    find_library(
+        MHD_LIBRARY_DEBUG
+        NAMES microhttpd_d microhttpd-10_d libmicrohttpd_d libmicrohttpd-dll_d
+        DOC "mhd debug library"
+    )
+    set(MHD_LIBRARIES optimized ${MHD_LIBRARIES} debug ${MHD_LIBRARY_DEBUG})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MHD DEFAULT_MSG MHD_LIBRARY MHD_INCLUDE_DIR)
+mark_as_advanced(MHD_INCLUDE_DIR MHD_LIBRARY)
+

cmake/OpenSSL.cmake

@@ -11,17 +11,15 @@ if (WITH_TLS)
     find_package(OpenSSL)
 
     if (OPENSSL_FOUND)
-        set(TLS_SOURCES src/base/net/stratum/Tls.h src/base/net/stratum/Tls.cpp)
+        set(TLS_SOURCES src/common/net/Tls.h src/common/net/Tls.cpp)
         include_directories(${OPENSSL_INCLUDE_DIR})
     else()
         message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
     endif()
-
-    add_definitions(/DXMRIG_FEATURE_TLS)
 else()
     set(TLS_SOURCES "")
     set(OPENSSL_LIBRARIES "")
-    remove_definitions(/DXMRIG_FEATURE_TLS)
+    add_definitions(/DXMRIG_NO_TLS)
 
     set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
 endif()

cmake/flags.cmake

@@ -10,6 +10,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Release")
     add_definitions(/DNDEBUG)
 endif()
 
+include(CheckSymbolExists)
+
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-strict-aliasing")
@@ -27,6 +29,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
     else()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+
+        add_definitions(/DHAVE_ROTR)
     endif()
 
     if (WIN32)
@@ -50,6 +54,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
     add_definitions(/D_CRT_SECURE_NO_WARNINGS)
     add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
     add_definitions(/DNOMINMAX)
+    add_definitions(/DHAVE_ROTR)
 
 elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
@@ -68,6 +73,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
     else()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
+
+        check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
+        if (HAVE_ROTR)
+            add_definitions(/DHAVE_ROTR)
+        endif()
     endif()
 
 endif()

res/app.rc

@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "../src/version.h"
 
-101 ICON "app.ico"
+IDI_ICON1    ICON    DISCARDABLE    "app.ico"
 
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_PATCH,0

src/3rdparty/http-parser/AUTHORS

@@ -1,68 +0,0 @@
-# Authors ordered by first contribution.
-Ryan Dahl <ry@tinyclouds.org>
-Jeremy Hinegardner <jeremy@hinegardner.org>
-Sergey Shepelev <temotor@gmail.com>
-Joe Damato <ice799@gmail.com>
-tomika <tomika_nospam@freemail.hu>
-Phoenix Sol <phoenix@burninglabs.com>
-Cliff Frey <cliff@meraki.com>
-Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
-Santiago Gala <sgala@apache.org>
-Tim Becker <tim.becker@syngenio.de>
-Jeff Terrace <jterrace@gmail.com>
-Ben Noordhuis <info@bnoordhuis.nl>
-Nathan Rajlich <nathan@tootallnate.net>
-Mark Nottingham <mnot@mnot.net>
-Aman Gupta <aman@tmm1.net>
-Tim Becker <tim.becker@kuriositaet.de>
-Sean Cunningham <sean.cunningham@mandiant.com>
-Peter Griess <pg@std.in>
-Salman Haq <salman.haq@asti-usa.com>
-Cliff Frey <clifffrey@gmail.com>
-Jon Kolb <jon@b0g.us>
-Fouad Mardini <f.mardini@gmail.com>
-Paul Querna <pquerna@apache.org>
-Felix Geisendörfer <felix@debuggable.com>
-koichik <koichik@improvement.jp>
-Andre Caron <andre.l.caron@gmail.com>
-Ivo Raisr <ivosh@ivosh.net>
-James McLaughlin <jamie@lacewing-project.org>
-David Gwynne <loki@animata.net>
-Thomas LE ROUX <thomas@november-eleven.fr>
-Randy Rizun <rrizun@ortivawireless.com>
-Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
-Simon Zimmermann <simonz05@gmail.com>
-Erik Dubbelboer <erik@dubbelboer.com>
-Martell Malone <martellmalone@gmail.com>
-Bertrand Paquet <bpaquet@octo.com>
-BogDan Vatra <bogdan@kde.org>
-Peter Faiman <peter@thepicard.org>
-Corey Richardson <corey@octayn.net>
-Tóth Tamás <tomika_nospam@freemail.hu>
-Cam Swords <cam.swords@gmail.com>
-Chris Dickinson <christopher.s.dickinson@gmail.com>
-Uli Köhler <ukoehler@btronik.de>
-Charlie Somerville <charlie@charliesomerville.com>
-Patrik Stutz <patrik.stutz@gmail.com>
-Fedor Indutny <fedor.indutny@gmail.com>
-runner <runner.mei@gmail.com>
-Alexis Campailla <alexis@janeasystems.com>
-David Wragg <david@wragg.org>
-Vinnie Falco <vinnie.falco@gmail.com>
-Alex Butum <alexbutum@linux.com>
-Rex Feng <rexfeng@gmail.com>
-Alex Kocharin <alex@kocharin.ru>
-Mark Koopman <markmontymark@yahoo.com>
-Helge Heß <me@helgehess.eu>
-Alexis La Goutte <alexis.lagoutte@gmail.com>
-George Miroshnykov <george.miroshnykov@gmail.com>
-Maciej Małecki <me@mmalecki.com>
-Marc O'Morain <github.com@marcomorain.com>
-Jeff Pinner <jpinner@twitter.com>
-Timothy J Fontaine <tjfontaine@gmail.com>
-Akagi201 <akagi201@gmail.com>
-Romain Giraud <giraud.romain@gmail.com>
-Jay Satiro <raysatiro@yahoo.com>
-Arne Steen <Arne.Steen@gmx.de>
-Kjell Schubert <kjell.schubert@gmail.com>
-Olivier Mengué <dolmen@cpan.org>

src/3rdparty/http-parser/LICENSE-MIT

@@ -1,19 +0,0 @@
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-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. 

src/3rdparty/http-parser/README.md

@@ -1,246 +0,0 @@
-HTTP Parser
-===========
-
-[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](https://travis-ci.org/nodejs/http-parser)
-
-This is a parser for HTTP messages written in C. It parses both requests and
-responses. The parser is designed to be used in performance HTTP
-applications. It does not make any syscalls nor allocations, it does not
-buffer data, it can be interrupted at anytime. Depending on your
-architecture, it only requires about 40 bytes of data per message
-stream (in a web server that is per connection).
-
-Features:
-
-  * No dependencies
-  * Handles persistent streams (keep-alive).
-  * Decodes chunked encoding.
-  * Upgrade support
-  * Defends against buffer overflow attacks.
-
-The parser extracts the following information from HTTP messages:
-
-  * Header fields and values
-  * Content-Length
-  * Request method
-  * Response status code
-  * Transfer-Encoding
-  * HTTP version
-  * Request URL
-  * Message body
-
-
-Usage
------
-
-One `http_parser` object is used per TCP connection. Initialize the struct
-using `http_parser_init()` and set the callbacks. That might look something
-like this for a request parser:
-```c
-http_parser_settings settings;
-settings.on_url = my_url_callback;
-settings.on_header_field = my_header_field_callback;
-/* ... */
-
-http_parser *parser = malloc(sizeof(http_parser));
-http_parser_init(parser, HTTP_REQUEST);
-parser->data = my_socket;
-```
-
-When data is received on the socket execute the parser and check for errors.
-
-```c
-size_t len = 80*1024, nparsed;
-char buf[len];
-ssize_t recved;
-
-recved = recv(fd, buf, len, 0);
-
-if (recved < 0) {
-  /* Handle error. */
-}
-
-/* Start up / continue the parser.
- * Note we pass recved==0 to signal that EOF has been received.
- */
-nparsed = http_parser_execute(parser, &settings, buf, recved);
-
-if (parser->upgrade) {
-  /* handle new protocol */
-} else if (nparsed != recved) {
-  /* Handle error. Usually just close the connection. */
-}
-```
-
-`http_parser` needs to know where the end of the stream is. For example, sometimes
-servers send responses without Content-Length and expect the client to
-consume input (for the body) until EOF. To tell `http_parser` about EOF, give
-`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
-can still be encountered during an EOF, so one must still be prepared
-to receive them.
-
-Scalar valued message information such as `status_code`, `method`, and the
-HTTP version are stored in the parser structure. This data is only
-temporally stored in `http_parser` and gets reset on each new message. If
-this information is needed later, copy it out of the structure during the
-`headers_complete` callback.
-
-The parser decodes the transfer-encoding for both requests and responses
-transparently. That is, a chunked encoding is decoded before being sent to
-the on_body callback.
-
-
-The Special Problem of Upgrade
-------------------------------
-
-`http_parser` supports upgrading the connection to a different protocol. An
-increasingly common example of this is the WebSocket protocol which sends
-a request like
-
-        GET /demo HTTP/1.1
-        Upgrade: WebSocket
-        Connection: Upgrade
-        Host: example.com
-        Origin: http://example.com
-        WebSocket-Protocol: sample
-
-followed by non-HTTP data.
-
-(See [RFC6455](https://tools.ietf.org/html/rfc6455) for more information the
-WebSocket protocol.)
-
-To support this, the parser will treat this as a normal HTTP message without a
-body, issuing both on_headers_complete and on_message_complete callbacks. However
-http_parser_execute() will stop parsing at the end of the headers and return.
-
-The user is expected to check if `parser->upgrade` has been set to 1 after
-`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
-offset by the return value of `http_parser_execute()`.
-
-
-Callbacks
----------
-
-During the `http_parser_execute()` call, the callbacks set in
-`http_parser_settings` will be executed. The parser maintains state and
-never looks behind, so buffering the data is not necessary. If you need to
-save certain data for later usage, you can do that from the callbacks.
-
-There are two types of callbacks:
-
-* notification `typedef int (*http_cb) (http_parser*);`
-    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
-* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
-    Callbacks: (requests only) on_url,
-               (common) on_header_field, on_header_value, on_body;
-
-Callbacks must return 0 on success. Returning a non-zero value indicates
-error to the parser, making it exit immediately.
-
-For cases where it is necessary to pass local information to/from a callback,
-the `http_parser` object's `data` field can be used.
-An example of such a case is when using threads to handle a socket connection,
-parse a request, and then give a response over that socket. By instantiation
-of a thread-local struct containing relevant data (e.g. accepted socket,
-allocated memory for callbacks to write into, etc), a parser's callbacks are
-able to communicate data between the scope of the thread and the scope of the
-callback in a threadsafe manner. This allows `http_parser` to be used in
-multi-threaded contexts.
-
-Example:
-```c
- typedef struct {
-  socket_t sock;
-  void* buffer;
-  int buf_len;
- } custom_data_t;
-
-
-int my_url_callback(http_parser* parser, const char *at, size_t length) {
-  /* access to thread local custom_data_t struct.
-  Use this access save parsed data for later use into thread local
-  buffer, or communicate over socket
-  */
-  parser->data;
-  ...
-  return 0;
-}
-
-...
-
-void http_parser_thread(socket_t sock) {
- int nparsed = 0;
- /* allocate memory for user data */
- custom_data_t *my_data = malloc(sizeof(custom_data_t));
-
- /* some information for use by callbacks.
- * achieves thread -> callback information flow */
- my_data->sock = sock;
-
- /* instantiate a thread-local parser */
- http_parser *parser = malloc(sizeof(http_parser));
- http_parser_init(parser, HTTP_REQUEST); /* initialise parser */
- /* this custom data reference is accessible through the reference to the
- parser supplied to callback functions */
- parser->data = my_data;
-
- http_parser_settings settings; /* set up callbacks */
- settings.on_url = my_url_callback;
-
- /* execute parser */
- nparsed = http_parser_execute(parser, &settings, buf, recved);
-
- ...
- /* parsed information copied from callback.
- can now perform action on data copied into thread-local memory from callbacks.
- achieves callback -> thread information flow */
- my_data->buffer;
- ...
-}
-
-```
-
-In case you parse HTTP message in chunks (i.e. `read()` request line
-from socket, parse, read half headers, parse, etc) your data callbacks
-may be called more than once. `http_parser` guarantees that data pointer is only
-valid for the lifetime of callback. You can also `read()` into a heap allocated
-buffer to avoid copying memory around if this fits your application.
-
-Reading headers may be a tricky task if you read/parse headers partially.
-Basically, you need to remember whether last header callback was field or value
-and apply the following logic:
-
-    (on_header_field and on_header_value shortened to on_h_*)
-     ------------------------ ------------ --------------------------------------------
-    | State (prev. callback) | Callback   | Description/action                         |
-     ------------------------ ------------ --------------------------------------------
-    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
-    |                        |            | into it                                    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_field | New header started.                        |
-    |                        |            | Copy current name,value buffers to headers |
-    |                        |            | list and allocate new buffer for new name  |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_field | Previous name continues. Reallocate name   |
-    |                        |            | buffer and append callback data to it      |
-     ------------------------ ------------ --------------------------------------------
-    | field                  | on_h_value | Value for current header started. Allocate |
-    |                        |            | new buffer and copy callback data to it    |
-     ------------------------ ------------ --------------------------------------------
-    | value                  | on_h_value | Value continues. Reallocate value buffer   |
-    |                        |            | and append callback data to it             |
-     ------------------------ ------------ --------------------------------------------
-
-
-Parsing URLs
-------------
-
-A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
-Users of this library may wish to use it to parse URLs constructed from
-consecutive `on_url` callbacks.
-
-See examples of reading in headers:
-
-* [partial example](http://gist.github.com/155877) in C
-* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
-* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript

src/3rdparty/http-parser/http_parser.h

@@ -1,439 +0,0 @@
-/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * 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.
- */
-#ifndef http_parser_h
-#define http_parser_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Also update SONAME in the Makefile whenever you change these. */
-#define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 9
-#define HTTP_PARSER_VERSION_PATCH 0
-
-#include <stddef.h>
-#if defined(_WIN32) && !defined(__MINGW32__) && \
-  (!defined(_MSC_VER) || _MSC_VER<1600) && !defined(__WINE__)
-#include <BaseTsd.h>
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
- * faster
- */
-#ifndef HTTP_PARSER_STRICT
-# define HTTP_PARSER_STRICT 1
-#endif
-
-/* Maximium header size allowed. If the macro is not defined
- * before including this header then the default is used. To
- * change the maximum header size, define the macro in the build
- * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
- * the effective limit on the size of the header, define the macro
- * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
- */
-#ifndef HTTP_MAX_HEADER_SIZE
-# define HTTP_MAX_HEADER_SIZE (80*1024)
-#endif
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-
-/* Callbacks should return non-zero to indicate an error. The parser will
- * then halt execution.
- *
- * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
- * returning '1' from on_headers_complete will tell the parser that it
- * should not expect a body. This is used when receiving a response to a
- * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
- * chunked' headers that indicate the presence of a body.
- *
- * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
- * useful for handling responses to a CONNECT request which may not contain
- * `Upgrade` or `Connection: upgrade` headers.
- *
- * http_data_cb does not return data chunks. It will be called arbitrarily
- * many times for each string. E.G. you might get 10 callbacks for "on_url"
- * each providing just a few characters more data.
- */
-typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
-typedef int (*http_cb) (http_parser*);
-
-
-/* Status Codes */
-#define HTTP_STATUS_MAP(XX)                                                 \
-  XX(100, CONTINUE,                        Continue)                        \
-  XX(101, SWITCHING_PROTOCOLS,             Switching Protocols)             \
-  XX(102, PROCESSING,                      Processing)                      \
-  XX(200, OK,                              OK)                              \
-  XX(201, CREATED,                         Created)                         \
-  XX(202, ACCEPTED,                        Accepted)                        \
-  XX(203, NON_AUTHORITATIVE_INFORMATION,   Non-Authoritative Information)   \
-  XX(204, NO_CONTENT,                      No Content)                      \
-  XX(205, RESET_CONTENT,                   Reset Content)                   \
-  XX(206, PARTIAL_CONTENT,                 Partial Content)                 \
-  XX(207, MULTI_STATUS,                    Multi-Status)                    \
-  XX(208, ALREADY_REPORTED,                Already Reported)                \
-  XX(226, IM_USED,                         IM Used)                         \
-  XX(300, MULTIPLE_CHOICES,                Multiple Choices)                \
-  XX(301, MOVED_PERMANENTLY,               Moved Permanently)               \
-  XX(302, FOUND,                           Found)                           \
-  XX(303, SEE_OTHER,                       See Other)                       \
-  XX(304, NOT_MODIFIED,                    Not Modified)                    \
-  XX(305, USE_PROXY,                       Use Proxy)                       \
-  XX(307, TEMPORARY_REDIRECT,              Temporary Redirect)              \
-  XX(308, PERMANENT_REDIRECT,              Permanent Redirect)              \
-  XX(400, BAD_REQUEST,                     Bad Request)                     \
-  XX(401, UNAUTHORIZED,                    Unauthorized)                    \
-  XX(402, PAYMENT_REQUIRED,                Payment Required)                \
-  XX(403, FORBIDDEN,                       Forbidden)                       \
-  XX(404, NOT_FOUND,                       Not Found)                       \
-  XX(405, METHOD_NOT_ALLOWED,              Method Not Allowed)              \
-  XX(406, NOT_ACCEPTABLE,                  Not Acceptable)                  \
-  XX(407, PROXY_AUTHENTICATION_REQUIRED,   Proxy Authentication Required)   \
-  XX(408, REQUEST_TIMEOUT,                 Request Timeout)                 \
-  XX(409, CONFLICT,                        Conflict)                        \
-  XX(410, GONE,                            Gone)                            \
-  XX(411, LENGTH_REQUIRED,                 Length Required)                 \
-  XX(412, PRECONDITION_FAILED,             Precondition Failed)             \
-  XX(413, PAYLOAD_TOO_LARGE,               Payload Too Large)               \
-  XX(414, URI_TOO_LONG,                    URI Too Long)                    \
-  XX(415, UNSUPPORTED_MEDIA_TYPE,          Unsupported Media Type)          \
-  XX(416, RANGE_NOT_SATISFIABLE,           Range Not Satisfiable)           \
-  XX(417, EXPECTATION_FAILED,              Expectation Failed)              \
-  XX(421, MISDIRECTED_REQUEST,             Misdirected Request)             \
-  XX(422, UNPROCESSABLE_ENTITY,            Unprocessable Entity)            \
-  XX(423, LOCKED,                          Locked)                          \
-  XX(424, FAILED_DEPENDENCY,               Failed Dependency)               \
-  XX(426, UPGRADE_REQUIRED,                Upgrade Required)                \
-  XX(428, PRECONDITION_REQUIRED,           Precondition Required)           \
-  XX(429, TOO_MANY_REQUESTS,               Too Many Requests)               \
-  XX(431, REQUEST_HEADER_FIELDS_TOO_LARGE, Request Header Fields Too Large) \
-  XX(451, UNAVAILABLE_FOR_LEGAL_REASONS,   Unavailable For Legal Reasons)   \
-  XX(500, INTERNAL_SERVER_ERROR,           Internal Server Error)           \
-  XX(501, NOT_IMPLEMENTED,                 Not Implemented)                 \
-  XX(502, BAD_GATEWAY,                     Bad Gateway)                     \
-  XX(503, SERVICE_UNAVAILABLE,             Service Unavailable)             \
-  XX(504, GATEWAY_TIMEOUT,                 Gateway Timeout)                 \
-  XX(505, HTTP_VERSION_NOT_SUPPORTED,      HTTP Version Not Supported)      \
-  XX(506, VARIANT_ALSO_NEGOTIATES,         Variant Also Negotiates)         \
-  XX(507, INSUFFICIENT_STORAGE,            Insufficient Storage)            \
-  XX(508, LOOP_DETECTED,                   Loop Detected)                   \
-  XX(510, NOT_EXTENDED,                    Not Extended)                    \
-  XX(511, NETWORK_AUTHENTICATION_REQUIRED, Network Authentication Required) \
-
-enum http_status
-  {
-#define XX(num, name, string) HTTP_STATUS_##name = num,
-  HTTP_STATUS_MAP(XX)
-#undef XX
-  };
-
-
-/* Request Methods */
-#define HTTP_METHOD_MAP(XX)         \
-  XX(0,  DELETE,      DELETE)       \
-  XX(1,  GET,         GET)          \
-  XX(2,  HEAD,        HEAD)         \
-  XX(3,  POST,        POST)         \
-  XX(4,  PUT,         PUT)          \
-  /* pathological */                \
-  XX(5,  CONNECT,     CONNECT)      \
-  XX(6,  OPTIONS,     OPTIONS)      \
-  XX(7,  TRACE,       TRACE)        \
-  /* WebDAV */                      \
-  XX(8,  COPY,        COPY)         \
-  XX(9,  LOCK,        LOCK)         \
-  XX(10, MKCOL,       MKCOL)        \
-  XX(11, MOVE,        MOVE)         \
-  XX(12, PROPFIND,    PROPFIND)     \
-  XX(13, PROPPATCH,   PROPPATCH)    \
-  XX(14, SEARCH,      SEARCH)       \
-  XX(15, UNLOCK,      UNLOCK)       \
-  XX(16, BIND,        BIND)         \
-  XX(17, REBIND,      REBIND)       \
-  XX(18, UNBIND,      UNBIND)       \
-  XX(19, ACL,         ACL)          \
-  /* subversion */                  \
-  XX(20, REPORT,      REPORT)       \
-  XX(21, MKACTIVITY,  MKACTIVITY)   \
-  XX(22, CHECKOUT,    CHECKOUT)     \
-  XX(23, MERGE,       MERGE)        \
-  /* upnp */                        \
-  XX(24, MSEARCH,     M-SEARCH)     \
-  XX(25, NOTIFY,      NOTIFY)       \
-  XX(26, SUBSCRIBE,   SUBSCRIBE)    \
-  XX(27, UNSUBSCRIBE, UNSUBSCRIBE)  \
-  /* RFC-5789 */                    \
-  XX(28, PATCH,       PATCH)        \
-  XX(29, PURGE,       PURGE)        \
-  /* CalDAV */                      \
-  XX(30, MKCALENDAR,  MKCALENDAR)   \
-  /* RFC-2068, section 19.6.1.2 */  \
-  XX(31, LINK,        LINK)         \
-  XX(32, UNLINK,      UNLINK)       \
-  /* icecast */                     \
-  XX(33, SOURCE,      SOURCE)       \
-
-enum http_method
-  {
-#define XX(num, name, string) HTTP_##name = num,
-  HTTP_METHOD_MAP(XX)
-#undef XX
-  };
-
-
-enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
-
-
-/* Flag values for http_parser.flags field */
-enum flags
-  { F_CHUNKED               = 1 << 0
-  , F_CONNECTION_KEEP_ALIVE = 1 << 1
-  , F_CONNECTION_CLOSE      = 1 << 2
-  , F_CONNECTION_UPGRADE    = 1 << 3
-  , F_TRAILING              = 1 << 4
-  , F_UPGRADE               = 1 << 5
-  , F_SKIPBODY              = 1 << 6
-  , F_CONTENTLENGTH         = 1 << 7
-  };
-
-
-/* Map for errno-related constants
- *
- * The provided argument should be a macro that takes 2 arguments.
- */
-#define HTTP_ERRNO_MAP(XX)                                           \
-  /* No error */                                                     \
-  XX(OK, "success")                                                  \
-                                                                     \
-  /* Callback-related errors */                                      \
-  XX(CB_message_begin, "the on_message_begin callback failed")       \
-  XX(CB_url, "the on_url callback failed")                           \
-  XX(CB_header_field, "the on_header_field callback failed")         \
-  XX(CB_header_value, "the on_header_value callback failed")         \
-  XX(CB_headers_complete, "the on_headers_complete callback failed") \
-  XX(CB_body, "the on_body callback failed")                         \
-  XX(CB_message_complete, "the on_message_complete callback failed") \
-  XX(CB_status, "the on_status callback failed")                     \
-  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
-  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
-                                                                     \
-  /* Parsing-related errors */                                       \
-  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
-  XX(HEADER_OVERFLOW,                                                \
-     "too many header bytes seen; overflow detected")                \
-  XX(CLOSED_CONNECTION,                                              \
-     "data received after completed connection: close message")      \
-  XX(INVALID_VERSION, "invalid HTTP version")                        \
-  XX(INVALID_STATUS, "invalid HTTP status code")                     \
-  XX(INVALID_METHOD, "invalid HTTP method")                          \
-  XX(INVALID_URL, "invalid URL")                                     \
-  XX(INVALID_HOST, "invalid host")                                   \
-  XX(INVALID_PORT, "invalid port")                                   \
-  XX(INVALID_PATH, "invalid path")                                   \
-  XX(INVALID_QUERY_STRING, "invalid query string")                   \
-  XX(INVALID_FRAGMENT, "invalid fragment")                           \
-  XX(LF_EXPECTED, "LF character expected")                           \
-  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
-  XX(INVALID_CONTENT_LENGTH,                                         \
-     "invalid character in content-length header")                   \
-  XX(UNEXPECTED_CONTENT_LENGTH,                                      \
-     "unexpected content-length header")                             \
-  XX(INVALID_CHUNK_SIZE,                                             \
-     "invalid character in chunk size header")                       \
-  XX(INVALID_CONSTANT, "invalid constant string")                    \
-  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
-  XX(STRICT, "strict mode assertion failed")                         \
-  XX(PAUSED, "parser is paused")                                     \
-  XX(UNKNOWN, "an unknown error occurred")
-
-
-/* Define HPE_* values for each errno value above */
-#define HTTP_ERRNO_GEN(n, s) HPE_##n,
-enum http_errno {
-  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
-};
-#undef HTTP_ERRNO_GEN
-
-
-/* Get an http_errno value from an http_parser */
-#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
-
-
-struct http_parser {
-  /** PRIVATE **/
-  unsigned int type : 2;         /* enum http_parser_type */
-  unsigned int flags : 8;        /* F_* values from 'flags' enum; semi-public */
-  unsigned int state : 7;        /* enum state from http_parser.c */
-  unsigned int header_state : 7; /* enum header_state from http_parser.c */
-  unsigned int index : 7;        /* index into current matcher */
-  unsigned int lenient_http_headers : 1;
-
-  uint32_t nread;          /* # bytes read in various scenarios */
-  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
-
-  /** READ-ONLY **/
-  unsigned short http_major;
-  unsigned short http_minor;
-  unsigned int status_code : 16; /* responses only */
-  unsigned int method : 8;       /* requests only */
-  unsigned int http_errno : 7;
-
-  /* 1 = Upgrade header was present and the parser has exited because of that.
-   * 0 = No upgrade header present.
-   * Should be checked when http_parser_execute() returns in addition to
-   * error checking.
-   */
-  unsigned int upgrade : 1;
-
-  /** PUBLIC **/
-  void *data; /* A pointer to get hook to the "connection" or "socket" object */
-};
-
-
-struct http_parser_settings {
-  http_cb      on_message_begin;
-  http_data_cb on_url;
-  http_data_cb on_status;
-  http_data_cb on_header_field;
-  http_data_cb on_header_value;
-  http_cb      on_headers_complete;
-  http_data_cb on_body;
-  http_cb      on_message_complete;
-  /* When on_chunk_header is called, the current chunk length is stored
-   * in parser->content_length.
-   */
-  http_cb      on_chunk_header;
-  http_cb      on_chunk_complete;
-};
-
-
-enum http_parser_url_fields
-  { UF_SCHEMA           = 0
-  , UF_HOST             = 1
-  , UF_PORT             = 2
-  , UF_PATH             = 3
-  , UF_QUERY            = 4
-  , UF_FRAGMENT         = 5
-  , UF_USERINFO         = 6
-  , UF_MAX              = 7
-  };
-
-
-/* Result structure for http_parser_parse_url().
- *
- * Callers should index into field_data[] with UF_* values iff field_set
- * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
- * because we probably have padding left over), we convert any port to
- * a uint16_t.
- */
-struct http_parser_url {
-  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
-  uint16_t port;                /* Converted UF_PORT string */
-
-  struct {
-    uint16_t off;               /* Offset into buffer in which field starts */
-    uint16_t len;               /* Length of run in buffer */
-  } field_data[UF_MAX];
-};
-
-
-/* Returns the library version. Bits 16-23 contain the major version number,
- * bits 8-15 the minor version number and bits 0-7 the patch level.
- * Usage example:
- *
- *   unsigned long version = http_parser_version();
- *   unsigned major = (version >> 16) & 255;
- *   unsigned minor = (version >> 8) & 255;
- *   unsigned patch = version & 255;
- *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
- */
-unsigned long http_parser_version(void);
-
-void http_parser_init(http_parser *parser, enum http_parser_type type);
-
-
-/* Initialize http_parser_settings members to 0
- */
-void http_parser_settings_init(http_parser_settings *settings);
-
-
-/* Executes the parser. Returns number of parsed bytes. Sets
- * `parser->http_errno` on error. */
-size_t http_parser_execute(http_parser *parser,
-                           const http_parser_settings *settings,
-                           const char *data,
-                           size_t len);
-
-
-/* If http_should_keep_alive() in the on_headers_complete or
- * on_message_complete callback returns 0, then this should be
- * the last message on the connection.
- * If you are the server, respond with the "Connection: close" header.
- * If you are the client, close the connection.
- */
-int http_should_keep_alive(const http_parser *parser);
-
-/* Returns a string version of the HTTP method. */
-const char *http_method_str(enum http_method m);
-
-/* Returns a string version of the HTTP status code. */
-const char *http_status_str(enum http_status s);
-
-/* Return a string name of the given error */
-const char *http_errno_name(enum http_errno err);
-
-/* Return a string description of the given error */
-const char *http_errno_description(enum http_errno err);
-
-/* Initialize all http_parser_url members to 0 */
-void http_parser_url_init(struct http_parser_url *u);
-
-/* Parse a URL; return nonzero on failure */
-int http_parser_parse_url(const char *buf, size_t buflen,
-                          int is_connect,
-                          struct http_parser_url *u);
-
-/* Pause or un-pause the parser; a nonzero value pauses */
-void http_parser_pause(http_parser *parser, int paused);
-
-/* Checks if this is the final chunk of the body. */
-int http_body_is_final(const http_parser *parser);
-
-/* Change the maximum header size provided at compile time. */
-void http_parser_set_max_header_size(uint32_t size);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

src/App.cpp

@@ -30,12 +30,12 @@
 
 #include "api/Api.h"
 #include "App.h"
-#include "base/io/Console.h"
-#include "base/io/log/Log.h"
 #include "base/kernel/Signals.h"
+#include "common/Console.h"
 #include "common/cpu/Cpu.h"
+#include "common/log/Log.h"
 #include "common/Platform.h"
-#include "core/config/Config.h"
+#include "core/Config.h"
 #include "core/Controller.h"
 #include "crypto/CryptoNight.h"
 #include "Mem.h"
@@ -45,8 +45,14 @@
 #include "workers/Workers.h"
 
 
+#ifndef XMRIG_NO_HTTPD
+#   include "common/api/Httpd.h"
+#endif
+
+
 xmrig::App::App(Process *process) :
     m_console(nullptr),
+    m_httpd(nullptr),
     m_signals(nullptr)
 {
     m_controller = new Controller(process);
@@ -62,9 +68,15 @@ xmrig::App::App(Process *process) :
 
 xmrig::App::~App()
 {
+    uv_tty_reset_mode();
+
     delete m_signals;
     delete m_console;
     delete m_controller;
+
+#   ifndef XMRIG_NO_HTTPD
+    delete m_httpd;
+#   endif
 }
 
 
@@ -88,9 +100,24 @@ int xmrig::App::exec()
         return 0;
     }
 
+#   ifndef XMRIG_NO_API
+    Api::start(m_controller);
+#   endif
+
+#   ifndef XMRIG_NO_HTTPD
+    m_httpd = new Httpd(
+                m_controller->config()->apiPort(),
+                m_controller->config()->apiToken(),
+                m_controller->config()->isApiIPv6(),
+                m_controller->config()->isApiRestricted()
+                );
+
+    m_httpd->start();
+#   endif
+
     Workers::start(m_controller);
 
-    m_controller->start();
+    m_controller->network()->connect();
 
     const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
     uv_loop_close(uv_default_loop());
@@ -110,7 +137,7 @@ void xmrig::App::onConsoleCommand(char command)
     case 'p':
     case 'P':
         if (Workers::isEnabled()) {
-            LOG_INFO(YELLOW_BOLD("paused") ", press " MAGENTA_BOLD("r") " to resume");
+            LOG_INFO(m_controller->config()->isColors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
             Workers::setEnabled(false);
         }
         break;
@@ -118,7 +145,7 @@ void xmrig::App::onConsoleCommand(char command)
     case 'r':
     case 'R':
         if (!Workers::isEnabled()) {
-            LOG_INFO(GREEN_BOLD("resumed"));
+            LOG_INFO(m_controller->config()->isColors() ? "\x1B[01;32mresumed" : "resumed");
             Workers::setEnabled(true);
         }
         break;
@@ -160,10 +187,8 @@ void xmrig::App::onSignal(int signum)
 
 void xmrig::App::close()
 {
-    m_signals->stop();
-    m_console->stop();
-    m_controller->stop();
-
+    m_controller->network()->stop();
     Workers::stop();
-    Log::destroy();
+
+    uv_stop(uv_default_loop());
 }

src/App.h

@@ -27,14 +27,17 @@
 #define XMRIG_APP_H
 
 
-#include "base/kernel/interfaces/IConsoleListener.h"
 #include "base/kernel/interfaces/ISignalListener.h"
+#include "common/interfaces/IConsoleListener.h"
+
+
+class Console;
+class Httpd;
 
 
 namespace xmrig {
 
 
-class Console;
 class Controller;
 class Network;
 class Process;
@@ -59,6 +62,7 @@ private:
 
     Console *m_console;
     Controller *m_controller;
+    Httpd *m_httpd;
     Signals *m_signals;
 };
 

src/App_unix.cpp

@@ -30,8 +30,8 @@
 
 
 #include "App.h"
-#include "base/io/log/Log.h"
-#include "core/config/Config.h"
+#include "common/log/Log.h"
+#include "core/Config.h"
 #include "core/Controller.h"
 
 

src/App_win.cpp

@@ -29,7 +29,7 @@
 
 #include "App.h"
 #include "core/Controller.h"
-#include "core/config/Config.h"
+#include "core/Config.h"
 
 
 void xmrig::App::background()

src/Mem_unix.cpp

@@ -28,18 +28,13 @@
 #include <sys/mman.h>
 
 
-#include "base/io/log/Log.h"
+#include "common/log/Log.h"
 #include "common/utils/mm_malloc.h"
 #include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
 #include "Mem.h"
 
 
-#if defined(__APPLE__)
-#   include <mach/vm_statistics.h>
-#endif
-
-
 void Mem::init(bool enabled)
 {
     m_enabled = enabled;

src/Mem_win.cpp

@@ -30,7 +30,7 @@
 #include <tchar.h>
 
 
-#include "base/io/log/Log.h"
+#include "common/log/Log.h"
 #include "common/utils/mm_malloc.h"
 #include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
@@ -67,11 +67,11 @@ static BOOL SetLockPagesPrivilege() {
     tp.PrivilegeCount = 1;
     tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
 
-    if (LookupPrivilegeValue(nullptr, SE_LOCK_MEMORY_NAME, &(tp.Privileges[0].Luid)) != TRUE) {
+    if (LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &(tp.Privileges[0].Luid)) != TRUE) {
         return FALSE;
     }
 
-    BOOL rc = AdjustTokenPrivileges(token, FALSE, (PTOKEN_PRIVILEGES) &tp, 0, nullptr, nullptr);
+    BOOL rc = AdjustTokenPrivileges(token, FALSE, (PTOKEN_PRIVILEGES) &tp, 0, NULL, NULL);
     if (rc != TRUE || GetLastError() != ERROR_SUCCESS) {
         return FALSE;
     }
@@ -95,12 +95,12 @@ static LSA_UNICODE_STRING StringToLsaUnicodeString(LPCTSTR string) {
 
 static BOOL ObtainLockPagesPrivilege() {
     HANDLE token;
-    PTOKEN_USER user = nullptr;
+    PTOKEN_USER user = NULL;
 
     if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token) == TRUE) {
         DWORD size = 0;
 
-        GetTokenInformation(token, TokenUser, nullptr, 0, &size);
+        GetTokenInformation(token, TokenUser, NULL, 0, &size);
         if (size) {
             user = (PTOKEN_USER) LocalAlloc(LPTR, size);
         }
@@ -118,7 +118,7 @@ static BOOL ObtainLockPagesPrivilege() {
     ZeroMemory(&attributes, sizeof(attributes));
 
     BOOL result = FALSE;
-    if (LsaOpenPolicy(nullptr, &attributes, POLICY_ALL_ACCESS, &handle) == 0) {
+    if (LsaOpenPolicy(NULL, &attributes, POLICY_ALL_ACCESS, &handle) == 0) {
         LSA_UNICODE_STRING str = StringToLsaUnicodeString(_T(SE_LOCK_MEMORY_NAME));
 
         if (LsaAddAccountRights(handle, user->User.Sid, &str, 1) == 0) {
@@ -187,7 +187,7 @@ void Mem::release(MemInfo &info)
 
 void *Mem::allocateExecutableMemory(size_t size)
 {
-    return VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+    return VirtualAlloc(0, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
 }
 
 

src/Summary.cpp

@@ -28,10 +28,10 @@
 #include <uv.h>
 
 
-#include "base/io/log/Log.h"
-#include "base/net/stratum/Pool.h"
+#include "base/net/Pool.h"
 #include "common/cpu/Cpu.h"
-#include "core/config/Config.h"
+#include "common/log/Log.h"
+#include "core/Config.h"
 #include "core/Controller.h"
 #include "crypto/Asm.h"
 #include "Mem.h"
@@ -41,44 +41,62 @@
 
 #ifndef XMRIG_NO_ASM
 static const char *coloredAsmNames[] = {
-    RED_BOLD("none"),
+    "\x1B[1;31mnone\x1B[0m",
     "auto",
-    GREEN_BOLD("intel"),
-    GREEN_BOLD("ryzen"),
-    GREEN_BOLD("bulldozer")
+    "\x1B[1;32mintel\x1B[0m",
+    "\x1B[1;32mryzen\x1B[0m",
+    "\x1B[1;32mbulldozer\x1B[0m"
 };
 
 
-inline static const char *asmName(xmrig::Assembly assembly)
+inline static const char *asmName(xmrig::Assembly assembly, bool colors)
 {
-    return coloredAsmNames[assembly];
+    return colors ? coloredAsmNames[assembly] : xmrig::Asm::toString(assembly);
 }
 #endif
 
 
-static void print_memory(xmrig::Config *) {
+static void print_memory(xmrig::Config *config) {
 #   ifdef _WIN32
-    xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s",
-                      "HUGE PAGES", Mem::isHugepagesAvailable() ? GREEN_BOLD("available") : RED_BOLD("unavailable"));
+    if (config->isColors()) {
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s",
+                       "HUGE PAGES", Mem::isHugepagesAvailable() ? "\x1B[1;32mavailable" : "\x1B[01;31munavailable");
+    }
+    else {
+        Log::i()->text(" * %-13s%s", "HUGE PAGES", Mem::isHugepagesAvailable() ? "available" : "unavailable");
+    }
 #   endif
 }
 
 
-static void print_cpu(xmrig::Config *)
+static void print_cpu(xmrig::Config *config)
 {
     using namespace xmrig;
 
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES %sAVX2",
-               "CPU",
-               Cpu::info()->brand(),
-               Cpu::info()->sockets(),
-               Cpu::info()->isX64()   ? GREEN_BOLD_S : RED_BOLD_S "-",
-               Cpu::info()->hasAES()  ? GREEN_BOLD_S : RED_BOLD_S "-",
-               Cpu::info()->hasAVX2() ? GREEN_BOLD_S : RED_BOLD_S "-"
-               );
-#   ifndef XMRIG_NO_LIBCPUID
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%.1f MB/%.1f MB"), "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
-#   endif
+    if (config->isColors()) {
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES %sAVX2",
+                       "CPU",
+                       Cpu::info()->brand(),
+                       Cpu::info()->sockets(),
+                       Cpu::info()->isX64()   ? "\x1B[1;32m" : "\x1B[1;31m-",
+                       Cpu::info()->hasAES()  ? "\x1B[1;32m" : "\x1B[1;31m-",
+                       Cpu::info()->hasAVX2() ? "\x1B[1;32m" : "\x1B[1;31m-");
+#       ifndef XMRIG_NO_LIBCPUID
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%.1f MB/%.1f MB"), "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
+#       endif
+    }
+    else {
+        Log::i()->text(" * %-13s%s (%d) %sx64 %sAES %sAVX2",
+                       "CPU",
+                       Cpu::info()->brand(),
+                       Cpu::info()->sockets(),
+                       Cpu::info()->isX64()   ? "" : "-",
+                       Cpu::info()->hasAES()  ? "" : "-",
+                       Cpu::info()->hasAVX2() ? "" : "-");
+#       ifndef XMRIG_NO_LIBCPUID
+        Log::i()->text(" * %-13s%.1f MB/%.1f MB", "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
+#       endif
+    }
 }
 
 
@@ -90,48 +108,49 @@ static void print_threads(xmrig::Config *config)
             snprintf(buf, sizeof buf, ", affinity=0x%" PRIX64, config->affinity());
         }
 
-        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, av=%d, %sdonate=%d%%") WHITE_BOLD("%s"),
-                          "THREADS",
-                          config->threadsCount(),
-                          config->algorithm().shortName(),
-                          config->algoVariant(),
-                          config->pools().donateLevel() == 0 ? RED_BOLD_S : "",
-                          config->pools().donateLevel(),
-                          buf
-                          );
+        Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, av=%d, %sdonate=%d%%") WHITE_BOLD("%s")
+                                          : " * %-13s%d, %s, av=%d, %sdonate=%d%%%s",
+                       "THREADS",
+                       config->threadsCount(),
+                       config->algorithm().name(),
+                       config->algoVariant(),
+                       config->isColors() && config->donateLevel() == 0 ? "\x1B[1;31m" : "",
+                       config->donateLevel(),
+                       buf);
     }
     else {
-        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, %sdonate=%d%%"),
-                          "THREADS",
-                          config->threadsCount(),
-                          config->algorithm().shortName(),
-                          config->pools().donateLevel() == 0 ? RED_BOLD_S : "",
-                          config->pools().donateLevel()
-                          );
+        Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, %sdonate=%d%%")
+                                          : " * %-13s%d, %s, %sdonate=%d%%",
+                       "THREADS",
+                       config->threadsCount(),
+                       config->algorithm().name(),
+                       config->isColors() && config->donateLevel() == 0 ? "\x1B[1;31m" : "",
+                       config->donateLevel());
     }
 
 #   ifndef XMRIG_NO_ASM
     if (config->assembly() == xmrig::ASM_AUTO) {
         const xmrig::Assembly assembly = xmrig::Cpu::info()->assembly();
 
-        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13sauto:%s"), "ASSEMBLY", asmName(assembly));
+        Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13sauto:%s")
+                                          : " * %-13sauto:%s", "ASSEMBLY", asmName(assembly, config->isColors()));
     }
     else {
-        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s"), "ASSEMBLY", asmName(config->assembly()));
+        Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s") : " * %-13s%s", "ASSEMBLY", asmName(config->assembly(), config->isColors()));
     }
 #   endif
 }
 
 
-static void print_commands(xmrig::Config *)
+static void print_commands(xmrig::Config *config)
 {
-    if (xmrig::Log::colors) {
-        xmrig::Log::print(GREEN_BOLD(" * ") WHITE_BOLD("COMMANDS     ") MAGENTA_BOLD("h") WHITE_BOLD("ashrate, ")
+    if (config->isColors()) {
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("COMMANDS     ") MAGENTA_BOLD("h") WHITE_BOLD("ashrate, ")
                                                                      MAGENTA_BOLD("p") WHITE_BOLD("ause, ")
                                                                      MAGENTA_BOLD("r") WHITE_BOLD("esume"));
     }
     else {
-        xmrig::Log::print(" * COMMANDS     'h' hashrate, 'p' pause, 'r' resume");
+        Log::i()->text(" * COMMANDS     'h' hashrate, 'p' pause, 'r' resume");
     }
 }
 
@@ -142,7 +161,8 @@ void Summary::print(xmrig::Controller *controller)
     print_memory(controller->config());
     print_cpu(controller->config());
     print_threads(controller->config());
-    controller->config()->pools().print();
+    controller->config()->printPools();
+    controller->config()->printAPI();
 
     print_commands(controller->config());
 }

src/api/Api.cpp

@@ -22,166 +22,52 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include <uv.h>
+#include <string.h>
 
 
-#ifndef _WIN32
-#   include <unistd.h>
-#endif
-
-
-#include "3rdparty/http-parser/http_parser.h"
 #include "api/Api.h"
-#include "api/interfaces/IApiListener.h"
-#include "api/requests/HttpApiRequest.h"
-#include "api/v1/ApiRouter.h"
-#include "base/tools/Buffer.h"
-#include "common/crypto/keccak.h"
-#include "core/config/Config.h"
-#include "core/Controller.h"
-#include "version.h"
+#include "api/ApiRouter.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
 
 
-#ifdef XMRIG_FEATURE_HTTP
-#   include "api/Httpd.h"
-#endif
+ApiRouter *Api::m_router = nullptr;
 
 
-xmrig::Api::Api(Controller *controller) :
-    m_id(),
-    m_workerId(),
-    m_controller(controller),
-    m_httpd(nullptr)
+bool Api::start(xmrig::Controller *controller)
 {
-    controller->addListener(this);
+    m_router = new ApiRouter(controller);
 
-    genId(m_controller->config()->apiId());
-
-    m_v1 = new ApiRouter(controller);
-    addListener(m_v1);
+    return true;
 }
 
 
-xmrig::Api::~Api()
+void Api::release()
 {
-    delete m_v1;
-
-#   ifdef XMRIG_FEATURE_HTTP
-    delete m_httpd;
-#   endif
+    delete m_router;
 }
 
 
-void xmrig::Api::request(const HttpRequest &req)
+void Api::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
 {
-    HttpApiRequest request(req, m_controller->config()->http().isRestricted());
-
-    exec(request);
-}
-
-
-void xmrig::Api::start()
-{
-    genWorkerId(m_controller->config()->apiWorkerId());
-
-#   ifdef XMRIG_FEATURE_HTTP
-    m_httpd = new Httpd(m_controller);
-    m_httpd->start();
-#   endif
-}
-
-
-void xmrig::Api::stop()
-{
-#   ifdef XMRIG_FEATURE_HTTP
-    m_httpd->stop();
-#   endif
-}
-
-
-void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig)
-{
-    if (config->apiId() != previousConfig->apiId()) {
-        genId(config->apiId());
-    }
-
-    if (config->apiWorkerId() != previousConfig->apiWorkerId()) {
-        genWorkerId(config->apiWorkerId());
-    }
-}
-
-
-void xmrig::Api::exec(IApiRequest &request)
-{
-    using namespace rapidjson;
-
-    if (request.method() == IApiRequest::METHOD_GET && (request.url() == "/1/summary" || request.url() == "/api.json")) {
-        request.accept();
-        request.reply().AddMember("id",        StringRef(m_id),       request.doc().GetAllocator());
-        request.reply().AddMember("worker_id", StringRef(m_workerId), request.doc().GetAllocator());;
-    }
-
-    for (IApiListener *listener : m_listeners) {
-        listener->onRequest(request);
-
-        if (request.isDone()) {
-            return;
-        }
-    }
-
-    request.done(request.isNew() ? HTTP_STATUS_NOT_FOUND : HTTP_STATUS_OK);
-}
-
-
-void xmrig::Api::genId(const String &id)
-{
-    memset(m_id, 0, sizeof(m_id));
-
-    if (id.size() > 0) {
-        strncpy(m_id, id.data(), sizeof(m_id) - 1);
+    if (!m_router) {
+        reply.status = 500;
         return;
     }
 
-    uv_interface_address_t *interfaces;
-    int count = 0;
+    if (req.method() == xmrig::HttpRequest::Get) {
+        return m_router->get(req, reply);
+    }
 
-    if (uv_interface_addresses(&interfaces, &count) < 0) {
+    m_router->exec(req, reply);
+}
+
+
+void Api::tick(const xmrig::NetworkState &network)
+{
+    if (!m_router) {
         return;
     }
 
-    for (int i = 0; i < count; i++) {
-        if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) {
-            uint8_t hash[200];
-            const size_t addrSize = sizeof(interfaces[i].phys_addr);
-            const size_t inSize   = strlen(APP_KIND) + addrSize + sizeof(uint16_t);
-            const uint16_t port   = static_cast<uint16_t>(m_controller->config()->http().port());
-
-            uint8_t *input = new uint8_t[inSize]();
-            memcpy(input, &port, sizeof(uint16_t));
-            memcpy(input + sizeof(uint16_t), interfaces[i].phys_addr, addrSize);
-            memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, strlen(APP_KIND));
-
-            xmrig::keccak(input, inSize, hash);
-            xmrig::Buffer::toHex(hash, 8, m_id);
-
-            delete [] input;
-            break;
-        }
-    }
-
-    uv_free_interface_addresses(interfaces, count);
-}
-
-
-void xmrig::Api::genWorkerId(const String &id)
-{
-    memset(m_workerId, 0, sizeof(m_workerId));
-
-    if (id.size() > 0) {
-        strncpy(m_workerId, id.data(), sizeof(m_workerId) - 1);
-    }
-    else {
-        gethostname(m_workerId, sizeof(m_workerId) - 1);
-    }
+    m_router->tick(network);
 }

src/api/Api.h

@@ -26,56 +26,32 @@
 #define XMRIG_API_H
 
 
-#include <vector>
-
-
-#include "base/kernel/interfaces/IControllerListener.h"
-
-
-namespace xmrig {
+#include <uv.h>
 
 
 class ApiRouter;
-class Controller;
-class Httpd;
-class HttpRequest;
-class IApiListener;
-class IApiRequest;
-class String;
+class Hashrate;
 
 
-class Api : public IControllerListener
+namespace xmrig {
+    class Controller;
+    class HttpReply;
+    class HttpRequest;
+    class NetworkState;
+}
+
+
+class Api
 {
 public:
-    Api(Controller *controller);
-    ~Api() override;
+    static bool start(xmrig::Controller *controller);
+    static void release();
 
-    inline const char *id() const                   { return m_id; }
-    inline const char *workerId() const             { return m_workerId; }
-    inline void addListener(IApiListener *listener) { m_listeners.push_back(listener); }
-
-    void request(const HttpRequest &req);
-    void start();
-    void stop();
-
-protected:
-    void onConfigChanged(Config *config, Config *previousConfig) override;
+    static void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);
+    static void tick(const xmrig::NetworkState &results);
 
 private:
-    void exec(IApiRequest &request);
-    void genId(const String &id);
-    void genWorkerId(const String &id);
-
-    ApiRouter *m_v1;
-    char m_id[32];
-    char m_workerId[128];
-    Controller *m_controller;
-    Httpd *m_httpd;
-    std::vector<IApiListener *> m_listeners;
+    static ApiRouter *m_router;
 };
 
-
-} // namespace xmrig
-
-
 #endif /* XMRIG_API_H */

src/api/ApiRouter.cpp

@@ -0,0 +1,341 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <math.h>
+#include <string.h>
+#include <uv.h>
+
+#if _WIN32
+#   include "winsock2.h"
+#else
+#   include "unistd.h"
+#endif
+
+
+#include "api/ApiRouter.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
+#include "common/cpu/Cpu.h"
+#include "common/crypto/keccak.h"
+#include "common/net/Job.h"
+#include "common/Platform.h"
+#include "core/Config.h"
+#include "core/Controller.h"
+#include "interfaces/IThread.h"
+#include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
+#include "version.h"
+#include "workers/Hashrate.h"
+#include "workers/Workers.h"
+
+
+static inline rapidjson::Value normalize(double d)
+{
+    using namespace rapidjson;
+
+    if (!isnormal(d)) {
+        return Value(kNullType);
+    }
+
+    return Value(floor(d * 100.0) / 100.0);
+}
+
+
+ApiRouter::ApiRouter(xmrig::Controller *controller) :
+    m_controller(controller)
+{
+    memset(m_workerId, 0, sizeof(m_workerId));
+
+    setWorkerId(controller->config()->apiWorkerId());
+    genId(controller->config()->apiId());
+}
+
+
+ApiRouter::~ApiRouter()
+{
+}
+
+
+void ApiRouter::ApiRouter::get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) const
+{
+    rapidjson::Document doc;
+
+    if (req.match("/1/config")) {
+        if (req.isRestricted()) {
+            reply.status = 403;
+            return;
+        }
+
+        m_controller->config()->getJSON(doc);
+
+        return finalize(reply, doc);
+    }
+
+    if (req.match("/1/threads")) {
+        getThreads(doc);
+
+        return finalize(reply, doc);
+    }
+
+    doc.SetObject();
+
+    getIdentify(doc);
+    getMiner(doc);
+    getHashrate(doc);
+    getResults(doc);
+    getConnection(doc);
+
+    return finalize(reply, doc);
+}
+
+
+void ApiRouter::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
+{
+    if (req.method() == xmrig::HttpRequest::Put && req.match("/1/config")) {
+        m_controller->config()->reload(req.body());
+        return;
+    }
+
+    reply.status = 404;
+}
+
+
+void ApiRouter::tick(const xmrig::NetworkState &network)
+{
+    m_network = network;
+}
+
+
+void ApiRouter::onConfigChanged(xmrig::Config *config, xmrig::Config *previousConfig)
+{
+    updateWorkerId(config->apiWorkerId(), previousConfig->apiWorkerId());
+}
+
+
+void ApiRouter::finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const
+{
+    rapidjson::StringBuffer buffer(nullptr, 4096);
+    rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
+    writer.SetMaxDecimalPlaces(10);
+    doc.Accept(writer);
+
+    reply.status = 200;
+    reply.buf    = strdup(buffer.GetString());
+    reply.size   = buffer.GetSize();
+}
+
+
+void ApiRouter::genId(const char *id)
+{
+    memset(m_id, 0, sizeof(m_id));
+
+    if (id && strlen(id) > 0) {
+        strncpy(m_id, id, sizeof(m_id) - 1);
+        return;
+    }
+
+    uv_interface_address_t *interfaces;
+    int count = 0;
+
+    if (uv_interface_addresses(&interfaces, &count) < 0) {
+        return;
+    }
+
+    for (int i = 0; i < count; i++) {
+        if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) {
+            uint8_t hash[200];
+            const size_t addrSize = sizeof(interfaces[i].phys_addr);
+            const size_t inSize   = strlen(APP_KIND) + addrSize + sizeof(uint16_t);
+            const uint16_t port   = static_cast<uint16_t>(m_controller->config()->apiPort());
+
+            uint8_t *input = new uint8_t[inSize]();
+            memcpy(input, &port, sizeof(uint16_t));
+            memcpy(input + sizeof(uint16_t), interfaces[i].phys_addr, addrSize);
+            memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, strlen(APP_KIND));
+
+            xmrig::keccak(input, inSize, hash);
+            xmrig::Job::toHex(hash, 8, m_id);
+
+            delete [] input;
+            break;
+        }
+    }
+
+    uv_free_interface_addresses(interfaces, count);
+}
+
+
+void ApiRouter::getConnection(rapidjson::Document &doc) const
+{
+    auto &allocator = doc.GetAllocator();
+
+    rapidjson::Value connection(rapidjson::kObjectType);
+    connection.AddMember("pool",      rapidjson::StringRef(m_network.pool), allocator);
+    connection.AddMember("uptime",    m_network.connectionTime(), allocator);
+    connection.AddMember("ping",      m_network.latency(), allocator);
+    connection.AddMember("failures",  m_network.failures, allocator);
+    connection.AddMember("error_log", rapidjson::Value(rapidjson::kArrayType), allocator);
+
+    doc.AddMember("connection", connection, allocator);
+}
+
+
+void ApiRouter::getHashrate(rapidjson::Document &doc) const
+{
+    auto &allocator = doc.GetAllocator();
+
+    rapidjson::Value hashrate(rapidjson::kObjectType);
+    rapidjson::Value total(rapidjson::kArrayType);
+    rapidjson::Value threads(rapidjson::kArrayType);
+
+    const Hashrate *hr = Workers::hashrate();
+
+    total.PushBack(normalize(hr->calc(Hashrate::ShortInterval)),  allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::MediumInterval)), allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::LargeInterval)),  allocator);
+
+    for (size_t i = 0; i < Workers::threads(); i++) {
+        rapidjson::Value thread(rapidjson::kArrayType);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
+
+        threads.PushBack(thread, allocator);
+    }
+
+    hashrate.AddMember("total",   total, allocator);
+    hashrate.AddMember("highest", normalize(hr->highest()), allocator);
+    hashrate.AddMember("threads", threads, allocator);
+    doc.AddMember("hashrate", hashrate, allocator);
+}
+
+
+void ApiRouter::getIdentify(rapidjson::Document &doc) const
+{
+    doc.AddMember("id",        rapidjson::StringRef(m_id),       doc.GetAllocator());
+    doc.AddMember("worker_id", rapidjson::StringRef(m_workerId), doc.GetAllocator());
+}
+
+
+void ApiRouter::getMiner(rapidjson::Document &doc) const
+{
+    using namespace xmrig;
+    auto &allocator = doc.GetAllocator();
+
+    rapidjson::Value cpu(rapidjson::kObjectType);
+    cpu.AddMember("brand",   rapidjson::StringRef(Cpu::info()->brand()), allocator);
+    cpu.AddMember("aes",     Cpu::info()->hasAES(), allocator);
+    cpu.AddMember("x64",     Cpu::info()->isX64(), allocator);
+    cpu.AddMember("sockets", Cpu::info()->sockets(), allocator);
+
+    doc.AddMember("version",      APP_VERSION, allocator);
+    doc.AddMember("kind",         APP_KIND, allocator);
+    doc.AddMember("ua",           rapidjson::StringRef(Platform::userAgent()), allocator);
+    doc.AddMember("cpu",          cpu, allocator);
+    doc.AddMember("algo",         rapidjson::StringRef(m_controller->config()->algorithm().name()), allocator);
+    doc.AddMember("hugepages",    Workers::hugePages() > 0, allocator);
+    doc.AddMember("donate_level", m_controller->config()->donateLevel(), allocator);
+}
+
+
+void ApiRouter::getResults(rapidjson::Document &doc) const
+{
+    auto &allocator = doc.GetAllocator();
+
+    rapidjson::Value results(rapidjson::kObjectType);
+
+    results.AddMember("diff_current",  m_network.diff, allocator);
+    results.AddMember("shares_good",   m_network.accepted, allocator);
+    results.AddMember("shares_total",  m_network.accepted + m_network.rejected, allocator);
+    results.AddMember("avg_time",      m_network.avgTime(), allocator);
+    results.AddMember("hashes_total",  m_network.total, allocator);
+
+    rapidjson::Value best(rapidjson::kArrayType);
+    for (size_t i = 0; i < m_network.topDiff.size(); ++i) {
+        best.PushBack(m_network.topDiff[i], allocator);
+    }
+
+    results.AddMember("best",      best, allocator);
+    results.AddMember("error_log", rapidjson::Value(rapidjson::kArrayType), allocator);
+
+    doc.AddMember("results", results, allocator);
+}
+
+
+void ApiRouter::getThreads(rapidjson::Document &doc) const
+{
+    doc.SetObject();
+    auto &allocator = doc.GetAllocator();
+    const Hashrate *hr = Workers::hashrate();
+
+    Workers::threadsSummary(doc);
+
+    const std::vector<xmrig::IThread *> &threads = m_controller->config()->threads();
+    rapidjson::Value list(rapidjson::kArrayType);
+
+    size_t i = 0;
+    for (const xmrig::IThread *thread : threads) {
+        rapidjson::Value value = thread->toAPI(doc);
+
+        rapidjson::Value hashrate(rapidjson::kArrayType);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
+
+        i++;
+
+        value.AddMember("hashrate", hashrate, allocator);
+        list.PushBack(value, allocator);
+    }
+
+    doc.AddMember("threads", list, allocator);
+}
+
+
+void ApiRouter::setWorkerId(const char *id)
+{
+    memset(m_workerId, 0, sizeof(m_workerId));
+
+    if (id && strlen(id) > 0) {
+        strncpy(m_workerId, id, sizeof(m_workerId) - 1);
+    }
+    else {
+        gethostname(m_workerId, sizeof(m_workerId) - 1);
+    }
+}
+
+
+void ApiRouter::updateWorkerId(const char *id, const char *previousId)
+{
+    if (id == previousId) {
+        return;
+    }
+
+    if (id != nullptr && previousId != nullptr && strcmp(id, previousId) == 0) {
+        return;
+    }
+
+    setWorkerId(id);
+}

src/api/ApiRouter.h

@@ -26,7 +26,8 @@
 #define XMRIG_APIROUTER_H
 
 
-#include "api/interfaces/IApiListener.h"
+#include "api/NetworkState.h"
+#include "common/interfaces/IControllerListener.h"
 #include "rapidjson/fwd.h"
 
 
@@ -34,30 +35,42 @@ class Hashrate;
 
 
 namespace xmrig {
+    class Controller;
+    class HttpReply;
+    class HttpRequest;
+}
 
 
-class Controller;
-
-
-class ApiRouter : public xmrig::IApiListener
+class ApiRouter : public xmrig::IControllerListener
 {
 public:
-    ApiRouter(Controller *controller);
+    ApiRouter(xmrig::Controller *controller);
     ~ApiRouter() override;
 
+    void get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) const;
+    void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);
+
+    void tick(const xmrig::NetworkState &results);
+
 protected:
-    void onRequest(IApiRequest &request) override;
+    void onConfigChanged(xmrig::Config *config, xmrig::Config *previousConfig) override;
 
 private:
-    void getHashrate(rapidjson::Value &reply, rapidjson::Document &doc) const;
-    void getMiner(rapidjson::Value &reply, rapidjson::Document &doc) const;
-    void getThreads(rapidjson::Value &reply, rapidjson::Document &doc) const;
+    void finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const;
+    void genId(const char *id);
+    void getConnection(rapidjson::Document &doc) const;
+    void getHashrate(rapidjson::Document &doc) const;
+    void getIdentify(rapidjson::Document &doc) const;
+    void getMiner(rapidjson::Document &doc) const;
+    void getResults(rapidjson::Document &doc) const;
+    void getThreads(rapidjson::Document &doc) const;
+    void setWorkerId(const char *id);
+    void updateWorkerId(const char *id, const char *previousId);
 
-    Controller *m_controller;
+    char m_id[32];
+    char m_workerId[128];
+    xmrig::NetworkState m_network;
+    xmrig::Controller *m_controller;
 };
 
-
-} // namespace xmrig
-
-
 #endif /* XMRIG_APIROUTER_H */

src/api/Httpd.cpp

@@ -1,193 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "3rdparty/http-parser/http_parser.h"
-#include "api/Api.h"
-#include "api/Httpd.h"
-#include "base/io/log/Log.h"
-#include "base/net/http/HttpApiResponse.h"
-#include "base/net/http/HttpRequest.h"
-#include "base/net/http/HttpServer.h"
-#include "base/net/tools/TcpServer.h"
-#include "core/config/Config.h"
-#include "core/Controller.h"
-
-
-namespace xmrig {
-
-static const char *kAuthorization = "authorization";
-static const char *kContentType   = "content-type";
-
-#ifdef _WIN32
-static const char *favicon = nullptr;
-static size_t faviconSize  = 0;
-#endif
-
-} // namespace xmrig
-
-
-xmrig::Httpd::Httpd(Controller *controller) :
-    m_controller(controller),
-    m_http(nullptr),
-    m_server(nullptr),
-    m_port(0)
-{
-    controller->addListener(this);
-}
-
-
-xmrig::Httpd::~Httpd()
-{
-}
-
-
-bool xmrig::Httpd::start()
-{
-    const Http &config = m_controller->config()->http();
-
-    if (!config.isEnabled()) {
-        return true;
-    }
-
-    m_http   = new HttpServer(this);
-    m_server = new TcpServer(config.host(), config.port(), m_http);
-
-    const int rc = m_server->bind();
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") BLUE_BOLD("%s:%d") " " RED_BOLD("%s"),
-               "HTTP API",
-               config.host().data(),
-               rc < 0 ? config.port() : rc,
-               rc < 0 ? uv_strerror(rc) : ""
-               );
-
-    if (rc < 0) {
-        stop();
-
-        return false;
-    }
-
-    m_port = static_cast<uint16_t>(rc);
-
-#   ifdef _WIN32
-    HRSRC src = FindResource(nullptr, MAKEINTRESOURCE(1), RT_ICON);
-    if (src != nullptr) {
-        HGLOBAL res = LoadResource(nullptr, src);
-        if (res != nullptr) {
-            favicon     = static_cast<const char *>(LockResource(res));
-            faviconSize = SizeofResource(nullptr, src);
-        }
-    }
-#   endif
-
-    return true;
-}
-
-
-void xmrig::Httpd::stop()
-{
-    delete m_server;
-    delete m_http;
-
-    m_server = nullptr;
-    m_http   = nullptr;
-    m_port   = 0;
-}
-
-
-
-void xmrig::Httpd::onConfigChanged(Config *config, Config *previousConfig)
-{
-    if (config->http() == previousConfig->http()) {
-        return;
-    }
-
-    stop();
-    start();
-}
-
-
-void xmrig::Httpd::onHttpRequest(const HttpRequest &req)
-{
-    if (req.method == HTTP_OPTIONS) {
-        return HttpApiResponse(req.id()).end();
-    }
-
-    if (req.method == HTTP_GET && req.url == "/favicon.ico") {
-#       ifdef _WIN32
-        if (favicon != nullptr) {
-            HttpResponse response(req.id());
-            response.setHeader("Content-Type", "image/x-icon");
-
-            return response.end(favicon, faviconSize);
-        }
-#       endif
-
-        return HttpResponse(req.id(), 404).end();
-    }
-
-    if (req.method > 4) {
-        return HttpApiResponse(req.id(), HTTP_STATUS_METHOD_NOT_ALLOWED).end();
-    }
-
-    const int status = auth(req);
-    if (status != HTTP_STATUS_OK) {
-        return HttpApiResponse(req.id(), status).end();
-    }
-
-    if (req.method != HTTP_GET) {
-        if (m_controller->config()->http().isRestricted()) {
-            return HttpApiResponse(req.id(), HTTP_STATUS_FORBIDDEN).end();
-        }
-
-        if (!req.headers.count(kContentType) || req.headers.at(kContentType) != "application/json") {
-            return HttpApiResponse(req.id(), HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE).end();
-        }
-    }
-
-    m_controller->api()->request(req);
-}
-
-
-int xmrig::Httpd::auth(const HttpRequest &req) const
-{
-    const Http &config = m_controller->config()->http();
-
-    if (!req.headers.count(kAuthorization)) {
-        return config.isAuthRequired() ? HTTP_STATUS_UNAUTHORIZED : HTTP_STATUS_OK;
-    }
-
-    if (config.token().isNull()) {
-        return HTTP_STATUS_UNAUTHORIZED;
-    }
-
-    const std::string &token = req.headers.at(kAuthorization);
-    const size_t size        = token.size();
-
-    if (token.size() < 8 || config.token().size() != size - 7 || memcmp("Bearer ", token.c_str(), 7) != 0) {
-        return HTTP_STATUS_FORBIDDEN;
-    }
-
-    return strncmp(config.token().data(), token.c_str() + 7, config.token().size()) == 0 ? HTTP_STATUS_OK : HTTP_STATUS_FORBIDDEN;
-}

src/api/NetworkState.cpp

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -29,9 +28,8 @@
 #include <uv.h>
 
 
-#include "base/net/stratum/SubmitResult.h"
-#include "base/tools/Chrono.h"
-#include "net/NetworkState.h"
+#include "api/NetworkState.h"
+#include "common/net/SubmitResult.h"
 
 
 xmrig::NetworkState::NetworkState() :
@@ -46,6 +44,12 @@ xmrig::NetworkState::NetworkState() :
 }
 
 
+int xmrig::NetworkState::connectionTime() const
+{
+    return m_active ? (int)((uv_now(uv_default_loop()) - m_connectionTime) / 1000) : 0;
+}
+
+
 uint32_t xmrig::NetworkState::avgTime() const
 {
     if (m_latency.empty()) {
@@ -70,12 +74,6 @@ uint32_t xmrig::NetworkState::latency() const
 }
 
 
-uint64_t xmrig::NetworkState::connectionTime() const
-{
-    return m_active ? ((Chrono::steadyMSecs() - m_connectionTime) / 1000) : 0;
-}
-
-
 void xmrig::NetworkState::add(const SubmitResult &result, const char *error)
 {
     if (error) {
@@ -101,7 +99,7 @@ void xmrig::NetworkState::setPool(const char *host, int port, const char *ip)
     snprintf(pool, sizeof(pool) - 1, "%s:%d", host, port);
 
     m_active = true;
-    m_connectionTime = Chrono::steadyMSecs();
+    m_connectionTime = uv_now(uv_default_loop());
 }
 
 

src/api/NetworkState.h

@@ -41,9 +41,9 @@ class NetworkState
 public:
     NetworkState();
 
+    int connectionTime() const;
     uint32_t avgTime() const;
     uint32_t latency() const;
-    uint64_t connectionTime() const;
     void add(const SubmitResult &result, const char *error);
     void setPool(const char *host, int port, const char *ip);
     void stop();

src/api/interfaces/IApiRequest.h

@@ -1,72 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2018 XMRig       <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_IAPIREQUEST_H
-#define XMRIG_IAPIREQUEST_H
-
-
-#include "rapidjson/fwd.h"
-
-
-namespace xmrig {
-
-
-class String;
-
-
-class IApiRequest
-{
-public:
-    enum Method {
-        METHOD_DELETE,
-        METHOD_GET,
-        METHOD_HEAD,
-        METHOD_POST,
-        METHOD_PUT
-    };
-
-
-    enum Source {
-        SOURCE_HTTP
-    };
-
-
-    virtual ~IApiRequest() = default;
-
-    virtual bool isDone() const                                  = 0;
-    virtual bool isNew() const                                   = 0;
-    virtual bool isRestricted() const                            = 0;
-    virtual const rapidjson::Value &json() const                 = 0;
-    virtual const String &url() const                            = 0;
-    virtual Method method() const                                = 0;
-    virtual rapidjson::Document &doc()                           = 0;
-    virtual rapidjson::Value &reply()                            = 0;
-    virtual Source source() const                                = 0;
-    virtual void accept()                                        = 0;
-    virtual void done(int status)                                = 0;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif // XMRIG_IAPIREQUEST_H

src/api/requests/ApiRequest.h

@@ -1,67 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_APIREQUEST_H
-#define XMRIG_APIREQUEST_H
-
-
-#include "api/interfaces/IApiRequest.h"
-
-
-namespace xmrig {
-
-
-class ApiRequest : public IApiRequest
-{
-public:
-    ApiRequest(Source source, bool restricted);
-    ~ApiRequest() override;
-
-protected:
-    inline bool isDone() const override          { return m_state == STATE_DONE; }
-    inline bool isNew() const override           { return m_state == STATE_NEW; }
-    inline bool isRestricted() const override    { return m_restricted; }
-    inline Source source() const override        { return m_source; }
-    inline void accept() override                { m_state = STATE_ACCEPTED; }
-    inline void done(int) override               { m_state = STATE_DONE; }
-
-private:
-    enum State {
-        STATE_NEW,
-        STATE_ACCEPTED,
-        STATE_DONE
-    };
-
-    bool m_restricted;
-    Source m_source;
-    State m_state;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_APIREQUEST_H
-

src/api/requests/HttpApiRequest.cpp

@@ -1,76 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "api/requests/HttpApiRequest.h"
-#include "base/net/http/HttpRequest.h"
-#include "rapidjson/error/en.h"
-
-
-xmrig::HttpApiRequest::HttpApiRequest(const HttpRequest &req, bool restricted) :
-    ApiRequest(SOURCE_HTTP, restricted),
-    m_parsed(false),
-    m_req(req),
-    m_res(req.id()),
-    m_url(req.url.c_str())
-{
-}
-
-
-const rapidjson::Value &xmrig::HttpApiRequest::json() const
-{
-    return m_body;
-}
-
-
-xmrig::IApiRequest::Method xmrig::HttpApiRequest::method() const
-{
-    return static_cast<IApiRequest::Method>(m_req.method);
-}
-
-
-void xmrig::HttpApiRequest::accept()
-{
-    using namespace rapidjson;
-
-    ApiRequest::accept();
-
-    if (!m_parsed && !m_req.body.empty()) {
-        m_parsed = true;
-        m_body.Parse<kParseCommentsFlag | kParseTrailingCommasFlag>(m_req.body.c_str());
-
-        if (m_body.HasParseError()) {
-            reply().AddMember("error", StringRef(GetParseError_En(m_body.GetParseError())), doc().GetAllocator());;
-        }
-    }
-}
-
-
-void xmrig::HttpApiRequest::done(int status)
-{
-    ApiRequest::done(status);
-
-    m_res.setStatus(status);
-    m_res.end();
-}

src/api/requests/HttpApiRequest.h

@@ -1,69 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPAPIREQUEST_H
-#define XMRIG_HTTPAPIREQUEST_H
-
-
-#include "api/requests/ApiRequest.h"
-#include "base/net/http/HttpApiResponse.h"
-#include "base/tools/String.h"
-
-
-namespace xmrig {
-
-
-class HttpRequest;
-
-
-class HttpApiRequest : public ApiRequest
-{
-public:
-    HttpApiRequest(const HttpRequest &req, bool restricted);
-
-protected:
-    inline rapidjson::Document &doc() override           { return m_res.doc(); }
-    inline rapidjson::Value &reply() override            { return m_res.doc(); }
-    inline const String &url() const override            { return m_url; }
-
-    const rapidjson::Value &json() const override;
-    Method method() const override;
-    void accept() override;
-    void done(int status) override;
-
-private:
-    bool m_parsed;
-    const HttpRequest &m_req;
-    HttpApiResponse m_res;
-    rapidjson::Document m_body;
-    String m_url;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPAPIREQUEST_H
-

src/api/v1/ApiRouter.cpp

@@ -1,178 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <math.h>
-#include <string.h>
-#include <uv.h>
-
-
-#include "api/interfaces/IApiRequest.h"
-#include "api/v1/ApiRouter.h"
-#include "common/cpu/Cpu.h"
-#include "common/Platform.h"
-#include "core/config/Config.h"
-#include "core/Controller.h"
-#include "interfaces/IThread.h"
-#include "rapidjson/document.h"
-#include "version.h"
-#include "workers/Hashrate.h"
-#include "workers/Workers.h"
-
-
-static inline double normalize(double d)
-{
-    if (!isnormal(d)) {
-        return 0.0;
-    }
-
-    return floor(d * 100.0) / 100.0;
-}
-
-
-xmrig::ApiRouter::ApiRouter(xmrig::Controller *controller) :
-    m_controller(controller)
-{
-}
-
-
-xmrig::ApiRouter::~ApiRouter()
-{
-}
-
-
-void xmrig::ApiRouter::onRequest(IApiRequest &request)
-{
-    if (request.method() == IApiRequest::METHOD_GET) {
-        if (request.url() == "/1/summary" || request.url() == "/api.json") {
-            request.accept();
-            getMiner(request.reply(), request.doc());
-            getHashrate(request.reply(), request.doc());
-        }
-        else if (request.url() == "/1/threads") {
-            request.accept();
-            getThreads(request.reply(), request.doc());
-        }
-        else if (request.url() == "/1/config") {
-            if (request.isRestricted()) {
-                return request.done(403);
-            }
-
-            request.accept();
-            m_controller->config()->getJSON(request.doc());
-        }
-    }
-    else if (request.method() == IApiRequest::METHOD_PUT || request.method() == IApiRequest::METHOD_POST) {
-        if (request.url() == "/1/config") {
-            request.accept();
-
-            if (!m_controller->config()->reload(request.json())) {
-                return request.done(400);
-            }
-
-            request.done(204);
-        }
-    }
-}
-
-
-void xmrig::ApiRouter::getHashrate(rapidjson::Value &reply, rapidjson::Document &doc) const
-{
-    using namespace rapidjson;
-    auto &allocator = doc.GetAllocator();
-
-    Value hashrate(kObjectType);
-    Value total(kArrayType);
-    Value threads(kArrayType);
-
-    const Hashrate *hr = Workers::hashrate();
-
-    total.PushBack(normalize(hr->calc(Hashrate::ShortInterval)),  allocator);
-    total.PushBack(normalize(hr->calc(Hashrate::MediumInterval)), allocator);
-    total.PushBack(normalize(hr->calc(Hashrate::LargeInterval)),  allocator);
-
-    for (size_t i = 0; i < Workers::threads(); i++) {
-        Value thread(kArrayType);
-        thread.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
-        thread.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
-        thread.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
-
-        threads.PushBack(thread, allocator);
-    }
-
-    hashrate.AddMember("total",   total, allocator);
-    hashrate.AddMember("highest", normalize(hr->highest()), allocator);
-    hashrate.AddMember("threads", threads, allocator);
-    reply.AddMember("hashrate", hashrate, allocator);
-}
-
-
-void xmrig::ApiRouter::getMiner(rapidjson::Value &reply, rapidjson::Document &doc) const
-{
-    using namespace rapidjson;
-    auto &allocator = doc.GetAllocator();
-
-    Value cpu(kObjectType);
-    cpu.AddMember("brand",   StringRef(Cpu::info()->brand()), allocator);
-    cpu.AddMember("aes",     Cpu::info()->hasAES(), allocator);
-    cpu.AddMember("x64",     Cpu::info()->isX64(), allocator);
-    cpu.AddMember("sockets", Cpu::info()->sockets(), allocator);
-
-    reply.AddMember("version",      APP_VERSION, allocator);
-    reply.AddMember("kind",         APP_KIND, allocator);
-    reply.AddMember("ua",           StringRef(Platform::userAgent()), allocator);
-    reply.AddMember("cpu",          cpu, allocator);
-    reply.AddMember("algo",         StringRef(m_controller->config()->algorithm().name()), allocator);
-    reply.AddMember("hugepages",    Workers::hugePages() > 0, allocator);
-    reply.AddMember("donate_level", m_controller->config()->pools().donateLevel(), allocator);
-}
-
-
-void xmrig::ApiRouter::getThreads(rapidjson::Value &reply, rapidjson::Document &doc) const
-{
-    using namespace rapidjson;
-    auto &allocator = doc.GetAllocator();
-    const Hashrate *hr = Workers::hashrate();
-
-    Workers::threadsSummary(doc);
-
-    const std::vector<xmrig::IThread *> &threads = m_controller->config()->threads();
-    Value list(kArrayType);
-
-    size_t i = 0;
-    for (const xmrig::IThread *thread : threads) {
-        Value value = thread->toAPI(doc);
-
-        Value hashrate(kArrayType);
-        hashrate.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
-        hashrate.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
-        hashrate.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
-
-        i++;
-
-        value.AddMember("hashrate", hashrate, allocator);
-        list.PushBack(value, allocator);
-    }
-
-    reply.AddMember("threads", list, allocator);
-}

src/base/base.cmake

@@ -1,116 +0,0 @@
-set(HEADERS_BASE
-    src/base/io/Console.h
-    src/base/io/Json.h
-    src/base/io/log/backends/ConsoleLog.h
-    src/base/io/log/backends/FileLog.h
-    src/base/io/log/Log.h
-    src/base/io/Watcher.h
-    src/base/kernel/Entry.h
-    src/base/kernel/interfaces/IClientListener.h
-    src/base/kernel/interfaces/IConfigListener.h
-    src/base/kernel/interfaces/IConsoleListener.h
-    src/base/kernel/interfaces/IControllerListener.h
-    src/base/kernel/interfaces/IDnsListener.h
-    src/base/kernel/interfaces/ILineListener.h
-    src/base/kernel/interfaces/ILogBackend.h
-    src/base/kernel/interfaces/ISignalListener.h
-    src/base/kernel/interfaces/IStrategy.h
-    src/base/kernel/interfaces/IStrategyListener.h
-    src/base/kernel/interfaces/ITimerListener.h
-    src/base/kernel/interfaces/IWatcherListener.h
-    src/base/kernel/Process.h
-    src/base/kernel/Signals.h
-    src/base/net/dns/Dns.h
-    src/base/net/dns/DnsRecord.h
-    src/base/net/http/Http.h
-    src/base/net/stratum/Client.h
-    src/base/net/stratum/Job.h
-    src/base/net/stratum/Pool.h
-    src/base/net/stratum/Pools.h
-    src/base/net/stratum/strategies/FailoverStrategy.h
-    src/base/net/stratum/strategies/SinglePoolStrategy.h
-    src/base/net/stratum/SubmitResult.h
-    src/base/net/tools/RecvBuf.h
-    src/base/net/tools/Storage.h
-    src/base/tools/Arguments.h
-    src/base/tools/Buffer.h
-    src/base/tools/Chrono.h
-    src/base/tools/Handle.h
-    src/base/tools/String.h
-    src/base/tools/Timer.h
-   )
-
-set(SOURCES_BASE
-    src/base/io/Console.cpp
-    src/base/io/Json.cpp
-    src/base/io/log/backends/ConsoleLog.cpp
-    src/base/io/log/backends/FileLog.cpp
-    src/base/io/log/Log.cpp
-    src/base/io/Watcher.cpp
-    src/base/kernel/Entry.cpp
-    src/base/kernel/Process.cpp
-    src/base/kernel/Signals.cpp
-    src/base/net/dns/Dns.cpp
-    src/base/net/dns/DnsRecord.cpp
-    src/base/net/http/Http.cpp
-    src/base/net/stratum/Client.cpp
-    src/base/net/stratum/Job.cpp
-    src/base/net/stratum/Pool.cpp
-    src/base/net/stratum/Pools.cpp
-    src/base/net/stratum/strategies/FailoverStrategy.cpp
-    src/base/net/stratum/strategies/SinglePoolStrategy.cpp
-    src/base/tools/Arguments.cpp
-    src/base/tools/Buffer.cpp
-    src/base/tools/String.cpp
-    src/base/tools/Timer.cpp
-   )
-
-
-if (WIN32)
-    set(SOURCES_OS src/base/io/Json_win.cpp)
-else()
-    set(SOURCES_OS src/base/io/Json_unix.cpp)
-endif()
-
-
-if (NOT WIN32)
-    CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
-    if (HAVE_SYSLOG_H)
-        add_definitions(/DHAVE_SYSLOG_H)
-        set(SOURCES_SYSLOG src/base/io/log/backends/SysLog.h src/base/io/log/backends/SysLog.cpp)
-    endif()
-endif()
-
-
-if (WITH_HTTPD)
-    set(HEADERS_BASE_HTTP
-        src/3rdparty/http-parser/http_parser.h
-        src/base/kernel/interfaces/IHttpListener.h
-        src/base/kernel/interfaces/ITcpServerListener.h
-        src/base/net/http/HttpApiResponse.h
-        src/base/net/http/HttpContext.h
-        src/base/net/http/HttpRequest.h
-        src/base/net/http/HttpResponse.h
-        src/base/net/http/HttpServer.h
-        src/base/net/tools/TcpServer.h
-        )
-
-    set(SOURCES_BASE_HTTP
-        src/3rdparty/http-parser/http_parser.c
-        src/base/net/http/HttpApiResponse.cpp
-        src/base/net/http/HttpContext.cpp
-        src/base/net/http/HttpResponse.cpp
-        src/base/net/http/HttpServer.cpp
-        src/base/net/tools/TcpServer.cpp
-        )
-
-    add_definitions(/DXMRIG_FEATURE_HTTP)
-    add_definitions(/DXMRIG_FEATURE_API)
-else()
-    set(HEADERS_BASE_HTTP "")
-    set(SOURCES_BASE_HTTP "")
-    remove_definitions(/DXMRIG_FEATURE_HTTP)
-    remove_definitions(/DXMRIG_FEATURE_API)
-endif()
-
-add_definitions(/DXMRIG_DEPRECATED)

src/base/io/Watcher.cpp

@@ -29,31 +29,37 @@
 #include "base/kernel/interfaces/IWatcherListener.h"
 #include "base/io/Watcher.h"
 #include "base/tools/Handle.h"
-#include "base/tools/Timer.h"
 
 
 xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) :
     m_listener(listener),
     m_path(path)
 {
-    m_timer = new Timer(this);
-
     m_fsEvent = new uv_fs_event_t;
-    m_fsEvent->data = this;
     uv_fs_event_init(uv_default_loop(), m_fsEvent);
 
+    m_timer = new uv_timer_t;
+    uv_timer_init(uv_default_loop(), m_timer);
+
+    m_fsEvent->data = m_timer->data = this;
+
     start();
 }
 
 
 xmrig::Watcher::~Watcher()
 {
-    delete m_timer;
-
+    Handle::close(m_timer);
     Handle::close(m_fsEvent);
 }
 
 
+void xmrig::Watcher::onTimer(uv_timer_t *handle)
+{
+    static_cast<Watcher *>(handle->data)->reload();
+}
+
+
 void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, int)
 {
     if (!filename) {
@@ -66,8 +72,8 @@ void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int,
 
 void xmrig::Watcher::queueUpdate()
 {
-    m_timer->stop();
-    m_timer->start(kDelay, 0);
+    uv_timer_stop(m_timer);
+    uv_timer_start(m_timer, xmrig::Watcher::onTimer, kDelay, 0);
 }
 
 

src/base/io/Watcher.h

@@ -26,33 +26,30 @@
 #define XMRIG_WATCHER_H
 
 
-#include "base/kernel/interfaces/ITimerListener.h"
 #include "base/tools/String.h"
 
 
 typedef struct uv_fs_event_s uv_fs_event_t;
+typedef struct uv_timer_s uv_timer_t;
 
 
 namespace xmrig {
 
 
 class IWatcherListener;
-class Timer;
 
 
-class Watcher : public ITimerListener
+class Watcher
 {
 public:
     Watcher(const String &path, IWatcherListener *listener);
-    ~Watcher() override;
-
-protected:
-    inline void onTimer(const Timer *) override { reload(); }
+    ~Watcher();
 
 private:
     constexpr static int kDelay = 500;
 
     static void onFsEvent(uv_fs_event_t *handle, const char *filename, int events, int status);
+    static void onTimer(uv_timer_t *handle);
 
     void queueUpdate();
     void reload();
@@ -60,12 +57,11 @@ private:
 
     IWatcherListener *m_listener;
     String m_path;
-    Timer *m_timer;
     uv_fs_event_t *m_fsEvent;
+    uv_timer_t *m_timer;
 };
 
 
 } /* namespace xmrig */
 
-
 #endif /* XMRIG_WATCHER_H */

src/base/io/log/Log.cpp

@@ -1,247 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifdef WIN32
-#   include <winsock2.h>
-#   include <windows.h>
-#endif
-
-
-#include <algorithm>
-#include <string.h>
-#include <string>
-#include <time.h>
-#include <uv.h>
-#include <vector>
-
-
-#include "base/io/log/Log.h"
-#include "base/kernel/interfaces/ILogBackend.h"
-
-
-namespace xmrig {
-
-
-static const char *colors_map[] = {
-    RED_BOLD_S,    // EMERG
-    RED_BOLD_S,    // ALERT
-    RED_BOLD_S,    // CRIT
-    RED_S,         // ERR
-    YELLOW_S,      // WARNING
-    WHITE_BOLD_S,  // NOTICE
-    nullptr,       // INFO
-#   ifdef WIN32
-    BLACK_BOLD_S   // DEBUG
-#   else
-    BRIGHT_BLACK_S // DEBUG
-#   endif
-};
-
-
-
-class LogPrivate
-{
-public:
-    inline LogPrivate() :
-        m_buf()
-    {
-        uv_mutex_init(&m_mutex);
-    }
-
-
-    inline ~LogPrivate()
-    {
-        uv_mutex_destroy(&m_mutex);
-
-        for (ILogBackend *backend : m_backends) {
-            delete backend;
-        }
-    }
-
-
-    inline void add(ILogBackend *backend) { m_backends.push_back(backend); }
-
-
-    void print(Log::Level level, const char *fmt, va_list args)
-    {
-        size_t size   = 0;
-        size_t offset = 0;
-
-        lock();
-        timestamp(level, size, offset);
-        color(level, size);
-
-        const int rc = vsnprintf(m_buf + size, sizeof (m_buf) - offset - 32, fmt, args);
-        if (rc < 0) {
-            return unlock();
-        }
-
-        size += std::min(static_cast<size_t>(rc), sizeof (m_buf) - offset - 32);
-        endl(size);
-
-        std::string txt(m_buf);
-        size_t i;
-        while ((i = txt.find(CSI)) != std::string::npos) {
-            txt.erase(i, txt.find('m', i) - i + 1);
-        }
-
-        if (!m_backends.empty()) {
-            for (ILogBackend *backend : m_backends) {
-                backend->print(level, m_buf, offset, size, true);
-                backend->print(level, txt.c_str(), offset, txt.size(), false);
-            }
-        }
-        else {
-            fputs(txt.c_str(), stdout);
-            fflush(stdout);
-        }
-
-        unlock();
-    }
-
-
-private:
-    inline void lock()   { uv_mutex_lock(&m_mutex); }
-    inline void unlock() { uv_mutex_unlock(&m_mutex); }
-
-
-    inline void timestamp(Log::Level level, size_t &size, size_t &offset)
-    {
-        if (level == Log::NONE) {
-            return;
-        }
-
-        time_t now = time(nullptr);
-        tm stime;
-
-#       ifdef _WIN32
-        localtime_s(&stime, &now);
-#       else
-        localtime_r(&now, &stime);
-#       endif
-
-        const int rc = snprintf(m_buf, sizeof(m_buf) - 1, "[%d-%02d-%02d %02d:%02d:%02d] ",
-                                stime.tm_year + 1900,
-                                stime.tm_mon + 1,
-                                stime.tm_mday,
-                                stime.tm_hour,
-                                stime.tm_min,
-                                stime.tm_sec
-                                );
-
-        if (rc > 0) {
-            size = offset = static_cast<size_t>(rc);
-        }
-    }
-
-
-    inline void color(Log::Level level, size_t &size)
-    {
-        if (level == Log::NONE) {
-            return;
-        }
-
-        const char *color = colors_map[level];
-        if (color == nullptr) {
-            return;
-        }
-
-        const size_t s = strlen(color);
-        memcpy(m_buf + size, color, s);
-
-        size += s;
-    }
-
-
-    inline void endl(size_t &size)
-    {
-#       ifdef _WIN32
-        memcpy(m_buf + size, CLEAR "\r\n", 7);
-        size += 6;
-#       else
-        memcpy(m_buf + size, CLEAR "\n", 6);
-        size += 5;
-#       endif
-    }
-
-
-    char m_buf[4096];
-    std::vector<ILogBackend*> m_backends;
-    uv_mutex_t m_mutex;
-};
-
-
-bool Log::colors   = true;
-LogPrivate *Log::d = new LogPrivate();
-
-
-} /* namespace xmrig */
-
-
-
-void xmrig::Log::add(ILogBackend *backend)
-{
-    if (d) {
-        d->add(backend);
-    }
-}
-
-
-void xmrig::Log::destroy()
-{
-    delete d;
-    d = nullptr;
-}
-
-
-void xmrig::Log::print(const char *fmt, ...)
-{
-    if (!d) {
-        return;
-    }
-
-    va_list args;
-    va_start(args, fmt);
-
-    d->print(NONE, fmt, args);
-
-    va_end(args);
-}
-
-
-void xmrig::Log::print(Level level, const char *fmt, ...)
-{
-    if (!d) {
-        return;
-    }
-
-    va_list args;
-    va_start(args, fmt);
-
-    d->print(level, fmt, args);
-
-    va_end(args);
-}

src/base/io/log/Log.h

@@ -1,129 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_LOG_H
-#define XMRIG_LOG_H
-
-
-namespace xmrig {
-
-
-class ILogBackend;
-class LogPrivate;
-
-
-class Log
-{
-public:
-    enum Level : int {
-        NONE = -1,
-        EMERG,   // system is unusable
-        ALERT,   // action must be taken immediately
-        CRIT,    // critical conditions
-        ERR,     // error conditions
-        WARNING, // warning conditions
-        NOTICE,  // normal but significant condition
-        INFO,    // informational
-        DEBUG,   // debug-level messages
-    };
-
-    static void add(ILogBackend *backend);
-    static void destroy();
-    static void print(const char *fmt, ...);
-    static void print(Level level, const char *fmt, ...);
-
-    static bool colors;
-
-private:
-    static LogPrivate *d;
-};
-
-
-#define CSI            "\x1B["     // Control Sequence Introducer (ANSI spec name)
-#define CLEAR          CSI "0m"    // all attributes off
-#define BRIGHT_BLACK_S CSI "0;90m" // somewhat MD.GRAY
-#define BLACK_S        CSI "0;30m"
-#define BLACK_BOLD_S   CSI "1;30m" // another name for GRAY
-#define RED_S          CSI "0;31m"
-#define RED_BOLD_S     CSI "1;31m"
-#define GREEN_S        CSI "0;32m"
-#define GREEN_BOLD_S   CSI "1;32m"
-#define YELLOW_S       CSI "0;33m"
-#define YELLOW_BOLD_S  CSI "1;33m"
-#define BLUE_S         CSI "0;34m"
-#define BLUE_BOLD_S    CSI "1;34m"
-#define MAGENTA_S      CSI "0;35m"
-#define MAGENTA_BOLD_S CSI "1;35m"
-#define CYAN_S         CSI "0;36m"
-#define CYAN_BOLD_S    CSI "1;36m"
-#define WHITE_S        CSI "0;37m" // another name for LT.GRAY
-#define WHITE_BOLD_S   CSI "1;37m" // actually white
-
-//color wrappings
-#define BLACK(x)        BLACK_S x CLEAR
-#define BLACK_BOLD(x)   BLACK_BOLD_S x CLEAR
-#define RED(x)          RED_S x CLEAR
-#define RED_BOLD(x)     RED_BOLD_S x CLEAR
-#define GREEN(x)        GREEN_S x CLEAR
-#define GREEN_BOLD(x)   GREEN_BOLD_S x CLEAR
-#define YELLOW(x)       YELLOW_S x CLEAR
-#define YELLOW_BOLD(x)  YELLOW_BOLD_S x CLEAR
-#define BLUE(x)         BLUE_S x CLEAR
-#define BLUE_BOLD(x)    BLUE_BOLD_S x CLEAR
-#define MAGENTA(x)      MAGENTA_S x CLEAR
-#define MAGENTA_BOLD(x) MAGENTA_BOLD_S x CLEAR
-#define CYAN(x)         CYAN_S x CLEAR
-#define CYAN_BOLD(x)    CYAN_BOLD_S x CLEAR
-#define WHITE(x)        WHITE_S x CLEAR
-#define WHITE_BOLD(x)   WHITE_BOLD_S x CLEAR
-
-
-#define LOG_EMERG(x, ...)  xmrig::Log::print(xmrig::Log::EMERG,   x, ##__VA_ARGS__)
-#define LOG_ALERT(x, ...)  xmrig::Log::print(xmrig::Log::ALERT,   x, ##__VA_ARGS__)
-#define LOG_CRIT(x, ...)   xmrig::Log::print(xmrig::Log::CRIT,    x, ##__VA_ARGS__)
-#define LOG_ERR(x, ...)    xmrig::Log::print(xmrig::Log::ERR,     x, ##__VA_ARGS__)
-#define LOG_WARN(x, ...)   xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
-#define LOG_NOTICE(x, ...) xmrig::Log::print(xmrig::Log::NOTICE,  x, ##__VA_ARGS__)
-#define LOG_INFO(x, ...)   xmrig::Log::print(xmrig::Log::INFO,    x, ##__VA_ARGS__)
-
-#ifdef APP_DEBUG
-#   define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__)
-#else
-#   define LOG_DEBUG(x, ...)
-#endif
-
-#if defined(APP_DEBUG) || defined(APP_DEVEL)
-#   define LOG_DEBUG_ERR(x, ...)  xmrig::Log::print(xmrig::Log::ERR,     x, ##__VA_ARGS__)
-#   define LOG_DEBUG_WARN(x, ...) xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
-#else
-#   define LOG_DEBUG_ERR(x, ...)
-#   define LOG_DEBUG_WARN(x, ...)
-#endif
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_LOG_H */

src/base/io/log/backends/SysLog.cpp

@@ -1,53 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <syslog.h>
-
-
-#include "base/io/log/backends/SysLog.h"
-#include "version.h"
-
-
-xmrig::SysLog::SysLog()
-{
-    openlog(APP_ID, LOG_PID, LOG_USER);
-}
-
-
-xmrig::SysLog::~SysLog()
-{
-    closelog();
-}
-
-
-void xmrig::SysLog::print(int level, const char *line, size_t offset, size_t, bool colors)
-{
-    if (colors) {
-        return;
-    }
-
-    syslog(level == -1 ? LOG_INFO : level, "%s", line + offset);
-}

src/base/io/log/backends/SysLog.h

@@ -1,50 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_SYSLOG_H
-#define XMRIG_SYSLOG_H
-
-
-#include "base/kernel/interfaces/ILogBackend.h"
-
-
-namespace xmrig {
-
-
-class SysLog : public ILogBackend
-{
-public:
-    SysLog();
-    ~SysLog();
-
-protected:
-    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_SYSLOG_H */

src/base/kernel/Entry.cpp

@@ -27,14 +27,19 @@
 #include <uv.h>
 
 
-#ifdef XMRIG_FEATURE_TLS
+#ifndef XMRIG_NO_HTTPD
+#   include <microhttpd.h>
+#endif
+
+
+#ifndef XMRIG_NO_TLS
 #   include <openssl/opensslv.h>
 #endif
 
 
 #include "base/kernel/Entry.h"
 #include "base/kernel/Process.h"
-#include "core/config/usage.h"
+#include "core/usage.h"
 #include "version.h"
 
 
@@ -68,7 +73,11 @@ static int showVersion()
 
     printf("\nlibuv/%s\n", uv_version_string());
 
-#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
+#   ifndef XMRIG_NO_HTTPD
+    printf("microhttpd/%s\n", MHD_get_version());
+#   endif
+
+#   if !defined(XMRIG_NO_TLS) && defined(OPENSSL_VERSION_TEXT)
     {
         constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
         printf("OpenSSL/%.*s\n", static_cast<int>(strchr(v, ' ') - v), v);

src/base/kernel/Process.cpp

@@ -28,7 +28,6 @@
 
 
 #include "base/kernel/Process.h"
-#include "base/tools/Chrono.h"
 
 
 static size_t location(xmrig::Process::Location location, char *buf, size_t max)
@@ -51,7 +50,7 @@ static size_t location(xmrig::Process::Location location, char *buf, size_t max)
 xmrig::Process::Process(int argc, char **argv) :
     m_arguments(argc, argv)
 {
-    srand(static_cast<unsigned int>(Chrono::currentMSecsSinceEpoch() ^ reinterpret_cast<uintptr_t>(this)));
+    srand(static_cast<unsigned int>(static_cast<uintptr_t>(time(nullptr)) ^ reinterpret_cast<uintptr_t>(this)));
 }
 
 

src/base/kernel/Signals.cpp

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018      SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -44,31 +44,20 @@ xmrig::Signals::Signals(ISignalListener *listener)
         m_signals[i] = signal;
 
         uv_signal_init(uv_default_loop(), signal);
-        uv_signal_start(signal, Signals::onSignal, signums[i]);
+        uv_signal_start(signal, xmrig::Signals::onSignal, signums[i]);
     }
 }
 
 
 xmrig::Signals::~Signals()
 {
-    stop();
-}
-
-
-void xmrig::Signals::stop()
-{
-    if (!m_signals[0]) {
-        return;
-    }
-
     for (size_t i = 0; i < kSignalsCount; ++i) {
         Handle::close(m_signals[i]);
-        m_signals[i] = nullptr;
     }
 }
 
 
 void xmrig::Signals::onSignal(uv_signal_t *handle, int signum)
 {
-    static_cast<Signals *>(handle->data)->m_listener->onSignal(signum);
+    static_cast<xmrig::Signals *>(handle->data)->m_listener->onSignal(signum);
 }

src/base/kernel/Signals.h

@@ -46,8 +46,6 @@ public:
     Signals(ISignalListener *listener);
     ~Signals();
 
-    void stop();
-
 private:
     void close(int signum);
 

src/base/net/Pool.cpp

@@ -30,12 +30,12 @@
 
 
 #include "base/io/Json.h"
-#include "base/net/stratum/Pool.h"
+#include "base/net/Pool.h"
 #include "rapidjson/document.h"
 
 
 #ifdef APP_DEBUG
-#   include "base/io/log/Log.h"
+#   include "common/log/Log.h"
 #endif
 
 
@@ -47,19 +47,16 @@
 
 namespace xmrig {
 
-static const char *kEnabled         = "enabled";
-static const char *kFingerprint     = "tls-fingerprint";
-static const char *kKeepalive       = "keepalive";
-static const char *kNicehash        = "nicehash";
-static const char *kPass            = "pass";
-static const char *kRigId           = "rig-id";
-static const char *kTls             = "tls";
-static const char *kUrl             = "url";
-static const char *kUser            = "user";
-static const char *kVariant         = "variant";
-
-const String Pool::kDefaultPassword = "x";
-const String Pool::kDefaultUser     = "x";
+static const char *kEnabled     = "enabled";
+static const char *kFingerprint = "tls-fingerprint";
+static const char *kKeepalive   = "keepalive";
+static const char *kNicehash    = "nicehash";
+static const char *kPass        = "pass";
+static const char *kRigId       = "rig-id";
+static const char *kTls         = "tls";
+static const char *kUrl         = "url";
+static const char *kUser        = "user";
+static const char *kVariant     = "variant";
 
 }
 
@@ -168,7 +165,7 @@ bool xmrig::Pool::isCompatible(const Algorithm &algorithm) const
 
 #   ifdef XMRIG_PROXY_PROJECT
     if (m_algorithm.algo() == xmrig::CRYPTONIGHT && algorithm.algo() == xmrig::CRYPTONIGHT) {
-        return m_algorithm.variant() == xmrig::VARIANT_RWZ || m_algorithm.variant() == xmrig::VARIANT_ZLS;
+        return m_algorithm.variant() == xmrig::VARIANT_XTL || m_algorithm.variant() == xmrig::VARIANT_MSR;
     }
 #   endif
 
@@ -178,7 +175,7 @@ bool xmrig::Pool::isCompatible(const Algorithm &algorithm) const
 
 bool xmrig::Pool::isEnabled() const
 {
-#   ifndef XMRIG_FEATURE_TLS
+#   ifdef XMRIG_NO_TLS
     if (isTLS()) {
         return false;
     }

src/base/net/Pool.h

@@ -40,9 +40,8 @@ namespace xmrig {
 class Pool
 {
 public:
-    static const String kDefaultPassword;
-    static const String kDefaultUser;
-
+    constexpr static const char *kDefaultPassword = "x";
+    constexpr static const char *kDefaultUser     = "x";
     constexpr static uint16_t kDefaultPort        = 3333;
     constexpr static int kKeepAliveTimeout        = 60;
 
@@ -58,28 +57,28 @@ public:
          bool tls               = false
        );
 
-    inline Algorithm &algorithm()                       { return m_algorithm; }
     inline bool isNicehash() const                      { return m_nicehash; }
     inline bool isTLS() const                           { return m_tls; }
     inline bool isValid() const                         { return !m_host.isNull() && m_port > 0; }
+    inline const char *fingerprint() const              { return m_fingerprint.data(); }
+    inline const char *host() const                     { return m_host.data(); }
+    inline const char *password() const                 { return !m_password.isNull() ? m_password.data() : kDefaultPassword; }
+    inline const char *rigId() const                    { return m_rigId.data(); }
+    inline const char *url() const                      { return m_url.data(); }
+    inline const char *user() const                     { return !m_user.isNull() ? m_user.data() : kDefaultUser; }
     inline const Algorithm &algorithm() const           { return m_algorithm; }
     inline const Algorithms &algorithms() const         { return m_algorithms; }
-    inline const String &fingerprint() const            { return m_fingerprint; }
-    inline const String &host() const                   { return m_host; }
-    inline const String &password() const               { return !m_password.isNull() ? m_password : kDefaultPassword; }
-    inline const String &rigId() const                  { return m_rigId; }
-    inline const String &url() const                    { return m_url; }
-    inline const String &user() const                   { return !m_user.isNull() ? m_user : kDefaultUser; }
     inline int keepAlive() const                        { return m_keepAlive; }
     inline uint16_t port() const                        { return m_port; }
     inline void setFingerprint(const char *fingerprint) { m_fingerprint = fingerprint; }
-    inline void setKeepAlive(bool enable)               { setKeepAlive(enable ? kKeepAliveTimeout : 0); }
     inline void setKeepAlive(int keepAlive)             { m_keepAlive = keepAlive >= 0 ? keepAlive : 0; }
+    inline void setKeepAlive(bool enable)               { setKeepAlive(enable ? kKeepAliveTimeout : 0); }
     inline void setNicehash(bool nicehash)              { m_nicehash = nicehash; }
     inline void setPassword(const char *password)       { m_password = password; }
     inline void setRigId(const char *rigId)             { m_rigId = rigId; }
     inline void setTLS(bool tls)                        { m_tls = tls; }
     inline void setUser(const char *user)               { m_user = user; }
+    inline Algorithm &algorithm()                       { return m_algorithm; }
 
     inline bool operator!=(const Pool &other) const  { return !isEqual(other); }
     inline bool operator==(const Pool &other) const  { return isEqual(other); }

src/base/net/Pools.cpp

@@ -23,19 +23,16 @@
  */
 
 
-#include "base/io/log/Log.h"
-#include "base/net/stratum/Pools.h"
-#include "base/net/stratum/strategies/FailoverStrategy.h"
-#include "base/net/stratum/strategies/SinglePoolStrategy.h"
-#include "donate.h"
+#include "base/net/Pools.h"
+#include "common/log/Log.h"
+#include "common/net/strategies/FailoverStrategy.h"
+#include "common/net/strategies/SinglePoolStrategy.h"
 #include "rapidjson/document.h"
 
 
 xmrig::Pools::Pools() :
-    m_donateLevel(kDefaultDonateLevel),
     m_retries(5),
-    m_retryPause(5),
-    m_proxyDonate(PROXY_DONATE_AUTO)
+    m_retryPause(5)
 {
 #   ifdef XMRIG_PROXY_PROJECT
     m_retries    = 2;
@@ -161,12 +158,25 @@ void xmrig::Pools::print() const
 {
     size_t i = 1;
     for (const Pool &pool : m_data) {
-        Log::print(GREEN_BOLD(" * ") WHITE_BOLD("POOL #%-7zu") CSI "1;%dm%s" CLEAR " variant " WHITE_BOLD("%s"),
-                   i,
-                   (pool.isEnabled() ? (pool.isTLS() ? 32 : 36) : 31),
-                   pool.url().data(),
-                   pool.algorithm().variantName()
-                   );
+        if (Log::colors) {
+            const int color = pool.isEnabled() ? (pool.isTLS() ? 32 : 36) : 31;
+
+            Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("POOL #%-7zu") "\x1B[1;%dm%s\x1B[0m variant " WHITE_BOLD("%s"),
+                           i,
+                           color,
+                           pool.url(),
+                           pool.algorithm().variantName()
+                           );
+        }
+        else {
+            Log::i()->text(" * POOL #%-7zu%s%s variant=%s %s",
+                           i,
+                           pool.isEnabled() ? "" : "-",
+                           pool.url(),
+                           pool.algorithm().variantName(),
+                           pool.isTLS() ? "TLS" : ""
+                           );
+        }
 
         i++;
     }
@@ -181,25 +191,6 @@ void xmrig::Pools::print() const
 }
 
 
-void xmrig::Pools::setDonateLevel(int level)
-{
-    if (level >= kMinimumDonateLevel && level <= 99) {
-        m_donateLevel = level;
-    }
-}
-
-
-void xmrig::Pools::setProxyDonate(int value)
-{
-    switch (value) {
-    case PROXY_DONATE_NONE:
-    case PROXY_DONATE_AUTO:
-    case PROXY_DONATE_ALWAYS:
-        m_proxyDonate = static_cast<ProxyDonate>(value);
-    }
-}
-
-
 void xmrig::Pools::setRetries(int retries)
 {
     if (retries > 0 && retries <= 1000) {

src/base/net/Pools.h

@@ -29,7 +29,7 @@
 #include <vector>
 
 
-#include "base/net/stratum/Pool.h"
+#include "base/net/Pool.h"
 
 
 namespace xmrig {
@@ -42,20 +42,12 @@ class IStrategyListener;
 class Pools
 {
 public:
-    enum ProxyDonate {
-        PROXY_DONATE_NONE,
-        PROXY_DONATE_AUTO,
-        PROXY_DONATE_ALWAYS
-    };
-
     Pools();
 
     inline bool setUserpass(const char *userpass)       { return current().setUserpass(userpass); }
     inline const std::vector<Pool> &data() const        { return m_data; }
-    inline int donateLevel() const                      { return m_donateLevel; }
     inline int retries() const                          { return m_retries; }
     inline int retryPause() const                       { return m_retryPause; }
-    inline ProxyDonate proxyDonate() const              { return m_proxyDonate; }
     inline void setFingerprint(const char *fingerprint) { current().setFingerprint(fingerprint); }
     inline void setKeepAlive(bool enable)               { current().setKeepAlive(enable); }
     inline void setKeepAlive(int keepAlive)             { current().setKeepAlive(keepAlive); }
@@ -78,18 +70,14 @@ public:
     void adjust(const Algorithm &algorithm);
     void load(const rapidjson::Value &pools);
     void print() const;
-    void setDonateLevel(int level);
-    void setProxyDonate(int value);
     void setRetries(int retries);
     void setRetryPause(int retryPause);
 
 private:
     Pool &current();
 
-    int m_donateLevel;
     int m_retries;
     int m_retryPause;
-    ProxyDonate m_proxyDonate;
     std::vector<Pool> m_data;
 };
 

src/base/net/dns/Dns.cpp

@@ -1,159 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "base/kernel/interfaces/IDnsListener.h"
-#include "base/net/dns/Dns.h"
-#include "base/tools/Handle.h"
-
-
-namespace xmrig {
-    Storage<Dns> Dns::m_storage;
-    static const DnsRecord defaultRecord;
-}
-
-
-xmrig::Dns::Dns(IDnsListener *listener) :
-    m_hints(),
-    m_listener(listener),
-    m_status(0),
-    m_resolver(nullptr)
-{
-    m_key = m_storage.add(this);
-
-    m_resolver = new uv_getaddrinfo_t;
-    m_resolver->data = m_storage.ptr(m_key);
-
-    m_hints.ai_family   = AF_UNSPEC;
-    m_hints.ai_socktype = SOCK_STREAM;
-    m_hints.ai_protocol = IPPROTO_TCP;
-}
-
-
-xmrig::Dns::~Dns()
-{
-    m_storage.release(m_key);
-
-    delete m_resolver;
-}
-
-
-bool xmrig::Dns::resolve(const String &host)
-{
-    if (m_host != host) {
-        m_host = host;
-
-        clear();
-    }
-
-    m_status = uv_getaddrinfo(uv_default_loop(), m_resolver, Dns::onResolved, m_host.data(), nullptr, &m_hints);
-
-    return m_status == 0;
-}
-
-
-const char *xmrig::Dns::error() const
-{
-    return uv_strerror(m_status);
-}
-
-
-const xmrig::DnsRecord &xmrig::Dns::get(DnsRecord::Type prefered) const
-{
-    if (count() == 0) {
-        return defaultRecord;
-    }
-
-    const size_t ipv4 = m_ipv4.size();
-    const size_t ipv6 = m_ipv6.size();
-
-    if (ipv6 && (prefered == DnsRecord::AAAA || !ipv4)) {
-        return m_ipv6[ipv6 == 1 ? 0 : static_cast<size_t>(rand()) % ipv6];
-    }
-
-    if (ipv4) {
-        return m_ipv4[ipv4 == 1 ? 0 : static_cast<size_t>(rand()) % ipv4];
-    }
-
-    return defaultRecord;
-}
-
-
-size_t xmrig::Dns::count(DnsRecord::Type type) const
-{
-    if (type == DnsRecord::A) {
-        return m_ipv4.size();
-    }
-
-    if (type == DnsRecord::AAAA) {
-        return m_ipv6.size();
-    }
-
-    return m_ipv4.size() + m_ipv6.size();
-}
-
-
-void xmrig::Dns::clear()
-{
-    m_ipv4.clear();
-    m_ipv6.clear();
-}
-
-
-void xmrig::Dns::onResolved(int status, addrinfo *res)
-{
-    m_status = status;
-
-    if (m_status < 0) {
-        return m_listener->onResolved(*this, status);
-    }
-
-    clear();
-
-    addrinfo *ptr = res;
-    while (ptr != nullptr) {
-        if (ptr->ai_family == AF_INET) {
-            m_ipv4.push_back(ptr);
-        }
-
-        if (ptr->ai_family == AF_INET6) {
-            m_ipv6.push_back(ptr);
-        }
-
-        ptr = ptr->ai_next;
-    }
-
-    m_listener->onResolved(*this, status);
-}
-
-
-void xmrig::Dns::onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res)
-{
-    Dns *dns = m_storage.get(req->data);
-    if (dns) {
-        dns->onResolved(status, res);
-    }
-
-    uv_freeaddrinfo(res);
-}

src/base/net/dns/Dns.h

@@ -1,80 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_DNS_H
-#define XMRIG_DNS_H
-
-
-#include <vector>
-#include <uv.h>
-
-
-#include "base/net/dns/DnsRecord.h"
-#include "base/net/tools/Storage.h"
-#include "base/tools/String.h"
-
-
-namespace xmrig {
-
-
-class IDnsListener;
-
-
-class Dns
-{
-public:
-    Dns(IDnsListener *listener);
-    ~Dns();
-
-    inline bool isEmpty() const { return m_ipv4.empty() && m_ipv6.empty(); }
-    inline int status() const   { return m_status; }
-
-    bool resolve(const String &host);
-    const char *error() const;
-    const DnsRecord &get(DnsRecord::Type prefered = DnsRecord::A) const;
-    size_t count(DnsRecord::Type type = DnsRecord::Unknown) const;
-
-private:
-    void clear();
-    void onResolved(int status, addrinfo *res);
-
-    static void onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res);
-
-    addrinfo m_hints;
-    IDnsListener *m_listener;
-    int m_status;
-    std::vector<DnsRecord> m_ipv4;
-    std::vector<DnsRecord> m_ipv6;
-    String m_host;
-    uintptr_t m_key;
-    uv_getaddrinfo_t *m_resolver;
-
-    static Storage<Dns> m_storage;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_DNS_H */

src/base/net/dns/DnsRecord.h

@@ -1,66 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_DNSRECORD_H
-#define XMRIG_DNSRECORD_H
-
-
-struct addrinfo;
-struct sockaddr;
-
-
-#include "base/tools/String.h"
-
-
-namespace xmrig {
-
-
-class DnsRecord
-{
-public:
-    enum Type {
-        Unknown,
-        A,
-        AAAA
-    };
-
-    inline DnsRecord() : m_type(Unknown) {}
-    DnsRecord(const addrinfo *addr);
-
-    sockaddr *addr(uint16_t port = 0) const;
-
-    inline bool isValid() const     { return m_type != Unknown; }
-    inline const String &ip() const { return m_ip; }
-    inline Type type() const        { return m_type; }
-
-private:
-    Type m_type;
-    String m_ip;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_DNSRECORD_H */

src/base/net/http/Http.cpp

@@ -1,99 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "3rdparty/rapidjson/document.h"
-#include "base/io/Json.h"
-#include "base/net/http/Http.h"
-
-
-namespace xmrig {
-
-static const char *kEnabled    = "enabled";
-static const char *kHost       = "host";
-static const char *kLocalhost  = "127.0.0.1";
-static const char *kPort       = "port";
-static const char *kRestricted = "restricted";
-static const char *kToken      = "access-token";
-
-}
-
-
-xmrig::Http::Http() :
-    m_enabled(false),
-    m_restricted(true),
-    m_host(kLocalhost),
-    m_port(0)
-{
-}
-
-
-bool xmrig::Http::isEqual(const Http &other) const
-{
-    return other.m_enabled    == m_enabled &&
-           other.m_restricted == m_restricted &&
-           other.m_host       == m_host &&
-           other.m_token      == m_token &&
-           other.m_port       == m_port;
-}
-
-
-rapidjson::Value xmrig::Http::toJSON(rapidjson::Document &doc) const
-{
-    using namespace rapidjson;
-    auto &allocator = doc.GetAllocator();
-
-    Value obj(kObjectType);
-
-    obj.AddMember(StringRef(kEnabled),    m_enabled, allocator);
-    obj.AddMember(StringRef(kHost),       m_host.toJSON(), allocator);
-    obj.AddMember(StringRef(kPort),       m_port, allocator);
-    obj.AddMember(StringRef(kToken),      m_token.toJSON(), allocator);
-    obj.AddMember(StringRef(kRestricted), m_restricted, allocator);
-
-    return obj;
-}
-
-
-void xmrig::Http::load(const rapidjson::Value &http)
-{
-    if (!http.IsObject()) {
-        return;
-    }
-
-    m_enabled    = Json::getBool(http, kEnabled);
-    m_restricted = Json::getBool(http, kRestricted, true);
-    m_host       = Json::getString(http, kHost, kLocalhost);
-    m_token      = Json::getString(http, kToken);
-
-    setPort(Json::getInt(http, kPort));
-}
-
-
-void xmrig::Http::setPort(int port)
-{
-    if (port >= 0 && port <= 65536) {
-        m_port = static_cast<uint16_t>(port);
-    }
-}

src/base/net/http/Http.h

@@ -1,73 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTP_H
-#define XMRIG_HTTP_H
-
-
-#include "base/tools/String.h"
-
-
-namespace xmrig {
-
-
-class Http
-{
-public:
-    Http();
-
-    inline bool isAuthRequired() const         { return m_restricted == false || !m_token.isNull(); }
-    inline bool isEnabled() const              { return m_enabled; }
-    inline bool isRestricted() const           { return m_restricted; }
-    inline const String &host() const          { return m_host; }
-    inline const String &token() const         { return m_token; }
-    inline uint16_t port() const               { return m_port; }
-    inline void setEnabled(bool enabled)       { m_enabled = enabled; }
-    inline void setHost(const char *host)      { m_host = host; }
-    inline void setRestricted(bool restricted) { m_restricted = restricted; }
-    inline void setToken(const char *token)    { m_token = token; }
-
-    inline bool operator!=(const Http &other) const    { return !isEqual(other); }
-    inline bool operator==(const Http &other) const    { return isEqual(other); }
-
-    bool isEqual(const Http &other) const;
-    rapidjson::Value toJSON(rapidjson::Document &doc) const;
-    void load(const rapidjson::Value &http);
-    void setPort(int port);
-
-private:
-    bool m_enabled;
-    bool m_restricted;
-    String m_host;
-    String m_token;
-    uint16_t m_port;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTP_H
-

src/base/net/http/HttpApiResponse.cpp

@@ -1,86 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "3rdparty/http-parser/http_parser.h"
-#include "base/net/http/HttpApiResponse.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
-
-
-namespace xmrig {
-
-static const char *kError  = "error";
-static const char *kStatus = "status";
-
-} // namespace xmrig
-
-
-xmrig::HttpApiResponse::HttpApiResponse(uint64_t id) :
-    HttpResponse(id),
-    m_doc(rapidjson::kObjectType)
-{
-}
-
-
-xmrig::HttpApiResponse::HttpApiResponse(uint64_t id, int status) :
-    HttpResponse(id),
-    m_doc(rapidjson::kObjectType)
-{
-    setStatus(status);
-}
-
-
-void xmrig::HttpApiResponse::end()
-{
-    using namespace rapidjson;
-
-    setHeader("Access-Control-Allow-Origin", "*");
-    setHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-    setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type");
-
-    if (statusCode() >= 400) {
-        if (!m_doc.HasMember(kStatus)) {
-            m_doc.AddMember(StringRef(kStatus), statusCode(), m_doc.GetAllocator());
-        }
-
-        if (!m_doc.HasMember(kError)) {
-            m_doc.AddMember(StringRef(kError), StringRef(http_status_str(static_cast<http_status>(statusCode()))), m_doc.GetAllocator());
-        }
-    }
-
-    if (!m_doc.MemberCount()) {
-        return HttpResponse::end();
-    }
-
-    setHeader("Content-Type", "application/json");
-
-    StringBuffer buffer(nullptr, 4096);
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.SetMaxDecimalPlaces(10);
-    m_doc.Accept(writer);
-
-    HttpResponse::end(buffer.GetString(), buffer.GetSize());
-}

src/base/net/http/HttpApiResponse.h

@@ -1,57 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPAPIRESPONSE_H
-#define XMRIG_HTTPAPIRESPONSE_H
-
-
-#include "base/net/http/HttpResponse.h"
-#include "rapidjson/document.h"
-
-
-namespace xmrig {
-
-
-class HttpApiResponse : public HttpResponse
-{
-public:
-    HttpApiResponse(uint64_t id);
-    HttpApiResponse(uint64_t id, int status);
-
-    inline rapidjson::Document &doc() { return m_doc; }
-
-    void end();
-
-private:
-    rapidjson::Document m_doc;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPAPIRESPONSE_H
-

src/base/net/http/HttpContext.cpp

@@ -1,193 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <algorithm>
-#include <uv.h>
-
-
-#include "3rdparty/http-parser/http_parser.h"
-#include "base/kernel/interfaces/IHttpListener.h"
-#include "base/net/http/HttpContext.h"
-
-
-namespace xmrig {
-
-static uint64_t SEQUENCE = 0;
-std::map<uint64_t, HttpContext *> HttpContext::m_storage;
-
-} // namespace xmrig
-
-
-xmrig::HttpContext::HttpContext(int parser_type, IHttpListener *listener) :
-    HttpRequest(SEQUENCE++),
-    listener(listener),
-    connect(nullptr),
-    m_wasHeaderValue(false)
-{
-    m_storage[id()] = this;
-
-    parser = new http_parser;
-    tcp    = new uv_tcp_t;
-
-    uv_tcp_init(uv_default_loop(), tcp);
-    http_parser_init(parser, static_cast<http_parser_type>(parser_type));
-
-    parser->data = tcp->data = this;
-}
-
-
-xmrig::HttpContext::~HttpContext()
-{
-    delete connect;
-    delete tcp;
-    delete parser;
-}
-
-
-void xmrig::HttpContext::close()
-{
-    auto it = m_storage.find(id());
-    if (it != m_storage.end()) {
-        m_storage.erase(it);
-    }
-
-    if (!uv_is_closing(handle())) {
-        uv_close(handle(), [](uv_handle_t *handle) -> void { delete reinterpret_cast<HttpContext*>(handle->data); });
-    }
-}
-
-
-xmrig::HttpContext *xmrig::HttpContext::get(uint64_t id)
-{
-    if (m_storage.count(id) == 0) {
-        return nullptr;
-    }
-
-    return m_storage[id];
-}
-
-
-void xmrig::HttpContext::attach(http_parser_settings *settings)
-{
-    if (settings->on_message_complete != nullptr) {
-        return;
-    }
-
-    settings->on_message_begin  = nullptr;
-    settings->on_status         = nullptr;
-    settings->on_chunk_header   = nullptr;
-    settings->on_chunk_complete = nullptr;
-
-    settings->on_url = [](http_parser *parser, const char *at, size_t length) -> int
-    {
-        static_cast<HttpContext*>(parser->data)->url = std::string(at, length);
-        return 0;
-    };
-
-    settings->on_header_field = onHeaderField;
-    settings->on_header_value = onHeaderValue;
-
-    settings->on_headers_complete = [](http_parser* parser) -> int {
-        HttpContext *ctx = static_cast<HttpContext*>(parser->data);
-        ctx->method = parser->method;
-
-        if (!ctx->m_lastHeaderField.empty()) {
-            ctx->setHeader();
-        }
-
-        return 0;
-    };
-
-    settings->on_body = [](http_parser *parser, const char *at, size_t len) -> int
-    {
-        static_cast<HttpContext*>(parser->data)->body += std::string(at, len);
-
-        return 0;
-    };
-
-    settings->on_message_complete = [](http_parser *parser) -> int
-    {
-        const HttpContext *ctx = reinterpret_cast<const HttpContext*>(parser->data);
-        ctx->listener->onHttpRequest(*ctx);
-
-        return 0;
-    };
-}
-
-
-void xmrig::HttpContext::closeAll()
-{
-    for (auto kv : m_storage) {
-        if (!uv_is_closing(kv.second->handle())) {
-            uv_close(kv.second->handle(), [](uv_handle_t *handle) -> void { delete reinterpret_cast<HttpContext*>(handle->data); });
-        }
-    }
-}
-
-
-int xmrig::HttpContext::onHeaderField(http_parser *parser, const char *at, size_t length)
-{
-    HttpContext *ctx = static_cast<HttpContext*>(parser->data);
-
-    if (ctx->m_wasHeaderValue) {
-        if (!ctx->m_lastHeaderField.empty()) {
-            ctx->setHeader();
-        }
-
-        ctx->m_lastHeaderField = std::string(at, length);
-        ctx->m_wasHeaderValue  = false;
-    } else {
-        ctx->m_lastHeaderField += std::string(at, length);
-    }
-
-    return 0;
-}
-
-
-int xmrig::HttpContext::onHeaderValue(http_parser *parser, const char *at, size_t length)
-{
-    HttpContext *ctx = static_cast<HttpContext*>(parser->data);
-
-    if (!ctx->m_wasHeaderValue) {
-        ctx->m_lastHeaderValue = std::string(at, length);
-        ctx->m_wasHeaderValue  = true;
-    } else {
-        ctx->m_lastHeaderValue += std::string(at, length);
-    }
-
-    return 0;
-}
-
-
-void xmrig::HttpContext::setHeader()
-{
-    std::transform(m_lastHeaderField.begin(), m_lastHeaderField.end(), m_lastHeaderField.begin(), ::tolower);
-    headers.insert({ m_lastHeaderField, m_lastHeaderValue });
-
-    m_lastHeaderField.clear();
-    m_lastHeaderValue.clear();
-}
-

src/base/net/http/HttpContext.h

@@ -1,86 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPCONTEXT_H
-#define XMRIG_HTTPCONTEXT_H
-
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-typedef struct uv_connect_s uv_connect_t;
-typedef struct uv_handle_s uv_handle_t;
-typedef struct uv_stream_s uv_stream_t;
-typedef struct uv_tcp_s uv_tcp_t;
-
-
-#include "base/net/http/HttpRequest.h"
-
-
-namespace xmrig {
-
-
-class IHttpListener;
-
-
-class HttpContext : public HttpRequest
-{
-public:
-    HttpContext(int parser_type, IHttpListener *listener);
-    ~HttpContext();
-
-    inline uv_stream_t *stream() const { return reinterpret_cast<uv_stream_t *>(tcp); }
-    inline uv_handle_t *handle() const { return reinterpret_cast<uv_handle_t *>(tcp); }
-
-    void close();
-
-    static HttpContext *get(uint64_t id);
-    static void attach(http_parser_settings *settings);
-    static void closeAll();
-
-    http_parser *parser;
-    IHttpListener *listener;
-    uv_connect_t *connect;
-    uv_tcp_t *tcp;
-
-private:
-    static int onHeaderField(http_parser *parser, const char *at, size_t length);
-    static int onHeaderValue(http_parser *parser, const char *at, size_t length);
-
-    void setHeader();
-
-    bool m_wasHeaderValue;
-    std::string m_lastHeaderField;
-    std::string m_lastHeaderValue;
-
-    static std::map<uint64_t, HttpContext *> m_storage;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPCONTEXT_H
-

src/base/net/http/HttpRequest.h

@@ -1,60 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPREQUEST_H
-#define XMRIG_HTTPREQUEST_H
-
-
-#include <map>
-#include <sstream>
-#include <string>
-
-
-namespace xmrig {
-
-
-class HttpRequest
-{
-public:
-    inline HttpRequest(uint64_t id) : method(0), m_id(id) {}
-
-    inline uint64_t id() const { return m_id; }
-
-    int method;
-    std::map<const std::string, const std::string> headers;
-    std::string body;
-    std::string url;
-
-private:
-    const uint64_t m_id;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPREQUEST_H
-

src/base/net/http/HttpResponse.cpp

@@ -1,139 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <sstream>
-#include <string.h>
-#include <uv.h>
-
-
-#include "3rdparty/http-parser/http_parser.h"
-#include "base/io/log/Log.h"
-#include "base/net/http/HttpContext.h"
-#include "base/net/http/HttpResponse.h"
-
-
-namespace xmrig {
-
-static const char *kCRLF      = "\r\n";
-static const char *kUserAgent = "user-agent";
-
-} // namespace xmrig
-
-
-xmrig::HttpResponse::HttpResponse(uint64_t id, int statusCode) :
-    m_id(id),
-    m_statusCode(statusCode)
-{
-}
-
-
-bool xmrig::HttpResponse::isAlive() const
-{
-    HttpContext *ctx = HttpContext::get(m_id);
-
-    return ctx && uv_is_writable(ctx->stream());
-}
-
-
-void xmrig::HttpResponse::end(const char *data, size_t size)
-{
-    if (!isAlive()) {
-        return;
-    }
-
-    if (data && !size) {
-        size = strlen(data);
-    }
-
-    if (size) {
-        setHeader("Content-Length", std::to_string(size));
-    }
-
-    setHeader("Connection", "close");
-
-    std::stringstream ss;
-    ss << "HTTP/1.1 " << statusCode() << " " << http_status_str(static_cast<http_status>(statusCode())) << kCRLF;
-
-    for (auto &header : m_headers) {
-        ss << header.first << ": " << header.second << kCRLF;
-    }
-
-    ss << kCRLF;
-    const std::string header = ss.str();
-
-    uv_buf_t bufs[2];
-    bufs[0].base = const_cast<char *>(header.c_str());
-
-#   ifdef _WIN32
-    bufs[0].len = static_cast<unsigned int>(header.size());
-#   else
-    bufs[0].len = header.size();
-#   endif
-
-    if (data) {
-        bufs[1].base = const_cast<char *>(data);
-
-#       ifdef _WIN32
-        bufs[1].len = static_cast<unsigned int>(size);
-#       else
-        bufs[1].len = size;
-#       endif
-    }
-
-    HttpContext *ctx = HttpContext::get(m_id);
-
-#   ifndef APP_DEBUG
-    if (statusCode() >= 400)
-#   endif
-    {
-        const bool err        = statusCode() >= 400;
-        char ip[46]           = {};
-        sockaddr_storage addr = {};
-        int aSize             = sizeof(addr);
-
-        uv_tcp_getpeername(ctx->tcp, reinterpret_cast<sockaddr*>(&addr), &aSize);
-        if (reinterpret_cast<sockaddr_in *>(&addr)->sin_family == AF_INET6) {
-            uv_ip6_name(reinterpret_cast<sockaddr_in6*>(&addr), ip, 45);
-        }
-        else {
-            uv_ip4_name(reinterpret_cast<sockaddr_in*>(&addr), ip, 16);
-        }
-
-        Log::print(err ? Log::ERR : Log::INFO, CYAN("%s ") CLEAR MAGENTA_BOLD("%s") WHITE_BOLD(" %s ") CSI "1;%dm%d " CLEAR WHITE_BOLD("%zu ") BLACK_BOLD("\"%s\""),
-                   ip,
-                   http_method_str(static_cast<http_method>(ctx->method)),
-                   ctx->url.c_str(),
-                   err ? 31 : 32,
-                   statusCode(),
-                   header.size() + size,
-                   ctx->headers.count(kUserAgent) ? ctx->headers.at(kUserAgent).c_str() : nullptr
-                   );
-    }
-
-    uv_try_write(ctx->stream(), bufs, data ? 2 : 1);
-
-    ctx->close();
-}

src/base/net/http/HttpResponse.h

@@ -1,61 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPRESPONSE_H
-#define XMRIG_HTTPRESPONSE_H
-
-
-#include <map>
-#include <string>
-
-
-namespace xmrig {
-
-
-class HttpResponse
-{
-public:
-    HttpResponse(uint64_t id, int statusCode = 200);
-
-    inline int statusCode() const                                           { return m_statusCode; }
-    inline void setHeader(const std::string &key, const std::string &value) { m_headers.insert({ key, value }); }
-    inline void setStatus(int code)                                         { m_statusCode = code; }
-
-    bool isAlive() const;
-    void end(const char *data = nullptr, size_t size = 0);
-
-private:
-    const uint64_t m_id;
-    int m_statusCode;
-    std::map<const std::string, const std::string> m_headers;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPRESPONSE_H
-

src/base/net/http/HttpServer.cpp

@@ -1,91 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <functional>
-#include <uv.h>
-
-
-#include "3rdparty/http-parser/http_parser.h"
-#include "base/kernel/interfaces/IHttpListener.h"
-#include "base/net/http/HttpContext.h"
-#include "base/net/http/HttpResponse.h"
-#include "base/net/http/HttpServer.h"
-
-
-namespace xmrig {
-
-static http_parser_settings http_settings;
-
-} // namespace xmrig
-
-
-xmrig::HttpServer::HttpServer(IHttpListener *listener) :
-    m_listener(listener)
-{
-    HttpContext::attach(&http_settings);
-}
-
-
-xmrig::HttpServer::~HttpServer()
-{
-    HttpContext::closeAll();
-}
-
-
-void xmrig::HttpServer::onConnection(uv_stream_t *stream, uint16_t)
-{
-    HttpContext *ctx = new HttpContext(HTTP_REQUEST, m_listener);
-    uv_accept(stream, ctx->stream());
-
-    uv_read_start(ctx->stream(),
-        [](uv_handle_t *, size_t suggested_size, uv_buf_t *buf)
-        {
-            buf->base = new char[suggested_size];
-
-#           ifdef _WIN32
-            buf->len = static_cast<unsigned int>(suggested_size);
-#           else
-            buf->len = suggested_size;
-#           endif
-        },
-        [](uv_stream_t *tcp, ssize_t nread, const uv_buf_t *buf)
-        {
-            HttpContext *ctx = static_cast<HttpContext*>(tcp->data);
-
-            if (nread >= 0) {
-                const size_t size   = static_cast<size_t>(nread);
-                const size_t parsed = http_parser_execute(ctx->parser, &http_settings, buf->base, size);
-
-                if (parsed < size) {
-                    ctx->close();
-                }
-            } else {
-                ctx->close();
-            }
-
-            delete [] buf->base;
-        });
-}

src/base/net/http/HttpServer.h

@@ -1,62 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef XMRIG_HTTPSERVER_H
-#define XMRIG_HTTPSERVER_H
-
-
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-
-
-#include "base/kernel/interfaces/ITcpServerListener.h"
-
-
-namespace xmrig {
-
-
-class IHttpListener;
-
-
-class HttpServer : public ITcpServerListener
-{
-public:
-    HttpServer(IHttpListener *listener);
-    ~HttpServer() override;
-
-protected:
-    void onConnection(uv_stream_t *stream, uint16_t port) override;
-
-private:
-    IHttpListener *m_listener;
-};
-
-
-} // namespace xmrig
-
-
-#endif // XMRIG_HTTPSERVER_H
-

src/base/net/tools/RecvBuf.h

@@ -1,99 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_RECVBUF_H
-#define XMRIG_RECVBUF_H
-
-
-#include <string.h>
-
-
-#include "base/kernel/interfaces/ILineListener.h"
-
-
-namespace xmrig {
-
-
-template<size_t N>
-class RecvBuf
-{
-public:
-    inline RecvBuf() :
-        m_buf(),
-        m_pos(0)
-    {
-    }
-
-    inline char *base()                { return m_buf; }
-    inline char *current()             { return m_buf + m_pos; }
-    inline const char *base() const    { return m_buf; }
-    inline const char *current() const { return m_buf + m_pos; }
-    inline size_t available() const    { return N - m_pos; }
-    inline size_t pos() const          { return m_pos; }
-    inline void nread(size_t size)     { m_pos += size; }
-    inline void reset()                { m_pos = 0; }
-
-    constexpr inline size_t size() const { return N; }
-
-    inline void getline(ILineListener *listener)
-    {
-        char *end;
-        char *start = m_buf;
-        size_t remaining = m_pos;
-
-        while ((end = static_cast<char*>(memchr(start, '\n', remaining))) != nullptr) {
-            *end = '\0';
-
-            end++;
-            const size_t len = static_cast<size_t>(end - start);
-
-            listener->onLine(start, len - 1);
-
-            remaining -= len;
-            start = end;
-        }
-
-        if (remaining == 0) {
-            m_pos = 0;
-            return;
-        }
-
-        if (start == m_buf) {
-            return;
-        }
-
-        memcpy(m_buf, start, remaining);
-        m_pos = remaining;
-    }
-
-private:
-    char m_buf[N];
-    size_t m_pos;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_RECVBUF_H */

src/base/net/tools/TcpServer.cpp

@@ -1,102 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "base/kernel/interfaces/ITcpServerListener.h"
-#include "base/net/tools/TcpServer.h"
-#include "base/tools/Handle.h"
-#include "base/tools/String.h"
-
-
-static const xmrig::String kLocalHost("127.0.0.1");
-
-
-xmrig::TcpServer::TcpServer(const String &host, uint16_t port, ITcpServerListener *listener) :
-    m_host(host.isNull() ? kLocalHost : host),
-    m_version(0),
-    m_listener(listener),
-    m_addr(),
-    m_port(port)
-{
-    m_tcp = new uv_tcp_t;
-    uv_tcp_init(uv_default_loop(), m_tcp);
-    m_tcp->data = this;
-
-    uv_tcp_nodelay(m_tcp, 1);
-
-    if (m_host.contains(":") && uv_ip6_addr(m_host.data(), m_port, reinterpret_cast<sockaddr_in6 *>(&m_addr)) == 0) {
-        m_version = 6;
-    }
-    else if (uv_ip4_addr(m_host.data(), m_port, reinterpret_cast<sockaddr_in *>(&m_addr)) == 0) {
-        m_version = 4;
-    }
-}
-
-
-xmrig::TcpServer::~TcpServer()
-{
-    Handle::close(m_tcp);
-}
-
-
-int xmrig::TcpServer::bind()
-{
-    if (!m_version) {
-        return UV_EAI_ADDRFAMILY;
-    }
-
-    uv_tcp_bind(m_tcp, reinterpret_cast<const sockaddr*>(&m_addr), 0);
-
-    const int rc = uv_listen(reinterpret_cast<uv_stream_t*>(m_tcp), 511, TcpServer::onConnection);
-    if (rc != 0) {
-        return rc;
-    }
-
-    if (!m_port) {
-        sockaddr_storage storage = {};
-        int size = sizeof(storage);
-
-        uv_tcp_getsockname(m_tcp, reinterpret_cast<sockaddr*>(&storage), &size);
-
-        m_port = ntohs(reinterpret_cast<sockaddr_in *>(&storage)->sin_port);
-    }
-
-    return m_port;
-}
-
-
-void xmrig::TcpServer::create(uv_stream_t *stream, int status)
-{
-    if (status < 0) {
-        return;
-    }
-
-    m_listener->onConnection(stream, m_port);
-}
-
-
-void xmrig::TcpServer::onConnection(uv_stream_t *stream, int status)
-{
-    static_cast<TcpServer *>(stream->data)->create(stream, status);
-}

src/base/net/tools/TcpServer.h

@@ -1,64 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_TCPSERVER_H
-#define XMRIG_TCPSERVER_H
-
-
-#include <uv.h>
-
-
-namespace xmrig {
-
-
-class ITcpServerListener;
-class String;
-
-
-class TcpServer
-{
-public:
-    TcpServer(const String &host, uint16_t port, ITcpServerListener *listener);
-    ~TcpServer();
-
-    int bind();
-
-private:
-    void create(uv_stream_t *stream, int status);
-
-    static void onConnection(uv_stream_t *stream, int status);
-
-    const String &m_host;
-    int m_version;
-    ITcpServerListener *m_listener;
-    sockaddr_storage m_addr;
-    uint16_t m_port;
-    uv_tcp_t *m_tcp;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_TCPSERVER_H */

src/base/tools/Buffer.cpp

@@ -1,201 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "base/tools/Buffer.h"
-
-
-static inline uint8_t hf_hex2bin(uint8_t c, bool &err)
-{
-    if (c >= '0' && c <= '9') {
-        return c - '0';
-    }
-    else if (c >= 'a' && c <= 'f') {
-        return c - 'a' + 0xA;
-    }
-    else if (c >= 'A' && c <= 'F') {
-        return c - 'A' + 0xA;
-    }
-
-    err = true;
-    return 0;
-}
-
-
-static inline uint8_t hf_bin2hex(uint8_t c)
-{
-    if (c <= 0x9) {
-        return '0' + c;
-    }
-
-    return 'a' - 0xA + c;
-}
-
-
-xmrig::Buffer::Buffer() :
-    m_data(nullptr),
-    m_size(0)
-{
-}
-
-
-xmrig::Buffer::Buffer(Buffer &&other) :
-    m_data(other.m_data),
-    m_size(other.m_size)
-{
-    other.m_data = nullptr;
-    other.m_size = 0;
-}
-
-
-xmrig::Buffer::Buffer(const Buffer &other)
-{
-    copy(other.data(), other.size());
-}
-
-
-xmrig::Buffer::Buffer(const char *data, size_t size)
-{
-    copy(data, size);
-}
-
-
-xmrig::Buffer::Buffer(size_t size) :
-    m_size(size)
-{
-    m_data = new char[size]();
-}
-
-
-xmrig::Buffer::~Buffer()
-{
-    delete [] m_data;
-}
-
-
-void xmrig::Buffer::from(const char *data, size_t size)
-{
-    if (m_size > 0) {
-        if (m_size == size) {
-            memcpy(m_data, data, m_size);
-
-            return;
-        }
-
-        delete [] m_data;
-    }
-
-    copy(data, size);
-}
-
-
-xmrig::Buffer xmrig::Buffer::allocUnsafe(size_t size)
-{
-    Buffer buf;
-    buf.m_size = size;
-    buf.m_data = new char[size];
-
-    return buf;
-}
-
-
-bool xmrig::Buffer::fromHex(const uint8_t *in, size_t size, uint8_t *out)
-{
-    bool error = false;
-    for (size_t i = 0; i < size; i += 2) {
-        out[i / 2] = static_cast<uint8_t>((hf_hex2bin(in[i], error) << 4) | hf_hex2bin(in[i + 1], error));
-
-        if (error) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-xmrig::Buffer xmrig::Buffer::fromHex(const char *data, size_t size)
-{
-    if (data == nullptr || size % 2 != 0) {
-        return Buffer();
-    }
-
-    Buffer buf(size / 2);
-    fromHex(data, size, buf.data());
-
-    return buf;
-}
-
-
-void xmrig::Buffer::toHex(const uint8_t *in, size_t size, uint8_t *out)
-{
-    for (size_t i = 0; i < size; i++) {
-        out[i * 2]     = hf_bin2hex((in[i] & 0xF0) >> 4);
-        out[i * 2 + 1] = hf_bin2hex(in[i] & 0x0F);
-    }
-}
-
-
-xmrig::String xmrig::Buffer::toHex(const uint8_t *in, size_t size)
-{
-    return Buffer(reinterpret_cast<const char *>(in), size).toHex();
-}
-
-
-xmrig::String xmrig::Buffer::toHex() const
-{
-    if (m_size == 0) {
-        return String();
-    }
-
-    char *buf       = new char[m_size * 2 + 1];
-    buf[m_size * 2] = '\0';
-
-    toHex(m_data, m_size, buf);
-
-    return String(buf);
-}
-
-
-void xmrig::Buffer::copy(const char *data, size_t size)
-{
-    m_data = new char[size];
-    m_size = size;
-
-    memcpy(m_data, data, m_size);
-}
-
-
-void xmrig::Buffer::move(Buffer &&other)
-{
-    if (m_size > 0) {
-        delete [] m_data;
-    }
-
-    m_data = other.m_data;
-    m_size = other.m_size;
-
-    other.m_data = nullptr;
-    other.m_size = 0;
-}

src/base/tools/Buffer.h

@@ -1,88 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef XMRIG_BUFFER_H
-#define XMRIG_BUFFER_H
-
-
-#include "base/tools/String.h"
-
-
-namespace xmrig {
-
-
-class Buffer
-{
-public:
-    Buffer();
-    Buffer(Buffer &&other);
-    Buffer(const Buffer &other);
-    Buffer(const char *data, size_t size);
-    Buffer(size_t size);
-    ~Buffer();
-
-
-    inline char *data()                   { return m_data; }
-    inline const char *data() const       { return m_data; }
-    inline size_t size() const            { return m_size; }
-    inline void from(const Buffer &other) { from(other.data(), other.size()); }
-
-
-    void from(const char *data, size_t size);
-
-
-    inline Buffer &operator=(const Buffer &other) { from(other); return *this; }
-    inline Buffer &operator=(Buffer &&other)      { move(std::move(other)); return *this; }
-
-
-    static Buffer allocUnsafe(size_t size);
-    static inline Buffer alloc(size_t size) { return Buffer(size); }
-
-
-    inline static bool fromHex(const char *in, size_t size, char *out)    { return fromHex(reinterpret_cast<const uint8_t *>(in), size, reinterpret_cast<uint8_t *>(out)); }
-    inline static bool fromHex(const char *in, size_t size, uint8_t *out) { return fromHex(reinterpret_cast<const uint8_t *>(in), size, out); }
-    inline static Buffer fromHex(const char *data)                        { return fromHex(data, strlen(data)); }
-    inline static Buffer fromHex(const String &str)                       { return fromHex(str.data(), str.size()); }
-    inline static void toHex(const char *in, size_t size, char *out)      { return toHex(reinterpret_cast<const uint8_t *>(in), size, reinterpret_cast<uint8_t *>(out)); }
-    inline static void toHex(const uint8_t *in, size_t size, char *out)   { return toHex(in, size, reinterpret_cast<uint8_t *>(out)); }
-
-    static bool fromHex(const uint8_t *in, size_t size, uint8_t *out);
-    static Buffer fromHex(const char *data, size_t size);
-    static String toHex(const uint8_t *in, size_t size);
-    static void toHex(const uint8_t *in, size_t size, uint8_t *out);
-    String toHex() const;
-
-private:
-    void copy(const char *data, size_t size);
-    void move(Buffer &&other);
-
-    char *m_data;
-    size_t m_size;
-};
-
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_BUFFER_H */

src/base/tools/Handle.cpp

@@ -26,41 +26,54 @@
 #include <uv.h>
 
 
-#include "base/net/dns/DnsRecord.h"
+#include "base/tools/Handle.h"
 
 
-xmrig::DnsRecord::DnsRecord(const addrinfo *addr) :
-    m_type(addr->ai_family == AF_INET6 ? AAAA : A)
+void xmrig::Handle::close(uv_fs_event_t *handle)
 {
-    char *buf = nullptr;
-
-    if (m_type == AAAA) {
-        buf = new char[45]();
-        uv_ip6_name(reinterpret_cast<sockaddr_in6*>(addr->ai_addr), buf, 45);
+    if (handle) {
+        uv_fs_event_stop(handle);
+        close(reinterpret_cast<uv_handle_t *>(handle));
     }
-    else {
-        buf = new char[16]();
-        uv_ip4_name(reinterpret_cast<sockaddr_in*>(addr->ai_addr), buf, 16);
-    }
-
-    m_ip = buf;
 }
 
 
-sockaddr *xmrig::DnsRecord::addr(uint16_t port) const
+void xmrig::Handle::close(uv_getaddrinfo_t *handle)
 {
-    if (m_type == A) {
-        sockaddr_in *addr = new sockaddr_in();
-        uv_ip4_addr(m_ip.data(), port, addr);
-
-        return reinterpret_cast<sockaddr *>(addr);
+    if (handle) {
+        uv_cancel(reinterpret_cast<uv_req_t *>(handle));
+        close(reinterpret_cast<uv_handle_t *>(handle));
+    }
+}
+
+
+void xmrig::Handle::close(uv_handle_t *handle)
+{
+    uv_close(handle, [](uv_handle_t *handle) { delete handle; });
+}
+
+
+void xmrig::Handle::close(uv_signal_t *handle)
+{
+    if (handle) {
+        uv_signal_stop(handle);
+        close(reinterpret_cast<uv_handle_t *>(handle));
+    }
+}
+
+
+void xmrig::Handle::close(uv_tcp_t *handle)
+{
+    if (handle) {
+        close(reinterpret_cast<uv_handle_t *>(handle));
+    }
+}
+
+
+void xmrig::Handle::close(uv_timer_s *handle)
+{
+    if (handle) {
+        uv_timer_stop(handle);
+        close(reinterpret_cast<uv_handle_t *>(handle));
     }
-    else if (m_type == AAAA) {
-        sockaddr_in6 *addr = new sockaddr_in6();
-        uv_ip6_addr(m_ip.data(), port, addr);
-
-        return reinterpret_cast<sockaddr *>(addr);
-    }
-
-    return nullptr;
 }

src/base/tools/Handle.h

@@ -26,7 +26,12 @@
 #define XMRIG_HANDLE_H
 
 
-#include <uv.h>
+typedef struct uv_fs_event_s uv_fs_event_t;
+typedef struct uv_getaddrinfo_s uv_getaddrinfo_t;
+typedef struct uv_handle_s uv_handle_t;
+typedef struct uv_signal_s uv_signal_t;
+typedef struct uv_tcp_s uv_tcp_t;
+typedef struct uv_timer_s uv_timer_t;
 
 
 namespace xmrig {
@@ -35,57 +40,15 @@ namespace xmrig {
 class Handle
 {
 public:
-    template<typename T>
-    static inline void close(T handle)
-    {
-        if (handle) {
-            deleteLater(handle);
-        }
-    }
-
-
-    template<typename T>
-    static inline void deleteLater(T handle)
-    {
-        if (uv_is_closing(reinterpret_cast<uv_handle_t *>(handle))) {
-            return;
-        }
-
-        uv_close(reinterpret_cast<uv_handle_t *>(handle), [](uv_handle_t *handle) { delete handle; });
-    }
+    static void close(uv_fs_event_t *handle);
+    static void close(uv_getaddrinfo_t *handle);
+    static void close(uv_handle_t *handle);
+    static void close(uv_signal_t *handle);
+    static void close(uv_tcp_t *handle);
+    static void close(uv_timer_t *handle);
 };
 
 
-template<>
-inline void Handle::close(uv_timer_t *handle)
-{
-    if (handle) {
-        uv_timer_stop(handle);
-        deleteLater(handle);
-    }
-}
-
-
-template<>
-inline void Handle::close(uv_signal_t *handle)
-{
-    if (handle) {
-        uv_signal_stop(handle);
-        deleteLater(handle);
-    }
-}
-
-
-template<>
-inline void Handle::close(uv_fs_event_t *handle)
-{
-    if (handle) {
-        uv_fs_event_stop(handle);
-        deleteLater(handle);
-    }
-}
-
-
 } /* namespace xmrig */
 
 

src/base/tools/String.cpp

@@ -5,7 +5,6 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
  * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -179,10 +178,14 @@ void xmrig::String::copy(const char *str)
 
 void xmrig::String::copy(const String &other)
 {
-    if (m_size > 0 && m_size == other.m_size) {
-        memcpy(m_data, other.m_data, m_size + 1);
+    if (m_size > 0) {
+        if (m_size == other.m_size) {
+            memcpy(m_data, other.m_data, m_size + 1);
 
-        return;
+            return;
+        }
+
+        delete [] m_data;
     }
 
     delete [] m_data;

src/base/tools/String.h

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/tools/Timer.cpp

@@ -1,91 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "base/kernel/interfaces/ITimerListener.h"
-#include "base/tools/Handle.h"
-#include "base/tools/Timer.h"
-
-
-xmrig::Timer::Timer(ITimerListener *listener) :
-    m_listener(listener),
-    m_timer(nullptr)
-{
-    init();
-}
-
-
-xmrig::Timer::Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat) :
-    m_listener(listener),
-    m_timer(nullptr)
-{
-    init();
-    start(timeout, repeat);
-}
-
-
-xmrig::Timer::~Timer()
-{
-    Handle::close(m_timer);
-}
-
-
-uint64_t xmrig::Timer::repeat() const
-{
-    return uv_timer_get_repeat(m_timer);
-}
-
-
-void xmrig::Timer::setRepeat(uint64_t repeat)
-{
-    uv_timer_set_repeat(m_timer, repeat);
-}
-
-
-void xmrig::Timer::start(uint64_t timeout, uint64_t repeat)
-{
-    uv_timer_start(m_timer, onTimer, timeout, repeat);
-}
-
-
-void xmrig::Timer::stop()
-{
-    uv_timer_stop(m_timer);
-}
-
-
-void xmrig::Timer::init()
-{
-    m_timer = new uv_timer_t;
-    m_timer->data = this;
-    uv_timer_init(uv_default_loop(), m_timer);
-}
-
-
-void xmrig::Timer::onTimer(uv_timer_t *handle)
-{
-    const Timer *timer = static_cast<Timer *>(handle->data);
-
-    timer->m_listener->onTimer(timer);
-}

src/common/Console.cpp

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,44 +22,26 @@
  */
 
 
-#include "base/io/Console.h"
-#include "base/kernel/interfaces/IConsoleListener.h"
-#include "base/tools/Handle.h"
+#include "common/Console.h"
+#include "interfaces/IConsoleListener.h"
 
 
-xmrig::Console::Console(IConsoleListener *listener)
+Console::Console(IConsoleListener *listener)
     : m_listener(listener)
 {
-    m_tty = new uv_tty_t;
+    m_tty.data = this;
+    uv_tty_init(uv_default_loop(), &m_tty, 0, 1);
 
-    m_tty->data = this;
-    uv_tty_init(uv_default_loop(), m_tty, 0, 1);
-
-    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(m_tty))) {
+    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(&m_tty))) {
         return;
     }
 
-    uv_tty_set_mode(m_tty, UV_TTY_MODE_RAW);
-    uv_read_start(reinterpret_cast<uv_stream_t*>(m_tty), Console::onAllocBuffer, Console::onRead);
+    uv_tty_set_mode(&m_tty, UV_TTY_MODE_RAW);
+    uv_read_start(reinterpret_cast<uv_stream_t*>(&m_tty), Console::onAllocBuffer, Console::onRead);
 }
 
 
-xmrig::Console::~Console()
-{
-    stop();
-}
-
-
-void xmrig::Console::stop()
-{
-    uv_tty_reset_mode();
-
-    Handle::close(m_tty);
-    m_tty = nullptr;
-}
-
-
-void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
+void Console::onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf)
 {
     auto console = static_cast<Console*>(handle->data);
     buf->len  = 1;
@@ -68,7 +49,7 @@ void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
 }
 
 
-void xmrig::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
+void Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
 {
     if (nread < 0) {
         return uv_close(reinterpret_cast<uv_handle_t*>(stream), nullptr);

src/common/Console.h

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,17 +21,13 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_CONSOLE_H
-#define XMRIG_CONSOLE_H
+#ifndef __CONSOLE_H__
+#define __CONSOLE_H__
 
 
 #include <uv.h>
 
 
-
-namespace xmrig {
-
-
 class IConsoleListener;
 
 
@@ -40,9 +35,6 @@ class Console
 {
 public:
     Console(IConsoleListener *listener);
-    ~Console();
-
-    void stop();
 
 private:
     static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
@@ -50,11 +42,8 @@ private:
 
     char m_buf[1];
     IConsoleListener *m_listener;
-    uv_tty_t *m_tty;
+    uv_tty_t m_tty;
 };
 
 
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_CONSOLE_H */
+#endif /* __CONSOLE_H__ */

src/common/Platform.cpp

@@ -27,7 +27,7 @@
 #include <uv.h>
 
 
-#ifdef XMRIG_FEATURE_TLS
+#ifndef XMRIG_NO_TLS
 #   include <openssl/ssl.h>
 #   include <openssl/err.h>
 #endif
@@ -41,7 +41,7 @@ xmrig::String Platform::m_userAgent;
 
 void Platform::init(const char *userAgent)
 {
-#   ifdef XMRIG_FEATURE_TLS
+#   ifndef XMRIG_NO_TLS
     SSL_library_init();
     SSL_load_error_strings();
     ERR_load_BIO_strings();

src/common/Platform_win.cpp

@@ -29,7 +29,7 @@
 #include <uv.h>
 
 
-#include "base/io/log/Log.h"
+#include "log/Log.h"
 #include "Platform.h"
 #include "version.h"
 

src/common/api/HttpBody.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,27 +22,48 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_IHTTPLISTENER_H
-#define XMRIG_IHTTPLISTENER_H
+#ifndef __HTTPBODY_H__
+#define __HTTPBODY_H__
+
+
+#include <string.h>
 
 
 namespace xmrig {
 
 
-class HttpRequest;
-class HttpResponse;
-
-
-class IHttpListener
+class HttpBody
 {
 public:
-    virtual ~IHttpListener() = default;
+    inline HttpBody() :
+        m_pos(0)
+    {}
 
-    virtual void onHttpRequest(const HttpRequest &req) = 0;
+
+    inline bool write(const char *data, size_t size)
+    {
+        if (size > (sizeof(m_data) - m_pos - 1)) {
+            return false;
+        }
+
+        memcpy(m_data + m_pos, data, size);
+
+        m_pos += size;
+        m_data[m_pos] = '\0';
+
+        return true;
+    }
+
+
+    inline const char *data() const { return m_data; }
+
+private:
+    char m_data[32768];
+    size_t m_pos;
 };
 
 
 } /* namespace xmrig */
 
 
-#endif // XMRIG_IHTTPLISTENER_H
+#endif /* __HTTPBODY_H__ */

src/common/api/HttpReply.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_ILINELISTENER_H
-#define XMRIG_ILINELISTENER_H
+#ifndef __HTTPREPLY_H__
+#define __HTTPREPLY_H__
 
 
 #include <stdint.h>
@@ -32,19 +32,22 @@
 namespace xmrig {
 
 
-class String;
-
-
-class ILineListener
+class HttpReply
 {
 public:
-    virtual ~ILineListener() = default;
+    HttpReply() :
+        buf(nullptr),
+        status(200),
+        size(0)
+    {}
 
-    virtual void onLine(char *line, size_t size) = 0;
+    char *buf;
+    int status;
+    size_t size;
 };
 
 
 } /* namespace xmrig */
 
 
-#endif // XMRIG_ILINELISTENER_H
+#endif /* __HTTPREPLY_H__ */

src/common/api/HttpRequest.cpp

@@ -0,0 +1,175 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <microhttpd.h>
+#include <string.h>
+
+#include "common/api/HttpBody.h"
+#include "common/api/HttpRequest.h"
+#include "common/api/HttpReply.h"
+
+
+#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE
+#   define MHD_HTTP_PAYLOAD_TOO_LARGE 413
+#endif
+
+
+xmrig::HttpRequest::HttpRequest(MHD_Connection *connection, const char *url, const char *method, const char *uploadData, size_t *uploadSize, void **cls) :
+    m_fulfilled(true),
+    m_restricted(true),
+    m_uploadData(uploadData),
+    m_url(url),
+    m_body(static_cast<HttpBody*>(*cls)),
+    m_method(Unsupported),
+    m_connection(connection),
+    m_uploadSize(uploadSize),
+    m_cls(cls)
+{
+    if (strcmp(method, MHD_HTTP_METHOD_OPTIONS) == 0) {
+        m_method = Options;
+    }
+    else if (strcmp(method, MHD_HTTP_METHOD_GET) == 0) {
+        m_method = Get;
+    }
+    else if (strcmp(method, MHD_HTTP_METHOD_PUT) == 0) {
+        m_method = Put;
+    }
+}
+
+
+xmrig::HttpRequest::~HttpRequest()
+{
+    if (m_fulfilled) {
+        delete m_body;
+    }
+}
+
+
+bool xmrig::HttpRequest::match(const char *path) const
+{
+    return strcmp(m_url, path) == 0;
+}
+
+
+bool xmrig::HttpRequest::process(const char *accessToken, bool restricted, xmrig::HttpReply &reply)
+{
+    m_restricted = restricted || !accessToken;
+
+    if (m_body) {
+        if (*m_uploadSize != 0) {
+            if (!m_body->write(m_uploadData, *m_uploadSize)) {
+                *m_cls       = nullptr;
+                m_fulfilled  = true;
+                reply.status = MHD_HTTP_PAYLOAD_TOO_LARGE;
+                return false;
+            }
+
+            *m_uploadSize = 0;
+            m_fulfilled   = false;
+            return true;
+        }
+
+        m_fulfilled = true;
+        return true;
+    }
+
+    reply.status = auth(accessToken);
+    if (reply.status != MHD_HTTP_OK) {
+        return false;
+    }
+
+    if (m_restricted && m_method != Get) {
+        reply.status = MHD_HTTP_FORBIDDEN;
+        return false;
+    }
+
+    if (m_method == Get) {
+        return true;
+    }
+
+    const char *contentType = MHD_lookup_connection_value(m_connection, MHD_HEADER_KIND, "Content-Type");
+    if (!contentType || strcmp(contentType, "application/json") != 0) {
+        reply.status = MHD_HTTP_UNSUPPORTED_MEDIA_TYPE;
+        return false;
+    }
+
+    m_body      = new xmrig::HttpBody();
+    m_fulfilled = false;
+    *m_cls      = m_body;
+
+    return true;
+}
+
+
+const char *xmrig::HttpRequest::body() const
+{
+    return m_body ? m_body->data() : nullptr;
+}
+
+
+int xmrig::HttpRequest::end(const HttpReply &reply)
+{
+    if (reply.buf) {
+        return end(reply.status, MHD_create_response_from_buffer(reply.size ? reply.size : strlen(reply.buf), (void*) reply.buf, MHD_RESPMEM_MUST_FREE));
+    }
+
+    return end(reply.status, nullptr);
+}
+
+
+int xmrig::HttpRequest::end(int status, MHD_Response *rsp)
+{
+    if (!rsp) {
+        rsp = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
+    }
+
+    MHD_add_response_header(rsp, "Content-Type", "application/json");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Origin", "*");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Methods", "GET, PUT");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Headers", "Authorization, Content-Type");
+
+    const int ret = MHD_queue_response(m_connection, status, rsp);
+    MHD_destroy_response(rsp);
+    return ret;
+}
+
+
+int xmrig::HttpRequest::auth(const char *accessToken)
+{
+    if (!accessToken) {
+        return MHD_HTTP_OK;
+    }
+
+    const char *header = MHD_lookup_connection_value(m_connection, MHD_HEADER_KIND, "Authorization");
+    if (accessToken && !header) {
+        return MHD_HTTP_UNAUTHORIZED;
+    }
+
+    const size_t size = strlen(header);
+    if (size < 8 || strlen(accessToken) != size - 7 || memcmp("Bearer ", header, 7) != 0) {
+        return MHD_HTTP_FORBIDDEN;
+    }
+
+    return strncmp(accessToken, header + 7, strlen(accessToken)) == 0 ? MHD_HTTP_OK : MHD_HTTP_FORBIDDEN;
+}

src/common/api/HttpRequest.h

@@ -5,8 +5,8 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,49 +22,63 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_HTTPD_H
-#define XMRIG_HTTPD_H
+#ifndef __HTTPREQUEST_H__
+#define __HTTPREQUEST_H__
 
 
 #include <stdint.h>
 
 
-#include "base/kernel/interfaces/IControllerListener.h"
-#include "base/kernel/interfaces/IHttpListener.h"
+struct MHD_Connection;
+struct MHD_Response;
 
 
 namespace xmrig {
 
 
-class Controller;
-class HttpServer;
-class TcpServer;
+class HttpBody;
+class HttpReply;
 
 
-class Httpd : public IControllerListener, public IHttpListener
+class HttpRequest
 {
 public:
-    Httpd(Controller *controller);
-    ~Httpd() override;
+    enum Method {
+        Unsupported,
+        Options,
+        Get,
+        Put
+    };
 
-    bool start();
-    void stop();
+    HttpRequest(MHD_Connection *connection, const char *url, const char *method, const char *uploadData, size_t *uploadSize, void **cls);
+    ~HttpRequest();
 
-protected:
-    void onConfigChanged(Config *config, Config *previousConfig) override;
-    void onHttpRequest(const HttpRequest &req) override;
+    inline bool isFulfilled() const  { return m_fulfilled; }
+    inline bool isRestricted() const { return m_restricted; }
+    inline Method method() const     { return m_method; }
+
+    bool match(const char *path) const;
+    bool process(const char *accessToken, bool restricted, xmrig::HttpReply &reply);
+    const char *body() const;
+    int end(const HttpReply &reply);
+    int end(int status, MHD_Response *rsp);
 
 private:
-    int auth(const HttpRequest &req) const;
+    int auth(const char *accessToken);
 
-    Controller *m_controller;
-    HttpServer *m_http;
-    TcpServer *m_server;
-    uint16_t m_port;
+    bool m_fulfilled;
+    bool m_restricted;
+    const char *m_uploadData;
+    const char *m_url;
+    HttpBody *m_body;
+    Method m_method;
+    MHD_Connection *m_connection;
+    size_t *m_uploadSize;
+    void **m_cls;
 };
 
 
 } /* namespace xmrig */
 
 
-#endif /* XMRIG_HTTPD_H */
+#endif /* __HTTPREQUEST_H__ */

src/common/api/Httpd.cpp

@@ -0,0 +1,148 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <microhttpd.h>
+#include <string.h>
+
+
+#include "api/Api.h"
+#include "common/api/Httpd.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
+#include "common/log/Log.h"
+
+
+Httpd::Httpd(int port, const char *accessToken, bool IPv6, bool restricted) :
+    m_idle(true),
+    m_IPv6(IPv6),
+    m_restricted(restricted),
+    m_accessToken(accessToken ? strdup(accessToken) : nullptr),
+    m_port(port),
+    m_daemon(nullptr)
+{
+    uv_timer_init(uv_default_loop(), &m_timer);
+    m_timer.data = this;
+}
+
+
+Httpd::~Httpd()
+{
+    uv_timer_stop(&m_timer);
+
+    if (m_daemon) {
+        MHD_stop_daemon(m_daemon);
+    }
+
+    delete m_accessToken;
+}
+
+
+bool Httpd::start()
+{
+    if (!m_port) {
+        return false;
+    }
+
+    unsigned int flags = 0;
+#   if MHD_VERSION >= 0x00093500
+    if (m_IPv6 && MHD_is_feature_supported(MHD_FEATURE_IPv6)) {
+        flags |= MHD_USE_DUAL_STACK;
+    }
+
+    if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) {
+        flags |= MHD_USE_EPOLL_LINUX_ONLY;
+    }
+#   endif
+
+    m_daemon = MHD_start_daemon(flags, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
+    if (!m_daemon) {
+        LOG_ERR("HTTP Daemon failed to start.");
+        return false;
+    }
+
+#   if MHD_VERSION >= 0x00093900
+    uv_timer_start(&m_timer, Httpd::onTimer, kIdleInterval, kIdleInterval);
+#   else
+    uv_timer_start(&m_timer, Httpd::onTimer, kActiveInterval, kActiveInterval);
+#   endif
+
+    return true;
+}
+
+
+int Httpd::process(xmrig::HttpRequest &req)
+{
+    xmrig::HttpReply reply;
+    if (!req.process(m_accessToken, m_restricted, reply)) {
+        return req.end(reply);
+    }
+
+    if (!req.isFulfilled()) {
+        return MHD_YES;
+    }
+
+    Api::exec(req, reply);
+
+    return req.end(reply);
+}
+
+
+void Httpd::run()
+{
+    MHD_run(m_daemon);
+
+#   if MHD_VERSION >= 0x00093900
+    const MHD_DaemonInfo *info = MHD_get_daemon_info(m_daemon, MHD_DAEMON_INFO_CURRENT_CONNECTIONS);
+    if (m_idle && info->num_connections) {
+        uv_timer_set_repeat(&m_timer, kActiveInterval);
+        m_idle = false;
+    }
+    else if (!m_idle && !info->num_connections) {
+        uv_timer_set_repeat(&m_timer, kIdleInterval);
+        m_idle = true;
+    }
+#   endif
+}
+
+
+int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls)
+{
+    xmrig::HttpRequest req(connection, url, method, uploadData, uploadSize, con_cls);
+
+    if (req.method() == xmrig::HttpRequest::Options) {
+        return req.end(MHD_HTTP_OK, nullptr);
+    }
+
+    if (req.method() == xmrig::HttpRequest::Unsupported) {
+        return req.end(MHD_HTTP_METHOD_NOT_ALLOWED, nullptr);
+    }
+
+    return static_cast<Httpd*>(cls)->process(req);
+}
+
+
+void Httpd::onTimer(uv_timer_t *handle)
+{
+    static_cast<Httpd*>(handle->data)->run();
+}

src/common/api/Httpd.h

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,45 +21,50 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_TIMER_H
-#define XMRIG_TIMER_H
+#ifndef __HTTPD_H__
+#define __HTTPD_H__
 
 
-#include <stdint.h>
+#include <uv.h>
 
 
-typedef struct uv_timer_s uv_timer_t;
+struct MHD_Connection;
+struct MHD_Daemon;
+struct MHD_Response;
+
+
+class UploadCtx;
 
 
 namespace xmrig {
+    class HttpRequest;
+}
 
 
-class ITimerListener;
-
-
-class Timer
+class Httpd
 {
 public:
-    Timer(ITimerListener *listener);
-    Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat);
-    ~Timer();
-
-    uint64_t repeat() const;
-    void setRepeat(uint64_t repeat);
-    void start(uint64_t timeout, uint64_t repeat);
-    void stop();
+    Httpd(int port, const char *accessToken, bool IPv6, bool restricted);
+    ~Httpd();
+    bool start();
 
 private:
-    void init();
+    constexpr static const int kIdleInterval   = 200;
+    constexpr static const int kActiveInterval = 25;
 
+    int process(xmrig::HttpRequest &req);
+    void run();
+
+    static int handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls);
     static void onTimer(uv_timer_t *handle);
 
-    ITimerListener *m_listener;
-    uv_timer_t *m_timer;
+    bool m_idle;
+    bool m_IPv6;
+    bool m_restricted;
+    const char *m_accessToken;
+    const int m_port;
+    MHD_Daemon *m_daemon;
+    uv_timer_t m_timer;
 };
 
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_TIMER_H */
+#endif /* __HTTPD_H__ */

src/common/config/CommonConfig.cpp

@@ -30,7 +30,12 @@
 #include <uv.h>
 
 
-#ifdef XMRIG_FEATURE_TLS
+#ifndef XMRIG_NO_HTTPD
+#   include <microhttpd.h>
+#endif
+
+
+#ifndef XMRIG_NO_TLS
 #   include <openssl/opensslv.h>
 #endif
 
@@ -50,8 +55,9 @@
 
 
 #include "base/io/Json.h"
-#include "base/io/log/Log.h"
 #include "common/config/CommonConfig.h"
+#include "common/log/Log.h"
+#include "donate.h"
 #include "rapidjson/document.h"
 #include "rapidjson/filewritestream.h"
 #include "rapidjson/prettywriter.h"
@@ -61,18 +67,47 @@
 xmrig::CommonConfig::CommonConfig() :
     m_algorithm(CRYPTONIGHT, VARIANT_AUTO),
     m_adjusted(false),
+    m_apiIPv6(false),
+    m_apiRestricted(true),
     m_autoSave(true),
     m_background(false),
     m_dryRun(false),
     m_syslog(false),
-    m_upgrade(false),
     m_watch(true),
+    m_apiPort(0),
+    m_donateLevel(kDefaultDonateLevel),
     m_printTime(60),
     m_state(NoneState)
 {
 }
 
 
+bool xmrig::CommonConfig::isColors() const
+{
+    return Log::colors;
+}
+
+
+void xmrig::CommonConfig::printAPI()
+{
+#   ifndef XMRIG_NO_API
+    if (apiPort() == 0) {
+        return;
+    }
+
+    Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN("%s:") CYAN_BOLD("%d")
+                              : " * %-13s%s:%d",
+                   "API BIND", isApiIPv6() ? "[::]" : "0.0.0.0", apiPort());
+#   endif
+}
+
+
+void xmrig::CommonConfig::printPools()
+{
+    m_pools.print();
+}
+
+
 void xmrig::CommonConfig::printVersions()
 {
     char buf[256] = { 0 };
@@ -85,7 +120,9 @@ void xmrig::CommonConfig::printVersions()
     snprintf(buf, sizeof buf, "MSVC/%d", MSVC_VERSION);
 #   endif
 
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s"), "ABOUT", APP_NAME, APP_VERSION, buf);
+    Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%s/%s") WHITE_BOLD(" %s")
+                              : " * %-13s%s/%s %s",
+                   "ABOUT", APP_NAME, APP_VERSION, buf);
 
 #   if defined(XMRIG_AMD_PROJECT)
 #   if CL_VERSION_2_0
@@ -106,19 +143,25 @@ void xmrig::CommonConfig::printVersions()
 #   else
     memset(buf, 0, 16);
 
-#   if defined(XMRIG_FEATURE_HTTP) || defined(XMRIG_FEATURE_TLS)
+#   if !defined(XMRIG_NO_HTTPD) || !defined(XMRIG_NO_TLS)
     int length = 0;
 #   endif
 #   endif
 
-#   if defined(XMRIG_FEATURE_TLS) && defined(OPENSSL_VERSION_TEXT)
+#   if !defined(XMRIG_NO_TLS) && defined(OPENSSL_VERSION_TEXT)
     {
         constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
         length += snprintf(buf + length, (sizeof buf) - length, "OpenSSL/%.*s ", static_cast<int>(strchr(v, ' ') - v), v);
     }
 #   endif
 
-    Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s"), "LIBS", uv_version_string(), buf);
+#   ifndef XMRIG_NO_HTTPD
+    length += snprintf(buf + length, (sizeof buf) - length, "microhttpd/%s ", MHD_get_version());
+#   endif
+
+    Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s")
+                              : " * %-13slibuv/%s %s",
+                   "LIBS", uv_version_string(), buf);
 }
 
 
@@ -199,23 +242,12 @@ bool xmrig::CommonConfig::parseBoolean(int key, bool enable)
         m_watch = enable;
         break;
 
-#   ifdef XMRIG_DEPRECATED
-    case ApiIPv6Key: /* --api-ipv6 */
+    case ApiIPv6Key: /* ipv6 */
+        m_apiIPv6 = enable;
         break;
 
-    case ApiRestrictedKey: /* --api-no-restricted */
-        fputs("option \"--api-no-restricted\" deprecated, use \"--http-no-restricted\" instead.\n", stderr);
-        fflush(stdout);
-        m_http.setRestricted(enable);
-        break;
-#   endif
-
-    case HttpRestrictedKey: /* --http-no-restricted */
-        m_http.setRestricted(enable);
-        break;
-
-    case HttpEnabledKey: /* --http-enabled */
-        m_http.setEnabled(enable);
+    case ApiRestrictedKey: /* restricted */
+        m_apiRestricted = enable;
         break;
 
     case DryRunKey: /* --dry-run */
@@ -271,20 +303,8 @@ bool xmrig::CommonConfig::parseString(int key, const char *arg)
         m_logFile = arg;
         break;
 
-#   ifdef XMRIG_DEPRECATED
     case ApiAccessTokenKey: /* --api-access-token */
-        fputs("option \"--api-access-token\" deprecated, use \"--http-access-token\" instead.\n", stderr);
-        fflush(stdout);
-        m_http.setToken(arg);
-        break;
-#   endif
-
-    case HttpAccessTokenKey: /* --http-access-token */
-        m_http.setToken(arg);
-        break;
-
-    case HttpHostKey: /* --http-host */
-        m_http.setHost(arg);
+        m_apiToken = arg;
         break;
 
     case ApiWorkerIdKey: /* --api-worker-id */
@@ -301,33 +321,32 @@ bool xmrig::CommonConfig::parseString(int key, const char *arg)
 
     case RetriesKey:     /* --retries */
     case RetryPauseKey:  /* --retry-pause */
+    case ApiPort:        /* --api-port */
     case PrintTimeKey:   /* --print-time */
-    case HttpPort:       /* --http-port */
-#   ifdef XMRIG_DEPRECATED
-    case ApiPort:       /* --api-port */
-#   endif
-        return parseUint64(key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
+        return parseUint64(key, strtol(arg, nullptr, 10));
 
-    case BackgroundKey:  /* --background */
-    case SyslogKey:      /* --syslog */
-    case KeepAliveKey:   /* --keepalive */
-    case NicehashKey:    /* --nicehash */
-    case TlsKey:         /* --tls */
-    case DryRunKey:      /* --dry-run */
-    case HttpEnabledKey: /* --http-enabled */
+    case BackgroundKey: /* --background */
+    case SyslogKey:     /* --syslog */
+    case KeepAliveKey:  /* --keepalive */
+    case NicehashKey:   /* --nicehash */
+    case TlsKey:        /* --tls */
+    case ApiIPv6Key:    /* --api-ipv6 */
+    case DryRunKey:     /* --dry-run */
         return parseBoolean(key, true);
 
-    case ColorKey:          /* --no-color */
-    case WatchKey:          /* --no-watch */
-    case HttpRestrictedKey: /* --http-no-restricted */
-#   ifdef XMRIG_DEPRECATED
+    case ColorKey:         /* --no-color */
+    case WatchKey:         /* --no-watch */
     case ApiRestrictedKey: /* --api-no-restricted */
-    case ApiIPv6Key:       /* --api-ipv6 */
-#   endif
         return parseBoolean(key, false);
 
     case DonateLevelKey: /* --donate-level */
-        return parseUint64(key, static_cast<uint64_t>(strtol(arg, nullptr, 10)));
+#       ifdef XMRIG_PROXY_PROJECT
+        if (strncmp(arg, "minemonero.pro", 14) == 0) {
+            m_donateLevel = 0;
+            return true;
+        }
+#       endif
+        return parseUint64(key, strtol(arg, nullptr, 10));
 
     default:
         break;
@@ -343,27 +362,12 @@ bool xmrig::CommonConfig::parseUint64(int key, uint64_t arg)
 }
 
 
-void xmrig::CommonConfig::parseJSON(const rapidjson::Value &json)
+void xmrig::CommonConfig::parseJSON(const rapidjson::Document &doc)
 {
-    const rapidjson::Value &pools = json["pools"];
+    const rapidjson::Value &pools = doc["pools"];
     if (pools.IsArray()) {
         m_pools.load(pools);
     }
-
-#   ifdef XMRIG_DEPRECATED
-    const rapidjson::Value &api = json["api"];
-    if (api.IsObject() && api.HasMember("port")) {
-        m_upgrade = true;
-        m_http.load(api);
-        m_http.setEnabled(Json::getUint(api, "port") > 0);
-        m_http.setHost("0.0.0.0");
-    }
-    else {
-        m_http.load(json["http"]);
-    }
-#   else
-    m_http.load(doc["http"]);
-#   endif
 }
 
 
@@ -393,23 +397,15 @@ bool xmrig::CommonConfig::parseInt(int key, int arg)
         break;
 
     case DonateLevelKey: /* --donate-level */
-        m_pools.setDonateLevel(arg);
+        if (arg >= kMinimumDonateLevel && arg <= 99) {
+            m_donateLevel = arg;
+        }
         break;
 
-    case ProxyDonateKey: /* --donate-over-proxy */
-        m_pools.setProxyDonate(arg);
-        break;
-
-#   ifdef XMRIG_DEPRECATED
     case ApiPort: /* --api-port */
-        fputs("option \"--api-port\" deprecated, use \"--http-port\" instead.\n", stderr);
-        fflush(stdout);
-        m_http.setPort(arg);
-        break;
-#   endif
-
-    case HttpPort: /* --http-port */
-        m_http.setPort(arg);
+        if (arg > 0 && arg <= 65536) {
+            m_apiPort = arg;
+        }
         break;
 
     case PrintTimeKey: /* --print-time */

src/common/config/CommonConfig.h

@@ -26,8 +26,8 @@
 #define XMRIG_COMMONCONFIG_H
 
 
-#include "base/net/http/Http.h"
-#include "base/net/stratum/Pools.h"
+#include "base/net/Pools.h"
+#include "base/tools/String.h"
 #include "common/interfaces/IConfig.h"
 #include "common/xmrig.h"
 
@@ -40,16 +40,20 @@ class CommonConfig : public IConfig
 public:
     CommonConfig();
 
+    inline bool isApiIPv6() const                  { return m_apiIPv6; }
+    inline bool isApiRestricted() const            { return m_apiRestricted; }
     inline bool isAutoSave() const                 { return m_autoSave; }
     inline bool isBackground() const               { return m_background; }
     inline bool isDryRun() const                   { return m_dryRun; }
     inline bool isSyslog() const                   { return m_syslog; }
-    inline const String &apiId() const             { return m_apiId; }
-    inline const String &apiWorkerId() const       { return m_apiWorkerId; }
+    inline const char *apiId() const               { return m_apiId.data(); }
+    inline const char *apiToken() const            { return m_apiToken.data(); }
+    inline const char *apiWorkerId() const         { return m_apiWorkerId.data(); }
     inline const char *logFile() const             { return m_logFile.data(); }
     inline const char *userAgent() const           { return m_userAgent.data(); }
-    inline const Http &http() const                { return m_http; }
     inline const Pools &pools() const              { return m_pools; }
+    inline int apiPort() const                     { return m_apiPort; }
+    inline int donateLevel() const                 { return m_donateLevel; }
     inline int printTime() const                   { return m_printTime; }
 
     inline bool isWatch() const override               { return m_watch && !m_fileName.isNull(); }
@@ -58,6 +62,9 @@ public:
 
     bool save() override;
 
+    bool isColors() const;
+    void printAPI();
+    void printPools();
     void printVersions();
 
 protected:
@@ -71,22 +78,25 @@ protected:
     bool parseBoolean(int key, bool enable) override;
     bool parseString(int key, const char *arg) override;
     bool parseUint64(int key, uint64_t arg) override;
-    void parseJSON(const rapidjson::Value &json) override;
+    void parseJSON(const rapidjson::Document &doc) override;
     void setFileName(const char *fileName) override;
 
     Algorithm m_algorithm;
     bool m_adjusted;
+    bool m_apiIPv6;
+    bool m_apiRestricted;
     bool m_autoSave;
     bool m_background;
     bool m_dryRun;
     bool m_syslog;
-    bool m_upgrade;
     bool m_watch;
-    Http m_http;
+    int m_apiPort;
+    int m_donateLevel;
     int m_printTime;
     Pools m_pools;
     State m_state;
     String m_apiId;
+    String m_apiToken;
     String m_apiWorkerId;
     String m_fileName;
     String m_logFile;

src/common/config/ConfigLoader.cpp

@@ -29,6 +29,16 @@
 #include <uv.h>
 
 
+#ifndef XMRIG_NO_HTTPD
+#   include <microhttpd.h>
+#endif
+
+
+#ifndef XMRIG_NO_TLS
+#   include <openssl/opensslv.h>
+#endif
+
+
 #include "base/io/Json.h"
 #include "base/kernel/interfaces/IConfigListener.h"
 #include "base/kernel/Process.h"
@@ -36,24 +46,21 @@
 #include "common/config/ConfigWatcher.h"
 #include "common/interfaces/IConfig.h"
 #include "common/Platform.h"
-#include "core/config/Config.h"
-#include "core/config/ConfigLoader_platform.h"
+#include "core/ConfigCreator.h"
+#include "core/ConfigLoader_platform.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/fwd.h"
 
 
 #ifdef XMRIG_FEATURE_EMBEDDED_CONFIG
-#   include "core/config/ConfigLoader_default.h"
+#   include "core/ConfigLoader_default.h"
 #endif
 
 
-namespace xmrig {
-
-ConfigWatcher *ConfigLoader::m_watcher     = nullptr;
-IConfigListener *ConfigLoader::m_listener  = nullptr;
-
-} // namespace xmrig
+xmrig::ConfigWatcher *xmrig::ConfigLoader::m_watcher     = nullptr;
+xmrig::IConfigCreator *xmrig::ConfigLoader::m_creator    = nullptr;
+xmrig::IConfigListener *xmrig::ConfigLoader::m_listener  = nullptr;
 
 
 #ifndef ARRAY_SIZE
@@ -88,28 +95,28 @@ bool xmrig::ConfigLoader::loadFromJSON(xmrig::IConfig *config, const char *json)
 }
 
 
-bool xmrig::ConfigLoader::loadFromJSON(xmrig::IConfig *config, const rapidjson::Value &json)
+bool xmrig::ConfigLoader::loadFromJSON(xmrig::IConfig *config, const rapidjson::Document &doc)
 {
     for (size_t i = 0; i < ARRAY_SIZE(config_options); i++) {
-        parseJSON(config, &config_options[i], json);
+        parseJSON(config, &config_options[i], doc);
     }
 
-    const rapidjson::Value &api = json["api"];
+    const rapidjson::Value &api = doc["api"];
     if (api.IsObject()) {
         for (size_t i = 0; i < ARRAY_SIZE(api_options); i++) {
             parseJSON(config, &api_options[i], api);
         }
     }
 
-    config->parseJSON(json);
+    config->parseJSON(doc);
 
     return config->finalize();
 }
 
 
-bool xmrig::ConfigLoader::reload(xmrig::IConfig *oldConfig, const rapidjson::Value &json)
+bool xmrig::ConfigLoader::reload(xmrig::IConfig *oldConfig, const char *json)
 {
-    IConfig *config = Config::create();
+    xmrig::IConfig *config = m_creator->create();
     if (!loadFromJSON(config, json)) {
         delete config;
 
@@ -138,16 +145,17 @@ bool xmrig::ConfigLoader::watch(IConfig *config)
 
     assert(m_watcher == nullptr);
 
-    m_watcher = new ConfigWatcher(config->fileName(), m_listener);
+    m_watcher = new xmrig::ConfigWatcher(config->fileName(), m_creator, m_listener);
     return true;
 }
 
 
-xmrig::IConfig *xmrig::ConfigLoader::load(Process *process, IConfigListener *listener)
+xmrig::IConfig *xmrig::ConfigLoader::load(Process *process, IConfigCreator *creator, IConfigListener *listener)
 {
+    m_creator  = creator;
     m_listener = listener;
 
-    IConfig *config = Config::create();
+    xmrig::IConfig *config = m_creator->create();
     int key;
     int argc    = process->arguments().argc();
     char **argv = process->arguments().argv();
@@ -173,7 +181,7 @@ xmrig::IConfig *xmrig::ConfigLoader::load(Process *process, IConfigListener *lis
     if (!config->finalize()) {
         delete config;
 
-        config = Config::create();
+        config = m_creator->create();
         loadFromFile(config, process->location(Process::ExeLocation, "config.json"));
     }
 
@@ -181,7 +189,7 @@ xmrig::IConfig *xmrig::ConfigLoader::load(Process *process, IConfigListener *lis
     if (!config->finalize()) {
         delete config;
 
-        config = Config::create();
+        config = m_creator->create();
         loadFromJSON(config, default_config);
     }
 #   endif
@@ -205,8 +213,10 @@ xmrig::IConfig *xmrig::ConfigLoader::load(Process *process, IConfigListener *lis
 void xmrig::ConfigLoader::release()
 {
     delete m_watcher;
+    delete m_creator;
 
     m_watcher = nullptr;
+    m_creator = nullptr;
 }
 
 
@@ -229,7 +239,7 @@ bool xmrig::ConfigLoader::getJSON(const char *fileName, rapidjson::Document &doc
 
 bool xmrig::ConfigLoader::parseArg(xmrig::IConfig *config, int key, const char *arg)
 {
-    if (key == IConfig::ConfigKey) {
+    if (key == xmrig::IConfig::ConfigKey) {
         return loadFromFile(config, arg);
     }
 

src/common/config/ConfigLoader.h

@@ -39,6 +39,7 @@ namespace xmrig {
 
 
 class ConfigWatcher;
+class IConfigCreator;
 class IConfigListener;
 class IConfig;
 class Process;
@@ -49,10 +50,10 @@ class ConfigLoader
 public:
     static bool loadFromFile(IConfig *config, const char *fileName);
     static bool loadFromJSON(IConfig *config, const char *json);
-    static bool loadFromJSON(IConfig *config, const rapidjson::Value &json);
-    static bool reload(IConfig *oldConfig, const rapidjson::Value &json);
+    static bool loadFromJSON(IConfig *config, const rapidjson::Document &doc);
+    static bool reload(IConfig *oldConfig, const char *json);
     static bool watch(IConfig *config);
-    static IConfig *load(Process *process, IConfigListener *listener);
+    static IConfig *load(Process *process, IConfigCreator *creator, IConfigListener *listener);
     static void release();
 
 private:
@@ -61,11 +62,11 @@ private:
     static void parseJSON(IConfig *config, const struct option *option, const rapidjson::Value &object);
 
     static ConfigWatcher *m_watcher;
+    static IConfigCreator *m_creator;
     static IConfigListener *m_listener;
 };
 
 
 } /* namespace xmrig */
 
-
 #endif /* XMRIG_CONFIGLOADER_H */

src/common/config/ConfigWatcher.cpp

@@ -23,15 +23,16 @@
  */
 
 
-#include "base/io/log/Log.h"
 #include "base/io/Watcher.h"
 #include "base/kernel/interfaces/IConfigListener.h"
 #include "common/config/ConfigLoader.h"
 #include "common/config/ConfigWatcher.h"
-#include "core/config/Config.h"
+#include "common/log/Log.h"
+#include "core/ConfigCreator.h"
 
 
-xmrig::ConfigWatcher::ConfigWatcher(const String &path, IConfigListener *listener) :
+xmrig::ConfigWatcher::ConfigWatcher(const String &path, IConfigCreator *creator, IConfigListener *listener) :
+    m_creator(creator),
     m_listener(listener)
 {
    m_watcher = new Watcher(path, this);
@@ -49,7 +50,7 @@ void xmrig::ConfigWatcher::onFileChanged(const String &fileName)
 {
     LOG_WARN("\"%s\" was changed, reloading configuration", fileName.data());
 
-    IConfig *config = Config::create();
+    IConfig *config = m_creator->create();
     ConfigLoader::loadFromFile(config, fileName);
 
     if (!config->finalize()) {

src/common/config/ConfigWatcher.h

@@ -37,6 +37,7 @@ struct option;
 namespace xmrig {
 
 
+class IConfigCreator;
 class IConfigListener;
 class Watcher;
 
@@ -44,13 +45,14 @@ class Watcher;
 class ConfigWatcher : public IWatcherListener
 {
 public:
-    ConfigWatcher(const String &path, IConfigListener *listener);
+    ConfigWatcher(const String &path, IConfigCreator *creator, IConfigListener *listener);
     ~ConfigWatcher() override;
 
 protected:
     void onFileChanged(const String &fileName) override;
 
 private:
+    IConfigCreator *m_creator;
     IConfigListener *m_listener;
     Watcher *m_watcher;
 };

src/common/interfaces/IClientListener.h

@@ -29,9 +29,6 @@
 #include <stdint.h>
 
 
-#include "rapidjson/fwd.h"
-
-
 namespace xmrig {
 
 
@@ -46,8 +43,7 @@ public:
     virtual ~IClientListener() = default;
 
     virtual void onClose(Client *client, int failures)                                           = 0;
-    virtual void onJobReceived(Client *client, const Job &job, const rapidjson::Value &params)   = 0;
-    virtual void onLogin(Client *client, rapidjson::Document &doc, rapidjson::Value &params)     = 0;
+    virtual void onJobReceived(Client *client, const Job &job)                                   = 0;
     virtual void onLoginSuccess(Client *client)                                                  = 0;
     virtual void onResultAccepted(Client *client, const SubmitResult &result, const char *error) = 0;
 };

src/common/interfaces/IConfig.h

@@ -41,102 +41,91 @@ class IConfig
 public:
     enum Keys {
         // common
-        AlgorithmKey         = 'a',
-        ApiWorkerIdKey       = 4002,
-        ApiIdKey             = 4005,
-        HttpPort             = 4100,
-        HttpAccessTokenKey   = 4101,
-        HttpRestrictedKey    = 4104,
-        HttpEnabledKey       = 4106,
-        HttpHostKey          = 4107,
-        BackgroundKey        = 'B',
-        ColorKey             = 1002,
-        ConfigKey            = 'c',
-        DonateLevelKey       = 1003,
-        KeepAliveKey         = 'k',
-        LogFileKey           = 'l',
-        PasswordKey          = 'p',
-        RetriesKey           = 'r',
-        RetryPauseKey        = 'R',
-        RigIdKey             = 1012,
-        SyslogKey            = 'S',
-        UrlKey               = 'o',
-        UserAgentKey         = 1008,
-        UserKey              = 'u',
-        UserpassKey          = 'O',
-        VariantKey           = 1010,
-        VerboseKey           = 1100,
-        WatchKey             = 1105,
-        TlsKey               = 1013,
-        FingerprintKey       = 1014,
-        AutoSaveKey          = 1016,
-        ProxyDonateKey       = 1017,
-
-#       ifdef XMRIG_DEPRECATED
-        ApiPort              = 4000,
-        ApiAccessTokenKey    = 4001,
-        ApiIPv6Key           = 4003,
-        ApiRestrictedKey     = 4004,
-#       endif
+        AlgorithmKey      = 'a',
+        ApiAccessTokenKey = 4001,
+        ApiIPv6Key        = 4003,
+        ApiPort           = 4000,
+        ApiRestrictedKey  = 4004,
+        ApiWorkerIdKey    = 4002,
+        ApiIdKey          = 4005,
+        BackgroundKey     = 'B',
+        ColorKey          = 1002,
+        ConfigKey         = 'c',
+        DonateLevelKey    = 1003,
+        KeepAliveKey      = 'k',
+        LogFileKey        = 'l',
+        PasswordKey       = 'p',
+        RetriesKey        = 'r',
+        RetryPauseKey     = 'R',
+        RigIdKey          = 1012,
+        SyslogKey         = 'S',
+        UrlKey            = 'o',
+        UserAgentKey      = 1008,
+        UserKey           = 'u',
+        UserpassKey       = 'O',
+        VariantKey        = 1010,
+        VerboseKey        = 1100,
+        WatchKey          = 1105,
+        TlsKey            = 1013,
+        FingerprintKey    = 1014,
+        AutoSaveKey       = 1016,
 
         // xmrig common
-        CPUPriorityKey       = 1021,
-        NicehashKey          = 1006,
-        PrintTimeKey         = 1007,
+        CPUPriorityKey    = 1021,
+        NicehashKey       = 1006,
+        PrintTimeKey      = 1007,
 
         // xmrig cpu
-        AVKey                = 'v',
-        CPUAffinityKey       = 1020,
-        DryRunKey            = 5000,
-        HugePagesKey         = 1009,
-        MaxCPUUsageKey       = 1004,
-        SafeKey              = 1005,
-        ThreadsKey           = 't',
-        HardwareAESKey       = 1011,
-        AssemblyKey          = 1015,
+        AVKey             = 'v',
+        CPUAffinityKey    = 1020,
+        DryRunKey         = 5000,
+        HugePagesKey      = 1009,
+        MaxCPUUsageKey    = 1004,
+        SafeKey           = 1005,
+        ThreadsKey        = 't',
+        HardwareAESKey    = 1011,
+        AssemblyKey       = 1015,
 
         // xmrig amd
-        OclPlatformKey       = 1400,
-        OclAffinityKey       = 1401,
-        OclDevicesKey        = 1402,
-        OclLaunchKey         = 1403,
-        OclCacheKey          = 1404,
-        OclPrintKey          = 1405,
-        OclLoaderKey         = 1406,
-        OclSridedIndexKey    = 1407,
-        OclMemChunkKey       = 1408,
-        OclUnrollKey         = 1409,
-        OclCompModeKey       = 1410,
+        OclPlatformKey    = 1400,
+        OclAffinityKey    = 1401,
+        OclDevicesKey     = 1402,
+        OclLaunchKey      = 1403,
+        OclCacheKey       = 1404,
+        OclPrintKey       = 1405,
+        OclLoaderKey      = 1406,
+        OclSridedIndexKey = 1407,
+        OclMemChunkKey    = 1408,
+        OclUnrollKey      = 1409,
+        OclCompModeKey    = 1410,
 
         // xmrig-proxy
-        AccessLogFileKey     = 'A',
-        BindKey              = 'b',
-        CoinKey              = 1104,
-        CustomDiffKey        = 1102,
-        DebugKey             = 1101,
-        ModeKey              = 'm',
-        PoolCoinKey          = 'C',
-        ReuseTimeoutKey      = 1106,
-        WorkersKey           = 1103,
-        WorkersAdvKey        = 1107,
-        TlsBindKey           = 1108,
-        TlsCertKey           = 1109,
-        TlsCertKeyKey        = 1110,
-        TlsDHparamKey        = 1111,
-        TlsCiphersKey        = 1112,
-        TlsCipherSuitesKey   = 1113,
-        TlsProtocolsKey      = 1114,
-        AlgoExtKey           = 1115,
-        ProxyPasswordKey     = 1116,
+        AccessLogFileKey   = 'A',
+        BindKey            = 'b',
+        CoinKey            = 1104,
+        CustomDiffKey      = 1102,
+        DebugKey           = 1101,
+        ModeKey            = 'm',
+        PoolCoinKey        = 'C',
+        ReuseTimeoutKey    = 1106,
+        WorkersKey         = 1103,
+        WorkersAdvKey      = 1107,
+        TlsBindKey         = 1108,
+        TlsCertKey         = 1109,
+        TlsCertKeyKey      = 1110,
+        TlsDHparamKey      = 1111,
+        TlsCiphersKey      = 1112,
+        TlsCipherSuitesKey = 1113,
+        TlsProtocolsKey    = 1114,
 
         // xmrig nvidia
-        CudaMaxThreadsKey    = 1200,
-        CudaBFactorKey       = 1201,
-        CudaBSleepKey        = 1202,
-        CudaDevicesKey       = 1203,
-        CudaLaunchKey        = 1204,
-        CudaAffinityKey      = 1205,
-        CudaMaxUsageKey      = 1206,
+        CudaMaxThreadsKey = 1200,
+        CudaBFactorKey    = 1201,
+        CudaBSleepKey     = 1202,
+        CudaDevicesKey    = 1203,
+        CudaLaunchKey     = 1204,
+        CudaAffinityKey   = 1205,
+        CudaMaxUsageKey   = 1206,
     };
 
     virtual ~IConfig() = default;
@@ -150,7 +139,7 @@ public:
     virtual const Algorithm &algorithm() const             = 0;
     virtual const String &fileName() const                 = 0;
     virtual void getJSON(rapidjson::Document &doc) const   = 0;
-    virtual void parseJSON(const rapidjson::Value &json)   = 0;
+    virtual void parseJSON(const rapidjson::Document &doc) = 0;
     virtual void setFileName(const char *fileName)         = 0;
 };
 

src/common/interfaces/IConfigCreator.h

@@ -22,26 +22,26 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_IDNSLISTENER_H
-#define XMRIG_IDNSLISTENER_H
+#ifndef XMRIG_ICONFIGCREATOR_H
+#define XMRIG_ICONFIGCREATOR_H
 
 
 namespace xmrig {
 
 
-class Dns;
+class IConfig;
 
 
-class IDnsListener
+class IConfigCreator
 {
 public:
-    virtual ~IDnsListener() = default;
+    virtual ~IConfigCreator() = default;
 
-    virtual void onResolved(const Dns &dns, int status) = 0;
+    virtual IConfig *create() const = 0;
 };
 
 
 } /* namespace xmrig */
 
 
-#endif // XMRIG_IDNSLISTENER_H
+#endif // XMRIG_ICONFIGCREATOR_H

src/common/interfaces/IConsoleListener.h

@@ -0,0 +1,37 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2016-2017 XMRig       <support@xmrig.com>
+ *
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ICONSOLELISTENER_H__
+#define __ICONSOLELISTENER_H__
+
+
+class IConsoleListener
+{
+public:
+    virtual ~IConsoleListener() {}
+
+    virtual void onConsoleCommand(char command) = 0;
+};
+
+
+#endif // __ICONSOLELISTENER_H__

src/common/interfaces/ILogBackend.h

@@ -5,9 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,27 +21,36 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_ILOGBACKEND_H
-#define XMRIG_ILOGBACKEND_H
+#ifndef __ILOGBACKEND_H__
+#define __ILOGBACKEND_H__
 
 
 #include <stdarg.h>
 #include <stddef.h>
 
 
-namespace xmrig {
-
-
 class ILogBackend
 {
 public:
-    virtual ~ILogBackend() = default;
+    enum Level {
+        ERR,
+        WARNING,
+        NOTICE,
+        INFO,
+        DEBUG
+    };
 
-    virtual void print(int level, const char *line, size_t offset, size_t size, bool colors) = 0;
+#   ifdef APP_DEBUG
+    constexpr static const size_t kBufferSize = 1024;
+#   else
+    constexpr static const size_t kBufferSize = 512;
+#   endif
+
+    virtual ~ILogBackend() {}
+
+    virtual void message(Level level, const char* fmt, va_list args) = 0;
+    virtual void text(const char* fmt, va_list args)                 = 0;
 };
 
 
-} /* namespace xmrig */
-
-
-#endif // XMRIG_ILOGBACKEND_H
+#endif // __ILOGBACKEND_H__

src/common/interfaces/IStrategy.h

@@ -29,12 +29,13 @@
 #include <stdint.h>
 
 
+class JobResult;
+
+
 namespace xmrig {
 
 
 class Algorithm;
-class Client;
-class JobResult;
 
 
 class IStrategy
@@ -43,7 +44,6 @@ public:
     virtual ~IStrategy() = default;
 
     virtual bool isActive() const                      = 0;
-    virtual Client *client() const                     = 0;
     virtual int64_t submit(const JobResult &result)    = 0;
     virtual void connect()                             = 0;
     virtual void resume()                              = 0;

src/common/log/BasicLog.cpp

@@ -0,0 +1,89 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#ifdef WIN32
+#   include <winsock2.h>
+#   include <windows.h>
+#endif
+
+
+#include "common/log/BasicLog.h"
+#include "common/log/Log.h"
+
+
+BasicLog::BasicLog()
+{
+}
+
+
+void BasicLog::message(Level level, const char* fmt, va_list args)
+{
+    time_t now = time(nullptr);
+    tm stime;
+
+#   ifdef _WIN32
+    localtime_s(&stime, &now);
+#   else
+    localtime_r(&now, &stime);
+#   endif
+
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s",
+             stime.tm_year + 1900,
+             stime.tm_mon + 1,
+             stime.tm_mday,
+             stime.tm_hour,
+             stime.tm_min,
+             stime.tm_sec,
+             Log::colorByLevel(level, false),
+             fmt,
+             Log::endl(false)
+        );
+
+    print(args);
+}
+
+
+void BasicLog::text(const char* fmt, va_list args)
+{
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s", fmt, Log::endl(false));
+
+    print(args);
+}
+
+
+void BasicLog::print(va_list args)
+{
+    if (vsnprintf(m_buf, sizeof(m_buf) - 1, m_fmt, args) <= 0) {
+        return;
+    }
+
+    fputs(m_buf, stdout);
+    fflush(stdout);
+}

src/common/log/BasicLog.h

@@ -5,8 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,32 +21,35 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_ITCPSERVERLISTENER_H
-#define XMRIG_ITCPSERVERLISTENER_H
+#ifndef __BASICLOG_H__
+#define __BASICLOG_H__
 
 
-#include <stdint.h>
+#include <uv.h>
 
 
-typedef struct uv_stream_s uv_stream_t;
+#include "common/interfaces/ILogBackend.h"
 
 
 namespace xmrig {
+    class Controller;
+}
 
 
-class String;
-
-
-class ITcpServerListener
+class BasicLog : public ILogBackend
 {
 public:
-    virtual ~ITcpServerListener() = default;
+    BasicLog();
 
-    virtual void onConnection(uv_stream_t *stream, uint16_t port) = 0;
+    void message(Level level, const char *fmt, va_list args) override;
+    void text(const char *fmt, va_list args) override;
+
+private:
+    bool isWritable() const;
+    void print(va_list args);
+
+    char m_buf[kBufferSize];
+    char m_fmt[256];
 };
 
-
-} /* namespace xmrig */
-
-
-#endif // XMRIG_ITCPSERVERLISTENER_H
+#endif /* __BASICLOG_H__ */

src/common/log/ConsoleLog.cpp

@@ -5,9 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,26 +22,36 @@
  */
 
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#ifdef WIN32
+#   include <winsock2.h>
+#   include <windows.h>
+#endif
 
 
-#include "base/tools/Handle.h"
-#include "base/io/log/backends/ConsoleLog.h"
-#include "base/io/log/Log.h"
+#include "common/log/ConsoleLog.h"
+#include "common/log/Log.h"
+#include "core/Config.h"
+#include "core/Controller.h"
 
 
-xmrig::ConsoleLog::ConsoleLog() :
-    m_stream(nullptr)
+ConsoleLog::ConsoleLog(xmrig::Controller *controller) :
+    m_stream(nullptr),
+    m_controller(controller)
 {
-    m_tty = new uv_tty_t;
-
-    if (uv_tty_init(uv_default_loop(), m_tty, 1, 0) < 0) {
+    if (uv_tty_init(uv_default_loop(), &m_tty, 1, 0) < 0) {
         Log::colors = false;
         return;
     }
 
-    uv_tty_set_mode(m_tty, UV_TTY_MODE_NORMAL);
-    m_stream = reinterpret_cast<uv_stream_t*>(m_tty);
+    uv_tty_set_mode(&m_tty, UV_TTY_MODE_NORMAL);
+    m_uvBuf.base = m_buf;
+    m_stream     = reinterpret_cast<uv_stream_t*>(&m_tty);
 
 #   ifdef WIN32
     HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
@@ -58,35 +66,44 @@ xmrig::ConsoleLog::ConsoleLog() :
 }
 
 
-xmrig::ConsoleLog::~ConsoleLog()
+void ConsoleLog::message(Level level, const char* fmt, va_list args)
 {
-    Handle::close(m_tty);
-}
-
-
-void xmrig::ConsoleLog::print(int, const char *line, size_t, size_t size, bool colors)
-{
-    if (Log::colors != colors) {
-        return;
-    }
+    time_t now = time(nullptr);
+    tm stime;
 
 #   ifdef _WIN32
-    uv_buf_t buf = uv_buf_init(const_cast<char *>(line), static_cast<unsigned int>(size));
+    localtime_s(&stime, &now);
 #   else
-    uv_buf_t buf = uv_buf_init(const_cast<char *>(line), size);
+    localtime_r(&now, &stime);
 #   endif
 
-    if (!isWritable()) {
-        fputs(line, stdout);
-        fflush(stdout);
-    }
-    else {
-        uv_try_write(m_stream, &buf, 1);
-    }
+    const bool isColors = m_controller->config()->isColors();
+
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s",
+             stime.tm_year + 1900,
+             stime.tm_mon + 1,
+             stime.tm_mday,
+             stime.tm_hour,
+             stime.tm_min,
+             stime.tm_sec,
+             Log::colorByLevel(level, isColors),
+             fmt,
+             Log::endl(isColors)
+        );
+
+    print(args);
 }
 
 
-bool xmrig::ConsoleLog::isWritable() const
+void ConsoleLog::text(const char* fmt, va_list args)
+{
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s", fmt, Log::endl(m_controller->config()->isColors()));
+
+    print(args);
+}
+
+
+bool ConsoleLog::isWritable() const
 {
     if (!m_stream || uv_is_writable(m_stream) != 1) {
         return false;
@@ -95,3 +112,20 @@ bool xmrig::ConsoleLog::isWritable() const
     const uv_handle_type type = uv_guess_handle(1);
     return type == UV_TTY || type == UV_NAMED_PIPE;
 }
+
+
+void ConsoleLog::print(va_list args)
+{
+    m_uvBuf.len = vsnprintf(m_buf, sizeof(m_buf) - 1, m_fmt, args);
+    if (m_uvBuf.len <= 0) {
+        return;
+    }
+
+    if (!isWritable()) {
+        fputs(m_buf, stdout);
+        fflush(stdout);
+    }
+    else {
+        uv_try_write(m_stream, &m_uvBuf, 1);
+    }
+}

src/common/log/ConsoleLog.h

@@ -5,9 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,38 +21,39 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_CONSOLELOG_H
-#define XMRIG_CONSOLELOG_H
+#ifndef __CONSOLELOG_H__
+#define __CONSOLELOG_H__
 
 
-typedef struct uv_stream_s uv_stream_t;
-typedef struct uv_tty_s uv_tty_t;
+#include <uv.h>
 
 
-#include "base/kernel/interfaces/ILogBackend.h"
+#include "common/interfaces/ILogBackend.h"
 
 
 namespace xmrig {
+    class Controller;
+}
 
 
 class ConsoleLog : public ILogBackend
 {
 public:
-    ConsoleLog();
-    ~ConsoleLog() override;
+    ConsoleLog(xmrig::Controller *controller);
 
-protected:
-    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
+    void message(Level level, const char *fmt, va_list args) override;
+    void text(const char *fmt, va_list args) override;
 
 private:
     bool isWritable() const;
+    void print(va_list args);
 
+    char m_buf[kBufferSize];
+    char m_fmt[256];
+    uv_buf_t m_uvBuf;
     uv_stream_t *m_stream;
-    uv_tty_t *m_tty;
+    uv_tty_t m_tty;
+    xmrig::Controller *m_controller;
 };
 
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_CONSOLELOG_H */
+#endif /* __CONSOLELOG_H__ */

src/common/log/FileLog.cpp

@@ -5,9 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -24,14 +22,21 @@
  */
 
 
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <uv.h>
+#include <time.h>
 
 
-#include "base/io/log/backends/FileLog.h"
+#include "common/log/FileLog.h"
+#include "common/log/Log.h"
+#include "core/Config.h"
+#include "core/Controller.h"
 
 
-xmrig::FileLog::FileLog(const char *fileName)
+FileLog::FileLog(xmrig::Controller *controller, const char *fileName) :
+    m_controller(controller)
 {
     uv_fs_t req;
     m_file = uv_fs_open(uv_default_loop(), &req, fileName, O_CREAT | O_APPEND | O_WRONLY, 0644, nullptr);
@@ -39,29 +44,62 @@ xmrig::FileLog::FileLog(const char *fileName)
 }
 
 
-void xmrig::FileLog::print(int, const char *line, size_t, size_t size, bool colors)
+void FileLog::message(Level level, const char* fmt, va_list args)
 {
-    if (m_file < 0 || colors) {
+    if (m_file < 0) {
         return;
     }
 
+    time_t now = time(nullptr);
+    tm stime;
+
 #   ifdef _WIN32
-    uv_buf_t buf = uv_buf_init(strdup(line), static_cast<unsigned int>(size));
+    localtime_s(&stime, &now);
 #   else
-    uv_buf_t buf = uv_buf_init(strdup(line), size);
+    localtime_r(&now, &stime);
 #   endif
 
-    uv_fs_t *req = new uv_fs_t;
-    req->data = buf.base;
+    const bool isColors = m_controller->config()->isColors();
 
-    uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, -1, FileLog::onWrite);
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s",
+             stime.tm_year + 1900,
+             stime.tm_mon + 1,
+             stime.tm_mday,
+             stime.tm_hour,
+             stime.tm_min,
+             stime.tm_sec,
+             Log::colorByLevel(level, isColors),
+             fmt,
+             Log::endl(isColors)
+        );
+
+    char *buf = new char[kBufferSize];
+    const int size = vsnprintf(buf, kBufferSize - 1, m_fmt, args);
+
+    write(buf, size);
 }
 
 
-void xmrig::FileLog::onWrite(uv_fs_t *req)
+void FileLog::text(const char* fmt, va_list args)
+{
+    message(INFO, fmt, args);
+}
+
+
+void FileLog::onWrite(uv_fs_t *req)
 {
     delete [] static_cast<char *>(req->data);
 
     uv_fs_req_cleanup(req);
     delete req;
 }
+
+
+void FileLog::write(char *data, size_t size)
+{
+    uv_buf_t buf = uv_buf_init(data, (unsigned int) size);
+    uv_fs_t *req = new uv_fs_t;
+    req->data = buf.base;
+
+    uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, -1, FileLog::onWrite);
+}

src/common/log/FileLog.h

@@ -5,9 +5,7 @@
  * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,36 +21,37 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XMRIG_FILELOG_H
-#define XMRIG_FILELOG_H
+#ifndef __FILELOG_H__
+#define __FILELOG_H__
 
 
-typedef struct uv_fs_s uv_fs_t;
+#include <uv.h>
 
 
-#include "base/kernel/interfaces/ILogBackend.h"
+#include "common/interfaces/ILogBackend.h"
 
 
 namespace xmrig {
+    class Controller;
+}
 
 
 class FileLog : public ILogBackend
 {
 public:
-    FileLog(const char *fileName);
+    FileLog(xmrig::Controller *controller, const char *fileName);
 
-
-protected:
-    void print(int level, const char *line, size_t offset, size_t size, bool colors) override;
+    void message(Level level, const char* fmt, va_list args) override;
+    void text(const char* fmt, va_list args) override;
 
 private:
     static void onWrite(uv_fs_t *req);
 
+    void write(char *data, size_t size);
+
+    char m_fmt[256];
     int m_file;
+    xmrig::Controller *m_controller;
 };
 
-
-} /* namespace xmrig */
-
-
-#endif /* XMRIG_FILELOG_H */
+#endif /* __FILELOG_H__ */