Cloudflare DNS Hosts

Author: DHR60

V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt

@@ -168,10 +168,11 @@ object AppConfig {
     // Android Private DNS constants
     const val DNS_DNSPOD_DOMAIN = "dot.pub"
     const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_ONE_DOMAIN = "one.one.one.one"
     const val DNS_GOOGLE_DOMAIN = "dns.google"
     const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
     const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
+    val DNS_CLOUDFLARE_DOMAIN_LIST = listOf("dns.cloudflare.com", "cloudflare-dns.com")
 
     const val DEFAULT_PORT = 443
     const val DEFAULT_SECURITY = "auto"
@@ -182,7 +183,7 @@ object AppConfig {
     const val HEADER_TYPE_HTTP = "http"
 
     val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_CLOUDFLARE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
     val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
     val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
     val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -16,7 +16,6 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.fmt.HttpFmt
-import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
 import com.v2ray.ang.fmt.SocksFmt
 import com.v2ray.ang.fmt.TrojanFmt
@@ -479,20 +478,6 @@ object V2rayConfigManager {
                 )
             }
 
-            //User DNS hosts
-            try {
-                val userHosts = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
-                if (userHosts.isNotNullEmpty()) {
-                    var userHostsMap = userHosts?.split(",")
-                        ?.filter { it.isNotEmpty() }
-                        ?.filter { it.contains(":") }
-                        ?.associate { it.split(":").let { (k, v) -> k to v } }
-                    if (userHostsMap != null) hosts.putAll(userHostsMap)
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to configure user DNS hosts", e)
-            }
-
             //block dns
             val blkDomain = getUserRule2Domain(AppConfig.TAG_BLOCKED)
             if (blkDomain.isNotEmpty()) {
@@ -504,12 +489,35 @@ object V2rayConfigManager {
 
             // hardcode popular Android Private DNS rule to fix localhost DNS problem
             hosts[AppConfig.DNS_ALIDNS_DOMAIN] = AppConfig.DNS_ALIDNS_ADDRESSES
-            hosts[AppConfig.DNS_CLOUDFLARE_DOMAIN] = AppConfig.DNS_CLOUDFLARE_ADDRESSES
+            hosts[AppConfig.DNS_CLOUDFLARE_ONE_DOMAIN] = AppConfig.DNS_CLOUDFLARE_ONE_ADDRESSES
             hosts[AppConfig.DNS_DNSPOD_DOMAIN] = AppConfig.DNS_DNSPOD_ADDRESSES
             hosts[AppConfig.DNS_GOOGLE_DOMAIN] = AppConfig.DNS_GOOGLE_ADDRESSES
             hosts[AppConfig.DNS_QUAD9_DOMAIN] = AppConfig.DNS_QUAD9_ADDRESSES
             hosts[AppConfig.DNS_YANDEX_DOMAIN] = AppConfig.DNS_YANDEX_ADDRESSES
 
+            //User DNS hosts
+            try {
+                val userHosts = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
+                if (userHosts.isNotNullEmpty()) {
+                    var userHostsMap = userHosts?.split(",")
+                        ?.filter { it.isNotEmpty() }
+                        ?.filter { it.contains(":") }
+                        ?.associate { it.split(":").let { (k, v) -> k to v } }
+                    if (userHostsMap != null) hosts.putAll(userHostsMap)
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to configure user DNS hosts", e)
+            }
+
+            remoteDns.forEach { dns ->
+                val matchDomain = AppConfig.DNS_CLOUDFLARE_DOMAIN_LIST.find { dns.contains(it) }
+                if (matchDomain != null && !hosts.containsKey(matchDomain)) {
+                    val ip = HttpUtil.resolveHostToIP(matchDomain)
+                    if (!ip.isNullOrEmpty()) {
+                        hosts[matchDomain] = ip
+                    }
+                }
+            }
 
             // DNS dns
             v2rayConfig.dns = V2rayConfig.DnsBean(