Merge d51b01e559 into fc698f7bcf

CHANGELOG.md

@@ -1,12 +1,3 @@
-# v6.20.0
-- Added new ARM CPU names.
-- [#2394](https://github.com/xmrig/xmrig/pull/2394) Added new CMake options `ARM_V8` and `ARM_V7`.
-- [#2830](https://github.com/xmrig/xmrig/pull/2830) Added API rebind polling.
-- [#2927](https://github.com/xmrig/xmrig/pull/2927) Fixed compatibility with hwloc 1.11.x.
-- [#3060](https://github.com/xmrig/xmrig/pull/3060) Added x86 to `README.md`.
-- [#3236](https://github.com/xmrig/xmrig/pull/3236) Fixed: receive CUDA loader error on Linux too.
-- [#3290](https://github.com/xmrig/xmrig/pull/3290) Added [Zephyr](https://www.zephyrprotocol.com/) coin support for solo mining.
-
 # v6.19.3
 - [#3245](https://github.com/xmrig/xmrig/issues/3245) Improved algorithm negotiation for donation rounds by sending extra information about current mining job.
 - [#3254](https://github.com/xmrig/xmrig/pull/3254) Tweaked auto-tuning for Intel CPUs.

src/base/kernel/Platform.h

@@ -49,8 +49,6 @@ public:
     static inline bool isUserActive(uint64_t ms)    { return idleTime() < ms; }
     static inline const String &userAgent()         { return m_userAgent; }
 
-    static bool hasKeepalive();
-
     static bool isOnBatteryPower();
     static uint64_t idleTime();
 

src/base/kernel/Platform_mac.cpp

@@ -55,12 +55,6 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
-bool xmrig::Platform::hasKeepalive()
-{
-    return true;
-}
-
-
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {
     return true;

src/base/kernel/Platform_unix.cpp

@@ -70,12 +70,6 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
-bool xmrig::Platform::hasKeepalive()
-{
-    return true;
-}
-
-
 #ifndef XMRIG_FEATURE_HWLOC
 #ifdef __DragonFly__
 

src/base/kernel/Platform_win.cpp

@@ -70,12 +70,6 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
-bool xmrig::Platform::hasKeepalive()
-{
-    return winOsVersion().dwMajorVersion >= 6;
-}
-
-
 #ifndef XMRIG_FEATURE_HWLOC
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {

src/base/net/stratum/Client.cpp

@@ -50,7 +50,6 @@
 #include "base/tools/Cvt.h"
 #include "base/tools/cryptonote/BlobReader.h"
 #include "net/JobResult.h"
-#include "base/kernel/Platform.h"
 
 
 #ifdef _MSC_VER
@@ -568,9 +567,9 @@ void xmrig::Client::connect(const sockaddr *addr)
     uv_tcp_init(uv_default_loop(), m_socket);
     uv_tcp_nodelay(m_socket, 1);
 
-    if (Platform::hasKeepalive()) {
-        uv_tcp_keepalive(m_socket, 1, 60);
-    }
+#   ifndef WIN32
+    uv_tcp_keepalive(m_socket, 1, 60);
+#   endif
 
     uv_tcp_connect(req, m_socket, addr, onConnect);
 }

src/base/net/stratum/DaemonClient.cpp

@@ -46,7 +46,6 @@
 #include "base/tools/Timer.h"
 #include "base/tools/cryptonote/Signatures.h"
 #include "net/JobResult.h"
-#include "base/kernel/Platform.h"
 
 
 #ifdef XMRIG_FEATURE_TLS
@@ -359,9 +358,9 @@ void xmrig::DaemonClient::onResolved(const DnsRecords &records, int status, cons
     uv_tcp_init(uv_default_loop(), s);
     uv_tcp_nodelay(s, 1);
 
-    if (Platform::hasKeepalive()) {
-        uv_tcp_keepalive(s, 1, 60);
-    }
+#   ifndef WIN32
+    uv_tcp_keepalive(s, 1, 60);
+#   endif
 
     if (m_pool.zmq_port() > 0) {
         delete m_ZMQSocket;

src/version.h

@@ -22,15 +22,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.20.1-dev"
+#define APP_VERSION   "6.19.4-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
 #define APP_KIND      "miner"
 
 #define APP_VER_MAJOR  6
-#define APP_VER_MINOR  20
-#define APP_VER_PATCH  1
+#define APP_VER_MINOR  19
+#define APP_VER_PATCH  4
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)