Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-16 17:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Add tor-host option' (#356) from Nekun/feather:add-tor-host into master

Browse source 
Reviewed-on: https://git.featherwallet.org/feather/feather/pulls/356
This commit is contained in:
tobtoht 2021-04-05 00:12:12 +00:00
commit 0630747930
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main.cpp
View file

@ -48,6 +48,9 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
QCommandLineOption useLocalTorOption(QStringList() << "use-local-tor", "Use system wide installed Tor instead of the bundled.");
parser.addOption(useLocalTorOption);
QCommandLineOption torHostOption(QStringList() << "tor-host", "Address of running Tor instance.", "torHost");
parser.addOption(torHostOption);
QCommandLineOption torPortOption(QStringList() << "tor-port", "Port of running Tor instance.", "torPort");
parser.addOption(torPortOption);

9
src/utils/tor.cpp
View file

@ -23,11 +23,14 @@ Tor::Tor(AppContext *ctx, QObject *parent)
this->torDir = Config::defaultConfigDir().filePath("tor");
this->torDataPath = QDir(this->torDir).filePath("data");
if (m_ctx->cmdargs->isSet("tor-port")) {
Tor::torPort = m_ctx->cmdargs->value("tor-port").toUShort();
if (m_ctx->cmdargs->isSet("tor-port") || m_ctx->cmdargs->isSet("tor-host")) {
if (m_ctx->cmdargs->isSet("tor-host"))
Tor::torHost = m_ctx->cmdargs->value("tor-host");
if (m_ctx->cmdargs->isSet("tor-port"))
Tor::torPort = m_ctx->cmdargs->value("tor-port").toUShort();
this->localTor = true;
if (!Utils::portOpen(Tor::torHost, Tor::torPort)) {
this->errorMsg = QString("--tor-port was specified but no running Tor instance was found on port %1.").arg(QString::number(Tor::torPort));
this->errorMsg = QString("--tor-host || --tor-port were specified but no running Tor instance was found on %1:%2.").arg(Tor::torHost,QString::number(Tor::torPort));
}
return;
}