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

Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-01-29 09:43:03 +03:00
commit 74fbce8b96
279 changed files with 3217 additions and 14329 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/core/servercontroller.h
View file

@ -6,7 +6,6 @@
#include "defs.h"
#include "containers/containers_defs.h"
#include "sshclient.h"
class Settings;
@ -70,6 +69,7 @@ public:
QString checkSshConnection(const ServerCredentials &credentials, ErrorCode *errorCode = nullptr);
void setCancelInstallation(const bool cancel);
private:
ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
ErrorCode prepareHostWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
@ -81,7 +81,10 @@ private:
std::shared_ptr<Settings> m_settings;
std::shared_ptr<VpnConfigurator> m_configurator;
bool m_cancelInstallation = false;
libssh::Client m_sshClient;
signals:
void serverIsBusy(const bool isBusy);
};
#endif // SERVERCONTROLLER_H