Merge 5ac6d438fa into dd782c7001

Stratum: better check of the login response

src/base/kernel/Platform_unix.cpp

@@ -169,6 +169,12 @@ bool xmrig::Platform::isOnBatteryPower()
             return (status == "Discharging");
         }
     }
+    std::ifstream f("/sys/class/power_supply/macsmc-battery/status");
+    if (f.is_open()) {
+        std::string status;
+        f >> status;
+        return (status == "Discharging");
+    }
     return false;
 }
 

src/base/net/stratum/Client.cpp

@@ -609,6 +609,11 @@ bool xmrig::Client::parseLogin(const rapidjson::Value &result, int *code)
 
     parseExtensions(result);
 
+    if (!result.HasMember("job")) {
+        *code = 2;
+        return false;
+    }
+
     const bool rc = parseJob(result["job"], code);
     m_jobs = 0;
 

src/version.h

@@ -22,7 +22,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.21.1"
+#define APP_VERSION   "6.21.2-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"
@@ -30,7 +30,7 @@
 
 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  21
-#define APP_VER_PATCH  1
+#define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)