From 8130f656b6899c9a8ffc1741a0609d306c2bb449 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 14 Nov 2017 15:52:18 +0000 Subject: jpsock changes --- xmrstak/jconf.cpp | 2 +- xmrstak/net/jpsock.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++++----- xmrstak/net/jpsock.hpp | 13 ++++++++- 3 files changed, 78 insertions(+), 9 deletions(-) (limited to 'xmrstak') diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index 0418842..4eb3a70 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -193,7 +193,7 @@ const std::string jconf::GetCurrency() bool jconf::IsCurrencyMonero() { - if(xmrstak::strcmp_i(::jconf::inst()->GetCurrency(), "monero")) + if(xmrstak::strcmp_i(GetCurrency(), "monero")) { return true; } diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp index cb586d2..cc88aa8 100644 --- a/xmrstak/net/jpsock.cpp +++ b/xmrstak/net/jpsock.cpp @@ -23,6 +23,7 @@ #include #include +#include #include "jpsock.hpp" #include "socks.hpp" @@ -33,9 +34,6 @@ #include "xmrstak/misc/jext.hpp" #include "xmrstak/version.hpp" - -#define AGENTID_STR XMR_STAK_NAME "/" XMR_STAK_VERSION - using namespace rapidjson; struct jpsock::call_rsp @@ -366,10 +364,11 @@ bool jpsock::process_pool_job(const opq_json_val* params) if (!params->val->IsObject()) return set_socket_error("PARSE error: Job error 1"); - const Value * blob, *jobid, *target; + const Value *blob, *jobid, *target, *motd; jobid = GetObjectMember(*params->val, "job_id"); blob = GetObjectMember(*params->val, "blob"); target = GetObjectMember(*params->val, "target"); + motd = GetObjectMember(*params->val, "motd"); if (jobid == nullptr || blob == nullptr || target == nullptr || !jobid->IsString() || !blob->IsString() || !target->IsString()) @@ -415,6 +414,12 @@ bool jpsock::process_pool_job(const opq_json_val* params) else return set_socket_error("PARSE error: Job error 5"); + if(motd != nullptr && motd->IsString()) + { + std::unique_lock(motd_mutex); + pool_motd.assign(motd->GetString()); + } + iJobDiff = t64_to_diff(oPoolJob.iTarget); executor::inst()->push_event(ex_event(oPoolJob, pool_id)); @@ -426,6 +431,7 @@ bool jpsock::process_pool_job(const opq_json_val* params) bool jpsock::connect(std::string& sConnectError) { + ext_algo = ext_backend = ext_hashcount = ext_motd = false; bHaveSocketError = false; sSocketError.clear(); iJobDiff = 0; @@ -527,6 +533,7 @@ bool jpsock::cmd_login() const Value* id = GetObjectMember(*oResult.val, "id"); const Value* job = GetObjectMember(*oResult.val, "job"); + const Value* ext = GetObjectMember(*oResult.val, "extensions"); if (id == nullptr || job == nullptr || !id->IsString()) { @@ -545,6 +552,29 @@ bool jpsock::cmd_login() memset(sMinerId, 0, sizeof(sMinerId)); memcpy(sMinerId, id->GetString(), id->GetStringLength()); + if(ext != nullptr && ext->IsArray()) + { + for(size_t i=0; i < ext->Size(); i++) + { + const Value& jextname = ext->GetArray()[i]; + + if(!jextname.IsString()) + continue; + + std::string tmp(jextname.GetString()); + std::transform(tmp.begin(), tmp.end(), tmp.begin(), ::tolower); + + if(tmp.compare("algo")) + ext_algo = true; + else if(tmp.compare("backend")) + ext_backend = true; + else if(tmp.compare("hashcount")) + ext_hashcount = true; + else if(tmp.compare("motd")) + ext_motd = true; + } + } + opq_json_val v(job); if(!process_pool_job(&v)) { @@ -558,20 +588,33 @@ bool jpsock::cmd_login() return true; } -bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bResult) +bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bResult, xmrstak::iBackend* bend, bool algo_full_cn) { char cmd_buffer[1024]; char sNonce[9]; char sResult[65]; + /*Extensions*/ + char sAlgo[64] = {0}; + char sBackend[64] = {0}; + char sHashcount[64] = {0}; + + if(ext_backend) + snprintf(sBackend, sizeof(sBackend), ",\"backend\":\"%s\"", ""); + + if(ext_hashcount) + snprintf(sHashcount, sizeof(sHashcount), ",\"hashcount\":\"%llu\"", int_port(bend->iHashCount.load(std::memory_order_relaxed))); + if(ext_algo) + snprintf(sAlgo, sizeof(sAlgo), ",\"algo\":\"%s\"", algo_full_cn ? "cryptonight" : "cryptonight-lite"); + bin2hex((unsigned char*)&iNonce, 4, sNonce); sNonce[8] = '\0'; bin2hex(bResult, 32, sResult); sResult[64] = '\0'; - snprintf(cmd_buffer, sizeof(cmd_buffer), "{\"method\":\"submit\",\"params\":{\"id\":\"%s\",\"job_id\":\"%s\",\"nonce\":\"%s\",\"result\":\"%s\"},\"id\":1}\n", - sMinerId, sJobId, sNonce, sResult); + snprintf(cmd_buffer, sizeof(cmd_buffer), "{\"method\":\"submit\",\"params\":{\"id\":\"%s\",\"job_id\":\"%s\",\"nonce\":\"%s\",\"result\":\"%s\"%s%s%s},\"id\":1}\n", + sMinerId, sJobId, sNonce, sResult, sBackend, sHashcount, sAlgo); opq_json_val oResult(nullptr); return cmd_ret_wait(cmd_buffer, oResult); @@ -594,6 +637,21 @@ bool jpsock::get_current_job(pool_job& job) return true; } +bool jpsock::get_pool_motd(std::string& strin) +{ + if(!ext_motd) + return false; + + std::unique_lock(motd_mutex); + if(pool_motd.size() > 0) + { + strin.assign(pool_motd); + return true; + } + + return false; +} + inline unsigned char hf_hex2bin(char c, bool &err) { if (c >= '0' && c <= '9') diff --git a/xmrstak/net/jpsock.hpp b/xmrstak/net/jpsock.hpp index db8cd0e..9d276b7 100644 --- a/xmrstak/net/jpsock.hpp +++ b/xmrstak/net/jpsock.hpp @@ -1,5 +1,6 @@ #pragma once +#include "xmrstak/backend/iBackend.hpp" #include "msgstruct.hpp" #include @@ -33,7 +34,7 @@ public: void disconnect(bool quiet = false); bool cmd_login(); - bool cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bResult); + bool cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bResult, xmrstak::iBackend* bend, bool algo_full_cn); static bool hex2bin(const char* in, unsigned int len, unsigned char* out); static void bin2hex(const unsigned char* in, unsigned int len, char* out); @@ -58,6 +59,8 @@ public: inline const char* get_tls_fp() { return tls_fp.c_str(); } inline bool is_nicehash() { return nicehash; } + bool get_pool_motd(std::string& strin); + std::string&& get_call_error(); bool have_sock_error() { return bHaveSocketError; } @@ -87,6 +90,14 @@ private: bool pool; bool nicehash; + bool ext_algo = false; + bool ext_backend = false; + bool ext_hashcount = false; + bool ext_motd = false; + + std::string pool_motd; + std::mutex motd_mutex; + size_t connect_time = 0; std::atomic connect_attempts; std::atomic disconnect_time; -- cgit v1.1 From 8f9eb8ef2e10872344ecf4281c9a0a0946b00e4c Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 14 Nov 2017 16:12:18 +0000 Subject: change getName to static lc string (sorry psc) --- xmrstak/backend/iBackend.hpp | 27 +++++++++++++++++++-------- xmrstak/misc/executor.cpp | 5 ++++- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'xmrstak') diff --git a/xmrstak/backend/iBackend.hpp b/xmrstak/backend/iBackend.hpp index dbfbc99..3d2115a 100644 --- a/xmrstak/backend/iBackend.hpp +++ b/xmrstak/backend/iBackend.hpp @@ -8,22 +8,33 @@ #include #include +template +constexpr std::size_t countof(T const (&)[N]) noexcept +{ + return N; +} + namespace xmrstak { struct iBackend { - enum BackendType : uint32_t { UNKNOWN = 0, CPU = 1u, AMD = 2u, NVIDIA = 3u }; + enum BackendType : uint32_t { UNKNOWN = 0u, CPU = 1u, AMD = 2u, NVIDIA = 3u }; - static std::string getName(const BackendType type) + static const char* getName(const BackendType type) { - std::vector backendNames = { - "UNKNOWN", - "CPU", - "AMD", - "NVIDIA" + const char* backendNames[] = { + "unknown", + "cpu", + "amd", + "nvidia" }; - return backendNames[static_cast(type)]; + + uint32_t i = static_cast(type); + if(i >= countof(backendNames)) + i = 0; + + return backendNames[i]; } std::atomic iHashCount; diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 454d1cf..07ab759 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -641,7 +641,10 @@ void executor::hashrate_report(std::string& out) size_t i; auto bType = static_cast(b); - out.append("HASHRATE REPORT - ").append(xmrstak::iBackend::getName(bType)).append("\n"); + std::string name(xmrstak::iBackend::getName(bType)); + std::transform(name.begin(), name.end(), name.begin(), ::toupper); + + out.append("HASHRATE REPORT - ").append(name).append("\n"); out.append("| ID | 10s | 60s | 15m |"); if(nthd != 1) out.append(" ID | 10s | 60s | 15m |\n"); -- cgit v1.1 From 608139ccde751eb053b54e8d41899aec9208017d Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 14 Nov 2017 16:42:12 +0000 Subject: Pass threadno up the food chain --- xmrstak/backend/amd/minethd.cpp | 2 +- xmrstak/backend/cpu/minethd.cpp | 8 ++++---- xmrstak/backend/nvidia/minethd.cpp | 2 +- xmrstak/misc/executor.cpp | 5 +++-- xmrstak/net/jpsock.cpp | 2 +- xmrstak/net/msgstruct.hpp | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'xmrstak') diff --git a/xmrstak/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp index 912587b..ce62565 100644 --- a/xmrstak/backend/amd/minethd.cpp +++ b/xmrstak/backend/amd/minethd.cpp @@ -237,7 +237,7 @@ void minethd::work_main() hash_fun(bWorkBlob, oWork.iWorkSize, bResult, cpu_ctx); if ( (*((uint64_t*)(bResult + 24))) < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, results[i], bResult), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, results[i], bResult, iThreadNo), oWork.iPoolId)); else executor::inst()->log_result_error("AMD Invalid Result"); } diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp index 8b913cf..8b0eec1 100644 --- a/xmrstak/backend/cpu/minethd.cpp +++ b/xmrstak/backend/cpu/minethd.cpp @@ -354,7 +354,8 @@ void minethd::work_main() piHashVal = (uint64_t*)(result.bResult + 24); piNonce = (uint32_t*)(oWork.bWorkBlob + 39); globalStates::inst().inst().iConsumeCnt++; - + result.iThreadId = iThreadNo; + while (bQuit == 0) { if (oWork.bStall) @@ -535,17 +536,16 @@ void minethd::double_work_main() globalStates::inst().calc_start_nonce(iNonce, oWork.bNiceHash, nonce_chunk); } - *piNonce0 = ++iNonce; *piNonce1 = ++iNonce; hash_fun(bDoubleWorkBlob, oWork.iWorkSize, bDoubleHashOut, ctx0, ctx1); if (*piHashVal0 < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce-1, bDoubleHashOut), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce-1, bDoubleHashOut, iThreadNo), oWork.iPoolId)); if (*piHashVal1 < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce, bDoubleHashOut + 32), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce, bDoubleHashOut + 32, iThreadNo), oWork.iPoolId)); std::this_thread::yield(); } diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index a1cafa7..e15fc56 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -279,7 +279,7 @@ void minethd::work_main() hash_fun(bWorkBlob, oWork.iWorkSize, bResult, cpu_ctx); if ( (*((uint64_t*)(bResult + 24))) < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, foundNonce[i], bResult), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, foundNonce[i], bResult, iThreadNo), oWork.iPoolId)); else executor::inst()->log_result_error("NVIDIA Invalid Result"); } diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 07ab759..507d0de 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -400,12 +400,13 @@ void executor::on_pool_have_job(size_t pool_id, pool_job& oPoolJob) void executor::on_miner_result(size_t pool_id, job_result& oResult) { jpsock* pool = pick_pool_by_id(pool_id); + bool is_monero = jconf::inst()->IsCurrencyMonero(); if(pool->is_dev_pool()) { //Ignore errors silently if(pool->is_running() && pool->is_logged_in()) - pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult); + pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult, pvThreads->at(oResult.iThreadId), is_monero); return; } @@ -418,7 +419,7 @@ void executor::on_miner_result(size_t pool_id, job_result& oResult) using namespace std::chrono; size_t t_start = time_point_cast(high_resolution_clock::now()).time_since_epoch().count(); - bool bResult = pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult); + bool bResult = pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult, pvThreads->at(oResult.iThreadId), is_monero); size_t t_len = time_point_cast(high_resolution_clock::now()).time_since_epoch().count() - t_start; if(t_len > 0xFFFF) diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp index cc88aa8..381cbce 100644 --- a/xmrstak/net/jpsock.cpp +++ b/xmrstak/net/jpsock.cpp @@ -599,7 +599,7 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes char sHashcount[64] = {0}; if(ext_backend) - snprintf(sBackend, sizeof(sBackend), ",\"backend\":\"%s\"", ""); + snprintf(sBackend, sizeof(sBackend), ",\"backend\":\"%s\"", xmrstak::iBackend::getName(bend->backendType)); if(ext_hashcount) snprintf(sHashcount, sizeof(sHashcount), ",\"hashcount\":\"%llu\"", int_port(bend->iHashCount.load(std::memory_order_relaxed))); diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp index 01aa76c..305f40b 100644 --- a/xmrstak/net/msgstruct.hpp +++ b/xmrstak/net/msgstruct.hpp @@ -30,9 +30,10 @@ struct job_result uint8_t bResult[32]; char sJobID[64]; uint32_t iNonce; + uint32_t iThreadId; job_result() {} - job_result(const char* sJobID, uint32_t iNonce, const uint8_t* bResult) : iNonce(iNonce) + job_result(const char* sJobID, uint32_t iNonce, const uint8_t* bResult, uint32_t iThreadId) : iNonce(iNonce), iThreadId(iThreadId) { memcpy(this->sJobID, sJobID, sizeof(job_result::sJobID)); memcpy(this->bResult, bResult, sizeof(job_result::bResult)); -- cgit v1.1 From 41eb0ad64e6d003368ccf8f3212f190a829aae10 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 14 Nov 2017 20:22:31 +0000 Subject: Print motd on console and web ui --- xmrstak/config.tpl | 3 ++ xmrstak/http/webdesign.cpp | 23 +++++++++++- xmrstak/http/webdesign.hpp | 4 ++ xmrstak/jconf.cpp | 8 +++- xmrstak/jconf.hpp | 1 + xmrstak/misc/executor.cpp | 93 +++++++++++++++++++++++++++++++++++++++++++++- xmrstak/misc/executor.hpp | 4 ++ xmrstak/net/jpsock.cpp | 21 +++++++---- 8 files changed, 146 insertions(+), 11 deletions(-) (limited to 'xmrstak') diff --git a/xmrstak/config.tpl b/xmrstak/config.tpl index c3ea061..ae97190 100644 --- a/xmrstak/config.tpl +++ b/xmrstak/config.tpl @@ -51,8 +51,11 @@ POOLCONF], * 2 - All of level 1, and new job (block) event if the difficulty is different from the last job * 3 - All of level 1, and new job (block) event in all cases, result submission event. * 4 - All of level 3, and automatic hashrate report printing + * + * print_motd - Display messages from your pool operator in the hashrate result. */ "verbose_level" : 3, +"print_motd" : true, /* * Automatic hashrate report diff --git a/xmrstak/http/webdesign.cpp b/xmrstak/http/webdesign.cpp index 3c33e1f..963c080 100644 --- a/xmrstak/http/webdesign.cpp +++ b/xmrstak/http/webdesign.cpp @@ -1,6 +1,6 @@ #include -extern const char sHtmlCssEtag [] = "00000008"; +extern const char sHtmlCssEtag [] = "00000009"; extern const char sHtmlCssFile [] = "body {" "font-family: Tahoma, Arial, sans-serif;" @@ -92,6 +92,23 @@ extern const char sHtmlCssFile [] = ".flex-item {" "width: 33%;" "margin: 3px;" + "}" + + ".motd-box {" + "background-color: #ccc;" + "padding: 0px 10px 5px 10px;" + "margin-bottom: 10px;" + "}" + + ".motd-head {" + "border-bottom: 1px solid #000;" + "margin-bottom: 0.5em;" + "padding: 0.5em 0em;" + "font-weight: bold;" + "}" + + ".motd-body {" + "overflow: hidden;" "}"; size_t sHtmlCssSize = sizeof(sHtmlCssFile) - 1; @@ -130,6 +147,10 @@ extern const char sHtmlCommonHeader [] = "" "

%s

"; +extern const char sHtmlMotdBoxStart[] = "
"; +extern const char sHtmlMotdEntry[] = "
Message from %s
%s
"; +extern const char sHtmlMotdBoxEnd[] = "
"; + extern const char sHtmlHashrateBodyHigh [] = "
" "" diff --git a/xmrstak/http/webdesign.hpp b/xmrstak/http/webdesign.hpp index 122b5fb..48adfea 100644 --- a/xmrstak/http/webdesign.hpp +++ b/xmrstak/http/webdesign.hpp @@ -12,6 +12,10 @@ extern const char sHttpAuthOpaque[]; extern const char sHtmlCommonHeader[]; +extern const char sHtmlMotdBoxStart[]; +extern const char sHtmlMotdEntry[]; +extern const char sHtmlMotdBoxEnd[]; + extern const char sHtmlHashrateBodyHigh[]; extern const char sHtmlHashrateTableRow[]; extern const char sHtmlHashrateBodyLow[]; diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index 4eb3a70..a9f484f 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -51,7 +51,7 @@ using namespace rapidjson; * This enum needs to match index in oConfigValues, otherwise we will get a runtime error */ enum configEnum { - aPoolList, bTlsSecureAlgo, sCurrency, iCallTimeout, iNetRetry, iGiveUpLimit, iVerboseLevel, iAutohashTime, + aPoolList, bTlsSecureAlgo, sCurrency, iCallTimeout, iNetRetry, iGiveUpLimit, iVerboseLevel, bPrintMotd, iAutohashTime, bFlushStdout, bDaemonMode, sOutputFile, iHttpdPort, sHttpLogin, sHttpPass, bPreferIpv4, bAesOverride, sUseSlowMem }; @@ -71,6 +71,7 @@ configVal oConfigValues[] = { { iNetRetry, "retry_time", kNumberType }, { iGiveUpLimit, "giveup_limit", kNumberType }, { iVerboseLevel, "verbose_level", kNumberType }, + { bPrintMotd, "print_motd", kTrueType }, { iAutohashTime, "h_print_time", kNumberType }, { bFlushStdout, "flush_stdout", kTrueType}, { bDaemonMode, "daemon_mode", kTrueType }, @@ -228,6 +229,11 @@ uint64_t jconf::GetVerboseLevel() return prv->configValues[iVerboseLevel]->GetUint64(); } +bool jconf::PrintMotd() +{ + return prv->configValues[bPrintMotd]->GetBool(); +} + uint64_t jconf::GetAutohashTime() { return prv->configValues[iAutohashTime]->GetUint64(); diff --git a/xmrstak/jconf.hpp b/xmrstak/jconf.hpp index 1bd4d47..131263e 100644 --- a/xmrstak/jconf.hpp +++ b/xmrstak/jconf.hpp @@ -51,6 +51,7 @@ public: bool IsCurrencyMonero(); uint64_t GetVerboseLevel(); + bool PrintMotd(); uint64_t GetAutohashTime(); const char* GetOutputFile(); diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 507d0de..e3602c6 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -620,8 +620,75 @@ inline const char* hps_format(double h, char* buf, size_t l) return " (na)"; } +bool executor::motd_filter_console(std::string& motd) +{ + if(motd.size() > motd_max_length) + return false; + + motd.erase(std::remove_if(motd.begin(), motd.end(), [](int chr)->bool { return !((chr >= 0x20 && chr <= 0x7e) || chr == '\n');}), motd.end()); + return motd.size() > 0; +} + +bool executor::motd_filter_web(std::string& motd) +{ + if(!motd_filter_console(motd)) + return false; + + std::string tmp; + tmp.reserve(motd.size() + 128); + + for(size_t i=0; i < motd.size(); i++) + { + char c = motd[i]; + switch(c) + { + case '&': + tmp.append("&"); + break; + case '"': + tmp.append("""); + break; + case '\'': + tmp.append("'"); + break; + case '<': + tmp.append("<"); + break; + case '>': + tmp.append(">"); + break; + case '\n': + tmp.append("
"); + break; + default: + tmp.append(1, c); + break; + } + } + + motd = std::move(tmp); + return true; +} + void executor::hashrate_report(std::string& out) { + out.reserve(2048 + pvThreads->size() * 64); + + if(jconf::inst()->PrintMotd()) + { + std::string motd; + for(jpsock& pool : pools) + { + motd.empty(); + if(pool.get_pool_motd(motd) && motd_filter_console(motd)) + { + out.append("Message from ").append(pool.get_pool_addr()).append(":\n"); + out.append(motd).append("\n"); + out.append("-----------------------------------------------------\n"); + } + } + } + char num[32]; double fTotal[3] = { 0.0, 0.0, 0.0}; @@ -638,8 +705,6 @@ void executor::hashrate_report(std::string& out) size_t nthd = backEnds.size(); if(nthd != 0) { - out.reserve(256 + nthd * 64); - size_t i; auto bType = static_cast(b); std::string name(xmrstak::iBackend::getName(bType)); @@ -857,6 +922,30 @@ void executor::http_hashrate_report(std::string& out) snprintf(buffer, sizeof(buffer), sHtmlCommonHeader, "Hashrate Report", ver_html, "Hashrate Report"); out.append(buffer); + bool have_motd = false; + if(jconf::inst()->PrintMotd()) + { + std::string motd; + for(jpsock& pool : pools) + { + motd.empty(); + if(pool.get_pool_motd(motd) && motd_filter_web(motd)) + { + if(!have_motd) + { + out.append(sHtmlMotdBoxStart); + have_motd = true; + } + + snprintf(buffer, sizeof(buffer), sHtmlMotdEntry, pool.get_pool_addr(), motd.c_str()); + out.append(buffer); + } + } + } + + if(have_motd) + out.append(sHtmlMotdBoxEnd); + snprintf(buffer, sizeof(buffer), sHtmlHashrateBodyHigh, (unsigned int)nthd + 3); out.append(buffer); diff --git a/xmrstak/misc/executor.hpp b/xmrstak/misc/executor.hpp index 11c8206..27f89c4 100644 --- a/xmrstak/misc/executor.hpp +++ b/xmrstak/misc/executor.hpp @@ -95,6 +95,10 @@ private: void ex_clock_thd(); void pool_connect(jpsock* pool); + constexpr static size_t motd_max_length = 512; + bool motd_filter_console(std::string& motd); + bool motd_filter_web(std::string& motd); + void hashrate_report(std::string& out); void result_report(std::string& out); void connection_report(std::string& out); diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp index 381cbce..5769448 100644 --- a/xmrstak/net/jpsock.cpp +++ b/xmrstak/net/jpsock.cpp @@ -414,10 +414,17 @@ bool jpsock::process_pool_job(const opq_json_val* params) else return set_socket_error("PARSE error: Job error 5"); - if(motd != nullptr && motd->IsString()) + if(motd != nullptr && motd->IsString() && (motd->GetStringLength() & 0x01) == 0) { std::unique_lock(motd_mutex); - pool_motd.assign(motd->GetString()); + if(motd->GetStringLength() > 0) + { + pool_motd.resize(motd->GetStringLength()/2 + 1); + if(!hex2bin(motd->GetString(), motd->GetStringLength(), (unsigned char*)&pool_motd.front())) + pool_motd.clear(); + } + else + pool_motd.clear(); } iJobDiff = t64_to_diff(oPoolJob.iTarget); @@ -564,13 +571,13 @@ bool jpsock::cmd_login() std::string tmp(jextname.GetString()); std::transform(tmp.begin(), tmp.end(), tmp.begin(), ::tolower); - if(tmp.compare("algo")) + if(tmp == "algo") ext_algo = true; - else if(tmp.compare("backend")) + else if(tmp == "backend") ext_backend = true; - else if(tmp.compare("hashcount")) + else if(tmp == "hashcount") ext_hashcount = true; - else if(tmp.compare("motd")) + else if(tmp == "motd") ext_motd = true; } } @@ -602,7 +609,7 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes snprintf(sBackend, sizeof(sBackend), ",\"backend\":\"%s\"", xmrstak::iBackend::getName(bend->backendType)); if(ext_hashcount) - snprintf(sHashcount, sizeof(sHashcount), ",\"hashcount\":\"%llu\"", int_port(bend->iHashCount.load(std::memory_order_relaxed))); + snprintf(sHashcount, sizeof(sHashcount), ",\"hashcount\":%llu", int_port(bend->iHashCount.load(std::memory_order_relaxed))); if(ext_algo) snprintf(sAlgo, sizeof(sAlgo), ",\"algo\":\"%s\"", algo_full_cn ? "cryptonight" : "cryptonight-lite"); -- cgit v1.1