feat: Resolve Server hostname option

netchx · Oct 10, 2020 · 12b2989 · 12b2989
1 parent 0222792
commit 12b2989
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 26 deletions.
diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs
@@ -45,7 +45,7 @@ public static async Task<bool> Start(Server server, Mode mode)
                 return false;
             }
 
-            if (DNS.Lookup(server.Hostname) == null)
+            if (Global.Settings.ResolveServerHostname && DNS.Lookup(server.Hostname) == null)
             {
                 MessageBoxX.Show("Lookup Server hostname failed");
                 return false;

diff --git a/Netch/Forms/SettingForm.Designer.cs b/Netch/Forms/SettingForm.Designer.cs
diff --git a/Netch/Forms/SettingForm.cs b/Netch/Forms/SettingForm.cs
@@ -65,6 +65,7 @@ private void InitValue()
             CheckBetaUpdateCheckBox.Checked = Global.Settings.CheckBetaUpdate;
             ModifySystemDNSCheckBox.Checked = Global.Settings.ModifySystemDNS;
             UpdateSubscribeatWhenOpenedCheckBox.Checked = Global.Settings.UpdateSubscribeatWhenOpened;
+            ResolveServerHostnameCheckBox.Checked = Global.Settings.ResolveServerHostname;
 
             ProfileCountTextBox.Text = Global.Settings.ProfileCount.ToString();
             TcpingAtStartedCheckBox.Checked = Global.Settings.StartedTcping;
@@ -329,6 +330,7 @@ static void CheckPort(string portName, int port, int originPort, PortType portTy
             Global.Settings.CheckBetaUpdate = CheckBetaUpdateCheckBox.Checked;
             Global.Settings.ModifySystemDNS = ModifySystemDNSCheckBox.Checked;
             Global.Settings.UpdateSubscribeatWhenOpened = UpdateSubscribeatWhenOpenedCheckBox.Checked;
+            Global.Settings.ResolveServerHostname = ResolveServerHostnameCheckBox.Checked;
 
             Global.Settings.ProfileCount = profileCount;
             Global.Settings.StartedTcping = TcpingAtStartedCheckBox.Checked;

diff --git a/Netch/Models/Server.cs b/Netch/Models/Server.cs
@@ -101,4 +101,12 @@ public int Test()
             }
         }
     }
+
+    public static class ServerExtension
+    {
+        public static string AutoResolveHostname(this Server server)
+        {
+            return Global.Settings.ResolveServerHostname ? DNS.Lookup(server.Hostname).ToString() : server.Hostname;
+        }
+    }
 }
diff --git a/Netch/Models/Setting.cs b/Netch/Models/Setting.cs
@@ -103,6 +103,11 @@ public class Setting
         /// </summary>
         public bool ModifySystemDNS = false;
 
+        /// <summary>
+        ///     解析服务器主机名
+        /// </summary>
+        public bool ResolveServerHostname = true;
+
         /// <summary>
         ///     网页请求超时 毫秒
         /// </summary>

diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN
@@ -169,6 +169,7 @@
     "Custom ACL": "自定义 ACL 规则",
     "Language": "语言",
     "Tap Network Sharing": "Tap 网络共享",
+    "Resolve Server Hostname": "解析服务器主机名",
 
     "Profile": "配置名",
     "Profiles": "配置",

diff --git a/Netch/Servers/Shadowsocks/SSController.cs b/Netch/Servers/Shadowsocks/SSController.cs
@@ -27,7 +27,7 @@ public bool Start(Server s, Mode mode)
             {
                 State = State.Starting;
                 var client = Encoding.UTF8.GetBytes($"{this.LocalAddress()}:{this.Socks5LocalPort()}");
-                var remote = Encoding.UTF8.GetBytes($"{DNS.Lookup(server.Hostname)}:{server.Port}");
+                var remote = Encoding.UTF8.GetBytes($"{server.AutoResolveHostname()}:{server.Port}");
                 var passwd = Encoding.UTF8.GetBytes($"{server.Password}");
                 var method = Encoding.UTF8.GetBytes($"{server.EncryptMethod}");
                 if (!ShadowsocksDLL.Info(client, remote, passwd, method))
@@ -55,7 +55,7 @@ public bool Start(Server s, Mode mode)
 
             var argument = new StringBuilder();
             argument.Append(
-                $"-s {DNS.Lookup(server.Hostname)} " +
+                $"-s {server.AutoResolveHostname()} " +
                 $"-p {server.Port} " +
                 $"-b {this.LocalAddress()} " +
                 $"-l {this.Socks5LocalPort()} " +

diff --git a/Netch/Servers/ShadowsocksR/SSRController.cs b/Netch/Servers/ShadowsocksR/SSRController.cs
@@ -21,7 +21,7 @@ public bool Start(Server s, Mode mode)
             #region Argument
 
             var argument = new StringBuilder();
-            argument.Append($"-s {DNS.Lookup(server.Hostname)} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120");
+            argument.Append($"-s {server.AutoResolveHostname()} -p {server.Port} -k \"{server.Password}\" -m {server.EncryptMethod} -t 120");
             if (!string.IsNullOrEmpty(server.Protocol))
             {
                 argument.Append($" -O {server.Protocol}");

diff --git a/Netch/Servers/Trojan/TrojanController.cs b/Netch/Servers/Trojan/TrojanController.cs
@@ -29,7 +29,7 @@ public bool Start(Server s, Mode mode)
             {
                 local_addr = this.LocalAddress(),
                 local_port = this.Socks5LocalPort(),
-                remote_addr = DNS.Lookup(server.Hostname).ToString(),
+                remote_addr = server.AutoResolveHostname(),
                 remote_port = server.Port,
                 password = new List<string>
                 {

diff --git a/Netch/Servers/VMess/VMessController.cs b/Netch/Servers/VMess/VMessController.cs
@@ -47,7 +47,7 @@ public bool Start(Server s, Mode mode)
                             {
                                 new VMessConfig.VNext
                                 {
-                                    address = DNS.Lookup(server.Hostname).ToString(),
+                                    address = server.AutoResolveHostname(),
                                     port = server.Port,
                                     users = new List<VMessConfig.User>
                                     {