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

fix: stop calling vmess:// protocol a standardized URI

Browse Source
This commit is contained in:
Qv2ray-dev 2020-03-15 17:35:35 +08:00
parent 80c4922ee0
commit f81aed2c52
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
4710
4712

26
src/core/connection/Serialization_vmess.cpp
View File

@ -120,10 +120,6 @@ namespace Qv2ray::core::connection
flag = flag && C("path");
else if (net == "quic")
flag = flag && C("host") && C("type") && C("path");
else
{
LOG(MODULE_CONNECTION, "VMess protocol has an empty `net` option, we'll try to deduce it from the obfs type.")
}
#undef C
// return flag ? 0 : 1;
@ -184,15 +180,6 @@ namespace Qv2ray::core::connection
<< "utp" //
<< "wechat-video"); //
//
/*Deduce net type from obfs type*/ //
if (QStringList{ "srtp", "utp", "wechat-video" }.contains(type)) //
{ //
if (net != "quic") //
{ //
LOG(MODULE_CONNECTION, "Reset net settings from " + net + " to quic") //
net = "quic"; //
} //
} //
__vmess_checker__func(net, << "tcp" //
<< "http" //
<< "h2" //
@ -200,11 +187,20 @@ namespace Qv2ray::core::connection
<< "kcp" //
<< "domainsocket" //
<< "quic"); //
//
__vmess_checker__func(path, << ""); //
__vmess_checker__func(host, << ""); //
__vmess_checker__func(tls, << ""); //
} //
}
// Repect connection type rather than obfs type //
if (QStringList{ "srtp", "utp", "wechat-video" }.contains(type)) //
{ //
if (net != "quic") //
{ //
LOG(MODULE_CONNECTION, "Reset obfs settings from " + type + " to none") //
type = "none"; //
} //
}
port = vmessConf["port"].toVariant().toInt();
aid = vmessConf["aid"].toVariant().toInt();
//