diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
index 7a30e075..2adb4f8d 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2337,6 +2337,15 @@ namespace ServiceLib.Resx {
}
}
+ ///
+ /// 查找类似 Prevent domain-based routing rules from failing 的本地化字符串。
+ ///
+ public static string TbBlockSVCBHTTPSQueriesTips {
+ get {
+ return ResourceManager.GetString("TbBlockSVCBHTTPSQueriesTips", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Browse 的本地化字符串。
///
@@ -2733,15 +2742,6 @@ namespace ServiceLib.Resx {
}
}
- ///
- /// 查找类似 Prevent DNS Leaks 的本地化字符串。
- ///
- public static string TbPreventDNSLeaks {
- get {
- return ResourceManager.GetString("TbPreventDNSLeaks", resourceCulture);
- }
- }
-
///
/// 查找类似 Private Key 的本地化字符串。
///
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
index 82520c5f..d35c8d20 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1443,9 +1443,6 @@
Block SVCB and HTTPS Queries
-
- Prevent DNS Leaks
-
DNS Hosts: ("domain1 ip1 ip2" per line)
@@ -1470,6 +1467,9 @@
Custom DNS Enabled, This Page's Settings Invalid
+
+ Prevent domain-based routing rules from failing
+
Please fill in the correct config template
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
index 7ee68495..4bc19006 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1443,9 +1443,6 @@
Block SVCB and HTTPS Queries
-
- Prevent DNS Leaks
-
DNS Hosts: ("domain1 ip1 ip2" per line)
@@ -1470,6 +1467,9 @@
Custom DNS Enabled, This Page's Settings Invalid
+
+ Prevent domain-based routing rules from failing
+
Please fill in the correct config template
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
index 44343dee..4cf1b91a 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1443,9 +1443,6 @@
Block SVCB and HTTPS Queries
-
- Prevent DNS Leaks
-
DNS Hosts: ("domain1 ip1 ip2" per line)
@@ -1470,6 +1467,9 @@
Custom DNS Enabled, This Page's Settings Invalid
+
+ Prevent domain-based routing rules from failing
+
Please fill in the correct config template
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
index e9ab6efe..fd53b826 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1443,9 +1443,6 @@
Block SVCB and HTTPS Queries
-
- Prevent DNS Leaks
-
DNS Hosts: ("domain1 ip1 ip2" per line)
@@ -1470,6 +1467,9 @@
Custom DNS Enabled, This Page's Settings Invalid
+
+ Prevent domain-based routing rules from failing
+
Please fill in the correct config template
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
index 95a427c3..a2506ed8 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1440,9 +1440,6 @@
阻止 SVCB 和 HTTPS 查询
-
- 避免 DNS 泄漏
-
DNS Hosts：（“域名1 ip1 ip2” 一行一个）
@@ -1467,6 +1464,9 @@
自定义 DNS 已启用，此页面配置将无效
+
+ 避免域名分流规则失效
+
请填写正确的配置模板
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
index f35c5faa..3d16e5b5 100644
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1440,9 +1440,6 @@
Block SVCB and HTTPS Queries
-
- Prevent DNS Leaks
-
DNS Hosts: ("domain1 ip1 ip2" per line)
@@ -1467,6 +1464,9 @@
Custom DNS Enabled, This Page's Settings Invalid
+
+ Prevent domain-based routing rules from failing
+
Please fill in the correct config template
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
index 6563e991..19f0af35 100644
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1690,6 +1690,22 @@ public class CoreConfigSingboxService
}
}
+ if (simpleDNSItem.UseSystemHosts == true)
+ {
+ var systemHosts = Utils.GetSystemHosts();
+ if (systemHosts.Count > 0)
+ {
+ foreach (var host in systemHosts)
+ {
+ if (userHostsMap[host.Key] != null)
+ {
+ continue;
+ }
+ userHostsMap[host.Key] = new List { host.Value };
+ }
+ }
+ }
+
foreach (var host in hostsDns.predefined)
{
if (finalDns.server == host.Key)
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index 9ec377ff..afb3dd97 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -97,7 +97,8 @@
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
- Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}" />
+ Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbSBDoHOverride}"
+ TextWrapping="Wrap" />
@@ -228,7 +231,8 @@
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
- Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}" />
+ Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueriesTips}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbSBOutboundDomainResolve}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbSBFallbackDNSResolve}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbApplyProxyDomainsOnly}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbBlockSVCBHTTPSQueriesTips}"
+ TextWrapping="Wrap" />
+ Text="{x:Static resx:ResUI.TbValidateDirectExpectedIPsDesc}"
+ TextWrapping="Wrap" />