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

Use existing socket macros and close the socket on failure in init stratum.

Browse Source
This commit is contained in:
Con Kolivas 2012-09-26 15:40:26 +10:00
parent a1b17229b8
commit c0de671c4f
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
util.c
View File

@ -852,7 +852,7 @@ static bool sock_send(int sock, char *s, ssize_t len)
while (len > 0 ) { while (len > 0 ) {
sent = send(sock, s + sent, len, 0); sent = send(sock, s + sent, len, 0);
if (sent < 1) if (SOCKETFAIL(sent))
return false; return false;
len -= sent; len -= sent;
} }
@ -867,8 +867,9 @@ bool initiate_stratum(struct pool *pool)
{ {
json_t *val, *res_val, *err_val; json_t *val, *res_val, *err_val;
struct timeval timeout; struct timeval timeout;
char *s, *ret = NULL; char *s, *sret = NULL;
json_error_t err; json_error_t err;
bool ret = false;
ssize_t len; ssize_t len;
fd_set rd; fd_set rd;
@ -880,12 +881,12 @@ bool initiate_stratum(struct pool *pool)
quit(1, "Failed to create pool socket in initiate_stratum"); quit(1, "Failed to create pool socket in initiate_stratum");
if (SOCKETFAIL(connect(pool->sock, (struct sockaddr *)pool->server, sizeof(struct sockaddr)))) { if (SOCKETFAIL(connect(pool->sock, (struct sockaddr *)pool->server, sizeof(struct sockaddr)))) {
applog(LOG_DEBUG, "Failed to connect socket to pool"); applog(LOG_DEBUG, "Failed to connect socket to pool");
return false; goto out;
} }
if (!sock_send(pool->sock, s, strlen(s))) { if (!sock_send(pool->sock, s, strlen(s))) {
applog(LOG_DEBUG, "Failed to send s in initiate_stratum"); applog(LOG_DEBUG, "Failed to send s in initiate_stratum");
return false; goto out;
} }
/* Use select to timeout instead of waiting forever for a response */ /* Use select to timeout instead of waiting forever for a response */
@ -894,27 +895,28 @@ bool initiate_stratum(struct pool *pool)
timeout.tv_sec = 60; timeout.tv_sec = 60;
if (select(pool->sock + 1, &rd, NULL, NULL, &timeout) < 1) { if (select(pool->sock + 1, &rd, NULL, NULL, &timeout) < 1) {
applog(LOG_DEBUG, "Timed out waiting for response in initiate_stratum"); applog(LOG_DEBUG, "Timed out waiting for response in initiate_stratum");
return false; goto out;
} }
if (recv(pool->sock, s, RECVSIZE, MSG_PEEK | MSG_DONTWAIT) < 1) { if (SOCKETFAIL(recv(pool->sock, s, RECVSIZE, MSG_PEEK | MSG_DONTWAIT))) {
applog(LOG_DEBUG, "Failed to recv sock in initiate_stratum"); applog(LOG_DEBUG, "Failed to recv sock in initiate_stratum");
return false; goto out;
} }
ret = strtok(s, "\n"); sret = strtok(s, "\n");
if (!ret) { if (!sret) {
applog(LOG_DEBUG, "Failed to parse a \\n terminated string in initiate_stratum"); applog(LOG_DEBUG, "Failed to parse a \\n terminated string in initiate_stratum");
return false; goto out;
} }
len = strlen(ret); /* We know how much data is in the buffer so this read should not fail */
len = strlen(sret);
read(pool->sock, s, len); read(pool->sock, s, len);
val = JSON_LOADS(s, &err); val = JSON_LOADS(s, &err);
if (!val) { if (!val) {
applog(LOG_DEBUG, "JSON decode failed(%d): %s", err.line, err.text); applog(LOG_DEBUG, "JSON decode failed(%d): %s", err.line, err.text);
return false; goto out;
} }
res_val = json_object_get(val, "result"); res_val = json_object_get(val, "result");
@ -933,8 +935,13 @@ bool initiate_stratum(struct pool *pool)
free(ss); free(ss);
return false; goto out;
} }
return true; ret = true;
out:
if (!ret)
CLOSESOCKET(pool->sock);
return ret;
} }