github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: cleanup and removed VMess testsEnabled

Browse Source
This commit is contained in:
QxQ 2020-09-25 21:20:53 +08:00
parent 267dfed55c
commit a079a849f6
5 changed files with 17 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5942 5943

42
src/plugins/common/CommonTypes.hpp
View File

@ -19,14 +19,12 @@ struct SocksServerObject
{ {
QString user; QString user;
QString pass; QString pass;
int level; int level = 0;
UserObject() : user(), pass(), level(0){};
JSONSTRUCT_REGISTER(UserObject, F(user, pass, level)) JSONSTRUCT_REGISTER(UserObject, F(user, pass, level))
}; };
QString address; QString address = "0.0.0.0";
int port; int port = 0;
QList<UserObject> users; QList<UserObject> users;
SocksServerObject() : address("0.0.0.0"), port(0), users(){};
JSONSTRUCT_REGISTER(SocksServerObject, F(address, port, users)) JSONSTRUCT_REGISTER(SocksServerObject, F(address, port, users))
}; };
@ -38,14 +36,12 @@ struct HttpServerObject
{ {
QString user; QString user;
QString pass; QString pass;
int level; int level = 0;
UserObject() : user(), pass(), level(0){};
JSONSTRUCT_REGISTER(UserObject, F(user, pass, level)) JSONSTRUCT_REGISTER(UserObject, F(user, pass, level))
}; };
QString address; QString address = "0.0.0.0";
int port; int port = 0;
QList<UserObject> users; QList<UserObject> users;
HttpServerObject() : address("0.0.0.0"), port(0), users(){};
JSONSTRUCT_REGISTER(HttpServerObject, F(address, port, users)) JSONSTRUCT_REGISTER(HttpServerObject, F(address, port, users))
}; };
@ -53,11 +49,10 @@ struct HttpServerObject
// ShadowSocks Server // ShadowSocks Server
struct ShadowSocksServerObject struct ShadowSocksServerObject
{ {
QString address; QString address = "0.0.0.0";
QString method; QString method = "aes-256-cfb";
QString password; QString password;
int port; int port = 0;
ShadowSocksServerObject() : address("0.0.0.0"), method("aes-256-cfb"), password(""), port(0){};
JSONSTRUCT_REGISTER(ShadowSocksServerObject, F(address, port, method, password)) JSONSTRUCT_REGISTER(ShadowSocksServerObject, F(address, port, method, password))
}; };
@ -68,16 +63,14 @@ struct VLESSServerObject
struct UserObject struct UserObject
{ {
QString id; QString id;
QString encryption; QString encryption = "none";
QString flow; QString flow;
UserObject() : id(), encryption("none"), flow(){};
JSONSTRUCT_REGISTER(UserObject, F(id, encryption, flow)) JSONSTRUCT_REGISTER(UserObject, F(id, encryption, flow))
}; };
QString address; QString address;
int port; int port = 0;
QList<UserObject> users; QList<UserObject> users;
VLESSServerObject() : address(""), port(0), users(){};
JSONSTRUCT_REGISTER(VLESSServerObject, F(address, port, users)) JSONSTRUCT_REGISTER(VLESSServerObject, F(address, port, users))
}; };
@ -89,17 +82,14 @@ struct VMessServerObject
struct UserObject struct UserObject
{ {
QString id; QString id;
int alterId; int alterId = VMESS_USER_ALTERID_DEFAULT;
QString security; QString security = "auto";
int level; int level = 0;
QString testsEnabled; JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level))
UserObject() : id(), alterId(VMESS_USER_ALTERID_DEFAULT), security("auto"), level(0), testsEnabled("none"){};
JSONSTRUCT_REGISTER(UserObject, F(id, alterId, security, level, testsEnabled))
}; };
QString address; QString address;
int port; int port = 0;
QList<UserObject> users; QList<UserObject> users;
VMessServerObject() : address(""), port(0), users(){};
JSONSTRUCT_REGISTER(VMessServerObject, F(address, port, users)) JSONSTRUCT_REGISTER(VMessServerObject, F(address, port, users))
}; };

5
src/plugins/protocols/ui/outbound/vmess.cpp
View File

@ -35,8 +35,3 @@ void VmessOutboundEditor::on_alterLineEdit_valueChanged(int arg1)
{ {
vmess.users.front().alterId = arg1; vmess.users.front().alterId = arg1;
} }
void VmessOutboundEditor::on_testsEnabledCombo_currentIndexChanged(const QString &arg1)
{
vmess.users.front().testsEnabled = arg1;
}

2
src/plugins/protocols/ui/outbound/vmess.hpp
View File

@ -37,7 +37,6 @@ class VmessOutboundEditor
idLineEdit->setText(user.id); idLineEdit->setText(user.id);
alterLineEdit->setValue(user.alterId); alterLineEdit->setValue(user.alterId);
securityCombo->setCurrentText(user.security); securityCombo->setCurrentText(user.security);
testsEnabledCombo->setCurrentText(user.testsEnabled);
}) })
} }
const QJsonObject GetContent() const override const QJsonObject GetContent() const override
@ -59,5 +58,4 @@ class VmessOutboundEditor
void on_idLineEdit_textEdited(const QString &arg1); void on_idLineEdit_textEdited(const QString &arg1);
void on_securityCombo_currentIndexChanged(const QString &arg1); void on_securityCombo_currentIndexChanged(const QString &arg1);
void on_alterLineEdit_valueChanged(int arg1); void on_alterLineEdit_valueChanged(int arg1);
void on_testsEnabledCombo_currentIndexChanged(const QString &arg1);
}; };

24
src/plugins/protocols/ui/outbound/vmess.ui
View File

@ -88,30 +88,6 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Tests</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="testsEnabledCombo">
<property name="editable">
<bool>true</bool>
</property>
<item>
<property name="text">
<string notr="true">none</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">VMessAEAD</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>