for servers received via api, ignore the split tunneling settings

client/configurators/openvpn_configurator.cpp

@@ -118,11 +118,12 @@ QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentia
     return QJsonDocument(jConfig).toJson();
 }
 
-QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
+QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig, const int serverIndex)
 {
     QJsonObject json = QJsonDocument::fromJson(jsonConfig.toUtf8()).object();
     QString config = json[config_key::config].toString();
 
+    if (!m_settings->server(serverIndex).value(config_key::configVersion).toInt()) {
         QRegularExpression regex("redirect-gateway.*");
         config.replace(regex, "");
 
@@ -137,13 +138,14 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
             // no redirect-gateway
         }
         if (m_settings->routeMode() == Settings::VpnAllExceptSites) {
-#ifndef Q_OS_ANDROID
+    #ifndef Q_OS_ANDROID
             config.append("\nredirect-gateway ipv6 !ipv4 bypass-dhcp\n");
-#endif
+    #endif
             // Prevent ipv6 leak
             config.append("ifconfig-ipv6 fd15:53b6:dead::2/64  fd15:53b6:dead::1\n");
             config.append("block-ipv6\n");
         }
+    }
 
 #ifndef MZ_WINDOWS
     config.replace("block-outside-dns", "");

client/configurators/openvpn_configurator.h

@@ -26,7 +26,7 @@ public:
     QString genOpenVpnConfig(const ServerCredentials &credentials, DockerContainer container,
         const QJsonObject &containerConfig, QString &clientId, ErrorCode *errorCode = nullptr);
 
-    QString processConfigWithLocalSettings(QString jsonConfig);
+    QString processConfigWithLocalSettings(QString jsonConfig, const int serverIndex);
     QString processConfigWithExportSettings(QString jsonConfig);
 
     ErrorCode signCert(DockerContainer container,

client/configurators/vpn_configurator.cpp

@@ -92,7 +92,7 @@ QString &VpnConfigurator::processConfigWithLocalSettings(int serverIndex, Docker
     processConfigWithDnsSettings(serverIndex, container, proto, config);
 
     if (proto == Proto::OpenVpn) {
-        config = openVpnConfigurator->processConfigWithLocalSettings(config);
+        config = openVpnConfigurator->processConfigWithLocalSettings(config, serverIndex);
     }
     return config;
 }

client/ui/models/servers_model.cpp

@@ -531,3 +531,8 @@ void ServersModel::toggleAmneziaDns(bool enabled)
     emit defaultServerDescriptionChanged();
 }
 
+bool ServersModel::isDefaultServerFromApi()
+{
+    return m_settings->server(m_defaultServerIndex).value(config_key::configVersion).toInt();
+}
+

client/ui/models/servers_model.h

@@ -97,6 +97,8 @@ public slots:
 
     void toggleAmneziaDns(bool enabled);
 
+    bool isDefaultServerFromApi();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

client/ui/qml/Pages2/PageSettingsSplitTunneling.qml

@@ -21,7 +21,13 @@ PageType {
     id: root
 
     property bool pageEnabled: {
-        return !ConnectionController.isConnected
+        return !ConnectionController.isConnected && !ServersModel.isDefaultServerFromApi()
+    }
+
+    Component.onCompleted: {
+        if (ServersModel.isDefaultServerFromApi()) {
+            PageController.showNotificationMessage(qsTr("This server does not support split tunneling function"))
+        }
     }
 
     Connections {

client/vpnconnection.cpp

@@ -64,6 +64,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
             IpcClient::Interface()->resetIpStack();
             IpcClient::Interface()->flushDns();
 
+            if (!m_vpnConfiguration.value(config_key::configVersion).toInt()) {
                 if (m_settings->routeMode() != Settings::VpnAllSites) {
                     IpcClient::Interface()->routeDeleteList(m_vpnProtocol->vpnGateway(), QStringList() << "0.0.0.0");
                     // qDebug() << "VpnConnection::onConnectionStateChanged :: adding custom routes, count:" << forwardIps.size();
@@ -83,6 +84,7 @@ void VpnConnection::onConnectionStateChanged(Vpn::ConnectionState state)
                     IpcClient::Interface()->routeAddList(m_vpnProtocol->routeGateway(), QStringList() << remoteAddress());
                     addSitesRoutes(m_vpnProtocol->routeGateway(), m_settings->routeMode());
                 }
+            }
 
         } else if (state == Vpn::ConnectionState::Error) {
             IpcClient::Interface()->flushDns();
@@ -296,6 +298,7 @@ QJsonObject VpnConnection::createVpnConfiguration(int serverIndex, const ServerC
     vpnConfiguration[config_key::hostName] = server.value(config_key::hostName).toString();
     vpnConfiguration[config_key::description] = server.value(config_key::description).toString();
 
+    vpnConfiguration[config_key::configVersion] = server.value(config_key::configVersion).toInt();
     // TODO: try to get hostName, port, description for 3rd party configs
     // vpnConfiguration[config_key::port] = ...;