diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 9768818f..4096698f 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5962 +5963 diff --git a/src/base/models/CoreObjectModels.hpp b/src/base/models/CoreObjectModels.hpp index f211e72f..362bd8ca 100644 --- a/src/base/models/CoreObjectModels.hpp +++ b/src/base/models/CoreObjectModels.hpp @@ -220,7 +220,7 @@ namespace Qv2ray::base::objects // struct CertificateObject { - QString usage; + QString usage = "encipherment"; QString certificateFile; QString keyFile; QList certificate; @@ -235,7 +235,7 @@ namespace Qv2ray::base::objects bool allowInsecure = false; bool allowInsecureCiphers = false; bool disableSessionResumption = true; - QList alpn; + QList alpn = { "h2", "http/1.1" }; QList certificates; bool disableSystemRoot; JSONSTRUCT_REGISTER(TLSObject, diff --git a/src/components/plugins/QvPluginHost.cpp b/src/components/plugins/QvPluginHost.cpp index 00fdf9a0..d6fbbaec 100644 --- a/src/components/plugins/QvPluginHost.cpp +++ b/src/components/plugins/QvPluginHost.cpp @@ -283,13 +283,10 @@ namespace Qv2ray::components::plugins } return {}; } - const QString QvPluginHost::SerializeOutbound(const QString &protocol, // - const QJsonObject &outboundSettings, // - const QString &alias, // - const QString &groupName, // - bool *status) const + const QString QvPluginHost::SerializeOutbound(const QString &protocol, const QJsonObject &settings, const QString &name, const QString &group, + bool *ok) const { - *status = false; + *ok = false; for (const auto &plugin : plugins) { if (plugin.isLoaded && plugin.metadata.Components.contains(COMPONENT_OUTBOUND_HANDLER)) @@ -297,8 +294,8 @@ namespace Qv2ray::components::plugins auto serializer = plugin.pluginInterface->GetOutboundHandler(); if (serializer && serializer->SupportedProtocols().contains(protocol)) { - auto link = serializer->SerializeOutbound(protocol, alias, groupName, outboundSettings); - *status = true; + auto link = serializer->SerializeOutbound(protocol, name, group, settings); + *ok = true; return link; } } diff --git a/src/plugins/protocols/core/OutboundHandler.cpp b/src/plugins/protocols/core/OutboundHandler.cpp index 11ed7dd2..1d008eca 100644 --- a/src/plugins/protocols/core/OutboundHandler.cpp +++ b/src/plugins/protocols/core/OutboundHandler.cpp @@ -2,6 +2,8 @@ #include "3rdparty/QJsonStruct/QJsonIO.hpp" +#include + const Qv2rayPlugin::OutboundInfoObject BuiltinSerializer::GetOutboundInfo(const QString &protocol, const QJsonObject &outbound) const { Qv2rayPlugin::OutboundInfoObject obj;