icybear/sing-box-for-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix route range

Browse Source
This commit is contained in:
世界
2023-12-09 22:38:00 +08:00
parent c0d2f57ec0
commit 4892c54313
2 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/io/nekohasekai/sfa/bg/VPNService.kt
View File

@@ -8,6 +8,7 @@ import android.os.Build
import android.os.IBinder import android.os.IBinder
import io.nekohasekai.libbox.TunOptions import io.nekohasekai.libbox.TunOptions
import io.nekohasekai.sfa.database.Settings import io.nekohasekai.sfa.database.Settings
import io.nekohasekai.sfa.ktx.toIpPrefix
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@@ -61,29 +62,25 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
} }
val inet4Address = options.inet4Address val inet4Address = options.inet4Address
if (inet4Address.hasNext()) {
while (inet4Address.hasNext()) { while (inet4Address.hasNext()) {
val address = inet4Address.next() val address = inet4Address.next()
builder.addAddress(address.address, address.prefix) builder.addAddress(address.address(), address.prefix())
}
} }
val inet6Address = options.inet6Address val inet6Address = options.inet6Address
if (inet6Address.hasNext()) {
while (inet6Address.hasNext()) { while (inet6Address.hasNext()) {
val address = inet6Address.next() val address = inet6Address.next()
builder.addAddress(address.address, address.prefix) builder.addAddress(address.address(), address.prefix())
}
} }
if (options.autoRoute) { if (options.autoRoute) {
builder.addDnsServer(options.dnsServerAddress) builder.addDnsServer(options.dnsServerAddress)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
val inet4RouteAddress = options.inet4RouteAddress val inet4RouteAddress = options.inet4RouteAddress
if (inet4RouteAddress.hasNext()) { if (inet4RouteAddress.hasNext()) {
while (inet4RouteAddress.hasNext()) { while (inet4RouteAddress.hasNext()) {
val address = inet4RouteAddress.next() builder.addRoute(inet4RouteAddress.next().toIpPrefix())
builder.addRoute(address.address, address.prefix)
} }
} else { } else {
builder.addRoute("0.0.0.0", 0) builder.addRoute("0.0.0.0", 0)
@@ -92,13 +89,39 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
val inet6RouteAddress = options.inet6RouteAddress val inet6RouteAddress = options.inet6RouteAddress
if (inet6RouteAddress.hasNext()) { if (inet6RouteAddress.hasNext()) {
while (inet6RouteAddress.hasNext()) { while (inet6RouteAddress.hasNext()) {
val address = inet6RouteAddress.next() builder.addRoute(inet6RouteAddress.next().toIpPrefix())
builder.addRoute(address.address, address.prefix)
} }
} else { } else {
builder.addRoute("::", 0) builder.addRoute("::", 0)
} }
val inet4RouteExcludeAddress = options.inet4RouteExcludeAddress
while (inet4RouteExcludeAddress.hasNext()) {
builder.excludeRoute(inet4RouteExcludeAddress.next().toIpPrefix())
}
val inet6RouteExcludeAddress = options.inet6RouteExcludeAddress
while (inet6RouteExcludeAddress.hasNext()) {
builder.excludeRoute(inet6RouteExcludeAddress.next().toIpPrefix())
}
} else {
val inet4RouteAddress = options.inet4RouteRange
if (inet4RouteAddress.hasNext()) {
while (inet4RouteAddress.hasNext()) {
val address = inet4RouteAddress.next()
builder.addRoute(address.address(), address.prefix())
}
}
val inet6RouteAddress = options.inet6RouteRange
if (inet6RouteAddress.hasNext()) {
while (inet6RouteAddress.hasNext()) {
val address = inet6RouteAddress.next()
builder.addRoute(address.address(), address.prefix())
}
}
}
if (Settings.perAppProxyEnabled) { if (Settings.perAppProxyEnabled) {
val appList = Settings.perAppProxyList val appList = Settings.perAppProxyList
if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) { if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) {

8
app/src/main/java/io/nekohasekai/sfa/ktx/Wrappers.kt
View File

@@ -1,6 +1,11 @@
package io.nekohasekai.sfa.ktx package io.nekohasekai.sfa.ktx
import android.net.IpPrefix
import android.os.Build
import androidx.annotation.RequiresApi
import io.nekohasekai.libbox.RoutePrefix
import io.nekohasekai.libbox.StringIterator import io.nekohasekai.libbox.StringIterator
import java.net.InetAddress
fun Iterable<String>.toStringIterator(): StringIterator { fun Iterable<String>.toStringIterator(): StringIterator {
return object : StringIterator { return object : StringIterator {
@@ -23,3 +28,6 @@ fun StringIterator.toList(): List<String> {
} }
} }
} }
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
fun RoutePrefix.toIpPrefix() = IpPrefix(InetAddress.getByName(address()), prefix())