Browse Source

Differentiate clear_sock from clear_sockbuf.

Con Kolivas 13 years ago
parent
commit
1d697dd40d
1 changed files with 10 additions and 3 deletions
  1. 10 3
      util.c

+ 10 - 3
util.c

@@ -956,16 +956,22 @@ bool sock_full(struct pool *pool)
 	return (socket_full(pool, false));
 }
 
+static void clear_sockbuf(struct pool *pool)
+{
+	strcpy(pool->sockbuf, "");
+}
+
 static void clear_sock(struct pool *pool)
 {
 	ssize_t n;
 
 	mutex_lock(&pool->stratum_lock);
-	do
+	do {
 		n = recv(pool->sock, pool->sockbuf, RECVSIZE, 0);
-	while (n > 0);
+	} while (n > 0);
 	mutex_unlock(&pool->stratum_lock);
-	strcpy(pool->sockbuf, "");
+
+	clear_sockbuf(pool);
 }
 
 /* Make sure the pool sockbuf is large enough to cope with any coinbase size
@@ -1501,6 +1507,7 @@ out:
 
 void suspend_stratum(struct pool *pool)
 {
+	clear_sockbuf(pool);
 	applog(LOG_INFO, "Closing socket for stratum pool %d", pool->pool_no);
 	mutex_lock(&pool->stratum_lock);
 	pool->stratum_active = false;