mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
IKEv2 fixes
TOR fixes tray fix
This commit is contained in:
@@ -24,6 +24,12 @@
|
||||
|
||||
using namespace QSsh;
|
||||
|
||||
Settings &ServerController::m_settings()
|
||||
{
|
||||
static Settings s;
|
||||
return s;
|
||||
}
|
||||
|
||||
ErrorCode ServerController::runScript(const ServerCredentials &credentials, QString script,
|
||||
const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdOut,
|
||||
const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdErr)
|
||||
@@ -678,6 +684,8 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
|
||||
|
||||
vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}});
|
||||
|
||||
vars.append({{"$PRIMARY_SERVER_DNS", m_settings().primaryDns()}});
|
||||
vars.append({{"$SECONDARY_SERVER_DNS", m_settings().secondaryDns()}});
|
||||
|
||||
|
||||
// Sftp vars
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "sshconnection.h"
|
||||
#include "sshremoteprocess.h"
|
||||
#include "defs.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include "containers/containers_defs.h"
|
||||
|
||||
#include "sftpdefs.h"
|
||||
@@ -75,6 +77,7 @@ private:
|
||||
static ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
|
||||
static ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
|
||||
|
||||
static Settings &m_settings();
|
||||
};
|
||||
|
||||
#endif // SERVERCONTROLLER_H
|
||||
|
||||
Reference in New Issue
Block a user