From 1b37ca805f4737f748dcdae0d24303ebfba4bd82 Mon Sep 17 00:00:00 2001
From: Mykola Baibuz <mykola.baibuz@gmail.com>
Date: Tue, 24 Oct 2023 11:10:16 +0300
Subject: [PATCH] Cleanup debug stuff

---
 client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt | 11 ++---------
 client/android/src/org/amnezia/vpn/VPNService.kt      |  2 --
 client/configurators/openvpn_configurator.cpp         |  1 -
 client/platforms/ios/ios_controller.mm                |  3 ---
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt b/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
index d96131af..b35face4 100644
--- a/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
+++ b/client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
@@ -74,14 +74,9 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
 
         val jsonVpnConfig = mService.getVpnConfig()
         val ovpnConfig = jsonVpnConfig.getJSONObject("openvpn_config_data").getString("config")
-        Log.e(tag, "jsonVpnConfig $jsonVpnConfig")
         val splitTunnelType = jsonVpnConfig.getInt("splitTunnelType")
         val splitTunnelSites = jsonVpnConfig.getJSONArray("splitTunnelSites")
 
-        Log.e(tag, "splitTunnelType $splitTunnelType")
-        Log.e(tag, "splitTunnelSites $splitTunnelSites")
-
-
         val resultingConfig = StringBuilder()
         resultingConfig.append(ovpnConfig)
 
@@ -158,7 +153,6 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
                 val site = splitTunnelSites.getString(i)
                 val ipRange = IPRange(site)
                 mService.addRoute(ipRange.getFrom().getHostAddress(), ipRange.getPrefix())
-                Log.e(tag, "splitTunnelSites $ipRange")
             }
         }
         if (splitTunnelType == 2) {
@@ -170,8 +164,7 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
             }
             ipRangeSet.subnets().forEach {
                 mService.addRoute(it.getFrom().getHostAddress(), it.getPrefix())
-                Thread.sleep(100)
-                Log.e(tag, "splitTunnelSites $it")
+                Thread.sleep(10)
             }
             mService.addRoute("2000::", 3)
         }
@@ -196,7 +189,7 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
 
     override fun tun_builder_reroute_gw(ipv4: Boolean, ipv6: Boolean , flags: Long): Boolean {
           Log.v(tag, "tun_builder_reroute_gw")
-         // mService.addRoute("0.0.0.0", 0)
+          mService.addRoute("0.0.0.0", 0)
           return true
     }
 
diff --git a/client/android/src/org/amnezia/vpn/VPNService.kt b/client/android/src/org/amnezia/vpn/VPNService.kt
index ca468108..929545d6 100644
--- a/client/android/src/org/amnezia/vpn/VPNService.kt
+++ b/client/android/src/org/amnezia/vpn/VPNService.kt
@@ -611,7 +611,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                     /* VPN connection used only for defined IPs */
                     for (i in 0 until splitTunnelSites.length()) {
                         val site = splitTunnelSites.getString(i)
-                        Log.e(tag, "splitTunnelSites $site")
                         val internet = InetNetwork.parse(site)
                         peerBuilder.addAllowedIp(internet)
                     }
@@ -626,7 +625,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
                         ipRangeSet.remove(IPRange(site))
                     }
                     val allowedIps = ipRangeSet.subnets().joinToString(", ") + ", 2000::/3"
-                    Log.e(tag, "allowedIps $allowedIps")
                     peerBuilder.parseAllowedIPs(allowedIps)
                 }
             }
diff --git a/client/configurators/openvpn_configurator.cpp b/client/configurators/openvpn_configurator.cpp
index cc5c30e5..8c58a376 100644
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -131,7 +131,6 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
         config.append("block-ipv6\n");
     }
     if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
-        qDebug() << "Settings::VpnOnlyForwardSites";
         
         // no redirect-gateway
     }
diff --git a/client/platforms/ios/ios_controller.mm b/client/platforms/ios/ios_controller.mm
index 841ff1e0..79eddefd 100644
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -355,8 +355,6 @@ void IosController::startTunnel()
     m_rxBytes = 0;
     m_txBytes = 0;
     
-    qDebug() << "m_rawConfig " << m_rawConfig;
-    
     int STT = m_rawConfig["splitTunnelType"].toInt();
     QJsonArray splitTunnelSites = m_rawConfig["splitTunnelSites"].toArray();
     QJsonDocument doc;
@@ -397,7 +395,6 @@ void IosController::startTunnel()
                     NSDictionary* message = @{actionKey: actionValue, tunnelIdKey: tunnelIdValue,
                     SplitTunnelTypeKey: SplitTunnelTypeValue, SplitTunnelSitesKey: SplitTunnelSitesValue};
                 
-                    qDebug() << "sendVpnExtensionMessage " << message;
                     sendVpnExtensionMessage(message);