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

stratum: prevent a booo when receiving a new block

Browse Source 
seems to works in solo mode too...

note: anime wallet to check, different problem without reject-reason
This commit is contained in:
Tanguy Pruvot 2014-11-17 00:59:14 +01:00
parent d062f93bf5
commit f5e77452f0
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ccminer.cpp
View File

@ -554,14 +554,23 @@ static bool submit_upstream_work(CURL *curl, struct work *work)
json_t *val, *res, *reason; json_t *val, *res, *reason;
char s[345]; char s[345];
int i; int i;
bool stale_work;
bool rc = false; bool rc = false;
/* pass if the previous hash is not the current previous hash */
pthread_mutex_lock(&g_work_lock); pthread_mutex_lock(&g_work_lock);
if (memcmp(work->data + 1, g_work.data + 1, 32)) { if (strlen(work->job_id + 8)) {
/* stale if not the current job id */
stale_work = strcmp(work->job_id + 8, g_work.job_id + 8);
} else {
applog_hash((uchar*)&work->data);
/* fallback if not job id (compare hash) */
stale_work = memcmp(&work->data[1], &g_work.data[1], 32);
}
if (stale_work) {
pthread_mutex_unlock(&g_work_lock); pthread_mutex_unlock(&g_work_lock);
if (opt_debug) if (opt_debug)
applog(LOG_DEBUG, "stale work detected, discarding"); applog(LOG_WARNING, "stale work detected, discarding");
return true; return true;
} }
calc_diff(work, 0); calc_diff(work, 0);
@ -1465,7 +1474,7 @@ start:
if (work_decode(json_object_get(val, "result"), &g_work)) { if (work_decode(json_object_get(val, "result"), &g_work)) {
if (opt_debug) if (opt_debug)
applog(LOG_BLUE, "LONGPOLL pushed new work"); applog(LOG_BLUE, "LONGPOLL pushed new work");
time(&g_work_time); g_work_time = time(NULL);
restart_threads(); restart_threads();
} }
pthread_mutex_unlock(&g_work_lock); pthread_mutex_unlock(&g_work_lock);
@ -1474,11 +1483,9 @@ start:
pthread_mutex_lock(&g_work_lock); pthread_mutex_lock(&g_work_lock);
g_work_time -= LP_SCANTIME; g_work_time -= LP_SCANTIME;
pthread_mutex_unlock(&g_work_lock); pthread_mutex_unlock(&g_work_lock);
if (err == CURLE_OPERATION_TIMEDOUT) { restart_threads();
restart_threads(); if (err != CURLE_OPERATION_TIMEDOUT) {
} else {
have_longpoll = false; have_longpoll = false;
restart_threads();
free(hdr_path); free(hdr_path);
free(lp_url); free(lp_url);
lp_url = NULL; lp_url = NULL;
@ -1572,7 +1579,7 @@ static void *stratum_thread(void *userdata)
(!g_work_time || strncmp(stratum.job.job_id, g_work.job_id + 8, 120))) { (!g_work_time || strncmp(stratum.job.job_id, g_work.job_id + 8, 120))) {
pthread_mutex_lock(&g_work_lock); pthread_mutex_lock(&g_work_lock);
stratum_gen_work(&stratum, &g_work); stratum_gen_work(&stratum, &g_work);
time(&g_work_time); g_work_time = time(NULL);
if (stratum.job.clean) { if (stratum.job.clean) {
if (!opt_quiet) if (!opt_quiet)
applog(LOG_BLUE, "%s %s block %d", short_url, algo_names[opt_algo], applog(LOG_BLUE, "%s %s block %d", short_url, algo_names[opt_algo],