Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/cloak-and-ss-in-linux-bundle

This commit is contained in:
vladimir.kuznetsov 2023-02-02 13:08:23 +03:00
commit f7ee532add
22 changed files with 130 additions and 64 deletions

View file

@ -12,7 +12,7 @@ WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject*
VpnProtocol(configuration, parent)
{
m_configFile.setFileName(QDir::tempPath() + QDir::separator() + serviceName() + ".conf");
readWireguardConfiguration(configuration);
writeWireguardConfiguration(configuration);
}
WireguardProtocol::~WireguardProtocol()
@ -70,7 +70,7 @@ void WireguardProtocol::stop()
}
void WireguardProtocol::readWireguardConfiguration(const QJsonObject &configuration)
void WireguardProtocol::writeWireguardConfiguration(const QJsonObject &configuration)
{
QJsonObject jConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::WireGuard)).toObject();

View file

@ -23,7 +23,7 @@ public:
private:
QString configPath() const;
void readWireguardConfiguration(const QJsonObject &configuration);
void writeWireguardConfiguration(const QJsonObject &configuration);
void updateRouteGateway(QString line);
void updateVpnGateway(const QString &line);