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

Use service for PingSender

Browse source
This commit is contained in:
Mykola Baibuz 2025-03-13 17:43:13 +02:00
parent e792117be1
commit 8bb4fa3f35
7 changed files with 46 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/mozilla/localsocketcontroller.cpp
View file

@ -21,6 +21,8 @@
#include "models/server.h"
#include "daemon/daemonerrors.h"
#include "core/ipcclient.h"
#include "protocols/protocols_defs.h"
// How many times do we try to reconnect.
@ -39,7 +41,7 @@ LocalSocketController::LocalSocketController() {
m_socket = new QLocalSocket(this);
connect(m_socket, &QLocalSocket::connected, this,
&LocalSocketController::daemonConnected);
connect(m_socket, &QLocalSocket::disconnected, this,
connect(m_socket, &QLocalSocket::disconnected, this,
[&] { errorOccurred(QLocalSocket::PeerClosedError); });
connect(m_socket, &QLocalSocket::errorOccurred, this,
&LocalSocketController::errorOccurred);
@ -50,11 +52,12 @@ LocalSocketController::LocalSocketController() {
connect(&m_initializingTimer, &QTimer::timeout, this,
&LocalSocketController::initializeInternal);
connect(&m_pingHelper, &PingHelper::connectionLose, this, [this]() {
connect(IpcClient::Interface().data(), &IpcInterfaceReplica::connectionLose,
this, [this]() {
logger.debug() << "Connection Lose";
m_pingHelper.stop();
auto result = IpcClient::Interface()->stopNetworkCheck();
result.waitForFinished(3000);
this->deactivate();
QThread::msleep(3000);
this->activate(m_RawConfig);
});
@ -145,11 +148,14 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip));
// set up IPv6 unique-local-address, ULA, with "fd00::/8" prefix, not globally routable.
// this will be default IPv6 gateway, OS recognizes that IPv6 link is local and switches to IPv4.
// Otherwise some OSes (Linux) try IPv6 forever and hang.
// this will be default IPv6 gateway, OS recognizes that IPv6 link
// is local and switches to IPv4.
// Otherwise some OSes (Linux) try IPv6 forever and hang.
// https://en.wikipedia.org/wiki/Unique_local_address (RFC 4193)
// https://man7.org/linux/man-pages/man5/gai.conf.5.html
json.insert("deviceIpv6Address", "fd58:baa6:dead::1"); // simply "dead::1" is globally-routable, don't use it
// simply "dead::1" is globally-routable, don't use it
json.insert("deviceIpv6Address", "fd58:baa6:dead::1");
json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key));
json.insert("serverPskKey", wgConfig.value(amnezia::config_key::psk_key));
@ -286,6 +292,8 @@ void LocalSocketController::deactivate() {
QJsonObject json;
json.insert("type", "deactivate");
write(json);
auto result = IpcClient::Interface()->stopNetworkCheck();
result.waitForFinished(3000);
emit disconnected();
}
@ -375,8 +383,6 @@ void LocalSocketController::parseCommand(const QByteArray& command) {
return;
}
qDebug() << command;
QJsonObject obj = json.object();
QJsonValue typeValue = obj.value("type");
if (!typeValue.isString()) {
@ -434,7 +440,8 @@ void LocalSocketController::parseCommand(const QByteArray& command) {
return;
}
m_pingHelper.start(serverIpv4Gateway.toString(), deviceIpv4Address.toString());
IpcClient::Interface()->startNetworkCheck(serverIpv4Gateway.toString(),
deviceIpv4Address.toString());
QJsonValue txBytes = obj.value("txBytes");
if (!txBytes.isDouble()) {

2
client/mozilla/localsocketcontroller.h
View file

@ -11,7 +11,6 @@
#include <functional>
#include "controllerimpl.h"
#include "mozilla/pinghelper.h"
#include "qjsonobject.h"
@ -64,7 +63,6 @@ class LocalSocketController final : public ControllerImpl {
std::function<void(const QString&)> m_logCallback = nullptr;
QJsonObject m_RawConfig;
PingHelper m_pingHelper;
QTimer m_initializingTimer;
QTimer m_statusTimer;