Browse Source

Add update detection in parse_node_msg and remove double warning

master
Con Kolivas 9 years ago
parent
commit
6f7dc2d2f0
  1. 13
      src/stratifier.c

13
src/stratifier.c

@ -5151,17 +5151,18 @@ static int node_msg_type(json_t *val)
for (i = 0; i < SM_NONE; i++) { for (i = 0; i < SM_NONE; i++) {
if (!strcmp(method, stratum_msgs[i])) { if (!strcmp(method, stratum_msgs[i])) {
ret = i; ret = i;
LOGWARNING("Got node method %d:%s", i, method);
break; break;
} }
} }
json_object_del(val, "node.method"); json_object_del(val, "node.method");
out: out:
if (ret < 0 && json_get_string(&method, val, "method")) { if (ret < 0 && json_get_string(&method, val, "method")) {
if (!safecmp(method, "mining.subscribe")) if (!safecmp(method, "mining.submit"))
ret = SM_SUBSCRIBE;
else if (!safecmp(method, "mining.submit"))
ret = SM_SHARE; ret = SM_SHARE;
else if (!safecmp(method, "mining.notify"))
ret = SM_UPDATE;
else if (!safecmp(method, "mining.subscribe"))
ret = SM_SUBSCRIBE;
else if (cmdmatch(method, "mining.auth")) else if (cmdmatch(method, "mining.auth"))
ret = SM_AUTH; ret = SM_AUTH;
else if (cmdmatch(method, "mining.get")) else if (cmdmatch(method, "mining.get"))
@ -5176,9 +5177,9 @@ static void parse_node_msg(json_t *val, const char *buf, stratum_instance_t *cli
int msg_type = node_msg_type(val); int msg_type = node_msg_type(val);
if (msg_type > -1) if (msg_type > -1)
LOGWARNING("Got node method %d:%s", msg_type, stratum_msgs[msg_type]); LOGWARNING("Got client %"PRId64" node method %d:%s", client->id, msg_type, stratum_msgs[msg_type]);
else else
LOGWARNING("Missing node method from %s", buf); LOGWARNING("Missing client %"PRId64" node method from %s", client->id, buf);
} }
/* Entered with client holding ref count */ /* Entered with client holding ref count */

Loading…
Cancel
Save