From 23f85335475f12e06a6931ff233f92ca5901c795 Mon Sep 17 00:00:00 2001 From: zungmou Date: Fri, 6 Dec 2019 17:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E9=98=85=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=BD=93=E5=89=8D=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E8=BF=9E=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2rayN/v2rayN/Forms/MainForm.cs | 10 +++++++++- v2rayN/v2rayN/Handler/DownloadHandle.cs | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index bef32c86..1ac1e578 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -9,6 +9,7 @@ using v2rayN.Handler; using v2rayN.HttpProxyHandler; using v2rayN.Mode; using v2rayN.Base; +using System.Net; namespace v2rayN.Forms { @@ -1366,7 +1367,14 @@ namespace v2rayN.Forms AppendText(true, args.GetException().Message); }; - downloadHandle3.WebDownloadString(url); + IWebProxy proxy = null; + + if (config.index >= 0 && config.vmess.Count > 0) + { + proxy = new WebProxy(Global.Loopback, config.GetLocalPort(Global.InboundHttp)); + } + + downloadHandle3.WebDownloadString(url, proxy); AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}"); } diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index 68f5d9db..54849eb6 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -188,7 +188,7 @@ namespace v2rayN.Handler /// DownloadString /// /// - public void WebDownloadString(string url) + public void WebDownloadString(string url, IWebProxy proxy = null) { string source = string.Empty; try @@ -196,6 +196,12 @@ namespace v2rayN.Handler SetSecurityProtocol(); WebClientEx ws = new WebClientEx(); + + if (proxy != null) + { + ws.Proxy = proxy; + } + ws.DownloadStringCompleted += Ws_DownloadStringCompleted; ws.DownloadStringAsync(new Uri(url)); }