GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

Revert "Cope with out of order messages coming in upon attempting to auth_stratum."

Browse Source 
This reverts commit 237f67c617.
This commit is contained in:
Con Kolivas 2013-03-07 15:34:44 +11:00
parent ed903ddf31
commit c9b4f5c757
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
util.c
View File

@ -1369,46 +1369,38 @@ bool auth_stratum(struct pool *pool)
json_error_t err;
bool ret = false;
pool->stratum_notify = false;
sprintf(s, "{\"id\": %d, \"method\": \"mining.authorize\", \"params\": [\"%s\", \"%s\"]}",
swork_id++, pool->rpc_user, pool->rpc_pass);
if (!stratum_send(pool, s, strlen(s)))
goto out;
/* Parse all data in the queue and break out should we run out of data
* or we have successfully parsed a notify message. */
/* Parse all data in the queue and anything left should be auth */
while (42) {
sret = recv_line(pool);
if (!sret)
goto out;
if (parse_method(pool, sret)) {
if (parse_method(pool, sret))
free(sret);
if (pool->stratum_notify)
break;
} else
else
break;
}
if (!pool->stratum_notify) {
val = JSON_LOADS(sret, &err);
free(sret);
res_val = json_object_get(val, "result");
err_val = json_object_get(val, "error");
val = JSON_LOADS(sret, &err);
free(sret);
res_val = json_object_get(val, "result");
err_val = json_object_get(val, "error");
if (!res_val || json_is_false(res_val) || (err_val && !json_is_null(err_val))) {
char *ss;
if (!res_val || json_is_false(res_val) || (err_val && !json_is_null(err_val))) {
char *ss;
if (err_val)
ss = json_dumps(err_val, JSON_INDENT(3));
else
ss = strdup("(unknown reason)");
applog(LOG_WARNING, "JSON stratum auth failed: %s", ss);
free(ss);
if (err_val)
ss = json_dumps(err_val, JSON_INDENT(3));
else
ss = strdup("(unknown reason)");
applog(LOG_WARNING, "JSON stratum auth failed: %s", ss);
free(ss);
goto out;
}
applog(LOG_WARNING, "Failed to auth stratum");
goto out;
}