GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-08 22:07:56 +00:00
Code Issues Releases Wiki Activity

stats: fix get_stats answer when not allowed

Browse Source 
ccminer was answering both the error and the data

also remove the get_version stats hack...
This commit is contained in:
Tanguy Pruvot 2016-05-16 22:08:30 +02:00
parent ee042e5381
commit e22aca94f1
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util.cpp
View File

@ -1624,7 +1624,7 @@ static bool stratum_benchdata(json_t *result, json_t *params, int thr_id)
struct cgpu_info *cgpu = &thr_info[thr_id].gpu;
json_t *val;
if (!cgpu) return false;
if (!cgpu || !opt_stratum_stats) return false;
#if defined(WIN32) && (defined(_M_X64) || defined(__x86_64__))
strcpy(os, "win64");
@ -1683,7 +1683,7 @@ static bool stratum_get_stats(struct stratum_ctx *sctx, json_t *id, json_t *para
ret = stratum_benchdata(val, params, 0);
if (!opt_stratum_stats || !ret) {
if (!ret) {
json_object_set_error(val, 1, "disabled"); //EPERM
} else {
json_object_set_new(val, "error", json_null());
@ -1708,14 +1708,7 @@ static bool stratum_get_version(struct stratum_ctx *sctx, json_t *id, json_t *pa
val = json_object();
json_object_set(val, "id", id);
if (opt_stratum_stats && params) {
// linked here as transition, miners without get_stats method could fail
ret = stratum_benchdata(val, params, 0);
if (!ret) json_object_set_error(val, 1, "disabled"); // EPERM
} else {
json_object_set_new(val, "result", json_string(USER_AGENT));
}
json_object_set_new(val, "result", json_string(USER_AGENT));
if (ret) json_object_set_new(val, "error", json_null());
s = json_dumps(val, 0);