borked responses..

ethminer/MinerAux.h

@@ -886,22 +886,25 @@ private:
 		EthStratumClient client(&f, host, port, user, pass);
 
 		f.setSealers(sealers);
+		/*
 		if (_m == MinerType::CPU)
 			f.start("cpu");
 		else if (_m == MinerType::CL)
 			f.start("opencl");
 		else if (_m == MinerType::CUDA)
 			f.start("cuda");
-
+*/
 		bool completed = false;
 		EthashProofOfWork::Solution solution;
+		/*
 		f.onSolutionFound([&](EthashProofOfWork::Solution sol)
 		{
 			solution = sol;
 			minelog << "Solution!";
-			return client.submit(solution);
+			client.submit(solution);
+			return false;
 		});
-
+		*/
 		while (client.isRunning())
 		{
 			auto mp = f.miningProgress();

libstratum/EthStratumClient.cpp

@@ -103,13 +103,39 @@ void EthStratumClient::readResponse(const boost::system::error_code& ec, std::si
 		std::istream is(&m_responseBuffer);
 		std::string response;
 		getline(is, response);
-		//cnote << response;
+		cnote << response;
+
+		if (response.back() != '}') {
+			m_response = response;
+		}
+		if (response.front() != '{') {
+			response = m_response + response;
+		}
 
 		Json::Value responseObject;
 		Json::Reader reader;
 		if (reader.parse(response.c_str(), responseObject))
 		{
-			if (responseObject.isMember("id")) {
+			processReponse(responseObject);
+			m_response = response;
+		}
+		else
+		{
+			cwarn << "Parse response failed: " << reader.getFormattedErrorMessages();
+		}
+	}
+	else
+	{
+		cwarn << "Read response failed: " << ec.message();
+	}
+
+	async_read_until(m_socket, m_responseBuffer, "\n",
+		boost::bind(&EthStratumClient::readResponse, this,
+		boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
+}
+
+void EthStratumClient::processReponse(Json::Value& responseObject)
+{
 	Json::Value error = responseObject.get("error", NULL);
 	if (error.isArray())
 	{
@@ -140,7 +166,7 @@ void EthStratumClient::readResponse(const boost::system::error_code& ec, std::si
 		cnote << "Authorized worker " << m_user;
 		break;
 	case 4:
-					cnote << response;
+		cnote << m_response;
 	default:
 		string method = responseObject.get("method", "").asString();
 		if (method == "mining.notify")
@@ -194,20 +220,6 @@ void EthStratumClient::readResponse(const boost::system::error_code& ec, std::si
 		}
 		break;
 	}
-			}
-			async_read_until(m_socket, m_responseBuffer, "\n",
-				boost::bind(&EthStratumClient::readResponse, this,
-				boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred));
-		}
-		else
-		{
-			cwarn << "Parse response failed: " << reader.getFormattedErrorMessages();
-		}
-	}
-	else
-	{
-		cwarn << "Read response failed: " << ec.message();
-	}
 }
 
 bool EthStratumClient::submit(EthashProofOfWork::Solution solution) {

libstratum/EthStratumClient.h

@@ -34,8 +34,7 @@ private:
 	
 	void handleResponse(const boost::system::error_code& ec);
 	void readResponse(const boost::system::error_code& ec, std::size_t bytes_transferred);
-
+	void processReponse(Json::Value& responseObject);
-	
 	
 	string m_host;
 	string m_port;
@@ -45,6 +44,8 @@ private:
 	bool   m_running;
 	bool   m_precompute;
 
+	string m_response;
+
 	GenericFarm<EthashProofOfWork> * p_farm;
 	EthashProofOfWork::WorkPackage m_current;
 	string m_job;