GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-09 14:28:12 +00:00
Code Issues Releases Wiki Activity

Change stratum strings under stratum_lock in reconnect and free old strings.

Browse Source 
Conflicts resolved:
	util.c
This commit is contained in:
Con Kolivas 2014-01-11 09:32:16 +11:00 committed by Noel Maersk
parent 91d36d097a
commit 003b65b7b1
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
util.c
View File

@ -1661,8 +1661,18 @@ static bool parse_diff(struct pool *pool, json_t *val)
return true; return true;
} }
static void __suspend_stratum(struct pool *pool)
{
clear_sockbuf(pool);
pool->stratum_active = pool->stratum_notify = false;
if (pool->sock)
CLOSESOCKET(pool->sock);
pool->sock = 0;
}
static bool parse_reconnect(struct pool *pool, json_t *val) static bool parse_reconnect(struct pool *pool, json_t *val)
{ {
char *sockaddr_url, *stratum_port, *tmp;
char *url, *port, address[256]; char *url, *port, address[256];
memset(address, 0, 255); memset(address, 0, 255);
@ -1676,13 +1686,22 @@ static bool parse_reconnect(struct pool *pool, json_t *val)
sprintf(address, "%s:%s", url, port); sprintf(address, "%s:%s", url, port);
if (!extract_sockaddr(address, &pool->sockaddr_url, &pool->stratum_port)) if (!extract_sockaddr(address, &sockaddr_url, &stratum_port))
return false; return false;
pool->stratum_url = pool->sockaddr_url;
applog(LOG_NOTICE, "Reconnect requested from %s to %s", pool->poolname, address); applog(LOG_NOTICE, "Reconnect requested from %s to %s", pool->poolname, address);
mutex_lock(&pool->stratum_lock);
__suspend_stratum(pool);
tmp = pool->sockaddr_url;
pool->sockaddr_url = sockaddr_url;
pool->stratum_url = pool->sockaddr_url;
free(tmp);
tmp = pool->stratum_port;
pool->stratum_port = stratum_port;
free(tmp);
mutex_unlock(&pool->stratum_lock);
if (!restart_stratum(pool)) if (!restart_stratum(pool))
return false; return false;
@ -2268,14 +2287,10 @@ out:
void suspend_stratum(struct pool *pool) void suspend_stratum(struct pool *pool)
{ {
clear_sockbuf(pool);
applog(LOG_INFO, "Closing socket for stratum %s", pool->poolname); applog(LOG_INFO, "Closing socket for stratum %s", pool->poolname);
mutex_lock(&pool->stratum_lock); mutex_lock(&pool->stratum_lock);
pool->stratum_active = pool->stratum_notify = false; __suspend_stratum(pool);
if (pool->sock)
CLOSESOCKET(pool->sock);
pool->sock = 0;
mutex_unlock(&pool->stratum_lock); mutex_unlock(&pool->stratum_lock);
} }