diff --git a/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
index a0dd68b821..423b73869d 100644
--- a/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
@@ -117,12 +117,13 @@ private void InitializeComponent()
//
// cmbFlow
//
- this.cmbFlow.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbFlow.FormattingEnabled = true;
this.cmbFlow.Items.AddRange(new object[] {
resources.GetString("cmbFlow.Items"),
resources.GetString("cmbFlow.Items1"),
- resources.GetString("cmbFlow.Items2")});
+ resources.GetString("cmbFlow.Items2"),
+ resources.GetString("cmbFlow.Items3"),
+ resources.GetString("cmbFlow.Items4")});
resources.ApplyResources(this.cmbFlow, "cmbFlow");
this.cmbFlow.Name = "cmbFlow";
//
diff --git a/v2rayN/v2rayN/Forms/AddServer5Form.resx b/v2rayN/v2rayN/Forms/AddServer5Form.resx
index 2502f9245d..e4c57a41a5 100644
--- a/v2rayN/v2rayN/Forms/AddServer5Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.resx
@@ -152,6 +152,12 @@
xtls-rprx-origin-udp443
+
+ xtls-rprx-direct
+
+
+ xtls-rprx-direct-udp443
+
127, 123
@@ -255,6 +261,24 @@
3
+
+ True
+
+
+ NoControl
+
+
+ 529, 207
+
+
+ 119, 12
+
+
+ 35
+
+
+ 3)QUIC key/Kcp seed
+
label24
@@ -267,6 +291,24 @@
0
+
+ True
+
+
+ NoControl
+
+
+ 465, 140
+
+
+ 89, 12
+
+
+ 34
+
+
+ 4)QUIC securty
+
label23
@@ -279,6 +321,75 @@
1
+
+ True
+
+
+ NoControl
+
+
+ 12, 11
+
+
+ 83, 12
+
+
+ 31
+
+
+ allowInsecure
+
+
+ label21
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panTlsMore
+
+
+ 0
+
+
+
+
+
+ true
+
+
+ false
+
+
+ 107, 7
+
+
+ 91, 20
+
+
+ 30
+
+
+ cmbAllowInsecure
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panTlsMore
+
+
+ 1
+
+
+ 284, 232
+
+
+ 338, 35
+
+
+ 33
+
panTlsMore
@@ -291,6 +402,21 @@
2
+
+ True
+
+
+ 353, 32
+
+
+ 113, 12
+
+
+ 15
+
+
+ *Default value tcp
+
label9
@@ -303,6 +429,21 @@
3
+
+ True
+
+
+ 464, 124
+
+
+ 203, 12
+
+
+ 29
+
+
+ 3)h2 host Separated by commas (,)
+
label20
@@ -315,6 +456,18 @@
4
+
+ 127, 169
+
+
+ True
+
+
+ 396, 54
+
+
+ 28
+
txtPath
@@ -327,6 +480,30 @@
5
+
+ tcp
+
+
+ kcp
+
+
+ ws
+
+
+ h2
+
+
+ quic
+
+
+ 192, 28
+
+
+ 143, 20
+
+
+ 12
+
cmbNetwork
@@ -339,6 +516,21 @@
6
+
+ True
+
+
+ 9, 32
+
+
+ 167, 12
+
+
+ 13
+
+
+ Transport protocol(network)
+
label7
@@ -351,6 +543,21 @@
7
+
+ True
+
+
+ 9, 169
+
+
+ 29, 12
+
+
+ 27
+
+
+ Path
+
label19
@@ -363,6 +570,21 @@
8
+
+ True
+
+
+ 529, 189
+
+
+ 59, 12
+
+
+ 26
+
+
+ 2)h2 path
+
label18
@@ -375,6 +597,21 @@
9
+
+ True
+
+
+ 464, 109
+
+
+ 59, 12
+
+
+ 25
+
+
+ 2)ws host
+
label17
@@ -387,6 +624,21 @@
10
+
+ True
+
+
+ 529, 172
+
+
+ 59, 12
+
+
+ 24
+
+
+ 1)ws path
+
label16
@@ -399,11 +651,26 @@
11
-
- label14
+
+ True
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 464, 94
+
+
+ 215, 12
+
+
+ 23
+
+
+ 1)http host Separated by commas (,)
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
groupBox2
@@ -411,6 +678,21 @@
12
+
+ True
+
+
+ 9, 243
+
+
+ 23, 12
+
+
+ 22
+
+
+ TLS
+
label15
@@ -423,6 +705,24 @@
13
+
+
+
+
+ tls
+
+
+ xtls
+
+
+ 127, 239
+
+
+ 143, 20
+
+
+ 21
+
cmbStreamSecurity
@@ -435,6 +735,21 @@
14
+
+ True
+
+
+ 282, 68
+
+
+ 299, 12
+
+
+ 20
+
+
+ *tcp or kcp or QUIC camouflage type, default none
+
label12
@@ -447,6 +762,18 @@
15
+
+ 158, 100
+
+
+ True
+
+
+ 300, 53
+
+
+ 16
+
txtRequestHost
@@ -459,6 +786,21 @@
16
+
+ True
+
+
+ 9, 68
+
+
+ 95, 12
+
+
+ 19
+
+
+ Camouflage type
+
label11
@@ -471,6 +813,21 @@
17
+
+ True
+
+
+ 9, 100
+
+
+ 143, 12
+
+
+ 17
+
+
+ Camouflage domain(host)
+
label10
@@ -483,6 +840,36 @@
18
+
+ none
+
+
+ http
+
+
+ srtp
+
+
+ utp
+
+
+ wechat-video
+
+
+ dtls
+
+
+ wireguard
+
+
+ 127, 64
+
+
+ 143, 20
+
+
+ 18
+
cmbHeaderType
@@ -822,738 +1209,108 @@
0
-
- True
+
+ 303, 17
-
- NoControl
+
+ 75, 23
-
- 529, 207
+
+ 5
-
- 119, 12
+
+ &OK
-
- 35
+
+ btnOK
-
- 3)QUIC key/Kcp seed
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- label24
+
+ panel2
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 1
-
- groupBox2
+
+ Bottom
-
- 0
+
+ 0, 534
-
- True
+
+ 729, 60
-
- NoControl
+
+ 7
-
- 465, 140
+
+ panel2
-
- 89, 12
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 34
+
+ $this
-
- 4)QUIC securty
+
+ 1
-
- label23
+
+ Top
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0, 25
-
- groupBox2
+
+ 729, 10
-
- 1
+
+ 6
-
- label21
+
+ panel1
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- panTlsMore
+
+ $this
-
- 0
+
+ 2
-
- cmbAllowInsecure
+
+ 17, 17
+
+
+ 237, 22
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Import client configuration
-
- panTlsMore
+
+ 237, 22
-
- 1
+
+ Import server configuration
-
- 284, 232
+
+ 234, 6
-
- 338, 35
-
-
- 33
-
-
- panTlsMore
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 2
-
-
- True
-
-
- NoControl
-
-
- 12, 11
-
-
- 83, 12
-
-
- 31
-
-
- allowInsecure
-
-
- label21
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panTlsMore
-
-
- 0
-
-
-
-
-
- true
-
-
- false
-
-
- 107, 7
-
-
- 91, 20
-
-
- 30
-
-
- cmbAllowInsecure
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panTlsMore
-
-
- 1
-
-
- True
-
-
- 353, 32
-
-
- 113, 12
-
-
- 15
-
-
- *Default value tcp
-
-
- label9
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 3
-
-
- True
-
-
- 464, 124
-
-
- 203, 12
-
-
- 29
-
-
- 3)h2 host Separated by commas (,)
-
-
- label20
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 4
-
-
- 127, 169
-
-
- True
-
-
- 396, 54
-
-
- 28
-
-
- txtPath
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 5
-
-
- tcp
-
-
- kcp
-
-
- ws
-
-
- h2
-
-
- quic
-
-
- 192, 28
-
-
- 143, 20
-
-
- 12
-
-
- cmbNetwork
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 6
-
-
- True
-
-
- 9, 32
-
-
- 167, 12
-
-
- 13
-
-
- Transport protocol(network)
-
-
- label7
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 7
-
-
- True
-
-
- 9, 169
-
-
- 29, 12
-
-
- 27
-
-
- Path
-
-
- label19
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 8
-
-
- True
-
-
- 529, 189
-
-
- 59, 12
-
-
- 26
-
-
- 2)h2 path
-
-
- label18
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 9
-
-
- True
-
-
- 464, 109
-
-
- 59, 12
-
-
- 25
-
-
- 2)ws host
-
-
- label17
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 10
-
-
- True
-
-
- 529, 172
-
-
- 59, 12
-
-
- 24
-
-
- 1)ws path
-
-
- label16
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 11
-
-
- True
-
-
- 464, 94
-
-
- 215, 12
-
-
- 23
-
-
- 1)http host Separated by commas (,)
-
-
- label14
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 12
-
-
- True
-
-
- 9, 243
-
-
- 23, 12
-
-
- 22
-
-
- TLS
-
-
- label15
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 13
-
-
-
-
-
- tls
-
-
- xtls
-
-
- 127, 239
-
-
- 143, 20
-
-
- 21
-
-
- cmbStreamSecurity
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 14
-
-
- True
-
-
- 282, 68
-
-
- 299, 12
-
-
- 20
-
-
- *tcp or kcp or QUIC camouflage type, default none
-
-
- label12
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 15
-
-
- 158, 100
-
-
- True
-
-
- 300, 53
-
-
- 16
-
-
- txtRequestHost
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 16
-
-
- True
-
-
- 9, 68
-
-
- 95, 12
-
-
- 19
-
-
- Camouflage type
-
-
- label11
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 17
-
-
- True
-
-
- 9, 100
-
-
- 143, 12
-
-
- 17
-
-
- Camouflage domain(host)
-
-
- label10
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 18
-
-
- none
-
-
- http
-
-
- srtp
-
-
- utp
-
-
- wechat-video
-
-
- dtls
-
-
- wireguard
-
-
- 127, 64
-
-
- 143, 20
-
-
- 18
-
-
- cmbHeaderType
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 19
-
-
- btnOK
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel2
-
-
- 1
-
-
- Bottom
-
-
- 0, 534
-
-
- 729, 60
-
-
- 7
-
-
- panel2
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
-
- 303, 17
-
-
- 75, 23
-
-
- 5
-
-
- &OK
-
-
- btnOK
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel2
-
-
- 1
-
-
- Top
-
-
- 0, 25
-
-
- 729, 10
-
-
- 6
-
-
- panel1
+
+ 237, 22
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Import URL from clipboard
-
- $this
+
+ 162, 21
-
- 2
+
+ Import configuration file
-
- 17, 17
-
0, 0
@@ -1575,33 +1332,6 @@
3
-
- 162, 21
-
-
- Import configuration file
-
-
- 237, 22
-
-
- Import client configuration
-
-
- 237, 22
-
-
- Import server configuration
-
-
- 234, 6
-
-
- 237, 22
-
-
- Import URL from clipboard
-
True
@@ -1651,6 +1381,6 @@
AddServer5Form
- v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 58bcc689b1..55eeea1481 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -14,7 +14,7 @@ class Global
///
/// SpeedTestUrl
///
- public const string SpeedTestUrl = @"http://speedtest-sgp1.digitalocean.com/10mb.test";
+ public const string SpeedTestUrl = @"http://cachefly.cachefly.net/10mb.test";
public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
public const string AvailabilityTestUrl = @"https://www.google.com/generate_204";
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 8af1fcf078..59c0dcd7d5 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -40,7 +40,7 @@ public static int LoadConfig(ref Config config)
vmess = new List(),
//Mux
- muxEnabled = true,
+ muxEnabled = false,
////默认监听端口
//config.pacPort = 8888;
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index e893f28e62..fa2404361d 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
// 方法是按如下所示使用“*”:
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("3.25")]
+[assembly: AssemblyFileVersion("3.26")]