mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a0011305ad |
@@ -259,7 +259,7 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
|
|||||||
// return QJsonObject();
|
// return QJsonObject();
|
||||||
// }
|
// }
|
||||||
|
|
||||||
QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(configMap.value("AllowedIPs").split(","));
|
QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(configMap.value("AllowedIPs").split(", "));
|
||||||
|
|
||||||
lastConfig[config_key::allowed_ips] = allowedIpsJsonArray;
|
lastConfig[config_key::allowed_ips] = allowedIpsJsonArray;
|
||||||
|
|
||||||
|
|||||||
@@ -392,20 +392,13 @@ void VpnConnection::appendSplitTunnelingConfig()
|
|||||||
auto protocolName = m_vpnConfiguration.value(config_key::vpnproto).toString();
|
auto protocolName = m_vpnConfiguration.value(config_key::vpnproto).toString();
|
||||||
if (protocolName == ProtocolProps::protoToString(Proto::Awg)) {
|
if (protocolName == ProtocolProps::protoToString(Proto::Awg)) {
|
||||||
auto configData = m_vpnConfiguration.value(protocolName + "_config_data").toObject();
|
auto configData = m_vpnConfiguration.value(protocolName + "_config_data").toObject();
|
||||||
QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(configData.value("allowed_ips").toString().split(","));
|
QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(configData.value("allowed_ips").toString().split(", "));
|
||||||
QJsonArray defaultAllowedIP = QJsonArray::fromStringList(QString("0.0.0.0/0, ::/0").split(","));
|
|
||||||
|
|
||||||
if (allowedIpsJsonArray != defaultAllowedIP) {
|
|
||||||
allowedIpsJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
|
|
||||||
allowedIpsJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
|
|
||||||
|
|
||||||
m_vpnConfiguration.insert(config_key::splitTunnelType, Settings::RouteMode::VpnOnlyForwardSites);
|
|
||||||
m_vpnConfiguration.insert(config_key::splitTunnelSites, allowedIpsJsonArray);
|
|
||||||
|
|
||||||
|
configData[config_key::allowed_ips] = allowedIpsJsonArray;
|
||||||
|
m_vpnConfiguration.insert(protocolName + "_config_data", configData);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
auto routeMode = m_settings->routeMode();
|
auto routeMode = m_settings->routeMode();
|
||||||
auto sites = m_settings->getVpnIps(routeMode);
|
auto sites = m_settings->getVpnIps(routeMode);
|
||||||
|
|||||||
Reference in New Issue
Block a user