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

refactor: internalize AMNEZIA_DESKTOP guard in appendKillSwitchConfig

Browse Source
This commit is contained in:
cd-amn
2026-05-18 13:11:49 +00:00
parent 75f522e9dc
commit ce05b4e99c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnConnection.cpp
+5 -3
View File
@@ -208,9 +208,9 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
m_vpnProtocol->stop(); m_vpnProtocol->stop();
m_vpnProtocol.reset(); m_vpnProtocol.reset();
} }
appendKillSwitchConfig(config);
#endif #endif
appendKillSwitchConfig(config);
appendSplitTunnelingConfig(config); appendSplitTunnelingConfig(config);
m_vpnConfiguration = config; m_vpnConfiguration = config;
@@ -278,6 +278,7 @@ void VpnConnection::wireDaemonReconnectSignals()
void VpnConnection::appendKillSwitchConfig(QJsonObject &config) void VpnConnection::appendKillSwitchConfig(QJsonObject &config)
{ {
#ifdef AMNEZIA_DESKTOP
if (!m_appSettingsRepository) { if (!m_appSettingsRepository) {
qCritical() << "VpnConnection::appendKillSwitchConfig: repositories not initialized"; qCritical() << "VpnConnection::appendKillSwitchConfig: repositories not initialized";
return; return;
@@ -285,6 +286,9 @@ void VpnConnection::appendKillSwitchConfig(QJsonObject &config)
config.insert(configKey::killSwitchOption, QVariant(m_appSettingsRepository->isKillSwitchEnabled()).toString()); config.insert(configKey::killSwitchOption, QVariant(m_appSettingsRepository->isKillSwitchEnabled()).toString());
config.insert(configKey::allowedDnsServers, QVariant(m_appSettingsRepository->getAllowedDnsServers()).toJsonValue()); config.insert(configKey::allowedDnsServers, QVariant(m_appSettingsRepository->getAllowedDnsServers()).toJsonValue());
#else
Q_UNUSED(config)
#endif
} }
void VpnConnection::appendSplitTunnelingConfig(QJsonObject &config) void VpnConnection::appendSplitTunnelingConfig(QJsonObject &config)
@@ -537,9 +541,7 @@ void VpnConnection::startTunnelSwitch(DockerContainer container,
const QString &resolvedRemote) const QString &resolvedRemote)
{ {
QJsonObject config = vpnConfiguration; QJsonObject config = vpnConfiguration;
#ifdef AMNEZIA_DESKTOP
appendKillSwitchConfig(config); appendKillSwitchConfig(config);
#endif
appendSplitTunnelingConfig(config); appendSplitTunnelingConfig(config);
const QString stagingIfname = allocateIfname(); const QString stagingIfname = allocateIfname();