From f220825b809fb1b3b691a4a5519c4b0f0393d424 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:45:09 +0800
Subject: [PATCH] add xtls Flows
---
v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs | 6 ------
v2rayN/v2rayN/Forms/AddServer5Form.cs | 1 +
v2rayN/v2rayN/Forms/AddServer5Form.resx | 15 ---------------
v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs | 6 ------
v2rayN/v2rayN/Forms/AddServer6Form.cs | 1 +
v2rayN/v2rayN/Forms/AddServer6Form.resx | 15 ---------------
v2rayN/v2rayN/Global.cs | 1 +
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 4 ++--
8 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
index 44915372..be02d20f 100644
--- a/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs
@@ -88,12 +88,6 @@
// cmbFlow
//
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.Items3"),
- resources.GetString("cmbFlow.Items4")});
resources.ApplyResources(this.cmbFlow, "cmbFlow");
this.cmbFlow.Name = "cmbFlow";
//
diff --git a/v2rayN/v2rayN/Forms/AddServer5Form.cs b/v2rayN/v2rayN/Forms/AddServer5Form.cs
index 43d52751..7635e839 100644
--- a/v2rayN/v2rayN/Forms/AddServer5Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.cs
@@ -15,6 +15,7 @@ namespace v2rayN.Forms
private void AddServer5Form_Load(object sender, EventArgs e)
{
+ cmbFlow.Items.AddRange(Global.xtlsFlows.ToArray());
transportControl.AllowXtls = true;
if (EditIndex >= 0)
{
diff --git a/v2rayN/v2rayN/Forms/AddServer5Form.resx b/v2rayN/v2rayN/Forms/AddServer5Form.resx
index ab0fe1d5..48f6a172 100644
--- a/v2rayN/v2rayN/Forms/AddServer5Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer5Form.resx
@@ -143,21 +143,6 @@
0
-
-
-
-
- xtls-rprx-origin
-
-
- xtls-rprx-origin-udp443
-
-
- xtls-rprx-direct
-
-
- xtls-rprx-direct-udp443
-
127, 123
diff --git a/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
index 6ad64150..998dc789 100644
--- a/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
@@ -80,12 +80,6 @@
// cmbFlow
//
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.Items3"),
- resources.GetString("cmbFlow.Items4")});
resources.ApplyResources(this.cmbFlow, "cmbFlow");
this.cmbFlow.Name = "cmbFlow";
//
diff --git a/v2rayN/v2rayN/Forms/AddServer6Form.cs b/v2rayN/v2rayN/Forms/AddServer6Form.cs
index beab1dc7..70c60443 100644
--- a/v2rayN/v2rayN/Forms/AddServer6Form.cs
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.cs
@@ -14,6 +14,7 @@ namespace v2rayN.Forms
private void AddServer6Form_Load(object sender, EventArgs e)
{
+ cmbFlow.Items.AddRange(Global.xtlsFlows.ToArray());
transportControl.AllowXtls = true;
if (EditIndex >= 0)
{
diff --git a/v2rayN/v2rayN/Forms/AddServer6Form.resx b/v2rayN/v2rayN/Forms/AddServer6Form.resx
index f95db419..ffd92ee3 100644
--- a/v2rayN/v2rayN/Forms/AddServer6Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.resx
@@ -147,21 +147,6 @@
0
-
-
-
-
- xtls-rprx-origin
-
-
- xtls-rprx-origin-udp443
-
-
- xtls-rprx-direct
-
-
- xtls-rprx-direct-udp443
-
127, 123
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 10c892e4..94a9d369 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -198,6 +198,7 @@ namespace v2rayN
public static readonly List vmessSecuritys = new List { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
public static readonly List ssSecuritys = new List { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+ public static readonly List xtlsFlows = new List { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443" };
public const string GrpcgunMode = "gun";
public const string GrpcmultiMode = "multi";
diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index aea6eccd..c9931179 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -503,7 +503,7 @@ namespace v2rayN.Handler
{
if (Utils.IsNullOrEmpty(config.flow()))
{
- usersItem.flow = "xtls-rprx-origin";
+ usersItem.flow = Global.xtlsFlows[1];
}
else
{
@@ -543,7 +543,7 @@ namespace v2rayN.Handler
{
if (Utils.IsNullOrEmpty(config.flow()))
{
- serversItem.flow = "xtls-rprx-origin";
+ serversItem.flow = Global.xtlsFlows[1];
}
else
{