From 504a6c5d898ae6d3d22b93b9add76b89cb434d26 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 2 Jan 2020 13:49:37 +0800
Subject: [PATCH 1/5] upgrade

---
 v2rayN/v2rayUpgrade/MainForm.cs         | 41 ++++++++++++++++++++-----
 v2rayN/v2rayUpgrade/v2rayUpgrade.csproj |  1 +
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/v2rayN/v2rayUpgrade/MainForm.cs b/v2rayN/v2rayUpgrade/MainForm.cs
index 281f5d4b..6a597981 100644
--- a/v2rayN/v2rayUpgrade/MainForm.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.cs
@@ -1,14 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace v2rayUpgrade
@@ -16,6 +9,7 @@ namespace v2rayUpgrade
     public partial class MainForm : Form
     {
         private string[] _args;
+        private string _tempFileName = "v2rayUpgradeTemp.zip";
 
 
         public MainForm(string[] args)
@@ -35,9 +29,36 @@ namespace v2rayUpgrade
             {
                 return;
             }
+
             try
             {
-                var fileName = _args[0];
+                Process[] existing = Process.GetProcessesByName("v2rayN");
+                foreach (Process p in existing)
+                {
+                    var path = p.MainModule.FileName;
+                    if (path == GetPath("v2rayN.exe"))
+                    {
+                        p.Kill();
+                        p.WaitForExit(100);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("Failed to close v2rayN(关闭v2rayN失败)." + ex.StackTrace);
+                return;
+            }
+
+            var fileName = GetPath(_tempFileName);
+            try
+            {
+                File.Copy(_args[0], fileName);
+                if (!File.Exists(fileName))
+                {
+                    MessageBox.Show("Upgrade Failed, File Not Exist(升级失败,文件不存在).");
+                    return;
+                }
+
                 var startKey = "v2rayN/";
 
                 using (ZipArchive archive = ZipFile.OpenRead(fileName))
@@ -67,6 +88,10 @@ namespace v2rayUpgrade
                 MessageBox.Show("Upgrade Failed(升级失败)." + ex.StackTrace);
                 return;
             }
+            finally
+            {
+                File.Delete(fileName);
+            }
 
             MessageBox.Show("Upgrade  successed(升级成功)");
 
diff --git a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
index f7879414..a36e3f55 100644
--- a/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
+++ b/v2rayN/v2rayUpgrade/v2rayUpgrade.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

From cf5b0cbd06a9858145c171ea3ba1e3e6526c3917 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 2 Jan 2020 13:49:44 +0800
Subject: [PATCH 2/5] Update Program.cs

---
 v2rayN/v2rayN/Program.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Program.cs b/v2rayN/v2rayN/Program.cs
index 36ffb2e8..61797937 100644
--- a/v2rayN/v2rayN/Program.cs
+++ b/v2rayN/v2rayN/Program.cs
@@ -28,20 +28,20 @@ namespace v2rayN
             Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-         
+
             //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
 
             Process instance = RunningInstance();
             if (instance == null)
-            {                
+            {
                 if (!UnzipLibs())
                 {
                     UI.Show($"Error preparing the environment(准备运行环境出错)");
                     return;
                 }
 
-                Utils.SaveLog("v2rayN start up");
-                
+                Utils.SaveLog("v2rayN start up " + Utils.GetVersion());
+
                 //设置语言环境
                 string lang = Utils.RegReadValue(Global.MyRegPath, Global.MyRegKeyLanguage, "zh-Hans");
                 System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(lang);

From 40bb7a5ea129ca243ce388f509b8246944a1935b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 2 Jan 2020 13:49:48 +0800
Subject: [PATCH 3/5] Update libs.zip

---
 v2rayN/v2rayN/LIB/libs.zip | Bin 3685385 -> 3685725 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/v2rayN/v2rayN/LIB/libs.zip b/v2rayN/v2rayN/LIB/libs.zip
index 3b787743d085f072634cf56a5777cc5b7491197b..82a2668778514aa91f6994eb645af21f1809eaeb 100644
GIT binary patch
delta 5465
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
Pm$y4OOa>r0H~;_uPp^^2

delta 5122
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


From df5b55b14fabd7d8966c95decbcff5cb20dd37c4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 15 Jan 2020 09:35:06 +0800
Subject: [PATCH 4/5] Update MainForm.cs

---
 v2rayN/v2rayUpgrade/MainForm.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v2rayN/v2rayUpgrade/MainForm.cs b/v2rayN/v2rayUpgrade/MainForm.cs
index 6a597981..64982a12 100644
--- a/v2rayN/v2rayUpgrade/MainForm.cs
+++ b/v2rayN/v2rayUpgrade/MainForm.cs
@@ -52,6 +52,7 @@ namespace v2rayUpgrade
             var fileName = GetPath(_tempFileName);
             try
             {
+                File.Delete(fileName);
                 File.Copy(_args[0], fileName);
                 if (!File.Exists(fileName))
                 {

From 112273036b38bf1289a6aa6ab7eef305da114d52 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 15 Jan 2020 09:35:19 +0800
Subject: [PATCH 5/5] up doh

---
 v2rayN/v2rayN/Handler/V2rayConfigHandler.cs |   4 ++++
 v2rayN/v2rayN/LIB/libs.zip                  | Bin 3685725 -> 3685728 bytes
 v2rayN/v2rayN/Mode/V2rayConfig.cs           |   5 +++++
 v2rayN/v2rayN/Properties/AssemblyInfo.cs    |   2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index a7b950d8..8c3a81f3 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -354,6 +354,7 @@ namespace v2rayN.Handler
 
                     //Mux
                     outbound.mux.enabled = config.muxEnabled;
+                    outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
 
                     //远程服务器底层传输配置
                     StreamSettings streamSettings = outbound.streamSettings;
@@ -384,6 +385,8 @@ namespace v2rayN.Handler
                     serversItem.level = 1;
 
                     outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;
+                    
 
                     outbound.protocol = "shadowsocks";
                     outbound.settings.vnext = null;
@@ -418,6 +421,7 @@ namespace v2rayN.Handler
                     }
 
                     outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;
 
                     outbound.protocol = "socks";
                     outbound.settings.vnext = null;
diff --git a/v2rayN/v2rayN/LIB/libs.zip b/v2rayN/v2rayN/LIB/libs.zip
index 82a2668778514aa91f6994eb645af21f1809eaeb..ce28e787aacb7978b8d1ed5f47b32ae135ea6fd0 100644
GIT binary patch
delta 5462
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
MI86p4I5+?R0CI_+7ytkO

delta 5443
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

diff --git a/v2rayN/v2rayN/Mode/V2rayConfig.cs b/v2rayN/v2rayN/Mode/V2rayConfig.cs
index 0d661c0f..5d4ab5df 100644
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -281,6 +281,11 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public bool enabled { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int concurrency { get; set; }
     }
 
     public class Response
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index abd9350d..d7a18cd3 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("3.4")]
+[assembly: AssemblyFileVersion("3.5")]