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

fix: added missing QUrl include

Browse Source
This commit is contained in:
QxQ 2020-10-04 16:53:49 +08:00
parent aa92a336ff
commit adfccda2ce
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5962 5963

4
src/base/models/CoreObjectModels.hpp
View File

@ -220,7 +220,7 @@ namespace Qv2ray::base::objects
// //
struct CertificateObject struct CertificateObject
{ {
QString usage; QString usage = "encipherment";
QString certificateFile; QString certificateFile;
QString keyFile; QString keyFile;
QList<QString> certificate; QList<QString> certificate;
@ -235,7 +235,7 @@ namespace Qv2ray::base::objects
bool allowInsecure = false; bool allowInsecure = false;
bool allowInsecureCiphers = false; bool allowInsecureCiphers = false;
bool disableSessionResumption = true; bool disableSessionResumption = true;
QList<QString> alpn; QList<QString> alpn = { "h2", "http/1.1" };
QList<CertificateObject> certificates; QList<CertificateObject> certificates;
bool disableSystemRoot; bool disableSystemRoot;
JSONSTRUCT_REGISTER(TLSObject, JSONSTRUCT_REGISTER(TLSObject,

13
src/components/plugins/QvPluginHost.cpp
View File

@ -283,13 +283,10 @@ namespace Qv2ray::components::plugins
} }
return {}; return {};
} }
const QString QvPluginHost::SerializeOutbound(const QString &protocol, // const QString QvPluginHost::SerializeOutbound(const QString &protocol, const QJsonObject &settings, const QString &name, const QString &group,
const QJsonObject &outboundSettings, // bool *ok) const
const QString &alias, //
const QString &groupName, //
bool *status) const
{ {
*status = false; *ok = false;
for (const auto &plugin : plugins) for (const auto &plugin : plugins)
{ {
if (plugin.isLoaded && plugin.metadata.Components.contains(COMPONENT_OUTBOUND_HANDLER)) if (plugin.isLoaded && plugin.metadata.Components.contains(COMPONENT_OUTBOUND_HANDLER))
@ -297,8 +294,8 @@ namespace Qv2ray::components::plugins
auto serializer = plugin.pluginInterface->GetOutboundHandler(); auto serializer = plugin.pluginInterface->GetOutboundHandler();
if (serializer && serializer->SupportedProtocols().contains(protocol)) if (serializer && serializer->SupportedProtocols().contains(protocol))
{ {
auto link = serializer->SerializeOutbound(protocol, alias, groupName, outboundSettings); auto link = serializer->SerializeOutbound(protocol, name, group, settings);
*status = true; *ok = true;
return link; return link;
} }
} }

2
src/plugins/protocols/core/OutboundHandler.cpp
View File

@ -2,6 +2,8 @@
#include "3rdparty/QJsonStruct/QJsonIO.hpp" #include "3rdparty/QJsonStruct/QJsonIO.hpp"
#include <QUrl>
const Qv2rayPlugin::OutboundInfoObject BuiltinSerializer::GetOutboundInfo(const QString &protocol, const QJsonObject &outbound) const const Qv2rayPlugin::OutboundInfoObject BuiltinSerializer::GetOutboundInfo(const QString &protocol, const QJsonObject &outbound) const
{ {
Qv2rayPlugin::OutboundInfoObject obj; Qv2rayPlugin::OutboundInfoObject obj;