Browse Source

Rename nonce2 to n2size reflecting that it's a size variable and not the actual nonce.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
1221a80d41
  1. 2
      miner.h
  2. 10
      util.c

2
miner.h

@ -837,7 +837,7 @@ struct pool {
struct sockaddr_in *server, client; struct sockaddr_in *server, client;
char *subscription; char *subscription;
char *nonce1; char *nonce1;
int nonce2; int n2size;
bool has_stratum; bool has_stratum;
bool stratum_active; bool stratum_active;
bool stratum_auth; bool stratum_auth;

10
util.c

@ -1239,9 +1239,9 @@ bool initiate_stratum(struct pool *pool)
applog(LOG_WARNING, "Failed to get nonce1 in initiate_stratum"); applog(LOG_WARNING, "Failed to get nonce1 in initiate_stratum");
goto out; goto out;
} }
pool->nonce2 = json_integer_value(json_array_get(res_val, 2)); pool->n2size = json_integer_value(json_array_get(res_val, 2));
if (!pool->nonce2) { if (!pool->n2size) {
applog(LOG_WARNING, "Failed to get nonce2 in initiate_stratum"); applog(LOG_WARNING, "Failed to get n2size in initiate_stratum");
goto out; goto out;
} }
@ -1253,8 +1253,8 @@ out:
if (ret) { if (ret) {
pool->stratum_active = true; pool->stratum_active = true;
if (opt_protocol) { if (opt_protocol) {
applog(LOG_DEBUG, "Pool %d confirmed mining.notify with subscription %s extranonce1 %s extranonce2 %d", applog(LOG_DEBUG, "Pool %d confirmed mining.notify with subscription %s extranonce1 %s extran2size %d",
pool->pool_no, pool->subscription, pool->nonce1, pool->nonce2); pool->pool_no, pool->subscription, pool->nonce1, pool->n2size);
} }
} else } else
CLOSESOCKET(pool->sock); CLOSESOCKET(pool->sock);

Loading…
Cancel
Save