Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RX] fix irgnored tls on first start #2558

Merged
merged 1 commit into from
Nov 25, 2019
Merged

[RX] fix irgnored tls on first start #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions xmrstak/cli/cli-miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void do_guided_pool_config()
configTpl.set(std::string(tpl));
bool prompted = false;

auto& currency = params::inst().currency;
auto currency = params::inst().currency;
if(currency.empty() || !jconf::IsOnAlgoList(currency))
{
prompt_once(prompted);
Expand All @@ -236,7 +236,7 @@ void do_guided_pool_config()
currency = tmp;
}

auto& pool = params::inst().poolURL;
auto pool = params::inst().poolURL;
bool userSetPool = true;
if(pool.empty())
{
Expand All @@ -247,7 +247,7 @@ void do_guided_pool_config()
std::cin >> pool;
}

auto& userName = params::inst().poolUsername;
auto userName = params::inst().poolUsername;
if(userName.empty())
{
prompt_once(prompted);
Expand All @@ -257,7 +257,7 @@ void do_guided_pool_config()
}

bool stdin_flushed = false;
auto& passwd = params::inst().poolPasswd;
auto passwd = params::inst().poolPasswd;
if(passwd.empty() && !params::inst().userSetPwd)
{
prompt_once(prompted);
Expand All @@ -271,7 +271,7 @@ void do_guided_pool_config()
getline(std::cin, passwd);
}

auto& rigid = params::inst().poolRigid;
auto rigid = params::inst().poolRigid;
if(rigid.empty() && !params::inst().userSetRigid)
{
if(!use_simple_start())
Expand Down Expand Up @@ -366,7 +366,7 @@ void do_guided_config()
configTpl.set(std::string(tpl));
bool prompted = false;

auto& http_port = params::inst().httpd_port;
auto http_port = params::inst().httpd_port;
if(http_port == params::httpd_port_unset)
{
http_port = params::httpd_port_disabled;
Expand Down
3 changes: 2 additions & 1 deletion xmrstak/misc/executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,9 @@ void executor::ex_main()
const char* rigid = params.userSetRigid ? params.poolRigid.c_str() : cfg.sRigId;
const char* pwd = params.userSetPwd ? params.poolPasswd.c_str() : cfg.sPasswd;
bool nicehash = cfg.nicehash || params.nicehashMode;
bool tls = params.poolUseTls;

pools.emplace_back(i, cfg.sPoolAddr, wallet, rigid, pwd, 9.9, params.poolUseTls, cfg.tls_fingerprint, nicehash);
pools.emplace_back(i, cfg.sPoolAddr, wallet, rigid, pwd, 9.9, tls, cfg.tls_fingerprint, nicehash);
}
else
pools.emplace_back(i, cfg.sPoolAddr, cfg.sWalletAddr, cfg.sRigId, cfg.sPasswd, cfg.weight, cfg.tls, cfg.tls_fingerprint, cfg.nicehash);
Expand Down