AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add delay for ping checker stop

Browse source
This commit is contained in:
Mykola Baibuz 2025-03-27 21:46:10 +02:00
parent 681eb5aa86
commit 26994c21b1
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/mozilla/localsocketcontroller.cpp
View file

@ -49,9 +49,6 @@ LocalSocketController::LocalSocketController() {
m_initializingTimer.setSingleShot(true); m_initializingTimer.setSingleShot(true);
connect(&m_initializingTimer, &QTimer::timeout, this, connect(&m_initializingTimer, &QTimer::timeout, this,
&LocalSocketController::initializeInternal); &LocalSocketController::initializeInternal);
} }
LocalSocketController::~LocalSocketController() { LocalSocketController::~LocalSocketController() {
@ -279,8 +276,6 @@ void LocalSocketController::deactivate() {
QJsonObject json; QJsonObject json;
json.insert("type", "deactivate"); json.insert("type", "deactivate");
write(json); write(json);
auto result = IpcClient::Interface()->stopNetworkCheck();
result.waitForFinished(3000);
emit disconnected(); emit disconnected();
} }
@ -462,9 +457,7 @@ void LocalSocketController::parseCommand(const QByteArray& command) {
checkStatus(); checkStatus();
emit statusUpdated("", emit statusUpdated("", m_deviceIpv4, 0, 0);
m_deviceIpv4, 0,
0);
emit connected(pubkey.toString()); emit connected(pubkey.toString());
return; return;

1
client/mozilla/localsocketcontroller.h
View file

@ -11,7 +11,6 @@
#include <functional> #include <functional>
#include "controllerimpl.h" #include "controllerimpl.h"
#include "qjsonobject.h"
class QJsonObject; class QJsonObject;

8
client/vpnconnection.cpp
View file

@ -6,7 +6,6 @@
#include <QHostInfo> #include <QHostInfo>
#include <QJsonObject> #include <QJsonObject>
#include "core/controllers/serverController.h"
#include <configurators/cloak_configurator.h> #include <configurators/cloak_configurator.h>
#include <configurators/openvpn_configurator.h> #include <configurators/openvpn_configurator.h>
#include <configurators/shadowsocks_configurator.h> #include <configurators/shadowsocks_configurator.h>
@ -14,7 +13,6 @@
#ifdef AMNEZIA_DESKTOP #ifdef AMNEZIA_DESKTOP
#include "core/ipcclient.h" #include "core/ipcclient.h"
#include "ipc.h"
#include <protocols/wireguardprotocol.h> #include <protocols/wireguardprotocol.h>
#endif #endif
@ -91,7 +89,8 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
} else if (state == Vpn::ConnectionState::Error) { } else if (state == Vpn::ConnectionState::Error) {
IpcClient::Interface()->flushDns(); IpcClient::Interface()->flushDns();
IpcClient::Interface()->stopNetworkCheck(); auto result = IpcClient::Interface()->stopNetworkCheck();
result.waitForFinished(3000);
if (m_settings->isSitesSplitTunnelingEnabled()) { if (m_settings->isSitesSplitTunnelingEnabled()) {
if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) { if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
@ -101,7 +100,8 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
} else if (state == Vpn::ConnectionState::Connecting) { } else if (state == Vpn::ConnectionState::Connecting) {
} else if (state == Vpn::ConnectionState::Disconnected) { } else if (state == Vpn::ConnectionState::Disconnected) {
IpcClient::Interface()->stopNetworkCheck(); auto result = IpcClient::Interface()->stopNetworkCheck();
result.waitForFinished(3000);
} }
} }
#endif #endif