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

Optimize codes

Browse Source
This commit is contained in:
Tindy X committed 2020-03-29 23:39:22 +08:00
1 parent 7f2df3b2af
commit 775d83af58
1 file changed
+5 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/subexport.cpp
+5 -9
View File
@@ -807,7 +807,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
singleproxy["type"] = "ss"; singleproxy["type"] = "ss";
singleproxy["cipher"] = method; singleproxy["cipher"] = method;
singleproxy["password"] = password; singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit)) if(std::all_of(password.begin(), password.end(), ::isdigit) && !password.empty())
singleproxy["password"].SetTag("str"); singleproxy["password"].SetTag("str");
switch(hash_(plugin)) switch(hash_(plugin))
{ {
@@ -852,12 +852,8 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
singleproxy["network"] = transproto; singleproxy["network"] = transproto;
singleproxy["ws-path"] = path; singleproxy["ws-path"] = path;
singleproxy["ws-headers"]["Host"] = host; singleproxy["ws-headers"]["Host"] = host;
singleproxy["headers"]["Host"] = host;
if(edge.size()) if(edge.size())
{
singleproxy["ws-headers"]["Edge"] = edge; singleproxy["ws-headers"]["Edge"] = edge;
singleproxy["headers"]["Edge"] = edge;
}
break; break;
default: default:
continue; continue;
@@ -884,7 +880,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
singleproxy["type"] = "ssr"; singleproxy["type"] = "ssr";
singleproxy["cipher"] = method; singleproxy["cipher"] = method;
singleproxy["password"] = password; singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit)) if(std::all_of(password.begin(), password.end(), ::isdigit) && !password.empty())
singleproxy["password"].SetTag("str"); singleproxy["password"].SetTag("str");
singleproxy["protocol"] = protocol; singleproxy["protocol"] = protocol;
singleproxy["protocolparam"] = protoparam; singleproxy["protocolparam"] = protoparam;
@@ -895,7 +891,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
singleproxy["type"] = "socks5"; singleproxy["type"] = "socks5";
singleproxy["username"] = username; singleproxy["username"] = username;
singleproxy["password"] = password; singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit)) if(std::all_of(password.begin(), password.end(), ::isdigit) && !password.empty())
singleproxy["password"].SetTag("str"); singleproxy["password"].SetTag("str");
if(ext.skip_cert_verify) if(ext.skip_cert_verify)
singleproxy["skip-cert-verify"] = true; singleproxy["skip-cert-verify"] = true;
@@ -904,7 +900,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
singleproxy["type"] = "http"; singleproxy["type"] = "http";
singleproxy["username"] = username; singleproxy["username"] = username;
singleproxy["password"] = password; singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit)) if(std::all_of(password.begin(), password.end(), ::isdigit) && !password.empty())
singleproxy["password"].SetTag("str"); singleproxy["password"].SetTag("str");
singleproxy["tls"] = type == "HTTPS"; singleproxy["tls"] = type == "HTTPS";
if(ext.skip_cert_verify) if(ext.skip_cert_verify)
@@ -913,7 +909,7 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
case SPEEDTEST_MESSAGE_FOUNDTROJAN: case SPEEDTEST_MESSAGE_FOUNDTROJAN:
singleproxy["type"] = "trojan"; singleproxy["type"] = "trojan";
singleproxy["password"] = password; singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit)) if(std::all_of(password.begin(), password.end(), ::isdigit) && !password.empty())
singleproxy["password"].SetTag("str"); singleproxy["password"].SetTag("str");
if(ext.skip_cert_verify) if(ext.skip_cert_verify)
singleproxy["skip-cert-verify"] = true; singleproxy["skip-cert-verify"] = true;