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: TrafficGuard owns adapter IP swap for WG/AWG and Xray

Browse Source
This commit is contained in:
cd-amn
2026-06-16 12:00:37 +00:00
parent ef1ed7064a
commit 97b2de8cd1
6 changed files with 34 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnConnection.cpp
+14
View File
@@ -224,6 +224,13 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
if (isXray) {
config.insert("tunName", preAllocatedIfname);
config.insert("deviceIpv4Address", amnezia::protocols::xray::defaultLocalAddr);
} else if (isWg) {
const QString protoName = config.value("protocol").toString();
const QJsonObject wgConfig = config.value(protoName + "_config_data").toObject();
const QString clientIp = wgConfig.value(amnezia::configKey::clientIp).toString();
if (!clientIp.isEmpty()) {
config.insert("deviceIpv4Address", clientIp);
}
}
m_active = new Tunnel(preAllocatedIfname, container, config, resolvedRemote, this);
wireTunnelSignals(m_active, /*isActive=*/true);
@@ -553,6 +560,13 @@ void VpnConnection::startTunnelSwitch(DockerContainer container,
if (VpnProtocol::isXrayBased(container)) {
config.insert("tunName", stagingIfname);
config.insert("deviceIpv4Address", amnezia::protocols::xray::defaultLocalAddr);
} else if (VpnProtocol::isWireGuardBased(container)) {
const QString protoName = config.value("protocol").toString();
const QJsonObject wgConfig = config.value(protoName + "_config_data").toObject();
const QString clientIp = wgConfig.value(amnezia::configKey::clientIp).toString();
if (!clientIp.isEmpty()) {
config.insert("deviceIpv4Address", clientIp);
}
}
appendKillSwitchConfig(config);
appendSplitTunnelingConfig(config);