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

refactor: route OpenVPN and IKEv2 through Tunnel/TrafficGuard

Browse Source
This commit is contained in:
cd-amn
2026-06-22 17:57:58 +04:00
parent cd382546ac
commit 4543c5b534
5 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vpnConnection.cpp
+8 -16
View File
@@ -185,7 +185,11 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
#ifdef AMNEZIA_DESKTOP
const bool isWg = VpnProtocol::isWireGuardBased(container);
const bool isXray = VpnProtocol::isXrayBased(container);
const bool useTunnelPath = isWg || isXray;
const bool targetIsSwitchable = isWg || isXray;
const bool activeIsSwitchable = m_active
&& (VpnProtocol::isWireGuardBased(m_active->container())
|| VpnProtocol::isXrayBased(m_active->container()));
const bool useTunnelPath = true;
const QString preAllocatedIfname = useTunnelPath ? allocateIfname() : QString();
if (useTunnelPath && preAllocatedIfname.isEmpty()) {
setConnectionState(Vpn::ConnectionState::Error);
@@ -195,7 +199,8 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
if (m_active
&& m_connectionState == Vpn::ConnectionState::Connected
&& useTunnelPath) {
&& targetIsSwitchable
&& activeIsSwitchable) {
if (!m_trafficGuard->allowEndpoint(resolvedRemote, preAllocatedIfname)) {
releaseIfname(preAllocatedIfname);
setConnectionState(Vpn::ConnectionState::Error);
@@ -221,16 +226,11 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
if (m_active) {
const QString oldIfname = m_active->ifname();
m_trafficGuard->tearDown(m_active);
m_trafficGuard->flushAll();
delete m_active;
m_active = nullptr;
releaseIfname(oldIfname);
}
if (m_vpnProtocol) {
disconnect(m_vpnProtocol.data(), &VpnProtocol::protocolError, this, &VpnConnection::vpnProtocolError);
m_trafficGuard->flushAll();
m_vpnProtocol->stop();
m_vpnProtocol.reset();
}
#endif
appendKillSwitchConfig(config);
@@ -261,14 +261,6 @@ void VpnConnection::connectToVpn(const QString &serverId, DockerContainer contai
m_trafficGuard->bringUp(m_active);
return;
}
m_vpnProtocol.reset(VpnProtocol::factory(container, m_vpnConfiguration));
if (!m_vpnProtocol) {
setConnectionState(Vpn::ConnectionState::Error);
return;
}
m_vpnProtocol->prepare();
m_trafficGuard->setConfig(m_vpnConfiguration);
#elif defined Q_OS_ANDROID
androidVpnProtocol = createDefaultAndroidVpnProtocol();
createAndroidConnections();