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

Fix compatibility with Electron-SSR configurations

Browse Source 
Optimize codes.
This commit is contained in:
Tindy X committed 2020-08-13 19:30:54 +08:00
1 parent f671230ce8
commit 0c8913f87d
2 files changed
+11 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/speedtestutil.cpp
+10 -10
View File
@@ -569,25 +569,25 @@ void explodeSSRConf(std::string content, const std::string &custom_port, bool ss
for(unsigned int i = 0; i < json["configs"].Size(); i++)
{
json["configs"][i]["group"] >> group;
group = GetMember(json["configs"][i], "group");
if(group.empty())
group = SSR_DEFAULT_GROUP;
json["configs"][i]["remarks"] >> remarks;
json["configs"][i]["server"] >> server;
remarks = GetMember(json["configs"][i], "remarks");
server = GetMember(json["configs"][i], "server");
port = custom_port.size() ? custom_port : GetMember(json["configs"][i], "server_port");
if(port == "0")
continue;
if(remarks.empty())
remarks = server + ":" + port;
json["configs"][i]["remarks_base64"] >> remarks_base64;
json["configs"][i]["password"] >> password;
json["configs"][i]["method"] >> method;
remarks_base64 = GetMember(json["configs"][i], "remarks_base64"); // electron-ssr does not contain this field
password = GetMember(json["configs"][i], "password");
method = GetMember(json["configs"][i], "method");
json["configs"][i]["protocol"] >> protocol;
json["configs"][i]["protocolparam"] >> protoparam;
json["configs"][i]["obfs"] >> obfs;
json["configs"][i]["obfsparam"] >> obfsparam;
protocol = GetMember(json["configs"][i], "protocol");
protoparam = GetMember(json["configs"][i], "protocolparam");
obfs = GetMember(json["configs"][i], "obfs");
obfsparam = GetMember(json["configs"][i], "obfsparam");
node.linkType = SPEEDTEST_MESSAGE_FOUNDSSR;
node.group = group;
src/subexport.cpp
+1 -5
View File
@@ -1763,18 +1763,14 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, const std::string &base_c
if(filtered_nodelist.size() == 1)
{
proxy = toLower(filtered_nodelist[0]);
bool match_flag = false;
switch(hash_(proxy))
{
case "direct"_hash:
case "reject"_hash:
case "reject-tinygif"_hash:
ini.Set("Proxy", "{NONAME}", vArray[0] + " = " + proxy);
match_flag = true;
break;
}
if(match_flag)
continue;
}
}
proxy = vArray[1] + ",";