Merge 8f507b7d09 into e7de104d88

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;