Commit 331026595f6fb17c662b269fb7fc70ec390d7186
2012-09-28T10:18:58
Implement stratum parsing of notify parameters and storing them in the pool stratum work structure.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/util.c b/util.c
index 32ca0e6..211cc1c 100644
--- a/util.c
+++ b/util.c
@@ -943,7 +943,7 @@ static char *__json_array_string(json_t *val, unsigned int entry)
if (!json_is_string(arr_entry))
return NULL;
- return (json_string_value(arr_entry));
+ return (char *)json_string_value(arr_entry);
}
/* Creates a freshly malloced dup of __json_array_string */
@@ -958,9 +958,76 @@ static char *json_array_string(json_t *val, unsigned int entry)
static bool parse_notify(struct pool *pool, json_t *val)
{
+ char *job_id, *prev_hash, *coinbase1, *coinbase2, *merkle1, *merkle2,
+ *bbversion, *nbit, *ntime;
json_t *arr;
+ bool clean;
+
+ arr = json_array_get(val, 4);
+ if (!arr || !json_is_array(arr))
+ return false;
+
+ job_id = json_array_string(val, 0);
+ prev_hash = json_array_string(val, 1);
+ coinbase1 = json_array_string(val, 2);
+ coinbase2 = json_array_string(val, 3);
+ merkle1 = json_array_string(arr, 0);
+ merkle2 = json_array_string(arr, 1);
+ bbversion = json_array_string(val, 5);
+ nbit = json_array_string(val, 6);
+ ntime = json_array_string(val, 7);
+ clean = json_is_true(json_array_get(val, 8));
+
+ if (!job_id || !prev_hash || !coinbase1 || !coinbase2 || !merkle1 ||
+ !merkle2 || !bbversion || !nbit || !ntime) {
+ /* Annoying but we must not leak memory */
+ if (job_id)
+ free(job_id);
+ if (prev_hash)
+ free(prev_hash);
+ if (coinbase1)
+ free(coinbase1);
+ if (coinbase2)
+ free(coinbase2);
+ if (merkle1)
+ free(merkle1);
+ if (merkle2)
+ free(merkle2);
+ if (bbversion)
+ free(bbversion);
+ if (nbit)
+ free(nbit);
+ if (ntime)
+ free(ntime);
+ return false;
+ }
+
+ mutex_lock(&pool->pool_lock);
+ pool->swork.job_id = job_id;
+ pool->swork.prev_hash = prev_hash;
+ pool->swork.coinbase1 = coinbase1;
+ pool->swork.coinbase2 = coinbase2;
+ pool->swork.merkle1 = merkle1;
+ pool->swork.merkle2 = merkle2;
+ pool->swork.bbversion = bbversion;
+ pool->swork.nbit = nbit;
+ pool->swork.ntime = ntime;
+ pool->swork.clean = clean;
+ mutex_unlock(&pool->pool_lock);
+
+ if (opt_protocol) {
+ applog(LOG_DEBUG, "job_id: %s", job_id);
+ applog(LOG_DEBUG, "prev_hash: %s", prev_hash);
+ applog(LOG_DEBUG, "coinbase1: %s", coinbase1);
+ applog(LOG_DEBUG, "coinbase2: %s", coinbase2);
+ applog(LOG_DEBUG, "merkle1: %s", merkle1);
+ applog(LOG_DEBUG, "merkle2: %s", merkle2);
+ applog(LOG_DEBUG, "bbversion: %s", bbversion);
+ applog(LOG_DEBUG, "nbit: %s", nbit);
+ applog(LOG_DEBUG, "ntime: %s", ntime);
+ applog(LOG_DEBUG, "clean: %s", clean ? "yes" : "no");
+ }
-
return true;
}