From 5b9cdec1562b09f00f20a81dfb7c0a765e31ff65 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 23 Jan 2022 19:16:14 +0800
Subject: [PATCH] remove alterId
---
v2rayN/v2rayN/Forms/AddServerForm.Designer.cs | 16 ----
v2rayN/v2rayN/Forms/AddServerForm.cs | 11 ---
v2rayN/v2rayN/Forms/AddServerForm.resx | 80 ++++---------------
.../v2rayN/Forms/AddServerForm.zh-Hans.resx | 3 -
v2rayN/v2rayN/Handler/ConfigHandler.cs | 2 -
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 6 --
v2rayN/v2rayN/Mode/Config.cs | 19 +----
v2rayN/v2rayN/Mode/V2rayConfig.cs | 5 +-
v2rayN/v2rayN/Resx/ResUI.Designer.cs | 9 ---
v2rayN/v2rayN/Resx/ResUI.resx | 3 -
v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 3 -
v2rayN/v2rayN/Sample/SampleClientConfig.txt | 1 -
v2rayN/v2rayN/Sample/SampleServerConfig.txt | 1 -
13 files changed, 18 insertions(+), 141 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
index d6393c60..2abd7e1a 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -38,8 +38,6 @@
this.txtRemarks = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
- this.txtAlterId = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
this.txtId = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtPort = new System.Windows.Forms.TextBox();
@@ -80,8 +78,6 @@
this.groupBox1.Controls.Add(this.txtRemarks);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.label5);
- this.groupBox1.Controls.Add(this.txtAlterId);
- this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.txtId);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.txtPort);
@@ -137,16 +133,6 @@
resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5";
//
- // txtAlterId
- //
- resources.ApplyResources(this.txtAlterId, "txtAlterId");
- this.txtAlterId.Name = "txtAlterId";
- //
- // label4
- //
- resources.ApplyResources(this.label4, "label4");
- this.label4.Name = "label4";
- //
// txtId
//
resources.ApplyResources(this.txtId, "txtId");
@@ -280,8 +266,6 @@
private System.Windows.Forms.TextBox txtRemarks;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.TextBox txtAlterId;
- private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtId;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtPort;
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs
index fe344d8e..2c231ac8 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -35,7 +35,6 @@ namespace v2rayN.Forms
txtAddress.Text = vmessItem.address;
txtPort.Text = vmessItem.port.ToString();
txtId.Text = vmessItem.id;
- txtAlterId.Text = vmessItem.alterId.ToString();
cmbSecurity.Text = vmessItem.security;
txtRemarks.Text = vmessItem.remarks;
@@ -51,7 +50,6 @@ namespace v2rayN.Forms
txtAddress.Text = "";
txtPort.Text = "";
txtId.Text = "";
- txtAlterId.Text = "0";
cmbSecurity.Text = Global.DefaultSecurity;
txtRemarks.Text = "";
@@ -63,7 +61,6 @@ namespace v2rayN.Forms
string address = txtAddress.Text;
string port = txtPort.Text;
string id = txtId.Text;
- string alterId = txtAlterId.Text;
string security = cmbSecurity.Text;
string remarks = txtRemarks.Text;
@@ -82,18 +79,12 @@ namespace v2rayN.Forms
UI.Show(UIRes.I18N("FillUUID"));
return;
}
- if (Utils.IsNullOrEmpty(alterId) || !Utils.IsNumberic(alterId))
- {
- UI.Show(UIRes.I18N("FillCorrectAlterId"));
- return;
- }
transportControl.EndBindingServer();
vmessItem.address = address;
vmessItem.port = Utils.ToInt(port);
vmessItem.id = id;
- vmessItem.alterId = Utils.ToInt(alterId);
vmessItem.security = security;
vmessItem.remarks = remarks;
@@ -177,7 +168,6 @@ namespace v2rayN.Forms
txtAddress.Text = vmessItem.address;
txtPort.Text = vmessItem.port.ToString();
txtId.Text = vmessItem.id;
- txtAlterId.Text = vmessItem.alterId.ToString();
txtRemarks.Text = vmessItem.remarks;
transportControl.BindingServer(vmessItem);
@@ -203,7 +193,6 @@ namespace v2rayN.Forms
txtAddress.Text = vmessItem.address;
txtPort.Text = vmessItem.port.ToString();
txtId.Text = vmessItem.id;
- txtAlterId.Text = vmessItem.alterId.ToString();
txtRemarks.Text = vmessItem.remarks;
transportControl.BindingServer(vmessItem);
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx
index 665f5325..c8d1d996 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -171,7 +171,7 @@
True
- 411, 175
+ 411, 147
113, 12
@@ -198,7 +198,7 @@
True
- 411, 147
+ 411, 118
119, 12
@@ -237,7 +237,7 @@
zero
- 195, 143
+ 195, 114
210, 20
@@ -258,7 +258,7 @@
3
- 127, 171
+ 127, 143
278, 21
@@ -282,7 +282,7 @@
True
- 12, 175
+ 12, 147
95, 12
@@ -309,7 +309,7 @@
True
- 12, 147
+ 12, 118
173, 12
@@ -332,54 +332,6 @@
6
-
- 127, 114
-
-
- 143, 21
-
-
- 3
-
-
- txtAlterId
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 7
-
-
- True
-
-
- 12, 118
-
-
- 47, 12
-
-
- 6
-
-
- AlterId
-
-
- label4
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 8
-
127, 85
@@ -399,7 +351,7 @@
groupBox1
- 9
+ 7
True
@@ -426,7 +378,7 @@
groupBox1
- 10
+ 8
127, 56
@@ -447,7 +399,7 @@
groupBox1
- 11
+ 9
True
@@ -474,7 +426,7 @@
groupBox1
- 12
+ 10
127, 27
@@ -495,7 +447,7 @@
groupBox1
- 13
+ 11
True
@@ -522,7 +474,7 @@
groupBox1
- 14
+ 12
@@ -532,7 +484,7 @@
0, 35
- 729, 216
+ 729, 186
3
@@ -580,7 +532,7 @@
Bottom
- 0, 481
+ 0, 451
729, 60
@@ -703,7 +655,7 @@
Bottom
- 0, 251
+ 0, 221
729, 230
@@ -733,7 +685,7 @@
6, 12
- 729, 541
+ 729, 511
Edit or add a [VMess] server
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
index 47b4d4cd..5c854d9e 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -235,9 +235,6 @@
95, 12
-
- 额外ID(alterId)
-
65, 12
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index db9e81a8..728ef5bb 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -297,7 +297,6 @@ namespace v2rayN.Handler
address = config.vmess[index].address,
port = config.vmess[index].port,
id = config.vmess[index].id,
- alterId = config.vmess[index].alterId,
security = config.vmess[index].security,
network = config.vmess[index].network,
remarks = string.Format("{0}-clone", config.vmess[index].remarks),
@@ -1016,7 +1015,6 @@ namespace v2rayN.Handler
o.address == n.address &&
o.port == n.port &&
o.id == n.id &&
- o.alterId == n.alterId &&
o.security == n.security &&
o.network == n.network &&
o.headerType == n.headerType &&
diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index c30336ad..f3504c03 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -363,7 +363,6 @@ namespace v2rayN.Handler
}
//远程服务器用户ID
usersItem.id = config.id();
- usersItem.alterId = config.alterId();
usersItem.email = Global.userEMail;
usersItem.security = config.security();
@@ -479,7 +478,6 @@ namespace v2rayN.Handler
}
//远程服务器用户ID
usersItem.id = config.id();
- usersItem.alterId = 0;
usersItem.flow = string.Empty;
usersItem.email = Global.userEMail;
usersItem.encryption = config.security();
@@ -1025,13 +1023,11 @@ namespace v2rayN.Handler
if (config.configType() == (int)EConfigType.Vmess)
{
inbound.protocol = Global.vmessProtocolLite;
- usersItem.alterId = config.alterId();
}
else if (config.configType() == (int)EConfigType.VLESS)
{
inbound.protocol = Global.vlessProtocolLite;
- usersItem.alterId = 0;
usersItem.flow = config.flow();
inbound.settings.decryption = config.security();
}
@@ -1126,7 +1122,6 @@ namespace v2rayN.Handler
vmessItem.address = outbound.settings.vnext[0].address;
vmessItem.port = outbound.settings.vnext[0].port;
vmessItem.id = outbound.settings.vnext[0].users[0].id;
- vmessItem.alterId = outbound.settings.vnext[0].users[0].alterId;
vmessItem.remarks = string.Format("import@{0}", DateTime.Now.ToShortDateString());
//tcp or kcp
@@ -1270,7 +1265,6 @@ namespace v2rayN.Handler
vmessItem.address = string.Empty;
vmessItem.port = inbound.port;
vmessItem.id = inbound.settings.clients[0].id;
- vmessItem.alterId = inbound.settings.clients[0].alterId;
vmessItem.remarks = string.Format("import@{0}", DateTime.Now.ToShortDateString());
diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs
index f3425e8c..7945c0b3 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -218,15 +218,6 @@ namespace v2rayN.Mode
return vmess[index].id.TrimEx();
}
- public int alterId()
- {
- if (index < 0)
- {
- return 0;
- }
- return vmess[index].alterId;
- }
-
public string security()
{
if (index < 0)
@@ -388,7 +379,6 @@ namespace v2rayN.Mode
address = string.Empty;
port = 0;
id = string.Empty;
- alterId = 0;
security = string.Empty;
network = string.Empty;
remarks = string.Empty;
@@ -499,14 +489,7 @@ namespace v2rayN.Mode
public string id
{
get; set;
- }
- ///
- /// 远程服务器额外ID
- ///
- public int alterId
- {
- get; set;
- }
+ }
///
/// 本地安全策略
///
diff --git a/v2rayN/v2rayN/Mode/V2rayConfig.cs b/v2rayN/v2rayN/Mode/V2rayConfig.cs
index 4703ec21..b6d8ed55 100644
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -149,10 +149,7 @@ namespace v2rayN.Mode
///
///
public string id { get; set; }
- ///
- ///
- ///
- public int alterId { get; set; }
+
///
///
///
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 1842e7f0..509139fb 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -186,15 +186,6 @@ namespace v2rayN.Resx {
}
}
- ///
- /// 查找类似 Please fill in the correct format extra ID 的本地化字符串。
- ///
- internal static string FillCorrectAlterId {
- get {
- return ResourceManager.GetString("FillCorrectAlterId", resourceCulture);
- }
- }
-
///
/// 查找类似 Please fill in the correct custom DNS 的本地化字符串。
///
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 0c9a42b3..fcc7d104 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -156,9 +156,6 @@
Failed to read configuration file
-
- Please fill in the correct format extra ID
-
Please fill in the correct format server port
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index ce915bca..28d06e11 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -156,9 +156,6 @@
读取配置文件失败
-
- 请填写正确格式额外ID
-
请填写正确格式服务器端口
diff --git a/v2rayN/v2rayN/Sample/SampleClientConfig.txt b/v2rayN/v2rayN/Sample/SampleClientConfig.txt
index f2924c9a..0d2b2537 100644
--- a/v2rayN/v2rayN/Sample/SampleClientConfig.txt
+++ b/v2rayN/v2rayN/Sample/SampleClientConfig.txt
@@ -47,7 +47,6 @@
"port": 10086,
"users": [{
"id": "a3482e88-686a-4a58-8126-99c9df64b7bf",
- "alterId": 64,
"security": "auto"
}]
}],
diff --git a/v2rayN/v2rayN/Sample/SampleServerConfig.txt b/v2rayN/v2rayN/Sample/SampleServerConfig.txt
index bd773f43..29186903 100644
--- a/v2rayN/v2rayN/Sample/SampleServerConfig.txt
+++ b/v2rayN/v2rayN/Sample/SampleServerConfig.txt
@@ -11,7 +11,6 @@
"clients": [{
"id": "23ad6b10-8d1a-40f7-8ad0-e3e35cd38297",
"level": 1,
- "alterId": 64,
"email": "t@t.tt"
}]
},