Compatible

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -63,6 +63,7 @@ public sealed class AppHandler
         SQLiteHelper.Instance.CreateTable<ServerStatItem>();
         SQLiteHelper.Instance.CreateTable<RoutingItem>();
         SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+        SQLiteHelper.Instance.CreateTable<DNSItem>();
         return true;
     }
 
@@ -192,6 +193,16 @@ public sealed class AppHandler
         return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Id == id);
     }
 
+    public async Task<List<DNSItem>?> DNSItems()
+    {
+        return await SQLiteHelper.Instance.TableAsync<DNSItem>().ToListAsync();
+    }
+
+    public async Task<DNSItem?> GetDNSItem(ECoreType eCoreType)
+    {
+        return await SQLiteHelper.Instance.TableAsync<DNSItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
+    }
+
     #endregion SqliteHelper
 
     #region Core Type

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -2100,6 +2100,101 @@ public class ConfigHandler
 
     #endregion Routing
 
+    #region DNS
+
+    /// <summary>
+    /// Initialize built-in DNS configurations
+    /// Creates default DNS items for V2Ray and sing-box
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <returns>0 if successful</returns>
+    public static async Task<int> InitBuiltinDNS(Config config)
+    {
+        var items = await AppHandler.Instance.DNSItems();
+        if (items.Count <= 0)
+        {
+            var item = new DNSItem()
+            {
+                Remarks = "V2ray",
+                CoreType = ECoreType.Xray,
+            };
+            await SaveDNSItems(config, item);
+
+            var item2 = new DNSItem()
+            {
+                Remarks = "sing-box",
+                CoreType = ECoreType.sing_box,
+            };
+            await SaveDNSItems(config, item2);
+        }
+
+        return 0;
+    }
+
+    /// <summary>
+    /// Save a DNS item to the database
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="item">DNS item to save</param>
+    /// <returns>0 if successful, -1 if failed</returns>
+    public static async Task<int> SaveDNSItems(Config config, DNSItem item)
+    {
+        if (item == null)
+        {
+            return -1;
+        }
+
+        if (item.Id.IsNullOrEmpty())
+        {
+            item.Id = Utils.GetGuid(false);
+        }
+
+        if (await SQLiteHelper.Instance.ReplaceAsync(item) > 0)
+        {
+            return 0;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /// <summary>
+    /// Get an external DNS configuration from URL
+    /// Downloads and processes DNS templates
+    /// </summary>
+    /// <param name="type">Core type (Xray or sing-box)</param>
+    /// <param name="url">URL of the DNS template</param>
+    /// <returns>DNS item with configuration from the URL</returns>
+    public static async Task<DNSItem> GetExternalDNSItem(ECoreType type, string url)
+    {
+        var currentItem = await AppHandler.Instance.GetDNSItem(type);
+
+        var downloadHandle = new DownloadService();
+        var templateContent = await downloadHandle.TryDownloadString(url, true, "");
+        if (templateContent.IsNullOrEmpty())
+            return currentItem;
+
+        var template = JsonUtils.Deserialize<DNSItem>(templateContent);
+        if (template == null)
+            return currentItem;
+
+        if (!template.NormalDNS.IsNullOrEmpty())
+            template.NormalDNS = await downloadHandle.TryDownloadString(template.NormalDNS, true, "");
+
+        if (!template.TunDNS.IsNullOrEmpty())
+            template.TunDNS = await downloadHandle.TryDownloadString(template.TunDNS, true, "");
+
+        template.Id = currentItem.Id;
+        template.Enabled = currentItem.Enabled;
+        template.Remarks = currentItem.Remarks;
+        template.CoreType = type;
+
+        return template;
+    }
+
+    #endregion DNS
+
     #region Regional Presets
 
     /// <summary>
@@ -2118,7 +2213,8 @@ public class ConfigHandler
                 config.ConstItem.SrsSourceUrl = "";
                 config.ConstItem.RouteRulesTemplateSourceUrl = "";
 
-                //await SQLiteHelper.Instance.DeleteAllAsync<SimpleDNSItem>();
+                await SQLiteHelper.Instance.DeleteAllAsync<DNSItem>();
+                await InitBuiltinDNS(config);
 
                 return true;
 
@@ -2127,8 +2223,8 @@ public class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[1];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[1];
 
-                //await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
+                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[1] + "v2ray.json"));
-                //await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
+                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[1] + "sing_box.json"));
 
                 return true;
 
@@ -2137,8 +2233,8 @@ public class ConfigHandler
                 config.ConstItem.SrsSourceUrl = Global.SingboxRulesetSources[2];
                 config.ConstItem.RouteRulesTemplateSourceUrl = Global.RoutingRulesSources[2];
 
-                //await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
+                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.Xray, Global.DNSTemplateSources[2] + "v2ray.json"));
-                //await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
+                await SaveDNSItems(config, await GetExternalDNSItem(ECoreType.sing_box, Global.DNSTemplateSources[2] + "sing_box.json"));
 
                 return true;
         }

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -0,0 +1,19 @@
+using SQLite;
+
+namespace ServiceLib.Models;
+
+[Serializable]
+public class DNSItem
+{
+    [PrimaryKey]
+    public string Id { get; set; }
+
+    public string Remarks { get; set; }
+    public bool Enabled { get; set; } = false;
+    public ECoreType CoreType { get; set; }
+    public bool UseSystemHosts { get; set; }
+    public string? NormalDNS { get; set; }
+    public string? TunDNS { get; set; }
+    public string? DomainStrategy4Freedom { get; set; }
+    public string? DomainDNSAddress { get; set; }
+}

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -239,6 +239,12 @@ public class Server4Sbox : BaseServer4Sbox
     public Headers4Sbox? headers { get; set; }
     // public List<string>? path { get; set; } // hosts
     public Dictionary<string, List<string>>? predefined { get; set; }
+    // Deprecated
+    public string? address { get; set; }
+    public string? address_resolver { get; set; }
+    public string? address_strategy { get; set; }
+    public string? strategy { get; set; }
+    // Deprecated End
 }
 
 public class Experimental4Sbox

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2355,6 +2355,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable Custom DNS 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnable {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Custom DNS Enabled, This Page&apos;s Settings Invalid 的本地化字符串。
+        /// </summary>
+        public static string TbCustomDNSEnabledPageInvalid {
+            get {
+                return ResourceManager.GetString("TbCustomDNSEnabledPageInvalid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Display GUI 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1458,4 +1458,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1458,4 +1458,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1458,4 +1458,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1458,4 +1458,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1455,4 +1455,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>配置后，会对相应地区域名（如 geosite:cn）的返回 IP 进行校验，仅返回期望 IP</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>启用自定义 DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>自定义 DNS 已启用，此页面配置将无效</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1455,4 +1455,10 @@
   <data name="TbValidateDirectExpectedIPsDesc" xml:space="preserve">
     <value>When configured, validates IPs returned for regional domains (e.g., geosite:cn), returning only expected IPs</value>
   </data>
+  <data name="TbCustomDNSEnable" xml:space="preserve">
+    <value>Enable Custom DNS</value>
+  </data>
+  <data name="TbCustomDNSEnabledPageInvalid" xml:space="preserve">
+    <value>Custom DNS Enabled, This Page's Settings Invalid</value>
+  </data>
 </root>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -245,7 +245,15 @@ public class CoreConfigSingboxService
                 singboxConfig.route.rules.Add(rule);
             }
 
-            await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            var rawDNSItem = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (rawDNSItem != null && rawDNSItem.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, rawDNSItem);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
             //var dnsServer = singboxConfig.dns?.servers.FirstOrDefault();
             //if (dnsServer != null)
             //{
@@ -317,7 +325,15 @@ public class CoreConfigSingboxService
                 await GenOutbound(node, singboxConfig.outbounds.First());
             }
             await GenMoreOutbounds(node, singboxConfig);
-            await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                await GenDnsDomainsCompatible(singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomains(singboxConfig, _config.SimpleDNSItem);
+            }
 
             singboxConfig.route.rules.Clear();
             singboxConfig.inbounds.Clear();
@@ -1575,6 +1591,12 @@ public class CoreConfigSingboxService
     {
         try
         {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            if (item != null && item.Enabled == true)
+            {
+                return await GenDnsCompatible(singboxConfig);
+            }
+
             var simpleDNSItem = _config.SimpleDNSItem;
             await GenDnsServers(singboxConfig, simpleDNSItem);
             await GenDnsRules(singboxConfig, simpleDNSItem);
@@ -1819,6 +1841,138 @@ public class CoreConfigSingboxService
         return 0;
     }
 
+    private async Task<int> GenDnsCompatible(SingboxConfig singboxConfig)
+    {
+        try
+        {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+            var strDNS = string.Empty;
+            if (_config.TunModeItem.EnableTun)
+            {
+                strDNS = string.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
+            }
+            else
+            {
+                strDNS = string.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
+            }
+
+            var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
+            if (dns4Sbox is null)
+            {
+                return 0;
+            }
+            singboxConfig.dns = dns4Sbox;
+
+            if (dns4Sbox.servers != null && dns4Sbox.servers.Count > 0 && dns4Sbox.servers.First().address.IsNullOrEmpty())
+            {
+                await GenDnsDomainsCompatible(singboxConfig, item);
+            }
+            else
+            {
+                await GenDnsDomainsLegacyCompatible(singboxConfig, item);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsDomainsCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
+    {
+        var dns4Sbox = singboxConfig.dns ?? new();
+        dns4Sbox.servers ??= [];
+        dns4Sbox.rules ??= [];
+
+        var tag = "outbound_resolver";
+        var localDnsAddress = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress;
+
+        if (localDnsAddress.StartsWith("tag://"))
+        {
+            tag = localDnsAddress.Substring(6);
+
+            var localDnsTag = "local_local";
+
+            dns4Sbox.servers.Add(new()
+            {
+                tag = localDnsTag,
+                type = "local"
+            });
+
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = localDnsTag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+        }
+        else
+        {
+            var localDnsServer = ParseDnsAddress(localDnsAddress);
+            localDnsServer.tag = tag;
+
+            dns4Sbox.servers.Add(localDnsServer);
+
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = tag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+        }
+
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
+            clash_mode = ERuleMode.Global.ToString()
+        });
+
+        singboxConfig.dns = dns4Sbox;
+        return await Task.FromResult(0);
+    }
+
+    private async Task<int> GenDnsDomainsLegacyCompatible(SingboxConfig singboxConfig, DNSItem? dNSItem)
+    {
+        var dns4Sbox = singboxConfig.dns ?? new();
+        dns4Sbox.servers ??= [];
+        dns4Sbox.rules ??= [];
+
+        var tag = "local_local";
+        dns4Sbox.servers.Add(new()
+        {
+            tag = tag,
+            address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+            detour = Global.DirectTag,
+            strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
+        });
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = tag,
+            clash_mode = ERuleMode.Direct.ToString()
+        });
+        dns4Sbox.rules.Insert(0, new()
+        {
+            server = dns4Sbox.servers.Where(t => t.detour == Global.ProxyTag).Select(t => t.tag).FirstOrDefault() ?? "remote",
+            clash_mode = ERuleMode.Global.ToString()
+        });
+
+        var lstDomain = singboxConfig.outbounds
+                       .Where(t => t.server.IsNotEmpty() && Utils.IsDomain(t.server))
+                       .Select(t => t.server)
+                       .Distinct()
+                       .ToList();
+        if (lstDomain != null && lstDomain.Count > 0)
+        {
+            dns4Sbox.rules.Insert(0, new()
+            {
+                server = tag,
+                domain = lstDomain
+            });
+        }
+
+        singboxConfig.dns = dns4Sbox;
+        return await Task.FromResult(0);
+    }
+
     private static Server4Sbox? ParseDnsAddress(string address)
     {
         var addressFirst = address?.Split(address.Contains(',') ? ',' : ';').FirstOrDefault()?.Trim();

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -1137,8 +1137,13 @@ public class CoreConfigV2rayService
     {
         try
         {
-            var dNSItem = _config.SimpleDNSItem;
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
-            var domainStrategy4Freedom = dNSItem?.RayStrategy4Freedom;
+            if (item != null && item.Enabled == true)
+            {
+                return await GenDnsCompatible(node, v2rayConfig);
+            }
+            var simpleDNSItem = _config.SimpleDNSItem;
+            var domainStrategy4Freedom = simpleDNSItem?.RayStrategy4Freedom;
 
             //Outbound Freedom domainStrategy
             if (domainStrategy4Freedom.IsNotEmpty())
@@ -1154,8 +1159,8 @@ public class CoreConfigV2rayService
                 }
             }
 
-            await GenDnsServers(node, v2rayConfig, dNSItem);
+            await GenDnsServers(node, v2rayConfig, simpleDNSItem);
-            await GenDnsHosts(v2rayConfig, dNSItem);
+            await GenDnsHosts(v2rayConfig, simpleDNSItem);
         }
         catch (Exception ex)
         {
@@ -1378,6 +1383,137 @@ public class CoreConfigV2rayService
         return await Task.FromResult(0);
     }
 
+    private async Task<int> GenDnsCompatible(ProfileItem? node, V2rayConfig v2rayConfig)
+    {
+        try
+        {
+            var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+            var normalDNS = item?.NormalDNS;
+            var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
+            if (normalDNS.IsNullOrEmpty())
+            {
+                normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            }
+
+            //Outbound Freedom domainStrategy
+            if (domainStrategy4Freedom.IsNotEmpty())
+            {
+                var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
+                if (outbound != null)
+                {
+                    outbound.settings = new();
+                    outbound.settings.domainStrategy = domainStrategy4Freedom;
+                    outbound.settings.userLevel = 0;
+                }
+            }
+
+            var obj = JsonUtils.ParseJson(normalDNS);
+            if (obj is null)
+            {
+                List<string> servers = [];
+                string[] arrDNS = normalDNS.Split(',');
+                foreach (string str in arrDNS)
+                {
+                    servers.Add(str);
+                }
+                obj = JsonUtils.ParseJson("{}");
+                obj["servers"] = JsonUtils.SerializeToNode(servers);
+            }
+
+            // Append to dns settings
+            if (item.UseSystemHosts)
+            {
+                var systemHosts = Utils.GetSystemHosts();
+                if (systemHosts.Count > 0)
+                {
+                    var normalHost1 = obj["hosts"];
+                    if (normalHost1 != null)
+                    {
+                        foreach (var host in systemHosts)
+                        {
+                            if (normalHost1[host.Key] != null)
+                                continue;
+                            normalHost1[host.Key] = host.Value;
+                        }
+                    }
+                }
+            }
+            var normalHost = obj["hosts"];
+            if (normalHost != null)
+            {
+                foreach (var hostProp in normalHost.AsObject().ToList())
+                {
+                    if (hostProp.Value is JsonValue value && value.TryGetValue<string>(out var ip))
+                    {
+                        normalHost[hostProp.Key] = new JsonArray(ip);
+                    }
+                }
+            }
+
+            await GenDnsDomainsCompatible(node, obj, item);
+
+            v2rayConfig.dns = JsonUtils.Deserialize<Dns4Ray>(obj.ToJsonString());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return 0;
+    }
+
+    private async Task<int> GenDnsDomainsCompatible(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
+    {
+        if (node == null)
+        {
+            return 0;
+        }
+        var servers = dns["servers"];
+        if (servers != null)
+        {
+            var domainList = new List<string>();
+            if (Utils.IsDomain(node.Address))
+            {
+                domainList.Add(node.Address);
+            }
+            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                // Previous proxy
+                var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                if (prevNode is not null
+                    && prevNode.ConfigType != EConfigType.Custom
+                    && prevNode.ConfigType != EConfigType.Hysteria2
+                    && prevNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(prevNode.Address))
+                {
+                    domainList.Add(prevNode.Address);
+                }
+
+                // Next proxy
+                var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+                if (nextNode is not null
+                    && nextNode.ConfigType != EConfigType.Custom
+                    && nextNode.ConfigType != EConfigType.Hysteria2
+                    && nextNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(nextNode.Address))
+                {
+                    domainList.Add(nextNode.Address);
+                }
+            }
+            if (domainList.Count > 0)
+            {
+                var dnsServer = new DnsServer4Ray()
+                {
+                    address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainPureIPDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                    skipFallback = true,
+                    domains = domainList
+                };
+                servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
+            }
+        }
+        return await Task.FromResult(0);
+    }
+
     private async Task<int> GenStatistic(V2rayConfig v2rayConfig)
     {
         if (_config.GuiItem.EnableStatistics || _config.GuiItem.DisplayRealTimeSpeed)

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -20,9 +20,21 @@ public class DNSSettingViewModel : MyReactiveObject
     [Reactive] public string? Hosts { get; set; }
     [Reactive] public string? DirectExpectedIPs { get; set; }
 
+    [Reactive] public bool UseSystemHostsCompatible { get; set; }
+    [Reactive] public string DomainStrategy4FreedomCompatible { get; set; }
+    [Reactive] public string DomainDNSAddressCompatible { get; set; }
+    [Reactive] public string NormalDNSCompatible { get; set; }
+
+    [Reactive] public string DomainStrategy4Freedom2Compatible { get; set; }
+    [Reactive] public string DomainDNSAddress2Compatible { get; set; }
+    [Reactive] public string NormalDNS2Compatible { get; set; }
+    [Reactive] public string TunDNS2Compatible { get; set; }
+    [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
+    [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
+
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
-    //public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
-    //public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCmd { get; }
+    public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
 
     public DNSSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
     {
@@ -30,18 +42,18 @@ public class DNSSettingViewModel : MyReactiveObject
         _updateView = updateView;
         SaveCmd = ReactiveCommand.CreateFromTask(SaveSettingAsync);
 
-        //ImportDefConfig4V2rayCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4V2rayCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
-        //{
+        {
-        //    NormalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            NormalDNSCompatible = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
-        //    await Task.CompletedTask;
+            await Task.CompletedTask;
-        //});
+        });
 
-        //ImportDefConfig4SingboxCmd = ReactiveCommand.CreateFromTask(async () =>
+        ImportDefConfig4SingboxCompatibleCmd = ReactiveCommand.CreateFromTask(async () =>
-        //{
+        {
-        //    NormalDNS2 = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
+            NormalDNS2Compatible = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
-        //    TunDNS2 = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
+            TunDNS2Compatible = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
-        //    await Task.CompletedTask;
+            await Task.CompletedTask;
-        //});
+        });
 
         _ = Init();
     }
@@ -63,6 +75,20 @@ public class DNSSettingViewModel : MyReactiveObject
         SingboxStrategy4Proxy = item.SingboxStrategy4Proxy;
         Hosts = item.Hosts;
         DirectExpectedIPs = item.DirectExpectedIPs;
+
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        RayCustomDNSEnableCompatible = item1.Enabled;
+        UseSystemHostsCompatible = item1.UseSystemHosts;
+        DomainStrategy4FreedomCompatible = item1?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddressCompatible = item1?.DomainDNSAddress ?? string.Empty;
+        NormalDNSCompatible = item1?.NormalDNS ?? string.Empty;
+
+        var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+        SBCustomDNSEnableCompatible = item2.Enabled;
+        DomainStrategy4Freedom2Compatible = item2?.DomainStrategy4Freedom ?? string.Empty;
+        DomainDNSAddress2Compatible = item2?.DomainDNSAddress ?? string.Empty;
+        NormalDNS2Compatible = item2?.NormalDNS ?? string.Empty;
+        TunDNS2Compatible = item2?.TunDNS ?? string.Empty;
     }
 
     private async Task SaveSettingAsync()
@@ -80,6 +106,57 @@ public class DNSSettingViewModel : MyReactiveObject
         _config.SimpleDNSItem.SingboxStrategy4Proxy = SingboxStrategy4Proxy;
         _config.SimpleDNSItem.Hosts = Hosts;
         _config.SimpleDNSItem.DirectExpectedIPs = DirectExpectedIPs;
+
+        if (NormalDNSCompatible.IsNotEmpty())
+        {
+            var obj = JsonUtils.ParseJson(NormalDNSCompatible);
+            if (obj != null && obj["servers"] != null)
+            {
+            }
+            else
+            {
+                if (NormalDNSCompatible.Contains('{') || NormalDNSCompatible.Contains('}'))
+                {
+                    NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                    return;
+                }
+            }
+        }
+        if (NormalDNS2Compatible.IsNotEmpty())
+        {
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2Compatible);
+            if (obj2 == null)
+            {
+                NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                return;
+            }
+        }
+        if (TunDNS2Compatible.IsNotEmpty())
+        {
+            var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2Compatible);
+            if (obj2 == null)
+            {
+                NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
+                return;
+            }
+        }
+
+        var item1 = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
+        item1.Enabled = RayCustomDNSEnableCompatible;
+        item1.DomainStrategy4Freedom = DomainStrategy4FreedomCompatible;
+        item1.DomainDNSAddress = DomainDNSAddressCompatible;
+        item1.UseSystemHosts = UseSystemHostsCompatible;
+        item1.NormalDNS = NormalDNSCompatible;
+        await ConfigHandler.SaveDNSItems(_config, item1);
+
+        var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
+        item2.Enabled = RayCustomDNSEnableCompatible;
+        item2.DomainStrategy4Freedom = DomainStrategy4Freedom2Compatible;
+        item2.DomainDNSAddress = DomainDNSAddress2Compatible;
+        item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2Compatible));
+        item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2Compatible));
+        await ConfigHandler.SaveDNSItems(_config, item2);
+
         await ConfigHandler.SaveConfig(_config);
         if (_updateView != null)
         {

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -219,6 +219,7 @@ public class MainWindowViewModel : MyReactiveObject
         _config.UiItem.ShowInTaskbar = true;
 
         await ConfigHandler.InitBuiltinRouting(_config);
+        await ConfigHandler.InitBuiltinDNS(_config);
         await ProfileExHandler.Instance.Init();
         await CoreHandler.Instance.Init(_config, UpdateHandler);
         TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -40,128 +40,136 @@
                     <Grid
                         Margin="{StaticResource Margin4}"
                         ColumnDefinitions="Auto,Auto,*"
-                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                         <TextBlock
+                            x:Name="txtBasicDNSSettingsInvalid"
                             Grid.Row="0"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+                        
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbDomesticDNS}" />
                         <ComboBox
                             x:Name="cmbDirectDNS"
-                            Grid.Row="0"
+                            Grid.Row="1"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}" />
 
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbRemoteDNS}" />
                         <ComboBox
                             x:Name="cmbRemoteDNS"
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}" />
 
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
                         <ComboBox
                             x:Name="cmbSBResolverDNS"
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}" />
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
 
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
                         <ComboBox
                             x:Name="cmbSBFinalResolverDNS"
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}" />
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
 
                         <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbXrayFreedomResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbRayFreedomDNSStrategy"
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
                             PlaceholderText="Default" />
 
                         <TextBlock
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBDirectResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbSBDirectDNSStrategy"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
                             PlaceholderText="Default" />
 
                         <TextBlock
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSBRemoteResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbSBRemoteDNSStrategy"
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}"
                             PlaceholderText="Default" />
 
                         <TextBlock
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbAddCommonDNSHosts}" />
                         <ToggleSwitch
                             x:Name="togAddCommonHosts"
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
@@ -175,80 +183,88 @@
                     <Grid
                         Margin="{StaticResource Margin4}"
                         ColumnDefinitions="Auto,Auto,*"
-                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,*">
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">
 
                         <TextBlock
+                            x:Name="txtAdvancedDNSSettingsInvalid"
                             Grid.Row="0"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                         <ToggleSwitch
                             x:Name="togUseSystemHosts"
-                            Grid.Row="0"
+                            Grid.Row="1"
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbFakeIP}" />
                         <ToggleSwitch
                             x:Name="togFakeIP"
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
 
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueries}" />
                         <ToggleSwitch
                             x:Name="togBlockBindingQuery"
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbPreventDNSLeaks}" />
 
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
                         <ComboBox
                             x:Name="cmbDirectExpectedIPs"
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin4}" />
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="2"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
 
                         <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin4}"
@@ -257,7 +273,7 @@
 
                         <TextBox
                             x:Name="txtHosts"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin4}"
@@ -269,6 +285,184 @@
                     </Grid>
                 </ScrollViewer>
             </TabItem>
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togRayCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+
+                            <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
+                                <HyperlinkButton Classes="WithIcon" Click="linkDnsObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                </HyperlinkButton>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4V2rayCompatible"
+                                Margin="{StaticResource Margin4}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                            <ToggleSwitch
+                                x:Name="togUseSystemHostsCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
+                            <ComboBox
+                                x:Name="cmbdomainStrategy4FreedomCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
+                            <ComboBox
+                                x:Name="cmbdomainDNSAddressCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <HeaderedContentControl
+                        Margin="{StaticResource Margin4}"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        Header="HTTP/SOCKS">
+                        <TextBox
+                            Name="txtnormalDNSCompatible"
+                            VerticalAlignment="Stretch"
+                            Classes="TextArea"
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
+                </DockPanel>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleSwitch
+                                x:Name="togSBCustomDNSEnableCompatible"
+                                Margin="{StaticResource Margin4}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock Margin="{StaticResource Margin4}" VerticalAlignment="Center">
+                                <HyperlinkButton Classes="WithIcon" Click="linkDnsSingboxObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                </HyperlinkButton>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4SingboxCompatible"
+                                Margin="{StaticResource Margin4}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
+                            <ComboBox
+                                x:Name="cmbdomainStrategy4OutCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin4}"
+                                VerticalAlignment="Center"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
+                            <ComboBox
+                                x:Name="cmbdomainDNSAddress2Compatible"
+                                Width="150"
+                                Margin="{StaticResource Margin4}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
+
+                        <HeaderedContentControl
+                            Grid.Column="0"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="HTTP/SOCKS">
+                            <TextBox
+                                Name="txtnormalDNS2Compatible"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <HeaderedContentControl
+                            Grid.Column="2"
+                            BorderBrush="Gray"
+                            BorderThickness="1"
+                            Header="{x:Static resx:ResUI.TbSettingsTunMode}">
+                            <TextBox
+                                Name="txttunDNS2Compatible"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
+                    </Grid>
+                </DockPanel>
+            </TabItem>
         </TabControl>
     </DockPanel>
 </Window>

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,4 +1,5 @@
 using System.Reactive.Disposables;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
 using v2rayN.Desktop.Base;
@@ -26,6 +27,11 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
         cmbSBFinalResolverDNS.ItemsSource = Global.DomainPureIPDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
         cmbDirectExpectedIPs.ItemsSource = Global.ExpectedIPs;
 
+        cmbdomainStrategy4FreedomCompatible.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbdomainStrategy4OutCompatible.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbdomainDNSAddressCompatible.ItemsSource = Global.DomainPureIPDNSAddress;
+        cmbdomainDNSAddress2Compatible.ItemsSource = Global.DomainPureIPDNSAddress;
+
         this.WhenActivated(disposables =>
         {
             this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
@@ -43,6 +49,33 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
             this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.SelectedItem).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.RayCustomDNSEnableCompatible, v => v.togRayCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SBCustomDNSEnableCompatible, v => v.togSBCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.UseSystemHostsCompatible, v => v.togUseSystemHostsCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainStrategy4FreedomCompatible, v => v.cmbdomainStrategy4FreedomCompatible.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddressCompatible, v => v.cmbdomainDNSAddressCompatible.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNSCompatible, v => v.txtnormalDNSCompatible.Text).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2Compatible, v => v.cmbdomainStrategy4OutCompatible.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddress2Compatible, v => v.cmbdomainDNSAddress2Compatible.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNS2Compatible, v => v.txtnormalDNS2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunDNS2Compatible, v => v.txttunDNS2Compatible.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
+
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
         });
     }
 

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -53,6 +53,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -61,15 +62,25 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
+                            x:Name="txtBasicDNSSettingsInvalid"
                             Grid.Row="0"
                             Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbDomesticDNS}" />
                         <ComboBox
                             x:Name="cmbDirectDNS"
-                            Grid.Row="0"
+                            Grid.Row="1"
                             Grid.Column="1"
                             Width="200"
                             IsEditable="True"
@@ -77,7 +88,7 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -85,7 +96,7 @@
                             Text="{x:Static resx:ResUI.TbRemoteDNS}" />
                         <ComboBox
                             x:Name="cmbRemoteDNS"
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="1"
                             Width="200"
                             IsEditable="True"
@@ -93,7 +104,7 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -101,14 +112,14 @@
                             Text="{x:Static resx:ResUI.TbSBOutboundsResolverDNS}" />
                         <ComboBox
                             x:Name="cmbSBResolverDNS"
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="1"
                             Width="200"
                             IsEditable="True"
                             Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -116,7 +127,7 @@
                             Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
 
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -124,14 +135,14 @@
                             Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
                         <ComboBox
                             x:Name="cmbSBFinalResolverDNS"
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
                             IsEditable="True"
                             Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -139,7 +150,7 @@
                             Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}" />
 
                         <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -147,7 +158,7 @@
                             Text="{x:Static resx:ResUI.TbXrayFreedomResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbRayFreedomDNSStrategy"
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin8}"
@@ -155,7 +166,7 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -163,7 +174,7 @@
                             Text="{x:Static resx:ResUI.TbSBDirectResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbSBDirectDNSStrategy"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin8}"
@@ -171,7 +182,7 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -179,7 +190,7 @@
                             Text="{x:Static resx:ResUI.TbSBRemoteResolveStrategy}" />
                         <ComboBox
                             x:Name="cmbSBRemoteDNSStrategy"
-                            Grid.Row="6"
+                            Grid.Row="7"
                             Grid.Column="1"
                             Width="200"
                             Margin="{StaticResource Margin8}"
@@ -187,7 +198,7 @@
                             Style="{StaticResource DefComboBox}" />
 
                         <TextBlock
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -195,12 +206,12 @@
                             Text="{x:Static resx:ResUI.TbAddCommonDNSHosts}" />
                         <ToggleButton
                             x:Name="togAddCommonHosts"
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="7"
+                            Grid.Row="8"
                             Grid.Column="3"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -218,6 +229,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
@@ -227,21 +239,31 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
+                            x:Name="txtAdvancedDNSSettingsInvalid"
                             Grid.Row="0"
                             Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbCustomDNSEnabledPageInvalid}" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
                         <ToggleButton
                             x:Name="togUseSystemHosts"
-                            Grid.Row="0"
+                            Grid.Row="1"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -249,12 +271,12 @@
                             Text="{x:Static resx:ResUI.TbFakeIP}" />
                         <ToggleButton
                             x:Name="togFakeIP"
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="2"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -262,7 +284,7 @@
                             Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
 
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -270,12 +292,12 @@
                             Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueries}" />
                         <ToggleButton
                             x:Name="togBlockBindingQuery"
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
                         <TextBlock
-                            Grid.Row="2"
+                            Grid.Row="3"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -284,7 +306,7 @@
 
 
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="0"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -292,14 +314,14 @@
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPs}" />
                         <ComboBox
                             x:Name="cmbDirectExpectedIPs"
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="1"
                             Width="200"
                             IsEditable="True"
                             Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />
                         <TextBlock
-                            Grid.Row="3"
+                            Grid.Row="4"
                             Grid.Column="2"
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
@@ -307,7 +329,7 @@
                             Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}" />
 
                         <TextBlock
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin8}"
@@ -316,7 +338,7 @@
                             Text="{x:Static resx:ResUI.TbDNSHostsConfig}" />
                         <TextBox
                             x:Name="txtHosts"
-                            Grid.Row="5"
+                            Grid.Row="6"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             Margin="{StaticResource Margin8}"
@@ -330,6 +352,206 @@
                     </Grid>
                 </ScrollViewer>
             </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                    Margin="{StaticResource Margin8}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ToolbarTextBlock}"
+                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleButton
+                                    x:Name="togRayCustomDNSEnableCompatible"
+                                    Margin="{StaticResource Margin8}"
+                                    HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}">
+                                <Hyperlink Click="linkDnsObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                    <materialDesign:PackIcon Kind="Link" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4V2rayCompatible"
+                                Margin="{StaticResource Margin8}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
+                                Style="{StaticResource DefButton}" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                            <ToggleButton
+                                x:Name="togUseSystemHostsCompatible"
+                                Margin="{StaticResource Margin8}"
+                                HorizontalAlignment="Left" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
+                            <ComboBox
+                                x:Name="cmbdomainStrategy4FreedomCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin8}"
+                                Style="{StaticResource DefComboBox}" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
+                            <ComboBox
+                                x:Name="cmbdomainDNSAddressCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin8}"
+                                IsEditable="True"
+                                Style="{StaticResource DefComboBox}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <TextBox
+                        x:Name="txtnormalDNSCompatible"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Stretch"
+                        materialDesign:HintAssist.Hint="HTTP/SOCKS"
+                        AcceptsReturn="True"
+                        BorderThickness="1"
+                        Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
+                </DockPanel>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
+                <DockPanel Margin="{StaticResource Margin8}">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                    Margin="{StaticResource Margin8}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ToolbarTextBlock}"
+                                    Text="{x:Static resx:ResUI.TbCustomDNSEnable}" />
+                            <ToggleButton
+                                    x:Name="togSBCustomDNSEnableCompatible"
+                                    Margin="{StaticResource Margin8}"
+                                    HorizontalAlignment="Left" />
+                        </StackPanel>
+                        
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}">
+                                <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
+                                    <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                    <materialDesign:PackIcon Kind="Link" />
+                                </Hyperlink>
+                            </TextBlock>
+                            <Button
+                                x:Name="btnImportDefConfig4SingboxCompatible"
+                                Margin="{StaticResource Margin8}"
+                                Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                                Cursor="Hand"
+                                Style="{StaticResource DefButton}" />
+                        </StackPanel>
+                    </Grid>
+
+                    <WrapPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Out}" />
+                            <ComboBox
+                                x:Name="cmbdomainStrategy4OutCompatible"
+                                Width="150"
+                                Margin="{StaticResource Margin8}"
+                                Style="{StaticResource DefComboBox}" />
+                        </StackPanel>
+
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock
+                                Margin="{StaticResource Margin8}"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource ToolbarTextBlock}"
+                                Text="{x:Static resx:ResUI.TbSettingsDomainDNSAddress}" />
+                            <ComboBox
+                                x:Name="cmbdomainDNSAddress2Compatible"
+                                Width="150"
+                                Margin="{StaticResource Margin8}"
+                                IsEditable="True"
+                                Style="{StaticResource DefComboBox}" />
+                        </StackPanel>
+                    </WrapPanel>
+
+                    <Grid Margin="{StaticResource Margin8}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBox
+                            x:Name="txtnormalDNS2Compatible"
+                            Grid.Column="0"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="HTTP/SOCKS"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <TextBox
+                            x:Name="txttunDNS2Compatible"
+                            Grid.Column="2"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbSettingsTunMode}"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+                    </Grid>
+                </DockPanel>
+            </TabItem>
         </TabControl>
     </DockPanel>
 </base:WindowBase>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -26,6 +26,11 @@ public partial class DNSSettingWindow
         cmbSBFinalResolverDNS.ItemsSource = Global.DomainPureIPDNSAddress.Concat(new[] { "dhcp://auto,localhost" });
         cmbDirectExpectedIPs.ItemsSource = Global.ExpectedIPs;
 
+        cmbdomainStrategy4FreedomCompatible.ItemsSource = Global.DomainStrategy4Freedoms;
+        cmbdomainStrategy4OutCompatible.ItemsSource = Global.SingboxDomainStrategy4Out;
+        cmbdomainDNSAddressCompatible.ItemsSource = Global.DomainPureIPDNSAddress;
+        cmbdomainDNSAddress2Compatible.ItemsSource = Global.DomainPureIPDNSAddress;
+
         this.WhenActivated(disposables =>
         {
             this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
@@ -36,13 +41,42 @@ public partial class DNSSettingWindow
             this.Bind(ViewModel, vm => vm.RemoteDNS, v => v.cmbRemoteDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SingboxOutboundsResolveDNS, v => v.cmbSBResolverDNS.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SingboxFinalResolveDNS, v => v.cmbSBFinalResolverDNS.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.RayStrategy4Freedom, v => v.cmbRayFreedomDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.RayStrategy4Freedom, v => v.cmbRayFreedomDNSStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SingboxStrategy4Direct, v => v.cmbSBDirectDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Direct, v => v.cmbSBDirectDNSStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.SingboxStrategy4Proxy, v => v.cmbSBRemoteDNSStrategy.SelectedItem).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SingboxStrategy4Proxy, v => v.cmbSBRemoteDNSStrategy.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Hosts, v => v.txtHosts.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DirectExpectedIPs, v => v.cmbDirectExpectedIPs.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.RayCustomDNSEnableCompatible, v => v.togRayCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SBCustomDNSEnableCompatible, v => v.togSBCustomDNSEnableCompatible.IsChecked).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.UseSystemHostsCompatible, v => v.togUseSystemHostsCompatible.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainStrategy4FreedomCompatible, v => v.cmbdomainStrategy4FreedomCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddressCompatible, v => v.cmbdomainDNSAddressCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNSCompatible, v => v.txtnormalDNSCompatible.Text).DisposeWith(disposables);
+
+            this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2Compatible, v => v.cmbdomainStrategy4OutCompatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.DomainDNSAddress2Compatible, v => v.cmbdomainDNSAddress2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.NormalDNS2Compatible, v => v.txtnormalDNS2Compatible.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunDNS2Compatible, v => v.txttunDNS2Compatible.Text).DisposeWith(disposables);
+
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
+            this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
+
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
+                .BindTo(this, x => x.txtBasicDNSSettingsInvalid.Visibility)
+                .DisposeWith(disposables);
+            this.WhenAnyValue(
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
+                .BindTo(this, x => x.txtAdvancedDNSSettingsInvalid.Visibility)
+                .DisposeWith(disposables);
         });
         WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.CurrentTheme);
     }