andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-21 02:01:03 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: remove serverConfig struct (#2595)

Browse Source 
* refactor: remove serverConfig struct

* refactor: add warnings for api v1 configs

* refactor: moved the server type definition to a separate namespace

* refactor: simplified gateway stacks

* fix: fixed server description

* fix: fixed postAsync reply usage

* fix: fixed validateConfig call

* fix: fixed server name in notifications

* fix: fixed initPrepareConfigHandler for lagacy configs
This commit is contained in:
vkamn
2026-05-15 12:33:36 +08:00
committed by GitHub
parent 009ca981d5
commit 06372c8fd7
123 changed files with 3558 additions and 3026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnConnection.cpp
+44 -5
View File
@@ -30,6 +30,7 @@
#endif
#include "core/utils/networkUtilities.h"
#include "core/utils/serverConfigUtils.h"
#include "vpnConnection.h"
using namespace ProtocolUtils;
@@ -74,8 +75,46 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
return;
}
ServerConfig defaultServer = m_serversRepository->server(m_serversRepository->defaultServerIndex());
DockerContainer container = defaultServer.defaultContainer();
const QString defaultServerId = m_serversRepository->defaultServerId();
DockerContainer container = DockerContainer::None;
switch (m_serversRepository->serverKind(defaultServerId)) {
case serverConfigUtils::ConfigType::SelfHostedAdmin: {
const auto cfg = m_serversRepository->selfHostedAdminConfig(defaultServerId);
if (cfg.has_value()) {
container = cfg->defaultContainer;
}
break;
}
case serverConfigUtils::ConfigType::SelfHostedUser: {
const auto cfg = m_serversRepository->selfHostedUserConfig(defaultServerId);
if (cfg.has_value()) {
container = cfg->defaultContainer;
}
break;
}
case serverConfigUtils::ConfigType::Native: {
const auto cfg = m_serversRepository->nativeConfig(defaultServerId);
if (cfg.has_value()) {
container = cfg->defaultContainer;
}
break;
}
case serverConfigUtils::ConfigType::AmneziaPremiumV2:
case serverConfigUtils::ConfigType::AmneziaFreeV3:
case serverConfigUtils::ConfigType::ExternalPremium: {
const auto cfg = m_serversRepository->apiV2Config(defaultServerId);
if (cfg.has_value()) {
container = cfg->defaultContainer;
}
break;
}
case serverConfigUtils::ConfigType::AmneziaPremiumV1:
case serverConfigUtils::ConfigType::AmneziaFreeV2:
break;
case serverConfigUtils::ConfigType::Invalid:
default:
break;
}
IpcClient::withInterface([&](QSharedPointer<IpcInterfaceReplica> iface) {
switch (state) {
@@ -247,7 +286,7 @@ Vpn::ConnectionState VpnConnection::connectionState() const
return m_connectionState;
}
void VpnConnection::connectToVpn(int serverIndex, DockerContainer container, const QJsonObject &vpnConfiguration)
void VpnConnection::connectToVpn(const QString &serverId, DockerContainer container, const QJsonObject &vpnConfiguration)
{
if (!m_appSettingsRepository || !m_serversRepository) {
qCritical() << "VpnConnection::connectToVpn: repositories not initialized";
@@ -255,8 +294,8 @@ void VpnConnection::connectToVpn(int serverIndex, DockerContainer container, con
return;
}
qDebug() << QString("Trying to connect to VPN, server index is %1, container is %2, route mode is")
.arg(serverIndex)
qDebug() << QString("Trying to connect to VPN, server id is %1, container is %2, route mode is")
.arg(serverId)
.arg(ContainerUtils::containerToString(container))
<< m_appSettingsRepository->routeMode();