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

moved vpnConnection to separate thread

Browse source 
- added tabbar blocking when installing/removing containers
This commit is contained in:
vladimir.kuznetsov 2023-08-09 18:17:29 +05:00
parent e0d93eaa9f
commit 591d98d8b6
14 changed files with 128 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/amnezia_application.cpp
View file

@ -57,6 +57,27 @@ AmneziaApplication::AmneziaApplication(int &argc, char *argv[], bool allowSecond
AmneziaApplication::~AmneziaApplication() AmneziaApplication::~AmneziaApplication()
{ {
// emit hide();
// #ifdef AMNEZIA_DESKTOP
// if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
// m_vpnConnection->disconnectFromVpn();
// for (int i = 0; i < 50; i++) {
// qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
// QThread::msleep(100);
// if (m_vpnConnection->isDisconnected()) {
// break;
// }
// }
// }
// #endif
// m_vpnConnection->deleteLater();
// m_vpnConnectionThread.quit();
// m_vpnConnectionThread.wait(3000);
// qDebug() << "Application closed";
if (m_engine) { if (m_engine) {
QObject::disconnect(m_engine, 0, 0, 0); QObject::disconnect(m_engine, 0, 0, 0);
delete m_engine; delete m_engine;
@ -87,6 +108,8 @@ void AmneziaApplication::init()
m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this)); m_configurator = std::shared_ptr<VpnConfigurator>(new VpnConfigurator(m_settings, this));
m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator)); m_vpnConnection.reset(new VpnConnection(m_settings, m_configurator));
m_vpnConnection->moveToThread(&m_vpnConnectionThread);
m_vpnConnectionThread.start();
initModels(); initModels();
initControllers(); initControllers();

1
client/amnezia_application.h
View file

@ -101,6 +101,7 @@ private:
QScopedPointer<SftpConfigModel> m_sftpConfigModel; QScopedPointer<SftpConfigModel> m_sftpConfigModel;
QSharedPointer<VpnConnection> m_vpnConnection; QSharedPointer<VpnConnection> m_vpnConnection;
QThread m_vpnConnectionThread;
QScopedPointer<NotificationHandler> m_notificationHandler; QScopedPointer<NotificationHandler> m_notificationHandler;
QScopedPointer<ConnectionController> m_connectionController; QScopedPointer<ConnectionController> m_connectionController;

19
client/main.cpp
View file

@ -2,20 +2,19 @@
#include <QTimer> #include <QTimer>
#include "amnezia_application.h" #include "amnezia_application.h"
#include "version.h"
#include "migrations.h" #include "migrations.h"
#include "version.h"
#include <QTimer> #include <QTimer>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "Windows.h" #include "Windows.h"
#endif #endif
#if defined(Q_OS_IOS) #if defined(Q_OS_IOS)
#include "platforms/ios/QtAppDelegate-C-Interface.h" #include "platforms/ios/QtAppDelegate-C-Interface.h"
#endif #endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Migrations migrationsManager; Migrations migrationsManager;
@ -27,16 +26,14 @@ int main(int argc, char *argv[])
AllowSetForegroundWindow(ASFW_ANY); AllowSetForegroundWindow(ASFW_ANY);
#endif #endif
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
AmneziaApplication app(argc, argv); AmneziaApplication app(argc, argv);
#else #else
AmneziaApplication app(argc, argv, true, SingleApplication::Mode::User | SingleApplication::Mode::SecondaryNotification); AmneziaApplication app(argc, argv, true,
SingleApplication::Mode::User | SingleApplication::Mode::SecondaryNotification);
if (!app.isPrimary()) { if (!app.isPrimary()) {
QTimer::singleShot(1000, &app, [&](){ QTimer::singleShot(1000, &app, [&]() { app.quit(); });
app.quit();
});
return app.exec(); return app.exec();
} }
#endif #endif
@ -63,6 +60,10 @@ int main(int argc, char *argv[])
if (doExec) { if (doExec) {
app.init(); app.init();
qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
return app.exec(); return app.exec();
} }
return 0; return 0;

95
client/protocols/openvpnprotocol.cpp
View file

@ -1,21 +1,20 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QFileInfo> #include <QFileInfo>
#include <QProcess> #include <QProcess>
#include <QTcpSocket>
#include <QTcpServer>
#include <QRandomGenerator> #include <QRandomGenerator>
#include <QTcpServer>
#include <QTcpSocket>
#include "logger.h" #include "logger.h"
#include "version.h"
#include "utilities.h"
#include "openvpnprotocol.h" #include "openvpnprotocol.h"
#include "utilities.h"
#include "version.h"
OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *parent) : VpnProtocol(configuration, parent)
OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject* parent) :
VpnProtocol(configuration, parent)
{ {
readOpenVpnConfiguration(configuration); readOpenVpnConfiguration(configuration);
connect(&m_managementServer, &ManagementServer::readyRead, this, &OpenVpnProtocol::onReadyReadDataFromManagementServer); connect(&m_managementServer, &ManagementServer::readyRead, this,
&OpenVpnProtocol::onReadyReadDataFromManagementServer);
} }
OpenVpnProtocol::~OpenVpnProtocol() OpenVpnProtocol::~OpenVpnProtocol()
@ -27,7 +26,7 @@ OpenVpnProtocol::~OpenVpnProtocol()
QString OpenVpnProtocol::defaultConfigFileName() QString OpenVpnProtocol::defaultConfigFileName()
{ {
//qDebug() << "OpenVpnProtocol::defaultConfigFileName" << defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME); // qDebug() << "OpenVpnProtocol::defaultConfigFileName" << defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME);
return defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME); return defaultConfigPath() + QString("/%1.ovpn").arg(APPLICATION_NAME);
} }
@ -42,21 +41,20 @@ QString OpenVpnProtocol::defaultConfigPath()
void OpenVpnProtocol::stop() void OpenVpnProtocol::stop()
{ {
qDebug() << "OpenVpnProtocol::stop()"; qDebug() << "OpenVpnProtocol::stop()";
setConnectionState(VpnProtocol::Disconnecting); setConnectionState(Vpn::ConnectionState::Disconnecting);
// TODO: need refactoring // TODO: need refactoring
// sendTermSignal() will even return true while server connected ??? // sendTermSignal() will even return true while server connected ???
if ((m_connectionState == Vpn::ConnectionState::Preparing) || if ((m_connectionState == Vpn::ConnectionState::Preparing) || (m_connectionState == Vpn::ConnectionState::Connecting)
(m_connectionState == Vpn::ConnectionState::Connecting) || || (m_connectionState == Vpn::ConnectionState::Connected)
(m_connectionState == Vpn::ConnectionState::Connected) || || (m_connectionState == Vpn::ConnectionState::Reconnecting)) {
(m_connectionState == Vpn::ConnectionState::Reconnecting)) {
if (!sendTermSignal()) { if (!sendTermSignal()) {
killOpenVpnProcess(); killOpenVpnProcess();
} }
QThread::msleep(10); QThread::msleep(10);
m_managementServer.stop(); m_managementServer.stop();
} }
setConnectionState(VpnProtocol::Disconnected); setConnectionState(Vpn::ConnectionState::Disconnected);
} }
ErrorCode OpenVpnProtocol::prepare() ErrorCode OpenVpnProtocol::prepare()
@ -68,18 +66,19 @@ ErrorCode OpenVpnProtocol::prepare()
QRemoteObjectPendingReply<QStringList> resultCheck = IpcClient::Interface()->getTapList(); QRemoteObjectPendingReply<QStringList> resultCheck = IpcClient::Interface()->getTapList();
resultCheck.waitForFinished(); resultCheck.waitForFinished();
if (resultCheck.returnValue().isEmpty()){ if (resultCheck.returnValue().isEmpty()) {
QRemoteObjectPendingReply<bool> resultInstall = IpcClient::Interface()->checkAndInstallDriver(); QRemoteObjectPendingReply<bool> resultInstall = IpcClient::Interface()->checkAndInstallDriver();
resultInstall.waitForFinished(); resultInstall.waitForFinished();
if (!resultInstall.returnValue()) return ErrorCode::OpenVpnTapAdapterError; if (!resultInstall.returnValue())
return ErrorCode::OpenVpnTapAdapterError;
} }
return ErrorCode::NoError; return ErrorCode::NoError;
} }
void OpenVpnProtocol::killOpenVpnProcess() void OpenVpnProtocol::killOpenVpnProcess()
{ {
if (m_openVpnProcess){ if (m_openVpnProcess) {
m_openVpnProcess->close(); m_openVpnProcess->close();
} }
} }
@ -113,9 +112,9 @@ QString OpenVpnProtocol::configPath() const
return m_configFileName; return m_configFileName;
} }
void OpenVpnProtocol::sendManagementCommand(const QString& command) void OpenVpnProtocol::sendManagementCommand(const QString &command)
{ {
QIODevice *device = dynamic_cast<QIODevice*>(m_managementServer.socket().data()); QIODevice *device = dynamic_cast<QIODevice *>(m_managementServer.socket().data());
if (device) { if (device) {
QTextStream stream(device); QTextStream stream(device);
stream << command << Qt::endl; stream << command << Qt::endl;
@ -127,11 +126,12 @@ uint OpenVpnProtocol::selectMgmtPort()
for (int i = 0; i < 100; ++i) { for (int i = 0; i < 100; ++i) {
quint32 port = QRandomGenerator::global()->generate(); quint32 port = QRandomGenerator::global()->generate();
port = (double)(65000-15001) * port / UINT32_MAX + 15001; port = (double)(65000 - 15001) * port / UINT32_MAX + 15001;
QTcpServer s; QTcpServer s;
bool ok = s.listen(QHostAddress::LocalHost, port); bool ok = s.listen(QHostAddress::LocalHost, port);
if (ok) return port; if (ok)
return port;
} }
return m_managementPort; return m_managementPort;
@ -141,7 +141,8 @@ void OpenVpnProtocol::updateRouteGateway(QString line)
{ {
// TODO: fix for macos // TODO: fix for macos
line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1); line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1);
if (!line.contains("/")) return; if (!line.contains("/"))
return;
m_routeGateway = line.split("/", Qt::SkipEmptyParts).first(); m_routeGateway = line.split("/", Qt::SkipEmptyParts).first();
m_routeGateway.replace(" ", ""); m_routeGateway.replace(" ", "");
qDebug() << "Set VPN route gateway" << m_routeGateway; qDebug() << "Set VPN route gateway" << m_routeGateway;
@ -149,7 +150,7 @@ void OpenVpnProtocol::updateRouteGateway(QString line)
ErrorCode OpenVpnProtocol::start() ErrorCode OpenVpnProtocol::start()
{ {
//qDebug() << "Start OpenVPN connection"; // qDebug() << "Start OpenVPN connection";
OpenVpnProtocol::stop(); OpenVpnProtocol::stop();
if (!QFileInfo::exists(Utils::openVpnExecPath())) { if (!QFileInfo::exists(Utils::openVpnExecPath())) {
@ -167,7 +168,10 @@ ErrorCode OpenVpnProtocol::start()
QProcess p; QProcess p;
p.setProcessChannelMode(QProcess::MergedChannels); p.setProcessChannelMode(QProcess::MergedChannels);
p.start("route", QStringList() << "-n" << "get" << "default"); p.start("route",
QStringList() << "-n"
<< "get"
<< "default");
p.waitForFinished(); p.waitForFinished();
QString s = p.readAll(); QString s = p.readAll();
@ -176,15 +180,13 @@ ErrorCode OpenVpnProtocol::start()
if (match.hasMatch()) { if (match.hasMatch()) {
m_routeGateway = match.captured(1); m_routeGateway = match.captured(1);
qDebug() << "Set VPN route gateway" << m_routeGateway; qDebug() << "Set VPN route gateway" << m_routeGateway;
} } else {
else {
qWarning() << "Unable to set VPN route gateway, output:\n" << s; qWarning() << "Unable to set VPN route gateway, output:\n" << s;
} }
#endif #endif
// QString vpnLogFileNamePath = Utils::systemLogPath() + "/openvpn.log";
// QString vpnLogFileNamePath = Utils::systemLogPath() + "/openvpn.log"; // Utils::createEmptyFile(vpnLogFileNamePath);
// Utils::createEmptyFile(vpnLogFileNamePath);
uint mgmtPort = selectMgmtPort(); uint mgmtPort = selectMgmtPort();
qDebug() << "OpenVpnProtocol::start mgmt port selected:" << mgmtPort; qDebug() << "OpenVpnProtocol::start mgmt port selected:" << mgmtPort;
@ -199,7 +201,7 @@ ErrorCode OpenVpnProtocol::start()
m_openVpnProcess = IpcClient::CreatePrivilegedProcess(); m_openVpnProcess = IpcClient::CreatePrivilegedProcess();
if (!m_openVpnProcess) { if (!m_openVpnProcess) {
//qWarning() << "IpcProcess replica is not created!"; // qWarning() << "IpcProcess replica is not created!";
setLastError(ErrorCode::AmneziaServiceConnectionFailed); setLastError(ErrorCode::AmneziaServiceConnectionFailed);
return ErrorCode::AmneziaServiceConnectionFailed; return ErrorCode::AmneziaServiceConnectionFailed;
} }
@ -211,28 +213,25 @@ ErrorCode OpenVpnProtocol::start()
return ErrorCode::AmneziaServiceConnectionFailed; return ErrorCode::AmneziaServiceConnectionFailed;
} }
m_openVpnProcess->setProgram(PermittedProcess::OpenVPN); m_openVpnProcess->setProgram(PermittedProcess::OpenVPN);
QStringList arguments({"--config" , configPath(), QStringList arguments({
"--management", m_managementHost, QString::number(mgmtPort), "--config", configPath(), "--management", m_managementHost, QString::number(mgmtPort),
"--management-client"/*, "--log", vpnLogFileNamePath */ "--management-client" /*, "--log", vpnLogFileNamePath */
}); });
m_openVpnProcess->setArguments(arguments); m_openVpnProcess->setArguments(arguments);
qDebug() << arguments.join(" "); qDebug() << arguments.join(" ");
connect(m_openVpnProcess.data(), &PrivilegedProcess::errorOccurred, [&](QProcess::ProcessError error) { connect(m_openVpnProcess.data(), &PrivilegedProcess::errorOccurred,
qDebug() << "PrivilegedProcess errorOccurred" << error; [&](QProcess::ProcessError error) { qDebug() << "PrivilegedProcess errorOccurred" << error; });
});
connect(m_openVpnProcess.data(), &PrivilegedProcess::stateChanged, [&](QProcess::ProcessState newState) { connect(m_openVpnProcess.data(), &PrivilegedProcess::stateChanged,
qDebug() << "PrivilegedProcess stateChanged" << newState; [&](QProcess::ProcessState newState) { qDebug() << "PrivilegedProcess stateChanged" << newState; });
});
connect(m_openVpnProcess.data(), &PrivilegedProcess::finished, this, [&]() { connect(m_openVpnProcess.data(), &PrivilegedProcess::finished, this,
setConnectionState(Vpn::ConnectionState::Disconnected); [&]() { setConnectionState(Vpn::ConnectionState::Disconnected); });
});
m_openVpnProcess->start(); m_openVpnProcess->start();
//startTimeoutTimer(); // startTimeoutTimer();
return ErrorCode::NoError; return ErrorCode::NoError;
} }
@ -275,7 +274,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
setConnectionState(Vpn::ConnectionState::Connected); setConnectionState(Vpn::ConnectionState::Connected);
continue; continue;
} else if (line.contains("EXITING,SIGTER")) { } else if (line.contains("EXITING,SIGTER")) {
//openVpnStateSigTermHandler(); // openVpnStateSigTermHandler();
setConnectionState(Vpn::ConnectionState::Disconnecting); setConnectionState(Vpn::ConnectionState::Disconnecting);
continue; continue;
} else if (line.contains("RECONNECTING")) { } else if (line.contains("RECONNECTING")) {
@ -295,8 +294,7 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
if (line.contains("FATAL")) { if (line.contains("FATAL")) {
if (line.contains("tap-windows6 adapters on this system are currently in use or disabled")) { if (line.contains("tap-windows6 adapters on this system are currently in use or disabled")) {
emit protocolError(ErrorCode::OpenVpnAdaptersInUseError); emit protocolError(ErrorCode::OpenVpnAdaptersInUseError);
} } else {
else {
emit protocolError(ErrorCode::OpenVpnUnknownError); emit protocolError(ErrorCode::OpenVpnUnknownError);
} }
return; return;
@ -321,7 +319,8 @@ void OpenVpnProtocol::onReadyReadDataFromManagementServer()
void OpenVpnProtocol::updateVpnGateway(const QString &line) void OpenVpnProtocol::updateVpnGateway(const QString &line)
{ {
// line looks like // line looks like
// PUSH: Received control message: 'PUSH_REPLY,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-GCM' // PUSH: Received control message: 'PUSH_REPLY,route 10.8.0.1,topology net30,ping 10,ping-restart
// 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-GCM'
QStringList params = line.split(","); QStringList params = line.split(",");
for (const QString &l : params) { for (const QString &l : params) {

1
client/ui/controllers/pageController.h
View file

@ -88,6 +88,7 @@ signals:
void showNotificationMessage(const QString &message); void showNotificationMessage(const QString &message);
void showBusyIndicator(bool visible); void showBusyIndicator(bool visible);
void enableTabBar(bool enabled);
void hideMainWindow(); void hideMainWindow();
void raiseMainWindow(); void raiseMainWindow();

17
client/ui/controllers/sitesController.cpp
View file

@ -36,12 +36,13 @@ void SitesController::addSite(QString hostname)
m_sitesModel->addSite(hostname, ip); m_sitesModel->addSite(hostname, ip);
if (!ip.isEmpty()) { if (!ip.isEmpty()) {
m_vpnConnection->addRoutes(QStringList() << ip); QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
m_vpnConnection->flushDns(); Q_ARG(QStringList, QStringList() << ip));
} else if (Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) { } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
m_vpnConnection->addRoutes(QStringList() << hostname); QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
m_vpnConnection->flushDns(); Q_ARG(QStringList, QStringList() << hostname));
} }
QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
}; };
const auto &resolveCallback = [this, processSite](const QHostInfo &hostInfo) { const auto &resolveCallback = [this, processSite](const QHostInfo &hostInfo) {
@ -70,6 +71,10 @@ void SitesController::removeSite(int index)
auto hostname = m_sitesModel->data(modelIndex, SitesModel::Roles::UrlRole).toString(); auto hostname = m_sitesModel->data(modelIndex, SitesModel::Roles::UrlRole).toString();
m_sitesModel->removeSite(modelIndex); m_sitesModel->removeSite(modelIndex);
QMetaObject::invokeMethod(m_vpnConnection.get(), "deleteRoutes", Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << hostname));
QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
emit finished(tr("Site removed: ") + hostname); emit finished(tr("Site removed: ") + hostname);
} }
@ -124,8 +129,8 @@ void SitesController::importSites(bool replaceExisting)
m_sitesModel->addSites(sites, replaceExisting); m_sitesModel->addSites(sites, replaceExisting);
m_vpnConnection->addRoutes(QStringList() << ips); QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
m_vpnConnection->flushDns(); QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
emit finished(tr("Import completed")); emit finished(tr("Import completed"));
} }

32
client/ui/pages_logic/SitesLogic.cpp
View file

@ -66,18 +66,14 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
m_settings->addVpnSite(mode, newSite, ip); m_settings->addVpnSite(mode, newSite, ip);
if (!ip.isEmpty()) { if (!ip.isEmpty()) {
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << ip)); Q_ARG(QStringList, QStringList() << ip));
} } else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) {
else if (Utils::ipAddressWithSubnetRegExp().exactMatch(newSite)) { QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection,
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes",
Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << newSite)); Q_ARG(QStringList, QStringList() << newSite));
} }
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
Qt::QueuedConnection);
onUpdatePage(); onUpdatePage();
}; };
@ -124,19 +120,16 @@ void SitesLogic::onPushButtonSitesDeleteClicked(QStringList items)
return; return;
// sites.append(siteModel->data(row, 0).toString()); // sites.append(siteModel->data(row, 0).toString());
if (uiLogic()->m_vpnConnection && uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) { // if (uiLogic()->m_vpnConnection && uiLogic()->m_vpnConnection->connectionState() == VpnProtocol::Connected) {
ips.append(siteModel->data(row, 1).toString()); // ips.append(siteModel->data(row, 1).toString());
} // }
} }
m_settings->removeVpnSites(mode, sites); m_settings->removeVpnSites(mode, sites);
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "deleteRoutes", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "deleteRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
Qt::QueuedConnection,
Q_ARG(QStringList, ips));
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
Qt::QueuedConnection);
onUpdatePage(); onUpdatePage();
} }
@ -197,12 +190,9 @@ void SitesLogic::onPushButtonSitesImportClicked(const QString &fileName)
m_settings->addVpnIps(mode, ips); m_settings->addVpnIps(mode, ips);
m_settings->addVpnSites(mode, sites); m_settings->addVpnSites(mode, sites);
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "addRoutes", Qt::QueuedConnection, Q_ARG(QStringList, ips));
Qt::QueuedConnection,
Q_ARG(QStringList, ips));
QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", QMetaObject::invokeMethod(uiLogic()->m_vpnConnection, "flushDns", Qt::QueuedConnection);
Qt::QueuedConnection);
onUpdatePage(); onUpdatePage();
} }

3
client/ui/qml/Pages2/PageDeinstalling.qml
View file

@ -14,6 +14,9 @@ import "../Config"
PageType { PageType {
id: root id: root
Component.onCompleted: PageController.enableTabBar(false)
Component.onDestruction: PageController.enableTabBar(true)
SortFilterProxyModel { SortFilterProxyModel {
id: proxyServersModel id: proxyServersModel
sourceModel: ServersModel sourceModel: ServersModel

6
client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
View file

@ -299,6 +299,12 @@ PageType {
checked: additionalClientCommands !== "" checked: additionalClientCommands !== ""
text: qsTr("Additional client configuration commands") text: qsTr("Additional client configuration commands")
onCheckedChanged: {
if (!checked) {
additionalClientCommands = ""
}
}
} }
TextAreaType { TextAreaType {

2
client/ui/qml/Pages2/PageSettingsBackup.qml
View file

@ -21,7 +21,7 @@ PageType {
function onRestoreBackupFinished() { function onRestoreBackupFinished() {
PageController.showNotificationMessage(qsTr("Settings restored from backup file")) PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
goToStartPage() //goToStartPage()
PageController.goToPageHome() PageController.goToPageHome()
} }
} }

2
client/ui/qml/Pages2/PageSettingsServerData.qml
View file

@ -166,7 +166,7 @@ PageType {
questionDrawer.visible = false questionDrawer.visible = false
goToPage(PageEnum.PageDeinstalling) goToPage(PageEnum.PageDeinstalling)
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) { if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
ConnectionController.closeVpnConnection() ConnectionController.closeConnection()
} }
InstallController.removeAllContainers() InstallController.removeAllContainers()
} }

3
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -14,6 +14,9 @@ import "../Config"
PageType { PageType {
id: root id: root
Component.onCompleted: PageController.enableTabBar(false)
Component.onDestruction: PageController.enableTabBar(true)
Connections { Connections {
target: InstallController target: InstallController

8
client/ui/qml/Pages2/PageStart.qml
View file

@ -18,12 +18,12 @@ PageType {
function onGoToPageHome() { function onGoToPageHome() {
tabBar.currentIndex = 0 tabBar.currentIndex = 0
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome)) tabBarStackView.goToTabBarPage(PageEnum.PageHome)
} }
function onGoToPageSettings() { function onGoToPageSettings() {
tabBar.currentIndex = 2 tabBar.currentIndex = 2
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings)) tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
} }
function onGoToPageViewConfig() { function onGoToPageViewConfig() {
@ -37,6 +37,10 @@ PageType {
tabBar.enabled = !visible tabBar.enabled = !visible
} }
function onEnableTabBar(enabled) {
tabBar.enabled = enabled
}
function onClosePage() { function onClosePage() {
if (tabBarStackView.depth <= 1) { if (tabBarStackView.depth <= 1) {
return return

3
client/ui/uilogic.cpp
View file

@ -157,9 +157,6 @@ void UiLogic::initializeUiLogic()
// } // }
m_selectedServerIndex = m_settings->defaultServerIndex(); m_selectedServerIndex = m_settings->defaultServerIndex();
qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME).arg(APP_VERSION);
qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName()).arg(QSysInfo::currentCpuArchitecture());
} }
void UiLogic::showOnStartup() void UiLogic::showOnStartup()