Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 14:40:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fakedns rule conflict

Browse Source
This commit is contained in:
arm64v8a 2023-05-01 15:31:35 +09:00
parent c3aafbfdc9
commit d4fb7c614c
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
View File

@ -214,6 +214,7 @@ fun buildConfig(
IPv6Mode.DISABLE -> {
strategy = "ipv4_only"
}
IPv6Mode.ONLY -> {
strategy = "ipv6_only"
}
@ -234,9 +235,11 @@ fun buildConfig(
IPv6Mode.DISABLE -> {
inet4_address = listOf(VpnService.PRIVATE_VLAN4_CLIENT + "/28")
}
IPv6Mode.ONLY -> {
inet6_address = listOf(VpnService.PRIVATE_VLAN6_CLIENT + "/126")
}
else -> {
inet4_address = listOf(VpnService.PRIVATE_VLAN4_CLIENT + "/28")
inet6_address = listOf(VpnService.PRIVATE_VLAN6_CLIENT + "/126")
@ -389,20 +392,28 @@ fun buildConfig(
currentOutbound = when (bean) {
is ConfigBean ->
gson.fromJson(bean.config, currentOutbound.javaClass)
is ShadowTLSBean -> // before StandardV2RayBean
buildSingBoxOutboundShadowTLSBean(bean).asMap()
is StandardV2RayBean -> // http/trojan/vmess/vless
buildSingBoxOutboundStandardV2RayBean(bean).asMap()
is HysteriaBean ->
buildSingBoxOutboundHysteriaBean(bean).asMap()
is SOCKSBean ->
buildSingBoxOutboundSocksBean(bean).asMap()
is ShadowsocksBean ->
buildSingBoxOutboundShadowsocksBean(bean).asMap()
is WireGuardBean ->
buildSingBoxOutboundWireguardBean(bean).asMap()
is SSHBean ->
buildSingBoxOutboundSSHBean(bean).asMap()
else -> throw IllegalStateException("can't reach")
}
@ -752,14 +763,14 @@ fun buildConfig(
}
if (forTest) {
// Disable DNS for test
// Always use system DNS for urlTest
dns.servers = listOf(
DNSServerOptions().apply {
address = LOCAL_DNS_SERVER
tag = "dns-local"
detour = TAG_DIRECT
}
) // Always use system DNS for urlTest
)
dns.rules = listOf()
} else {
// built-in DNS rules
@ -788,16 +799,7 @@ fun buildConfig(
server = "dns-block"
disable_cache = true
})
// force bypass
if (domainListDNSDirectForce.isNotEmpty()) {
dns.rules.add(0, DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSDirectForce.toHashSet().toList())
server = "dns-direct"
})
}
}
// fakedns obj
// FakeDNS obj
if (useFakeDns) {
dns.servers.add(DNSServerOptions().apply {
address = "fakedns://" + VpnService.FAKEDNS_VLAN4_CLIENT + "/15"
@ -814,6 +816,14 @@ fun buildConfig(
disable_cache = true
})
}
// force bypass (always top DNS rule)
if (domainListDNSDirectForce.isNotEmpty()) {
dns.rules.add(0, DNSRule_DefaultOptions().apply {
makeSingBoxRule(domainListDNSDirectForce.toHashSet().toList())
server = "dns-direct"
})
}
}
}.let {
ConfigBuildResult(
gson.toJson(it.asMap().apply {