AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup debug stuff

Browse source
This commit is contained in:
Mykola Baibuz 2023-10-24 11:10:16 +03:00
parent c772f56da7
commit 1b37ca805f
4 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt
View file

@ -74,14 +74,9 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
val jsonVpnConfig = mService.getVpnConfig() val jsonVpnConfig = mService.getVpnConfig()
val ovpnConfig = jsonVpnConfig.getJSONObject("openvpn_config_data").getString("config") val ovpnConfig = jsonVpnConfig.getJSONObject("openvpn_config_data").getString("config")
Log.e(tag, "jsonVpnConfig $jsonVpnConfig")
val splitTunnelType = jsonVpnConfig.getInt("splitTunnelType") val splitTunnelType = jsonVpnConfig.getInt("splitTunnelType")
val splitTunnelSites = jsonVpnConfig.getJSONArray("splitTunnelSites") val splitTunnelSites = jsonVpnConfig.getJSONArray("splitTunnelSites")
Log.e(tag, "splitTunnelType $splitTunnelType")
Log.e(tag, "splitTunnelSites $splitTunnelSites")
val resultingConfig = StringBuilder() val resultingConfig = StringBuilder()
resultingConfig.append(ovpnConfig) resultingConfig.append(ovpnConfig)
@ -158,7 +153,6 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
val site = splitTunnelSites.getString(i) val site = splitTunnelSites.getString(i)
val ipRange = IPRange(site) val ipRange = IPRange(site)
mService.addRoute(ipRange.getFrom().getHostAddress(), ipRange.getPrefix()) mService.addRoute(ipRange.getFrom().getHostAddress(), ipRange.getPrefix())
Log.e(tag, "splitTunnelSites $ipRange")
} }
} }
if (splitTunnelType == 2) { if (splitTunnelType == 2) {
@ -170,8 +164,7 @@ class OpenVPNThreadv3(var service: VPNService): ClientAPI_OpenVPNClient(), Runna
} }
ipRangeSet.subnets().forEach { ipRangeSet.subnets().forEach {
mService.addRoute(it.getFrom().getHostAddress(), it.getPrefix()) mService.addRoute(it.getFrom().getHostAddress(), it.getPrefix())
Thread.sleep(100) Thread.sleep(10)
Log.e(tag, "splitTunnelSites $it")
} }
mService.addRoute("2000::", 3) 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 { override fun tun_builder_reroute_gw(ipv4: Boolean, ipv6: Boolean , flags: Long): Boolean {
Log.v(tag, "tun_builder_reroute_gw") Log.v(tag, "tun_builder_reroute_gw")
// mService.addRoute("0.0.0.0", 0) mService.addRoute("0.0.0.0", 0)
return true return true
} }

2
client/android/src/org/amnezia/vpn/VPNService.kt
View file

@ -611,7 +611,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
/* VPN connection used only for defined IPs */ /* VPN connection used only for defined IPs */
for (i in 0 until splitTunnelSites.length()) { for (i in 0 until splitTunnelSites.length()) {
val site = splitTunnelSites.getString(i) val site = splitTunnelSites.getString(i)
Log.e(tag, "splitTunnelSites $site")
val internet = InetNetwork.parse(site) val internet = InetNetwork.parse(site)
peerBuilder.addAllowedIp(internet) peerBuilder.addAllowedIp(internet)
} }
@ -626,7 +625,6 @@ class VPNService : BaseVpnService(), LocalDnsService.Interface {
ipRangeSet.remove(IPRange(site)) ipRangeSet.remove(IPRange(site))
} }
val allowedIps = ipRangeSet.subnets().joinToString(", ") + ", 2000::/3" val allowedIps = ipRangeSet.subnets().joinToString(", ") + ", 2000::/3"
Log.e(tag, "allowedIps $allowedIps")
peerBuilder.parseAllowedIPs(allowedIps) peerBuilder.parseAllowedIPs(allowedIps)
} }
} }

1
client/configurators/openvpn_configurator.cpp
View file

@ -131,7 +131,6 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString jsonConfig)
config.append("block-ipv6\n"); config.append("block-ipv6\n");
} }
if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) { if (m_settings->routeMode() == Settings::VpnOnlyForwardSites) {
qDebug() << "Settings::VpnOnlyForwardSites";
// no redirect-gateway // no redirect-gateway
} }

3
client/platforms/ios/ios_controller.mm
View file

@ -355,8 +355,6 @@ void IosController::startTunnel()
m_rxBytes = 0; m_rxBytes = 0;
m_txBytes = 0; m_txBytes = 0;
qDebug() << "m_rawConfig " << m_rawConfig;
int STT = m_rawConfig["splitTunnelType"].toInt(); int STT = m_rawConfig["splitTunnelType"].toInt();
QJsonArray splitTunnelSites = m_rawConfig["splitTunnelSites"].toArray(); QJsonArray splitTunnelSites = m_rawConfig["splitTunnelSites"].toArray();
QJsonDocument doc; QJsonDocument doc;
@ -397,7 +395,6 @@ void IosController::startTunnel()
NSDictionary* message = @{actionKey: actionValue, tunnelIdKey: tunnelIdValue, NSDictionary* message = @{actionKey: actionValue, tunnelIdKey: tunnelIdValue,
SplitTunnelTypeKey: SplitTunnelTypeValue, SplitTunnelSitesKey: SplitTunnelSitesValue}; SplitTunnelTypeKey: SplitTunnelTypeValue, SplitTunnelSitesKey: SplitTunnelSitesValue};
qDebug() << "sendVpnExtensionMessage " << message;
sendVpnExtensionMessage(message); sendVpnExtensionMessage(message);