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

Bugfix: API: Report errors from poolpriority command

Browse Source
This commit is contained in:
Luke Dashjr 2012-07-27 20:53:59 +00:00
parent 8326d2dcaf
commit 5ef9c13924
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api.c
View File

@ -2139,7 +2139,7 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
SETUP_STRTOK_TS; SETUP_STRTOK_TS;
int total_pools_ = total_pools; // Keep a local copy, to be more threadsafe int total_pools_ = total_pools; // Keep a local copy, to be more threadsafe
char *a; char *a;
int i, prio = 0; int i, prio = 0, e = -1;
if (total_pools_ == 0) { if (total_pools_ == 0) {
strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson)); strcpy(io_buffer, message(MSG_NOPOOL, 0, NULL, isjson));
@ -2152,7 +2152,11 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
a = strtok_ts(param, ","); a = strtok_ts(param, ",");
do { do {
i = atoi(a); i = strtol(a, &a, 10);
if (unlikely(*a > 0x20 || i < 0 || i >= total_pools)) {
e = (*a > 0x20) ? -2 : i;
continue;
}
pools[i]->prio = prio++; pools[i]->prio = prio++;
pools_changed[i] = true; pools_changed[i] = true;
} while ( (a = strtok_ts(NULL, ",")) ); } while ( (a = strtok_ts(NULL, ",")) );
@ -2164,6 +2168,14 @@ static void poolpriority(__maybe_unused SOCKETTYPE c, char *param, bool isjson,
if (current_pool()->prio) if (current_pool()->prio)
switch_pools(NULL); switch_pools(NULL);
if (e != -1) {
if (e == -2)
strcpy(io_buffer, message(MSG_MISPID, 0, NULL, isjson));
else
strcpy(io_buffer, message(MSG_INVPID, e, NULL, isjson));
return;
}
strcpy(io_buffer, message(MSG_POOLPRIO, 0, NULL, isjson)); strcpy(io_buffer, message(MSG_POOLPRIO, 0, NULL, isjson));
} }