Commit e3f1b02e9a4b86da2a5d25dc6ed05f5fbd7fb6f4
2012-09-26T16:49:51
Extract and store various parameters on stratum init confirming successful mining notify.
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
diff --git a/miner.h b/miner.h
index 572444b..f1a284e 100644
--- a/miner.h
+++ b/miner.h
@@ -812,8 +812,12 @@ struct pool {
struct cgminer_stats cgminer_stats;
struct cgminer_pool_stats cgminer_pool_stats;
+ /* Stratum variables */
SOCKETTYPE sock;
struct sockaddr_in *server, client;
+ char *subscription;
+ char *nonce1;
+ int nonce2;
};
#define GETWORK_MODE_TESTPOOL 'T'
diff --git a/util.c b/util.c
index d675d26..02c4c28 100644
--- a/util.c
+++ b/util.c
@@ -865,9 +865,9 @@ static bool sock_send(int sock, char *s, ssize_t len)
bool initiate_stratum(struct pool *pool)
{
- json_t *val, *res_val, *err_val;
+ json_t *val, *res_val, *err_val, *notify_val;
+ char *s, *buf, *sret = NULL;
struct timeval timeout;
- char *s, *sret = NULL;
json_error_t err;
bool ret = false;
ssize_t len;
@@ -938,10 +938,43 @@ bool initiate_stratum(struct pool *pool)
goto out;
}
+ notify_val = json_array_get(res_val, 0);
+ if (!notify_val || json_is_null(notify_val)) {
+ applog(LOG_WARNING, "Failed to parse notify_val in initiate_stratum");
+ goto out;
+ }
+
+ buf = (char *)json_string_value(json_array_get(notify_val, 0));
+ if (!buf || strcasecmp(buf, "mining.notify")) {
+ applog(LOG_WARNING, "Failed to get mining notify in initiate_stratum");
+ goto out;
+ }
+ pool->subscription = (char *)json_string_value(json_array_get(notify_val, 1));
+ if (!pool->subscription) {
+ applog(LOG_WARNING, "Failed to get a subscription in initiate_stratum");
+ goto out;
+ }
+
+ pool->nonce1 = (char *)json_string_value(json_array_get(res_val, 1));
+ if (!pool->nonce1) {
+ applog(LOG_WARNING, "Failed to get nonce1 in initiate_stratum");
+ goto out;
+ }
+ pool->nonce2 = json_integer_value(json_array_get(res_val, 2));
+ if (!pool->nonce2) {
+ applog(LOG_WARNING, "Failed to get nonce2 in initiate_stratum");
+ goto out;
+ }
+
ret = true;
out:
- if (!ret)
+ if (!ret) {
CLOSESOCKET(pool->sock);
+ if (val)
+ json_decref(val);
+ } else if (opt_protocol)
+ applog(LOG_DEBUG, "Pool %d confirmed mining.notify with subscription %s extranonce1 %s extranonce2 %d",
+ pool->pool_no, pool->subscription, pool->nonce1, pool->nonce2);
return ret;
}