Merge pull request #1070 from yuhan6665/bypass-fix

bypass local also bypass multicast address
2021-05-29 10:29:25 +08:00 · 2021-05-28 19:51:08 -04:00 · 2021-05-24 08:14:43 +08:00 · 2021-05-23 11:56:23 -04:00
3 changed files with 80 additions and 83 deletions
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
@@ -369,7 +369,7 @@ data class V2rayConfig(
        }
    }

-    data class DnsBean(var servers: List<Any>? = null,
+    data class DnsBean(var servers: ArrayList<Any>? = null,
                       var hosts: Map<String, String>? = null,
                       val clientIp: String? = null,
                       val disableCache: Boolean? = null,
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
@@ -69,10 +69,10 @@ object V2rayConfigUtil {

        fakedns(v2rayConfig)

+        dns(v2rayConfig)
+
        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
            customLocalDns(v2rayConfig)
-        } else {
-            customRemoteDns(v2rayConfig)
        }
        if (settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) != true) {
            v2rayConfig.stats = null
@@ -261,50 +261,19 @@ object V2rayConfigUtil {
     */
    private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
        try {
-            val hosts = mutableMapOf<String, String>()
-            val servers = ArrayList<Any>()
-            val remoteDns = Utils.getRemoteDnsServers()
-            val domesticDns = Utils.getDomesticDnsServers()
-            val geositeCn = arrayListOf("geosite:cn")
-            val geoipCn = arrayListOf("geoip:cn")
-            val proxyDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
-                    ?: "")
-            val directDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
-                    ?: "")
-
            if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
+                val geositeCn = arrayListOf("geosite:cn")
+                val proxyDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
+                        ?: "")
+                val directDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
+                        ?: "")
                // fakedns with all domains to make it always top priority
-                servers.add(V2rayConfig.DnsBean.ServersBean(address = "fakedns", domains = geositeCn.plus(proxyDomain).plus(directDomain)))
+                v2rayConfig.dns.servers?.add(0,
+                        V2rayConfig.DnsBean.ServersBean(address = "fakedns", domains = geositeCn.plus(proxyDomain).plus(directDomain)))
            }
-            remoteDns.forEach {
-                servers.add(it)
-            }
-            if (proxyDomain.size > 0) {
-                servers.add(V2rayConfig.DnsBean.ServersBean(remoteDns.first(), 53, proxyDomain, null))
-            }
-            if (directDomain.size > 0) {
-                servers.add(V2rayConfig.DnsBean.ServersBean(domesticDns.first(), 53, directDomain, geoipCn))
-            }
-            val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE) ?: "0"
-            if (routingMode == "2" || routingMode == "3") {
-                servers.add(V2rayConfig.DnsBean.ServersBean(domesticDns.first(), 53, geositeCn, geoipCn))
-            }
-
-            val blkDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_BLOCKED)
-                    ?: "")
-            if (blkDomain.size > 0) {
-                hosts.putAll(blkDomain.map { it to "127.0.0.1" })
-            }
-
-            // hardcode googleapi rule to fix play store problems
-            hosts.put("domain:googleapis.cn", "googleapis.com")
-
-            // DNS dns对象
-            v2rayConfig.dns = V2rayConfig.DnsBean(
-                    servers = servers,
-                    hosts = hosts)

            // DNS inbound对象
+            val remoteDns = Utils.getRemoteDnsServers()
            if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
                val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
                        address = if (remoteDns.first().startsWith("https")) "1.1.1.1" else remoteDns.first(),
@@ -333,16 +302,75 @@ object V2rayConfigUtil {
                                mux = null))
            }

-            // DNS routing
-            if (!domesticDns.first().startsWith("https")) {
-                v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
-                        type = "field",
-                        outboundTag = AppConfig.TAG_DIRECT,
-                        port = "53",
-                        ip = arrayListOf(domesticDns.first()),
-                        domain = null)
-                )
+            // DNS routing tag
+            v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
+                    type = "field",
+                    inboundTag = arrayListOf("dns-in"),
+                    outboundTag = "dns-out",
+                    domain = null)
+            )
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+        return true
+    }
+
+    private fun dns(v2rayConfig: V2rayConfig): Boolean {
+        try {
+            val hosts = mutableMapOf<String, String>()
+            val servers = ArrayList<Any>()
+            val remoteDns = Utils.getRemoteDnsServers()
+            val proxyDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_AGENT)
+                    ?: "")
+
+            remoteDns.forEach {
+                servers.add(it)
            }
+            if (proxyDomain.size > 0) {
+                servers.add(V2rayConfig.DnsBean.ServersBean(remoteDns.first(), 53, proxyDomain, null))
+            }
+
+            // domestic DNS
+            val directDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_DIRECT)
+                    ?: "")
+            val routingMode = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_MODE) ?: "0"
+            if (directDomain.size > 0 || routingMode == "2" || routingMode == "3") {
+                val domesticDns = Utils.getDomesticDnsServers()
+                val geositeCn = arrayListOf("geosite:cn")
+                val geoipCn = arrayListOf("geoip:cn")
+                if (directDomain.size > 0) {
+                    servers.add(V2rayConfig.DnsBean.ServersBean(domesticDns.first(), 53, directDomain, geoipCn))
+                }
+                if (routingMode == "2" || routingMode == "3") {
+                    servers.add(V2rayConfig.DnsBean.ServersBean(domesticDns.first(), 53, geositeCn, geoipCn))
+                }
+                if (!domesticDns.first().startsWith("https")) {
+                    v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
+                            type = "field",
+                            outboundTag = AppConfig.TAG_DIRECT,
+                            port = "53",
+                            ip = arrayListOf(domesticDns.first()),
+                            domain = null)
+                    )
+                }
+            }
+
+            val blkDomain = userRule2Domian(settingsStorage?.decodeString(AppConfig.PREF_V2RAY_ROUTING_BLOCKED)
+                    ?: "")
+            if (blkDomain.size > 0) {
+                hosts.putAll(blkDomain.map { it to "127.0.0.1" })
+            }
+
+            // hardcode googleapi rule to fix play store problems
+            hosts.put("domain:googleapis.cn", "googleapis.com")
+
+            // DNS dns对象
+            v2rayConfig.dns = V2rayConfig.DnsBean(
+                    servers = servers,
+                    hosts = hosts)
+
+            // DNS routing
            if (!remoteDns.first().startsWith("https")) {
                v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
                        type = "field",
@@ -352,37 +380,6 @@ object V2rayConfigUtil {
                        domain = null)
                )
            }
-
-            // DNS routing tag
-            v2rayConfig.routing.rules.add(0, V2rayConfig.RoutingBean.RulesBean(
-                    type = "field",
-                    inboundTag = arrayListOf("dns-in"),
-                    outboundTag = "dns-out",
-                    domain = null)
-            )
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
-
-    /**
-     * Custom Remote Dns
-     */
-    private fun customRemoteDns(v2rayConfig: V2rayConfig): Boolean {
-        try {
-            val servers = ArrayList<Any>()
-            val hosts = mutableMapOf<String, String>()
-
-            Utils.getRemoteDnsServers().forEach {
-                servers.add(it)
-            }
-            // hardcode googleapi rule to fix play store problems
-            hosts.put("domain:googleapis.cn", "googleapis.com")
-
-            v2rayConfig.dns = V2rayConfig.DnsBean(servers = servers, hosts = hosts)
        } catch (e: Exception) {
            e.printStackTrace()
            return false
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -132,6 +132,6 @@
        <item>196.0.0.0/6</item>
        <item>200.0.0.0/5</item>
        <item>208.0.0.0/4</item>
-        <item>224.0.0.0/3</item>
+        <item>240.0.0.0/4</item>
    </string-array>
 </resources>
Author	SHA1	Message	Date
2dust	35c5d64863	Merge pull request #1070 from yuhan6665/bypass-fix bypass local also bypass multicast address	2021-05-29 10:29:25 +08:00
yuhan6665	0b05756d12	bypass local also bypass multicast address https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.xhtml	2021-05-28 19:51:08 -04:00
2dust	3548dcbb67	Merge pull request #1065 from yuhan6665/domestic Always add domestic dns to config	2021-05-24 08:14:43 +08:00
yuhan6665	b897b2a0e9	Always add domestic dns to config Previously, domestic dns is only added to config under "local dns mode". However, it should be used for V2ray core routing DNS as well.	2021-05-23 11:56:23 -04:00