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

IKEv2 fixes

Browse source 
TOR fixes
tray fix
This commit is contained in:
pokamest 2021-11-18 01:40:28 +03:00
parent e0f42f4a0a
commit dde04ff979
5 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/core/servercontroller.cpp
View file

@ -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

3
client/core/servercontroller.h
View file

@ -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