stratum: properly free jobs on disconnect

ccminer.cpp

@@ -2310,10 +2310,9 @@ static void *stratum_thread(void *userdata)
 		if (switchn != pool_switch_count) goto pool_switched;
 
 		if (!stratum_socket_full(&stratum, opt_timeout)) {
-			if (!opt_quiet)
+			if (opt_debug)
 				applog(LOG_WARNING, "Stratum connection timed out");
 			s = NULL;
-			continue;
 		} else
 			s = stratum_recv_line(&stratum);
 
@@ -2322,7 +2321,7 @@ static void *stratum_thread(void *userdata)
 
 		if (!s) {
 			stratum_disconnect(&stratum);
-			applog(LOG_ERR, "Stratum connection interrupted");
+			applog(LOG_WARNING, "Stratum connection interrupted");
 			continue;
 		}
 		if (!stratum_handle_method(&stratum, s))
@@ -2418,8 +2417,12 @@ bool pool_switch(int pooln)
 	struct pool_infos* p = NULL;
 
 	// save prev stratum connection infos (struct)
-	if (prev->type & POOL_STRATUM)
+	if (prev->type & POOL_STRATUM) {
+		// may not be the right moment to free,
+		// to check if required on submit...
+		stratum_free_job(&stratum);
 		prev->stratum = stratum;
+	}
 
 	if (pooln < num_pools) {
 		cur_pooln = pooln;

miner.h

@@ -678,6 +678,7 @@ void stratum_disconnect(struct stratum_ctx *sctx);
 bool stratum_subscribe(struct stratum_ctx *sctx);
 bool stratum_authorize(struct stratum_ctx *sctx, const char *user, const char *pass);
 bool stratum_handle_method(struct stratum_ctx *sctx, const char *s);
+void stratum_free_job(struct stratum_ctx *sctx);
 
 void hashlog_remember_submit(struct work* work, uint32_t nonce);
 void hashlog_remember_scan_range(struct work* work);

util.cpp

@@ -993,6 +993,25 @@ bool stratum_connect(struct stratum_ctx *sctx, const char *url)
 	return true;
 }
 
+void stratum_free_job(struct stratum_ctx *sctx)
+{
+	pthread_mutex_lock(&stratum_work_lock);
+	if (sctx->job.job_id) {
+		free(sctx->job.job_id);
+	}
+	if (sctx->job.merkle_count) {
+		for (int i = 0; i < sctx->job.merkle_count; i++) {
+			free(sctx->job.merkle[i]);
+			sctx->job.merkle[i] = NULL;
+		}
+		free(sctx->job.merkle);
+	}
+	free(sctx->job.coinbase);
+	// note: xnonce2 is not allocated
+	memset(&(sctx->job.job_id), 0, sizeof(struct stratum_job));
+	pthread_mutex_unlock(&stratum_work_lock);
+}
+
 void stratum_disconnect(struct stratum_ctx *sctx)
 {
 	pthread_mutex_lock(&stratum_sock_lock);
@@ -1005,6 +1024,9 @@ void stratum_disconnect(struct stratum_ctx *sctx)
 		// free(sctx->sockbuf);
 		// sctx->sockbuf = NULL;
 	}
+	if (sctx->job.job_id) {
+		stratum_free_job(sctx);
+	}
 	pthread_mutex_unlock(&stratum_sock_lock);
 }