markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Hand old sessionid to new client

master
Con Kolivas 10 years ago
parent
c7dbb0114d
commit
08622a4b61
1 changed files with 9 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/stratifier.c

16
src/stratifier.c
Unescape View File

@ -1333,12 +1333,13 @@ static stratum_instance_t *__stratum_add_instance(ckpool_t *ckp, const int64_t i
return client; return client;
} }
static uint64_t disconnected_sessionid_exists(sdata_t *sdata, const char *sessionid, const int64_t id) static uint64_t disconnected_sessionid_exists(sdata_t *sdata, const char *sessionid,
int *session_id, const int64_t id)
{ {
int session_id, slen;
session_t *session; session_t *session;
int64_t old_id = 0; int64_t old_id = 0;
uint64_t ret = 0; uint64_t ret = 0;
int slen;
if (!sessionid) if (!sessionid)
goto out; goto out;
@ -1349,10 +1350,11 @@ static uint64_t disconnected_sessionid_exists(sdata_t *sdata, const char *sessio
if (!validhex(sessionid)) if (!validhex(sessionid))
goto out; goto out;
sscanf(sessionid, "%x", &session_id); sscanf(sessionid, "%x", session_id);
LOGDEBUG("Testing for sessionid %s %x", sessionid, *session_id);
ck_wlock(&sdata->instance_lock); ck_wlock(&sdata->instance_lock);
HASH_FIND_INT(sdata->disconnected_sessions, &session_id, session); HASH_FIND_INT(sdata->disconnected_sessions, session_id, session);
if (!session) if (!session)
goto out_unlock; goto out_unlock;
HASH_DEL(sdata->disconnected_sessions, session); HASH_DEL(sdata->disconnected_sessions, session);
@ -1983,9 +1985,9 @@ static json_t *parse_subscribe(stratum_instance_t *client, const int64_t client_
/* This would be the session id for reconnect, it will /* This would be the session id for reconnect, it will
* not work for clients on a proxied connection. */ * not work for clients on a proxied connection. */
buf = json_string_value(json_array_get(params_val, 1)); buf = json_string_value(json_array_get(params_val, 1));
LOGDEBUG("Found old session id %s", buf); LOGWARNING("Found old session id %s", buf);
/* Add matching here */ /* Add matching here */
if ((client->enonce1_64 = disconnected_sessionid_exists(sdata, buf, client_id))) { if ((client->enonce1_64 = disconnected_sessionid_exists(sdata, buf, &client->session_id, client_id))) {
sprintf(client->enonce1, "%016lx", client->enonce1_64); sprintf(client->enonce1, "%016lx", client->enonce1_64);
old_match = true; old_match = true;
@ -2015,7 +2017,7 @@ static json_t *parse_subscribe(stratum_instance_t *client, const int64_t client_
n2len = sdata->workbases->enonce2varlen; n2len = sdata->workbases->enonce2varlen;
else else
n2len = 8; n2len = 8;
sprintf(sessionid, "%x", client->session_id); sprintf(sessionid, "%08x", client->session_id);
JSON_CPACK(ret, "[[[s,s]],s,i]", "mining.notify", sessionid, client->enonce1, JSON_CPACK(ret, "[[[s,s]],s,i]", "mining.notify", sessionid, client->enonce1,
n2len); n2len);
ck_runlock(&sdata->workbase_lock); ck_runlock(&sdata->workbase_lock);

Write Preview
Loading…
Cancel
Save