add command line poll/passwd/usename overwrite

Use command line poolname, password and username  if defined
This commit is contained in:
psychocrypt
2017-09-30 23:46:08 +02:00
parent 1fbd6f6b16
commit 4fb2b5efee
+14 -3
View File
@@ -39,6 +39,7 @@
#include "rapidjson/error/en.h"
#include "jext.h"
#include "console.h"
#include "Params.hpp"
using namespace rapidjson;
@@ -127,17 +128,27 @@ const char* jconf::GetTlsFingerprint()
const char* jconf::GetPoolAddress()
{
return prv->configValues[sPoolAddr]->GetString();
auto& poolURL = xmrstak::Params::inst().poolURL;
if(poolURL.empty())
poolURL = prv->configValues[sPoolAddr]->GetString();
return poolURL.c_str();
}
const char* jconf::GetPoolPwd()
{
return prv->configValues[sPoolPwd]->GetString();
auto& poolPasswd = xmrstak::Params::inst().poolPasswd;
if(poolPasswd.empty())
poolPasswd = prv->configValues[sPoolPwd]->GetString();
return poolPasswd.c_str();
}
const char* jconf::GetWalletAddress()
{
return prv->configValues[sWalletAddr]->GetString();
auto& poolUsername = xmrstak::Params::inst().poolUsername;
if(poolUsername.empty())
poolUsername = prv->configValues[sWalletAddr]->GetString();
return poolUsername.c_str();
}
bool jconf::PreferIpv4()