Enhancements

Fix missing initializer option for /simple2clashr interface.
Add support for Trojan nodes in Clash configurations.
This commit is contained in:
Tindy X 2020-03-19 22:33:59 +08:00
parent 90772cd607
commit b9fb6b8d7d
No known key found for this signature in database
GPG Key ID: C6AD413169968D58
2 changed files with 9 additions and 1 deletions

View File

@ -1446,7 +1446,7 @@ std::string simpleToClashR(RESPONSE_CALLBACK_ARGS)
refreshRulesets(rulesets, ruleset_content_array); refreshRulesets(rulesets, ruleset_content_array);
rca = ruleset_content_array; rca = ruleset_content_array;
extra_settings ext = {true, overwrite_original_rules, safe_get_renames(), safe_get_emojis(), add_emoji, remove_old_emoji, append_proxy_type, udp_flag, tfo_flag, false, do_sort, scv_flag, filter_deprecated, "", "", ""}; extra_settings ext = {true, overwrite_original_rules, safe_get_renames(), safe_get_emojis(), add_emoji, remove_old_emoji, append_proxy_type, udp_flag, tfo_flag, false, do_sort, scv_flag, filter_deprecated, clash_use_new_field_name, "", "", ""};
std::string proxy; std::string proxy;
if(proxy_subscription == "SYSTEM") if(proxy_subscription == "SYSTEM")

View File

@ -849,6 +849,14 @@ void netchToClash(std::vector<nodeInfo> &nodes, YAML::Node &yamlnode, string_arr
if(ext.skip_cert_verify) if(ext.skip_cert_verify)
singleproxy["skip-cert-verify"] = true; singleproxy["skip-cert-verify"] = true;
break; break;
case SPEEDTEST_MESSAGE_FOUNDTROJAN:
singleproxy["type"] = "trojan";
singleproxy["password"] = password;
if(std::all_of(password.begin(), password.end(), ::isdigit))
singleproxy["password"].SetTag("str");
if(ext.skip_cert_verify)
singleproxy["skip-cert-verify"] = true;
break;
default: default:
continue; continue;
} }