summaryrefslogtreecommitdiffstats
path: root/xmrstak/net
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2017-11-16 15:25:08 +0000
committerGitHub <noreply@github.com>2017-11-16 15:25:08 +0000
commit036ffa887272b0c27197f78a6082b903ace1a344 (patch)
tree2b5dc47b60d3b1d001a0bf4830b7bf47d253190c /xmrstak/net
parent1dc874c542a23c36dd65ea0f5b9cb65e3c3a572a (diff)
parentcabd46f39fdadad7345f9603ccdcf1daf49e1a9c (diff)
downloadxmr-stak-036ffa887272b0c27197f78a6082b903ace1a344.zip
xmr-stak-036ffa887272b0c27197f78a6082b903ace1a344.tar.gz
Merge pull request #126 from psychocrypt/topic-removeSpaceIndentionWithTabs
remove space indention with tabs
Diffstat (limited to 'xmrstak/net')
-rw-r--r--xmrstak/net/jpsock.cpp12
-rw-r--r--xmrstak/net/msgstruct.hpp4
2 files changed, 8 insertions, 8 deletions
diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp
index 5769448..36c901e 100644
--- a/xmrstak/net/jpsock.cpp
+++ b/xmrstak/net/jpsock.cpp
@@ -93,8 +93,8 @@ struct jpsock::opq_json_val
};
jpsock::jpsock(size_t id, const char* sAddr, const char* sLogin, const char* sPassword, double pool_weight, bool dev_pool, bool tls, const char* tls_fp, bool nicehash) :
- net_addr(sAddr), usr_login(sLogin), usr_pass(sPassword), tls_fp(tls_fp), pool_id(id), pool_weight(pool_weight), pool(dev_pool), nicehash(nicehash),
- connect_time(0), connect_attempts(0), disconnect_time(0), quiet_close(false)
+ net_addr(sAddr), usr_login(sLogin), usr_pass(sPassword), tls_fp(tls_fp), pool_id(id), pool_weight(pool_weight), pool(dev_pool), nicehash(nicehash),
+ connect_time(0), connect_attempts(0), disconnect_time(0), quiet_close(false)
{
sock_init();
@@ -443,7 +443,7 @@ bool jpsock::connect(std::string& sConnectError)
sSocketError.clear();
iJobDiff = 0;
connect_attempts++;
-
+
if(sck->set_hostname(net_addr.c_str()))
{
bRunning = true;
@@ -607,13 +607,13 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes
if(ext_backend)
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)));
if(ext_algo)
snprintf(sAlgo, sizeof(sAlgo), ",\"algo\":\"%s\"", algo_full_cn ? "cryptonight" : "cryptonight-lite");
-
+
bin2hex((unsigned char*)&iNonce, 4, sNonce);
sNonce[8] = '\0';
@@ -648,7 +648,7 @@ bool jpsock::get_pool_motd(std::string& strin)
{
if(!ext_motd)
return false;
-
+
std::unique_lock<std::mutex>(motd_mutex);
if(pool_motd.size() > 0)
{
diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp
index 9065fe3..a15f806 100644
--- a/xmrstak/net/msgstruct.hpp
+++ b/xmrstak/net/msgstruct.hpp
@@ -170,6 +170,6 @@ struct ex_event
//Get steady_clock timestamp - misc helper function
inline size_t get_timestamp()
{
- using namespace std::chrono;
- return time_point_cast<seconds>(steady_clock::now()).time_since_epoch().count();
+ using namespace std::chrono;
+ return time_point_cast<seconds>(steady_clock::now()).time_since_epoch().count();
};
OpenPOWER on IntegriCloud