添加测速方式（TCPing&ICMPing）切换设置选项

netchx · Jan 4, 2021 · 35b9f16 · 35b9f16
1 parent ce15e94
commit 35b9f16
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 18 deletions.
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
@@ -59,6 +59,14 @@ private void InitValue()
                 c => Global.Settings.ResolveServerHostname = c,
                 Global.Settings.ResolveServerHostname);
 
+            BindRadioBox(ICMPingRadioBtn,
+                c => Global.Settings.ServerTCPing = c,
+                !Global.Settings.ServerTCPing);
+
+            BindRadioBox(TCPingRadioBtn,
+                c => Global.Settings.ServerTCPing = c,
+                Global.Settings.ServerTCPing);
+
             BindTextBox<int>(ProfileCountTextBox,
                 i => i > -1,
                 i => Global.Settings.ProfileCount = i,
@@ -346,17 +354,6 @@ private void ControlButton_Click(object sender, EventArgs e)
 
             #endregion
 
-            #region CheckProcessMode
-
-            if (NoProxyForUdpCheckBox.Checked && NoProxyForTcpCheckBox.Checked)
-            {
-                Utils.Utils.ChangeControlForeColor(STUN_ServerComboBox, Color.Red);
-                MessageBoxX.Show("TCP&UDP只允许勾选一个");
-                return;
-            }
-
-            #endregion
-
             #region Save
 
             foreach (var pair in _saveActions)
@@ -432,7 +429,13 @@ private void BindCheckBox(CheckBox control, Action<bool> save, bool value)
         {
             control.Checked = value;
             _checkActions.Add(control, s => true);
-            _saveActions.Add(control, c => save.Invoke(((CheckBox) c).Checked));
+            _saveActions.Add(control, c => save.Invoke(((CheckBox)c).Checked));
+        }
+        private void BindRadioBox(RadioButton control, Action<bool> save, bool value)
+        {
+            control.Checked = value;
+            _checkActions.Add(control, s => true);
+            _saveActions.Add(control, c => save.Invoke(((RadioButton)c).Checked));
         }
 
         private readonly Dictionary<Control, Func<string, bool>> _checkActions = new Dictionary<Control, Func<string, bool>>();
@@ -443,5 +446,25 @@ private void ModifySystemDNSCheckBox_CheckedChanged(object sender, EventArgs e)
         {
             ModifiedDNSTextBox.Enabled = ModifySystemDNSCheckBox.Checked;
         }
+
+        private void NoProxyForUdpCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (NoProxyForUdpCheckBox.Checked) NoProxyForTcpCheckBox.Checked = false;
+        }
+
+        private void NoProxyForTcpCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            if (NoProxyForTcpCheckBox.Checked) NoProxyForUdpCheckBox.Checked = false;
+        }
+
+        private void ICMPingRadioBtn_CheckedChanged(object sender, EventArgs e)
+        {
+            if (ICMPingRadioBtn.Checked) TCPingRadioBtn.Checked = false;
+        }
+
+        private void TCPingRadioBtn_CheckedChanged(object sender, EventArgs e)
+        {
+            if (TCPingRadioBtn.Checked) ICMPingRadioBtn.Checked = false;
+        }
     }
 }
diff --git a/Netch/Models/Server.cs b/Netch/Models/Server.cs
@@ -4,7 +4,7 @@
 
 namespace Netch.Models
 {
-    public class Server:ICloneable
+    public class Server : ICloneable
     {
         /// <summary>
         ///     备注
@@ -81,7 +81,7 @@ public int Test()
                     {
                         try
                         {
-                            return await Utils.Utils.TCPingAsync(destination, Port);
+                            return Global.Settings.ServerTCPing ? await Utils.Utils.TCPingAsync(destination, Port) : await Utils.Utils.ICMPing(destination, Port);
                         }
                         catch (Exception)
                         {

diff --git a/Netch/Models/Setting.cs b/Netch/Models/Setting.cs
@@ -272,6 +272,11 @@ public class Setting
         /// </summary>
         public string Language = "System";
 
+        /// <summary>
+        /// 服务器测试方式 false.ICMPing true.TCPing
+        /// </summary>
+        public bool ServerTCPing = true;
+
         /// <summary>
         /// 是否使用RDR内置SS
         /// </summary>

diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN
@@ -171,6 +171,7 @@
     "Failed to set the system proxy, it may be caused by the lack of dependent programs. Do you want to jump to Netch's official website to download dependent programs?": "设置系统代理失败，可能是缺少依赖导致，是否跳转 Netch 官网下载依赖程序？",
     "Delay test after start": "启动后延迟测试",
     "Enable": "启用",
+    "ServerPingType": "测速方式",
     "Detection interval(sec)": "检测间隔（秒）",
     "STUN Server": "STUN 服务器",
     "STUN Server Port": "STUN 服务器端口",

diff --git a/Netch/Utils/Utils.cs b/Netch/Utils/Utils.cs
@@ -56,7 +56,7 @@ public static async Task<int> TCPingAsync(IPAddress ip, int port, int timeout =
             return timeout;
         }
 
-        public static int ICMPing(IPAddress ip, int timeout = 1000)
+        public static async Task<int> ICMPing(IPAddress ip, int timeout = 1000)
         {
             var reply = new Ping().Send(ip, timeout);