From 2b00490dd65d784b45dd2f29c9a99cb8b1a1da44 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:19:53 +0800
Subject: [PATCH] re-add alterId
---
v2rayN/v2rayN/Forms/AddServerForm.Designer.cs | 16 ++++
v2rayN/v2rayN/Forms/AddServerForm.cs | 6 ++
v2rayN/v2rayN/Forms/AddServerForm.resx | 80 +++++++++++++----
.../v2rayN/Forms/AddServerForm.zh-Hans.resx | 89 ++++++++++++++++++-
v2rayN/v2rayN/Handler/ConfigHandler.cs | 2 +
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 4 +
v2rayN/v2rayN/Mode/Config.cs | 19 +++-
v2rayN/v2rayN/Mode/V2rayConfig.cs | 5 +-
8 files changed, 202 insertions(+), 19 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
index f9ca539f..c48ec522 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -38,6 +38,8 @@
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();
@@ -78,6 +80,8 @@
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);
@@ -127,6 +131,16 @@
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");
@@ -260,6 +274,8 @@
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 4f643eca..02223070 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -36,6 +36,7 @@ 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,6 +52,7 @@ namespace v2rayN.Forms
txtAddress.Text = "";
txtPort.Text = "";
txtId.Text = "";
+ txtAlterId.Text = "0";
cmbSecurity.Text = Global.DefaultSecurity;
txtRemarks.Text = "";
@@ -62,6 +64,7 @@ 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;
@@ -86,6 +89,7 @@ namespace v2rayN.Forms
vmessItem.address = address;
vmessItem.port = Utils.ToInt(port);
vmessItem.id = id;
+ vmessItem.alterId = Utils.ToInt(alterId);
vmessItem.security = security;
vmessItem.remarks = remarks;
@@ -169,6 +173,7 @@ 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);
@@ -194,6 +199,7 @@ 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 826ea809..1e251a8f 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -171,7 +171,7 @@
True
- 411, 147
+ 411, 175
113, 12
@@ -198,7 +198,7 @@
True
- 411, 118
+ 411, 147
119, 12
@@ -222,7 +222,7 @@
2
- 195, 114
+ 195, 143
210, 20
@@ -243,7 +243,7 @@
3
- 127, 143
+ 127, 171
278, 21
@@ -267,7 +267,7 @@
True
- 12, 147
+ 12, 175
95, 12
@@ -294,7 +294,7 @@
True
- 12, 118
+ 12, 147
173, 12
@@ -317,6 +317,54 @@
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
@@ -336,7 +384,7 @@
groupBox1
- 7
+ 9
True
@@ -363,7 +411,7 @@
groupBox1
- 8
+ 10
127, 56
@@ -384,7 +432,7 @@
groupBox1
- 9
+ 11
True
@@ -411,7 +459,7 @@
groupBox1
- 10
+ 12
127, 27
@@ -432,7 +480,7 @@
groupBox1
- 11
+ 13
True
@@ -459,7 +507,7 @@
groupBox1
- 12
+ 14
@@ -469,7 +517,7 @@
0, 35
- 729, 186
+ 729, 216
3
@@ -517,7 +565,7 @@
Bottom
- 0, 451
+ 0, 481
729, 60
@@ -640,7 +688,7 @@
Bottom
- 0, 221
+ 0, 251
729, 230
@@ -670,7 +718,7 @@
6, 12
- 729, 511
+ 729, 541
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 018a8578..47b4d4cd 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -127,6 +127,87 @@
*手填,方便识别管理
+
+ 149, 12
+
+
+ 95, 12
+
+
+ 167, 12
+
+
+ 180, 7
+
+
+ 350, 36
+
+
+ 143, 12
+
+
+ 149, 12
+
+
+ 127, 168
+
+
+ 127, 32
+
+
+ 211, 20
+
+
+ 9, 36
+
+
+ 107, 12
+
+
+ 9, 168
+
+
+ 65, 12
+
+
+ 161, 12
+
+
+ 9, 237
+
+
+ 107, 12
+
+
+ 127, 237
+
+
+ 282, 71
+
+
+ 197, 12
+
+
+ 127, 102
+
+
+ 334, 51
+
+
+ 9, 71
+
+
+ 89, 12
+
+
+ 9, 102
+
+
+ 89, 12
+
+
+ 127, 67
+
113, 12
@@ -134,7 +215,7 @@
*随便选,建议(auto)
- 127, 114
+ 127, 143
211, 20
@@ -151,6 +232,12 @@
加密方式(security)
+
+ 95, 12
+
+
+ 额外ID(alterId)
+
65, 12
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 06daf839..b5efa483 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -296,6 +296,7 @@ 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),
@@ -982,6 +983,7 @@ 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 909f5904..aea6eccd 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -363,6 +363,7 @@ namespace v2rayN.Handler
}
//远程服务器用户ID
usersItem.id = config.id();
+ usersItem.alterId = config.alterId();
usersItem.email = Global.userEMail;
if (Global.vmessSecuritys.Contains(config.security()))
{
@@ -1030,6 +1031,7 @@ namespace v2rayN.Handler
if (config.configType() == (int)EConfigType.Vmess)
{
inbound.protocol = Global.vmessProtocolLite;
+ usersItem.alterId = config.alterId();
}
else if (config.configType() == (int)EConfigType.VLESS)
@@ -1129,6 +1131,7 @@ 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
@@ -1272,6 +1275,7 @@ 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 7d3eb8bf..e26174cc 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -218,6 +218,15 @@ 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)
@@ -389,6 +398,7 @@ namespace v2rayN.Mode
address = string.Empty;
port = 0;
id = string.Empty;
+ alterId = 0;
security = string.Empty;
network = string.Empty;
remarks = string.Empty;
@@ -503,7 +513,14 @@ 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 b6d8ed55..4703ec21 100644
--- a/v2rayN/v2rayN/Mode/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Mode/V2rayConfig.cs
@@ -149,7 +149,10 @@ namespace v2rayN.Mode
///
///
public string id { get; set; }
-
+ ///
+ ///
+ ///
+ public int alterId { get; set; }
///
///
///