Merge branch 'dev' into feature/killswitch-strict-mode
This commit is contained in:
commit
b88cb4303a
23 changed files with 6735 additions and 2754 deletions
|
|
@ -374,8 +374,10 @@ void VpnConnection::appendSplitTunnelingConfig()
|
|||
sitesJsonArray.append(site);
|
||||
}
|
||||
|
||||
// Allow traffic to Amnezia DNS
|
||||
if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
|
||||
if (sitesJsonArray.isEmpty()) {
|
||||
sitesRouteMode = Settings::RouteMode::VpnAllSites;
|
||||
} else if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
|
||||
// Allow traffic to Amnezia DNS
|
||||
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
|
||||
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
|
||||
}
|
||||
|
|
@ -394,6 +396,10 @@ void VpnConnection::appendSplitTunnelingConfig()
|
|||
for (const auto &app : apps) {
|
||||
appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath);
|
||||
}
|
||||
|
||||
if (appsJsonArray.isEmpty()) {
|
||||
appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
|
||||
}
|
||||
}
|
||||
|
||||
m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue