mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
89818ff63d
* fix: app freeze on quit
* fix: typo in VpnConnection destructor
* add trace info
* add more trace info
* set timelimit for flushDns
* Refactor IpcClient::Interface access logic
* cleanup unused variable
* cleanup trace info
* fix: remove second disconnect from VPN on app close
* this object will be deleted at app close
* Don't terminate VPN thread on Linux
* Revert "Don't terminate VPN thread on Linux"
This reverts commit 20e4ea2d4a.
* disconnect all signals from vpnconnection on exit
* add interruption request on vpnConnectionThread
* use checktimer only for iOS
* disconnect all signals from vpnconnection on exit
* disconnect signals on exit before VPN disconnect
* add disconnectSlots method
* fix: add allow traffic rules on killswitch disable
* wait for response from service before object destroy
* change disconnect from vpn order
* add delay for connection close
* change disconnect method order
* use stop method for protocol disconnecect
* change disconnect method order
* allow dns traffic after app close
* delete tun on disconnect
---------
Co-authored-by: vkamn <vk@amnezia.org>
103 lines
2.4 KiB
C++
103 lines
2.4 KiB
C++
#ifndef VPNCONNECTION_H
|
|
#define VPNCONNECTION_H
|
|
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QScopedPointer>
|
|
#include <QRemoteObjectNode>
|
|
#include <QTimer>
|
|
|
|
#include "protocols/vpnprotocol.h"
|
|
#include "core/defs.h"
|
|
#include "settings.h"
|
|
|
|
#ifdef AMNEZIA_DESKTOP
|
|
#include "core/ipcclient.h"
|
|
#endif
|
|
|
|
#ifdef Q_OS_ANDROID
|
|
#include "protocols/android_vpnprotocol.h"
|
|
#endif
|
|
|
|
using namespace amnezia;
|
|
|
|
class VpnConnection : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit VpnConnection(std::shared_ptr<Settings> settings, QObject* parent = nullptr);
|
|
~VpnConnection() override;
|
|
|
|
static QString bytesPerSecToText(quint64 bytes);
|
|
|
|
ErrorCode lastError() const;
|
|
|
|
bool isConnected() const;
|
|
bool isDisconnected() const;
|
|
|
|
Vpn::ConnectionState connectionState();
|
|
QSharedPointer<VpnProtocol> vpnProtocol() const;
|
|
|
|
const QString &remoteAddress() const;
|
|
void addSitesRoutes(const QString &gw, Settings::RouteMode mode);
|
|
|
|
#ifdef Q_OS_ANDROID
|
|
void restoreConnection();
|
|
#endif
|
|
|
|
public slots:
|
|
void connectToVpn(int serverIndex,
|
|
const ServerCredentials &credentials, DockerContainer container, const QJsonObject &vpnConfiguration);
|
|
|
|
void disconnectFromVpn();
|
|
|
|
void addRoutes(const QStringList &ips);
|
|
void deleteRoutes(const QStringList &ips);
|
|
void flushDns();
|
|
void onKillSwitchModeChanged(bool enabled);
|
|
void disconnectSlots();
|
|
|
|
signals:
|
|
void bytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
|
void connectionStateChanged(Vpn::ConnectionState state);
|
|
void vpnProtocolError(amnezia::ErrorCode error);
|
|
|
|
void serviceIsNotReady();
|
|
|
|
protected slots:
|
|
void onBytesChanged(quint64 receivedBytes, quint64 sentBytes);
|
|
void onConnectionStateChanged(Vpn::ConnectionState state);
|
|
|
|
protected:
|
|
QSharedPointer<VpnProtocol> m_vpnProtocol;
|
|
|
|
private:
|
|
std::shared_ptr<Settings> m_settings;
|
|
QJsonObject m_vpnConfiguration;
|
|
QJsonObject m_routeMode;
|
|
QString m_remoteAddress;
|
|
|
|
// Only for iOS for now, check counters
|
|
QTimer m_checkTimer;
|
|
|
|
#ifdef AMNEZIA_DESKTOP
|
|
IpcClient *m_IpcClient {nullptr};
|
|
#endif
|
|
|
|
#ifdef Q_OS_ANDROID
|
|
AndroidVpnProtocol* androidVpnProtocol = nullptr;
|
|
|
|
AndroidVpnProtocol* createDefaultAndroidVpnProtocol();
|
|
void createAndroidConnections();
|
|
#endif
|
|
|
|
void createProtocolConnections();
|
|
|
|
void appendSplitTunnelingConfig();
|
|
void appendKillSwitchConfig();
|
|
bool InterfaceReady();
|
|
};
|
|
|
|
#endif // VPNCONNECTION_H
|