From cc7c274543c1ebb7adbb0fbedd8cd3ded6ffb052 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Mon, 5 Nov 2012 16:28:52 +1100 Subject: [PATCH] Manage appropriate response codes for share submission with GBT. --- cgminer.c | 7 ++++--- util.c | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cgminer.c b/cgminer.c index 57fff4c7..eae7228f 100644 --- a/cgminer.c +++ b/cgminer.c @@ -2131,7 +2131,7 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work, struct pool *pool = work->pool; struct cgpu_info *cgpu = thr_info[work->thr_id].cgpu; - if (json_is_true(res)) { + if (json_is_true(res) || (work->gbt && json_is_null(res))) { cgpu->accepted++; total_accepted++; pool->accepted++; @@ -2189,7 +2189,8 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work, else strcpy(where, ""); - res = json_object_get(val, "reject-reason"); + if (!work->gbt) + res = json_object_get(val, "reject-reason"); if (res) { const char *reasontmp = json_string_value(res); @@ -2329,7 +2330,7 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit) sprintf(s, "{\"id\": 0, \"method\": \"submitblock\", \"params\": [\"%s\", {}]}", gbt_block); } else sprintf(s, "{\"method\": \"getwork\", \"params\": [ \"%s\" ], \"id\":1}", hexstr); - applog(LOG_WARNING, "DBG: sending %s submit RPC call: %s", pool->rpc_url, s); + applog(LOG_DEBUG, "DBG: sending %s submit RPC call: %s", pool->rpc_url, s); strcat(s, "\n"); gettimeofday(&tv_submit, NULL); diff --git a/util.c b/util.c index 439c6035..072c5ce8 100644 --- a/util.c +++ b/util.c @@ -451,8 +451,7 @@ json_t *json_rpc_call(CURL *curl, const char *url, res_val = json_object_get(val, "result"); err_val = json_object_get(val, "error"); - if (!res_val || json_is_null(res_val) || - (err_val && !json_is_null(err_val))) { + if (!res_val ||(err_val && !json_is_null(err_val))) { char *s; if (err_val)