From 0720a0a75001d8489762db1ddd96d3fa2a3ec73b Mon Sep 17 00:00:00 2001
From: QwQ <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Sun, 19 Jul 2020 14:53:19 +0800
Subject: [PATCH] fix: changed VMess default user alterId to 32

---
 src/base/models/CoreObjectModels.hpp        | 6 +++---
 src/core/connection/serialization/vmess.cpp | 3 ++-
 src/ui/editors/w_OutboundEditor.ui          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/base/models/CoreObjectModels.hpp b/src/base/models/CoreObjectModels.hpp
index e24be207..b5f5b8ee 100644
--- a/src/base/models/CoreObjectModels.hpp
+++ b/src/base/models/CoreObjectModels.hpp
@@ -375,6 +375,7 @@ namespace Qv2ray::base::objects
         };
         //
         // VMess Server
+        constexpr auto VMESS_USER_ALTERID_DEFAULT = 32;
         struct VMessServerObject
         {
             struct UserObject
@@ -384,7 +385,7 @@ namespace Qv2ray::base::objects
                 QString security;
                 int level;
                 QString testsEnabled;
-                UserObject() : id(), alterId(64), security("auto"), level(0), testsEnabled("none"){};
+                UserObject() : id(), alterId(VMESS_USER_ALTERID_DEFAULT), security("auto"), level(0), testsEnabled("none"){};
                 JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level, testsEnabled))
             };
 
@@ -405,8 +406,7 @@ namespace Qv2ray::base::objects
             bool ota;
             int level;
             int port;
-            ShadowSocksServerObject()
-                : email(""), address("0.0.0.0"), method("aes-256-cfb"), password(""), ota(false), level(0), port(0){};
+            ShadowSocksServerObject() : email(""), address("0.0.0.0"), method("aes-256-cfb"), password(""), ota(false), level(0), port(0){};
             JSONSTRUCT_REGISTER(ShadowSocksServerObject, F(email, address, port, method, password, ota, level))
         };
     } // namespace protocol
diff --git a/src/core/connection/serialization/vmess.cpp b/src/core/connection/serialization/vmess.cpp
index b83236c1..6793c922 100644
--- a/src/core/connection/serialization/vmess.cpp
+++ b/src/core/connection/serialization/vmess.cpp
@@ -170,7 +170,8 @@ namespace Qv2ray::core::connection
             // Get Alias (AKA ps) from address and port.
             {
                 // Some idiot vmess:// links are using alterId...
-                aid = vmessConf.contains("aid") ? vmessConf.value("aid").toInt() : vmessConf.value("alterId").toInt();
+                aid = vmessConf.contains("aid") ? vmessConf.value("aid").toInt(VMESS_USER_ALTERID_DEFAULT) :
+                                                  vmessConf.value("alterId").toInt(VMESS_USER_ALTERID_DEFAULT);
                 //
                 //
                 __vmess_checker__func(ps, << vmessConf["add"].toVariant().toString() + ":" + vmessConf["port"].toVariant().toString()); //
diff --git a/src/ui/editors/w_OutboundEditor.ui b/src/ui/editors/w_OutboundEditor.ui
index 9c3dd706..8395d2b2 100644
--- a/src/ui/editors/w_OutboundEditor.ui
+++ b/src/ui/editors/w_OutboundEditor.ui
@@ -249,7 +249,7 @@
                <number>65535</number>
               </property>
               <property name="value">
-               <number>16</number>
+               <number>32</number>
               </property>
              </widget>
             </item>