From 88d1948b51522e741e12fb2c77ec6662ac4741c8 Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Mon, 17 Feb 2020 13:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=80=9F=E7=BD=91=E5=9D=80=E5=8F=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2rayN/v2rayN/Handler/ConfigHandler.cs | 8 ++++++++ v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 4 ++-- v2rayN/v2rayN/Mode/Config.cs | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 741976bb..d816617a 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -124,6 +124,14 @@ namespace v2rayN.Handler //{ // config.pacPort = 8888; //} + if (Utils.IsNullOrEmpty(config.speedTestUrl)) + { + config.speedTestUrl = Global.SpeedTestUrl; + } + if (Utils.IsNullOrEmpty(config.speedPingTestUrl)) + { + config.speedPingTestUrl = Global.SpeedPingTestUrl; + } if (Utils.IsNullOrEmpty(config.urlGFWList)) { config.urlGFWList = Global.GFWLIST_URL; diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index 5d437869..a609aab1 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -124,7 +124,7 @@ namespace v2rayN.Handler { WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex); int responseTime = -1; - string status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime); + string status = GetRealPingTime(_config.speedPingTestUrl, webProxy, out responseTime); string output = Utils.IsNullOrEmpty(status) ? string.Format("{0}ms", responseTime) : string.Format("{0}", status); _updateFunc(itemIndex, output); } @@ -160,7 +160,7 @@ namespace v2rayN.Handler Thread.Sleep(5000); - string url = Global.SpeedTestUrl; + string url = _config.speedTestUrl; testCounter = 0; if (downloadHandle2 == null) { diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 4e962fb2..e0ef85ff 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -114,6 +114,20 @@ namespace v2rayN.Mode get; set; } + /// + /// 自定义服务器下载测速url + /// + public string speedTestUrl + { + get; set; + } + /// + /// 自定义“服务器真连接延迟”测试url + /// + public string speedPingTestUrl + { + get; set; + } /// /// 自定义GFWList url ///