summaryrefslogtreecommitdiffstats
path: root/xmrstak/net
diff options
context:
space:
mode:
Diffstat (limited to 'xmrstak/net')
-rw-r--r--xmrstak/net/jpsock.cpp20
-rw-r--r--xmrstak/net/jpsock.hpp8
-rw-r--r--xmrstak/net/msgstruct.hpp8
-rw-r--r--xmrstak/net/socket.cpp2
4 files changed, 19 insertions, 19 deletions
diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp
index 144bad3..f9217c5 100644
--- a/xmrstak/net/jpsock.cpp
+++ b/xmrstak/net/jpsock.cpp
@@ -334,7 +334,7 @@ bool jpsock::process_line(char* line, size_t len)
mt = GetObjectMember(prv->jsonDoc, "error");
const char* sError = nullptr;
- size_t iErrorLn = 0;
+ size_t iErrorLen = 0;
if (mt == nullptr || mt->IsNull())
{
/* If there was no error we need a result */
@@ -351,7 +351,7 @@ bool jpsock::process_line(char* line, size_t len)
if(msg == nullptr || !msg->IsString())
return set_socket_error("PARSE error: Protocol error 6");
- iErrorLn = msg->GetStringLength();
+ iErrorLen = msg->GetStringLength();
sError = msg->GetString();
}
@@ -369,7 +369,7 @@ bool jpsock::process_line(char* line, size_t len)
if(sError != nullptr)
{
prv->oCallRsp.pCallData = nullptr;
- prv->oCallRsp.sCallErr.assign(sError, iErrorLn);
+ prv->oCallRsp.sCallErr.assign(sError, iErrorLen);
call_error = true;
}
else
@@ -402,15 +402,15 @@ bool jpsock::process_pool_job(const opq_json_val* params)
if (jobid->GetStringLength() >= sizeof(pool_job::sJobID)) // Note >=
return set_socket_error("PARSE error: Job error 3");
- uint32_t iWorkLn = blob->GetStringLength() / 2;
- if (iWorkLn > sizeof(pool_job::bWorkBlob))
+ uint32_t iWorkLen = blob->GetStringLength() / 2;
+ if (iWorkLen > sizeof(pool_job::bWorkBlob))
return set_socket_error("PARSE error: Invalid job length. Are you sure you are mining the correct coin?");
pool_job oPoolJob;
- if (!hex2bin(blob->GetString(), iWorkLn * 2, oPoolJob.bWorkBlob))
+ if (!hex2bin(blob->GetString(), iWorkLen * 2, oPoolJob.bWorkBlob))
return set_socket_error("PARSE error: Job error 4");
- oPoolJob.iWorkLen = iWorkLn;
+ oPoolJob.iWorkLen = iWorkLen;
memset(oPoolJob.sJobID, 0, sizeof(pool_job::sJobID));
memcpy(oPoolJob.sJobID, jobid->GetString(), jobid->GetStringLength()); //Bounds checking at proto error 3
@@ -423,7 +423,7 @@ bool jpsock::process_pool_job(const opq_json_val* params)
if(!hex2bin(sTempStr, 8, (unsigned char*)&iTempInt) || iTempInt == 0)
return set_socket_error("PARSE error: Invalid target");
-
+
oPoolJob.iTarget = t32_to_t64(iTempInt);
}
else if(target_slen <= 16)
@@ -589,7 +589,7 @@ bool jpsock::cmd_login()
for(size_t i=0; i < ext->Size(); i++)
{
const Value& jextname = ext->GetArray()[i];
-
+
if(!jextname.IsString())
continue;
@@ -702,7 +702,7 @@ bool jpsock::get_current_job(pool_job& job)
bool jpsock::get_pool_motd(std::string& strin)
{
- if(!ext_motd)
+ if(!ext_motd)
return false;
std::unique_lock<std::mutex> lck(motd_mutex);
diff --git a/xmrstak/net/jpsock.hpp b/xmrstak/net/jpsock.hpp
index 2ddeeee..3afcc9b 100644
--- a/xmrstak/net/jpsock.hpp
+++ b/xmrstak/net/jpsock.hpp
@@ -15,7 +15,7 @@
- Parsing or connection error
Those are fatal errors (we drop the connection if we encounter them).
After they are constructed from const char* strings from various places.
- (can be from read-only mem), we passs them in an exectutor message
+ (can be from read-only mem), we pass them in an executor message
once the recv thread expires.
- Call error
This error happens when the "server says no". Usually because the job was
@@ -40,9 +40,9 @@ public:
static bool hex2bin(const char* in, unsigned int len, unsigned char* out);
static void bin2hex(const unsigned char* in, unsigned int len, char* out);
- inline double get_pool_weight(bool gross_weight)
- {
- double ret = pool_weight;
+ inline double get_pool_weight(bool gross_weight)
+ {
+ double ret = pool_weight;
if(gross_weight && bRunning)
ret += 10.0;
if(gross_weight && bLoggedIn)
diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp
index e401f59..20092fe 100644
--- a/xmrstak/net/msgstruct.hpp
+++ b/xmrstak/net/msgstruct.hpp
@@ -5,7 +5,7 @@
#include <assert.h>
// Structures that we use to pass info between threads constructors are here just to make
-// the stack allocation take up less space, heap is a shared resouce that needs locks too of course
+// the stack allocation take up less space, heap is a shared resource that needs locks too of course
struct pool_job
{
@@ -72,15 +72,15 @@ struct gpu_res_err
};
enum ex_event_name { EV_INVALID_VAL, EV_SOCK_READY, EV_SOCK_ERROR, EV_GPU_RES_ERROR,
- EV_POOL_HAVE_JOB, EV_MINER_HAVE_RESULT, EV_PERF_TICK, EV_EVAL_POOL_CHOICE,
- EV_USR_HASHRATE, EV_USR_RESULTS, EV_USR_CONNSTAT, EV_HASHRATE_LOOP,
+ EV_POOL_HAVE_JOB, EV_MINER_HAVE_RESULT, EV_PERF_TICK, EV_EVAL_POOL_CHOICE,
+ EV_USR_HASHRATE, EV_USR_RESULTS, EV_USR_CONNSTAT, EV_HASHRATE_LOOP,
EV_HTML_HASHRATE, EV_HTML_RESULTS, EV_HTML_CONNSTAT, EV_HTML_JSON };
/*
This is how I learned to stop worrying and love c++11 =).
Ghosts of endless heap allocations have finally been exorcised. Thanks
to the nifty magic of move semantics, string will only be allocated
- once on the heap. Considering that it makes a jorney across stack,
+ once on the heap. Considering that it makes a journey across stack,
heap alloced queue, to another stack before being finally processed
I think it is kind of nifty, don't you?
Also note that for non-arg events we only copy two qwords
diff --git a/xmrstak/net/socket.cpp b/xmrstak/net/socket.cpp
index 9bc608f..6fcb454 100644
--- a/xmrstak/net/socket.cpp
+++ b/xmrstak/net/socket.cpp
@@ -339,7 +339,7 @@ bool tls_socket::connect()
{
if(!pCallback->is_dev_pool())
{
- printer::inst()->print_msg(L0, "FINGERPRINT FAILED CHECK [%s] %.*s was given, %s was configured",
+ printer::inst()->print_msg(L0, "FINGERPRINT FAILED CHECK [%s] %.*s was given, %s was configured",
pCallback->get_pool_addr(), (int)b64_len, b64_md, conf_md);
}
OpenPOWER on IntegriCloud