Merge commit '93deb26' into bfgminer

miner.c

@@ -4519,6 +4519,42 @@ void maybe_local_submit(const struct work *work)
 #endif
 }
 
+static
+json_t *extract_reject_reason_j(json_t * const val, json_t *res, json_t * const err, const struct work * const work)
+{
+	if (json_is_string(res))
+		return res;
+	if ( (res = json_object_get(val, "reject-reason")) )
+		return res;
+	if (work->stratum && err && json_is_array(err) && json_array_size(err) >= 2 && (res = json_array_get(err, 1)) && json_is_string(res))
+		return res;
+	return NULL;
+}
+
+static
+const char *extract_reject_reason(json_t * const val, json_t *res, json_t * const err, const struct work * const work)
+{
+	json_t * const j = extract_reject_reason_j(val, res, err, work);
+	return j ? json_string_value(j) : NULL;
+}
+
+static
+int put_in_parens(char * const buf, const size_t bufsz, const char * const s)
+{
+	if (!s)
+	{
+		if (bufsz)
+			buf[0] = '\0';
+		return 0;
+	}
+	
+	int p = snprintf(buf, bufsz, " (%s", s);
+	if (p >= bufsz - 1)
+		p = bufsz - 2;
+	strcpy(&buf[p], ")");
+	return p + 1;
+}
+
 /* Theoretically threads could race when modifying accepted and
  * rejected values but the chance of two submits completing at the
  * same time is zero so there is no point adding extra locking */
@@ -4582,6 +4618,15 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
 
 			test_work_current(&fakework);
 		}
+	}
+	else
+	if (!hash_target_check(work->hash, work->target))
+	{
+		// This was submitted despite failing the proper target
+		// Quietly ignore the reject
+		char reason[32];
+		put_in_parens(reason, sizeof(reason), extract_reject_reason(val, res, err, work));
+		applog(LOG_DEBUG, "Share above target rejected%s by pool %u as expected, ignoring", reason, pool->pool_no);
 	} else {
 		mutex_lock(&stats_lock);
 		cgpu->rejected++;
@@ -4595,38 +4640,13 @@ share_result(json_t *val, json_t *res, json_t *err, const struct work *work,
 
 		applog(LOG_DEBUG, "PROOF OF WORK RESULT: false (booooo)");
 		if (!QUIET) {
-			char where[20];
 			char disposition[36] = "reject";
 			char reason[32];
 
-			strcpy(reason, "");
-			if (total_pools > 1)
-				snprintf(where, sizeof(where), "pool %d", work->pool->pool_no);
-			else
-				strcpy(where, "");
-
-			if (!json_is_string(res))
-				res = json_object_get(val, "reject-reason");
-			if (res) {
-				const char *reasontmp = json_string_value(res);
-
-				size_t reasonLen = strlen(reasontmp);
-				if (reasonLen > 28)
-					reasonLen = 28;
-				reason[0] = ' '; reason[1] = '(';
-				memcpy(2 + reason, reasontmp, reasonLen);
-				reason[reasonLen + 2] = ')'; reason[reasonLen + 3] = '\0';
-				memcpy(disposition + 7, reasontmp, reasonLen);
-				disposition[6] = ':'; disposition[reasonLen + 7] = '\0';
-			} else if (work->stratum && err && json_is_array(err)) {
-				json_t *reason_val = json_array_get(err, 1);
-				char *reason_str;
-
-				if (reason_val && json_is_string(reason_val)) {
-					reason_str = (char *)json_string_value(reason_val);
-					snprintf(reason, 31, " (%s)", reason_str);
-				}
-			}
+			const char *reasontmp = extract_reject_reason(val, res, err, work);
+			int n = put_in_parens(reason, sizeof(reason), reasontmp);
+			if (reason[0])
+				snprintf(&disposition[6], sizeof(disposition) - 6, ":%.*s", n - 3, &reason[2]);
 
 			share_result_msg(work, "Rejected", reason, resubmit, worktime);
 			sharelog(disposition, work);