Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows: kill tor on exit

Browse source
This commit is contained in:
tobtoht 2020-10-09 02:13:08 +02:00
parent 1337baf832
commit bc65a2ab58
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/appcontext.cpp
View file

@ -169,7 +169,7 @@ AppContext::AppContext(QCommandLineParser *cmdargs) {
}
void AppContext::initTor() {
this->tor = new Tor(this);
this->tor = new Tor(this, this);
this->tor->start();
if (!(isTails || isWhonix)) {

2
src/mainwindow.cpp
View file

@ -932,6 +932,8 @@ void MainWindow::homeWidgetChanged(const QString &widgetName) {
}
void MainWindow::closeEvent(QCloseEvent *event) {
m_ctx->tor->stop();
this->saveGeo();
if(m_wizard != nullptr)
m_wizard->close();

18
src/utils/tor.cpp
View file

@ -50,6 +50,13 @@ Tor::Tor(AppContext *ctx, QObject *parent)
return;
}
// Don't spawn Tor on default port to avoid conflicts
Tor::torPort = 19450;
if (Utils::portOpen(Tor::torHost, Tor::torPort)) {
this->localTor = true;
return;
}
qDebug() << "Using embedded tor instance";
m_process.setProcessChannelMode(QProcess::MergedChannels);
@ -58,6 +65,10 @@ Tor::Tor(AppContext *ctx, QObject *parent)
connect(&m_process, &QProcess::stateChanged, this, &Tor::stateChanged);
}
void Tor::stop() {
m_process.kill();
}
void Tor::start() {
if (this->localTor) {
this->checkConnection();
@ -65,9 +76,6 @@ void Tor::start() {
return;
}
// Don't spawn Tor on default port to avoid conflicts
Tor::torPort = 19450;
auto state = m_process.state();
if (state == QProcess::ProcessState::Running || state == QProcess::ProcessState::Starting) {
this->errorMsg = "Can't start Tor, already running or starting";
@ -101,10 +109,6 @@ void Tor::start() {
m_process.start(this->torPath, arguments);
}
void Tor::stop() {
m_process.terminate();
}
void Tor::checkConnection() {
// We might not be able to connect to localhost if torsocks is used to start feather
if (m_ctx->isTorSocks)