taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-05 11:12:12 +00:00
Code Issues Projects Releases Wiki Activity

Enhancements

Browse Source 
Fix not adding local rulesets as Clash rule-providers.
Add "nullnode" as node placeholder to export configurations without adding any real node.
Add support for using !!import in source subscription URLs.
Add support for allowInsecure and tfo argument in Trojan links.
Optimize codes.
This commit is contained in:
Tindy X committed 2020-06-25 00:53:38 +08:00
1 parent 8138fadd48
commit d042f00a8e
7 files changed
+36 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/speedtestutil.cpp
+5 -2
View File
@@ -769,6 +769,7 @@ void explodeHTTPSub(std::string link, const std::string &custom_port, nodeInfo &
void explodeTrojan(std::string trojan, const std::string &custom_port, nodeInfo &node)
{
std::string server, port, psk, addition, remark, host;
tribool tfo, scv;
string_array vArray;
trojan.erase(0, 9);
string_size pos = trojan.rfind("#");
@@ -778,7 +779,7 @@ void explodeTrojan(std::string trojan, const std::string &custom_port, nodeInfo
remark = UrlDecode(trojan.substr(pos + 1));
trojan.erase(pos);
}
pos = trojan.rfind("?");
pos = trojan.find("?");
if(pos != trojan.npos)
{
addition = trojan.substr(pos + 1);
@@ -803,6 +804,8 @@ void explodeTrojan(std::string trojan, const std::string &custom_port, nodeInfo
return;
host = getUrlArg(addition, "peer");
tfo = getUrlArg(addition, "tfo");
scv = getUrlArg(addition, "allowInsecure");
if(remark.empty())
remark = server + ":" + port;
@@ -814,7 +817,7 @@ void explodeTrojan(std::string trojan, const std::string &custom_port, nodeInfo
node.remarks = remark;
node.server = server;
node.port = to_int(port, 1);
node.proxyStr = trojanConstruct(node.group, remark, server, port, psk, host, true);
node.proxyStr = trojanConstruct(node.group, remark, server, port, psk, host, true, tribool(), tfo, scv);
}
void explodeQuan(std::string quan, const std::string &custom_port, nodeInfo &node)