taixingyiji/subconverter
1
0
Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2025-10-26 02:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhancements

Browse Source 
Fix crash when parsing HTTP nodes in Surge subscriptions.
Fix section order problem for various subscriptions.
Add more custom settings in external configuration file.
Add no-resolve to LAN rules.
Update README-cn.md.
This commit is contained in:
Tindy X
2020-01-03 14:29:40 +08:00
parent 9094270b65
commit a775c69121
8 changed files with 160 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README-cn.md
View File

@@ -53,7 +53,7 @@ http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&config=%CONFIG%
| url | 必要 | https%3A%2F%2Fwww.xxx.com | 指机场所提供的订阅链接，需要经过 [URLEncode](https://www.urlencoder.org/) 处理 |
| config | 可选 | https%3A%2F%2Fwww.xxx.com | 指远程 `pref.ini` (包含分组和规则部分)，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，可查看 [示例仓库](https://github.com/lzdnico/subconverteriniexample) 寻找灵感，默认加载本地设置文件 |
运行 `subconverter.exe` 后，按照 [调用说明](###调用说明) 的对应内容替换即可得到一份使用**神机规则**的配置文件。
运行 subconverter 主程序后，按照 [调用说明](###调用说明) 的对应内容替换即可得到一份使用**神机规则**的配置文件。
此外，如果你需要将多个订阅合成一份, 则要在上方所提及的 URLEncode 之前使用 '|' 来分隔链接。
@@ -70,7 +70,7 @@ https://dler.cloud/subscribe/ABCDE?clash=vmess|https://rich.cloud/subscribe/ABCD
接着通过 URLEncode 后可以得到:
https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
然后将想要的 %TARGET% (即 clash)和上一步所得到的 %URL% 填入调用地址中:
然后将想要的 %TARGET% (即 clash) 和上一步所得到的 %URL% 填入调用地址中:
http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
最后将该链接填写至 Clash 的订阅处就大功告成了。
@@ -135,7 +135,7 @@ exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29
url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
接着将所有元素进行拼接：
http://127.0.0.1:25500/sub?surge&ver=4&tfo=true&udp=true&emoji=true&exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
最后将该链接填写至 Surge 的订阅处就大功告成了。
```
@@ -418,7 +418,7 @@ custom_proxy_group=🇯🇵 JP`select`沪日`日本
> 自动上传 gist ，可以用于 Clash For Android / Surge 等进行远程订阅
在程序目录内的 [gistconf.ini](./gistconf.ini) 中添加 [Personal Access Token](https://github.com/settings/tokens/new)，在链接后加上 `upload=true` 就会在更新好后自动上传 gist。
在程序目录内的 [gistconf.ini](./base/gistconf.ini) 中添加 [Personal Access Token](https://github.com/settings/tokens/new)，在链接后加上 `&upload=true` 就会在更新好后自动上传 gist。
例如：
```ini

35
base/example_external_config.ini Normal file
View File

@@ -0,0 +1,35 @@
[custom]
custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
custom_proxy_group=google`select`.*
custom_proxy_group=netflix`select`.*
custom_proxy_group=动画疯`select`(深台|彰化|新北|台)
custom_proxy_group=fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
custom_proxy_group=美区影视`select`(美|美国)
custom_proxy_group=Global_media`select`.*
custom_proxy_group=Domestic`select`[]DIRECT`[]Proxy
custom_proxy_group=Apple`select`[]DIRECT`[]Proxy
custom_proxy_group=Final`select`[]Proxy`[]DIRECT
custom_proxy_group=屏蔽广告`select`[]REJECT`[]DIRECT
custom_proxy_group=UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
custom_proxy_group=Telegram`select`新加坡`[]Proxy
enable_rule_generator=false
;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list
;surge_ruleset=⛔️ 广告拦截,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list
;surge_ruleset=🚫 运营劫持,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Hijacking.list
;surge_ruleset=🌌 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/YouTube.list
;surge_ruleset=🎥 NETFLIX,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Netflix.list
;surge_ruleset=HBO,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/HBO.list
;surge_ruleset=Fox,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Fox.list
;surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/GlobalMedia.list
;surge_ruleset=🌏 港台媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/HKMTMedia.list
;surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Telegram.list
;surge_ruleset=🔰 节点选择,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Global.list
;surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/China.list
clash_rule_base=forcerule.yml
;surge_rule_base=surge.conf
;surfboard_rule_base=surfboard.conf
;mellow_rule_base=mellow.conf

18
base/rules/LocalAreaNetwork.list
View File

@@ -1,10 +1,10 @@
DOMAIN-SUFFIX,local
IP-CIDR,192.168.0.0/16
IP-CIDR,10.0.0.0/8
IP-CIDR,172.16.0.0/12
IP-CIDR,127.0.0.0/8
IP-CIDR,100.64.0.0/10
IP-CIDR6,::1/128
IP-CIDR6,fc00::/7
IP-CIDR6,fe80::/10
IP-CIDR6,fd00::/8
IP-CIDR,192.168.0.0/16,no-resolve
IP-CIDR,10.0.0.0/8,no-resolve
IP-CIDR,172.16.0.0/12,no-resolve
IP-CIDR,127.0.0.0/8,no-resolve
IP-CIDR,100.64.0.0/10,no-resolve
IP-CIDR6,::1/128,no-resolve
IP-CIDR6,fc00::/7,no-resolve
IP-CIDR6,fe80::/10,no-resolve
IP-CIDR6,fd00::/8,no-resolve

28
src/ini_reader.h
View File

@@ -202,7 +202,7 @@ public:
{
last_error_index++;
lineSize = strLine.size();
if(!lineSize || strLine[0] == ';' || strLine[0] == '#') //empty lines and comments are ignored
if(!lineSize || strLine[0] == ';' || strLine[0] == '#' || (lineSize >= 2 && strLine[0] == '/' && strLine[1] == '/')) //empty lines and comments are ignored
continue;
if(strLine[lineSize - 1] == '\r') //remove line break
{
@@ -240,8 +240,11 @@ public:
__SAVE_ERROR_AND_RETURN(INIREADER_EXCEPTION_DUPLICATE); //not allowed, stop
}
ini_content.emplace(curSection, itemGroup); //insert previous section to content map
read_sections.emplace_back(curSection); //add to read sections list
read_sections.push_back(curSection); //add to read sections list
if(std::count(section_order.cbegin(), section_order.cend(), curSection) == 0)
section_order.emplace_back(curSection);
}
eraseElements(itemGroup); //reset section storage
curSection = thisSection; //start a new section
}
@@ -269,6 +272,8 @@ public:
}
ini_content.emplace(curSection, itemGroup); //insert this section to content map
read_sections.emplace_back(curSection); //add to read sections list
if(std::count(section_order.cbegin(), section_order.cend(), curSection) == 0)
section_order.emplace_back(curSection);
}
parsed = true;
__SAVE_ERROR_AND_RETURN(INIREADER_EXCEPTION_NONE); //all done
@@ -409,6 +414,7 @@ public:
void EraseAll()
{
eraseElements(ini_content);
eraseElements(section_order);
parsed = false;
}
@@ -596,6 +602,7 @@ public:
string_multimap mapTemp;
mapTemp.insert(std::pair<std::string, std::string>(itemName, itemVal));
ini_content.insert(std::pair<std::string, std::multimap<std::string, std::string>>(section, mapTemp));
section_order.emplace_back(section);
}
__SAVE_ERROR_AND_RETURN(INIREADER_EXCEPTION_NONE);
@@ -690,6 +697,7 @@ public:
*/
ini_content[newName] = std::move(ini_content[oldName]);
ini_content.erase(oldName);
std::replace(section_order.begin(), section_order.end(), oldName, newName);
__SAVE_ERROR_AND_RETURN(INIREADER_EXCEPTION_NONE);
}
@@ -758,6 +766,7 @@ public:
eraseElements(ini_content.at(section));
if(cached_section == section)
eraseElements(cached_section_content);
//section_order.erase(std::find(section_order.begin(), section_order.end(), section));
}
/**
@@ -779,14 +788,17 @@ public:
if(!parsed)
return std::string();
for(auto &x : ini_content)
for(auto &x : section_order)
{
content += "[" + x.first + "]\n";
for(auto &y : x.second)
content += "[" + x + "]\n";
if(ini_content.find(x) != ini_content.end())
{
if(y.first != "{NONAME}")
content += y.first + "=";
content += y.second + "\n";
for(auto &y : ini_content.at(x))
{
if(y.first != "{NONAME}")
content += y.first + "=";
content += y.second + "\n";
}
}
content += "\n";
}

95
src/main.cpp
View File

@@ -255,7 +255,19 @@ void readConf()
std::cerr<<"Read preference settings completed."<<std::endl;
}
int loadExternalConfig(std::string &path, string_array &custom_proxy_group, string_array &surge_ruleset, std::string proxy)
struct ExternalConfig
{
string_array custom_proxy_group;
string_array surge_ruleset;
std::string clash_rule_base;
std::string surge_rule_base;
std::string surfboard_rule_base;
std::string mellow_rule_base;
bool overwrite_original_rules = true;
bool enable_rule_generator = true;
};
int loadExternalConfig(std::string &path, ExternalConfig &ext, std::string proxy)
{
std::string base_content;
if(fileExist(path))
@@ -274,15 +286,23 @@ int loadExternalConfig(std::string &path, string_array &custom_proxy_group, stri
ini.EnterSection("custom");
if(ini.ItemPrefixExist("custom_proxy_group"))
{
eraseElements(custom_proxy_group);
ini.GetAll("custom_proxy_group", custom_proxy_group);
}
ini.GetAll("custom_proxy_group", ext.custom_proxy_group);
if(ini.ItemPrefixExist("surge_ruleset"))
{
eraseElements(surge_ruleset);
ini.GetAll("surge_ruleset", surge_ruleset);
}
ini.GetAll("surge_ruleset", ext.surge_ruleset);
if(ini.ItemExist("clash_rule_base"))
ext.clash_rule_base = ini.Get("clash_rule_base");
if(ini.ItemExist("surge_rule_base"))
ext.surge_rule_base = ini.Get("surge_rule_base");
if(ini.ItemExist("surfboard_rule_base"))
ext.surfboard_rule_base = ini.Get("surfboard_rule_base");
if(ini.ItemExist("mellow_rule_base"))
ext.mellow_rule_base = ini.Get("mellow_rule_base");
if(ini.ItemExist("overwrite_original_rules"))
ext.overwrite_original_rules = ini.GetBool("overwrite_original_rules");
if(ini.ItemExist("enable_rule_generator"))
ext.enable_rule_generator = ini.GetBool("enable_rule_generator");
return 0;
}
@@ -328,6 +348,10 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
string_array extra_group, extra_ruleset, include_remarks, exclude_remarks;
std::string groups = urlsafe_base64_decode(getUrlArg(argument, "groups")), ruleset = urlsafe_base64_decode(getUrlArg(argument, "ruleset")), config = UrlDecode(getUrlArg(argument, "config"));
std::vector<ruleset_content> rca;
extra_settings ext;
//for external configuration
std::string ext_clash_base = clash_rule_base, ext_surge_base = surge_rule_base, ext_mellow_base = mellow_rule_base, ext_surfboard_base = surfboard_rule_base;
if(!url.size())
url = default_url;
@@ -347,10 +371,30 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
if(config.size())
{
std::cerr<<"External configuration file provided. Loading...\n";
//read predefined data first
extra_group = clash_extra_group;
extra_ruleset = rulesets;
loadExternalConfig(config, extra_group, extra_ruleset, proxy);
refreshRulesets(extra_ruleset, rca);
//then load external configuration
ExternalConfig extconf;
loadExternalConfig(config, extconf, proxy);
if(extconf.clash_rule_base.size())
ext_clash_base = extconf.clash_rule_base;
if(extconf.surge_rule_base.size())
ext_surge_base = extconf.surge_rule_base;
if(extconf.surfboard_rule_base.size())
ext_surfboard_base = extconf.surfboard_rule_base;
if(extconf.mellow_rule_base.size())
ext_mellow_base = extconf.mellow_rule_base;
ext.enable_rule_generator = extconf.enable_rule_generator;
//load custom group
if(extconf.custom_proxy_group.size())
extra_group = extconf.custom_proxy_group;
//load custom rules
if(extconf.overwrite_original_rules)
{
extra_ruleset = extconf.surge_ruleset;
refreshRulesets(extra_ruleset, rca);
}
}
else
{
@@ -385,7 +429,6 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
}
}
extra_settings ext;
if(emoji.size())
{
ext.add_emoji = ext.remove_emoji = emoji == "true";
@@ -437,12 +480,12 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
if(target == "clash" || target == "clashr")
{
std::cerr<<"Clash"<<((target == "clashr") ? "R" : "")<<std::endl;
if(rca.size() || extra_group.size() || update_ruleset_on_request)
if(rca.size() || extra_group.size() || update_ruleset_on_request || ext_clash_base != clash_rule_base)
{
if(fileExist(clash_rule_base))
base_content = fileGet(clash_rule_base, false);
if(fileExist(ext_clash_base))
base_content = fileGet(ext_clash_base, false);
else
base_content = webGet(clash_rule_base, getSystemProxy());
base_content = webGet(ext_clash_base, getSystemProxy());
output_content = netchToClash(nodes, base_content, rca, extra_group, target == "clashr", ext);
}
@@ -458,10 +501,10 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
int surge_ver = version.size() ? to_int(version, 3) : 3;
std::cerr<<"Surge "<<surge_ver<<std::endl;
if(fileExist(surge_rule_base))
base_content = fileGet(surge_rule_base, false);
if(fileExist(ext_surge_base))
base_content = fileGet(ext_surge_base, false);
else
base_content = webGet(surge_rule_base, getSystemProxy());
base_content = webGet(ext_surge_base, getSystemProxy());
output_content = netchToSurge(nodes, base_content, rca, extra_group, surge_ver, ext);
if(upload == "true")
@@ -474,10 +517,10 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
else if(target == "surfboard")
{
std::cerr<<"Surfboard"<<std::endl;
if(fileExist(surfboard_rule_base))
base_content = fileGet(surfboard_rule_base, false);
if(fileExist(ext_surfboard_base))
base_content = fileGet(ext_surfboard_base, false);
else
base_content = webGet(surfboard_rule_base, getSystemProxy());
base_content = webGet(ext_surfboard_base, getSystemProxy());
output_content = netchToSurge(nodes, base_content, rca, extra_group, 2, ext);
if(upload == "true")
@@ -490,12 +533,12 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
else if(target == "mellow")
{
std::cerr<<"Mellow"<<std::endl;
if(rca.size() || extra_group.size() || update_ruleset_on_request)
if(rca.size() || extra_group.size() || update_ruleset_on_request || ext_mellow_base != mellow_rule_base)
{
if(fileExist(mellow_rule_base))
base_content = fileGet(mellow_rule_base, false);
if(fileExist(ext_mellow_base))
base_content = fileGet(ext_mellow_base, false);
else
base_content = webGet(mellow_rule_base, getSystemProxy());
base_content = webGet(ext_mellow_base, getSystemProxy());
output_content = netchToMellow(nodes, base_content, rca, extra_group, ext);
}

26
src/speedtestutil.cpp
View File

@@ -245,7 +245,7 @@ void explodeVmessConf(std::string content, std::string custom_port, int local_po
node.group = V2RAY_DEFAULT_GROUP;
node.remarks = add + ":" + port;
node.server = add;
node.port = stoi(port);
node.port = to_int(port);
nodes.push_back(node);
}
return;
@@ -320,7 +320,7 @@ void explodeVmessConf(std::string content, std::string custom_port, int local_po
node.remarks = ps;
node.id = index;
node.server = add;
node.port = stoi(port);
node.port = to_int(port);
nodes.push_back(node);
}
return;
@@ -416,7 +416,7 @@ void explodeSSD(std::string link, bool libev, std::string custom_port, int local
node.group = group;
node.remarks = remarks;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = ssConstruct(server, port, password, method, plugin, pluginopts, remarks, local_port, libev);
node.id = index;
nodes.push_back(node);
@@ -455,7 +455,7 @@ void explodeSSAndroid(std::string ss, bool libev, std::string custom_port, int l
node.group = group;
node.remarks = ps;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = ssConstruct(server, port, password, method, "", "", ps, local_port, libev);
nodes.push_back(node);
index++;
@@ -482,7 +482,7 @@ void explodeSSConf(std::string content, std::string custom_port, int local_port,
node.group = SS_DEFAULT_GROUP;
node.remarks = server + ":" + port;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = SerializeObject(json);
nodes.push_back(node);
return;
@@ -510,7 +510,7 @@ void explodeSSConf(std::string content, std::string custom_port, int local_port,
node.remarks = ps;
node.id = index;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = ssConstruct(server, port, password, method, plugin, pluginopts, ps, local_port, libev);
nodes.push_back(node);
index++;
@@ -601,7 +601,7 @@ void explodeSSRConf(std::string content, std::string custom_port, int local_port
node.group = SSR_DEFAULT_GROUP;
node.remarks = server + ":" + port;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = SerializeObject(json);
nodes.push_back(node);
return;
@@ -634,7 +634,7 @@ void explodeSSRConf(std::string content, std::string custom_port, int local_port
node.remarks = remarks;
node.id = index;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.proxyStr = ssrConstruct(group, remarks, remarks_base64, server, port, protocol, method, obfs, password, obfsparam, protoparam, local_port, ssr_libev);
nodes.push_back(node);
index++;
@@ -981,7 +981,7 @@ void explodeClash(Node yamlnode, std::string custom_port, int local_port, std::v
node.group = group;
node.remarks = ps;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.id = index;
nodes.push_back(node);
index++;
@@ -1209,6 +1209,8 @@ bool explodeSurge(std::string surge, std::string custom_port, int local_port, st
{
node.linkType = SPEEDTEST_MESSAGE_FOUNDSOCKS;
node.group = SOCKS_DEFAULT_GROUP;
server = trim(configs[1]);
port = custom_port == "" ? trim(configs[2]) : custom_port;
if(configs.size() >= 5)
{
username = trim(configs[2]);
@@ -1266,6 +1268,8 @@ bool explodeSurge(std::string surge, std::string custom_port, int local_port, st
{
node.linkType = SPEEDTEST_MESSAGE_FOUNDHTTP;
node.group = HTTP_DEFAULT_GROUP;
server = trim(configs[1]);
port = custom_port == "" ? trim(configs[2]) : custom_port;
if(configs.size() >= 5)
{
username = trim(configs[2]);
@@ -1330,7 +1334,7 @@ bool explodeSurge(std::string surge, std::string custom_port, int local_port, st
node.remarks = remarks;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
node.id = index;
nodes.push_back(node);
index++;
@@ -1394,7 +1398,7 @@ void explodeSSTap(std::string sstap, std::string custom_port, int local_port, st
node.remarks = remarks;
node.id = index;
node.server = server;
node.port = stoi(port);
node.port = to_int(port);
nodes.push_back(node);
}
}

10
src/subexport.cpp
View File

@@ -701,7 +701,8 @@ std::string netchToClash(std::vector<nodeInfo> &nodes, std::string &base_conf, s
if(ext.nodelist)
return YAML::Dump(yamlnode);
rulesetToClash(yamlnode, ruleset_content_array);
if(ext.enable_rule_generator)
rulesetToClash(yamlnode, ruleset_content_array);
return YAML::Dump(yamlnode);
}
@@ -866,6 +867,7 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
return output_nodelist;
ini.SetCurrentSection("Proxy Group");
ini.EraseSection();
for(std::string &x : extra_proxy_group)
{
eraseElements(filtered_nodelist);
@@ -925,7 +927,8 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
ini.Set("{NONAME}", vArray[0] + " = " + proxy); //insert order
}
rulesetToSurge(ini, ruleset_content_array, surge_ver);
if(ext.enable_rule_generator)
rulesetToSurge(ini, ruleset_content_array, surge_ver);
return ini.ToString();
}
@@ -1569,7 +1572,8 @@ void netchToMellow(std::vector<nodeInfo> &nodes, INIReader &ini, std::vector<rul
ini.Set("{NONAME}", proxy); //insert order
}
rulesetToSurge(ini, ruleset_content_array, 2);
if(ext.enable_rule_generator)
rulesetToSurge(ini, ruleset_content_array, 2);
ini.RenameSection("Rule", "RoutingRule");
}

1
src/subexport.h
View File

@@ -12,6 +12,7 @@ struct ruleset_content
struct extra_settings
{
bool enable_rule_generator = true;
bool add_emoji = false;
bool remove_emoji = false;
bool append_proxy_type = true;