Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
arm64v8a
2022-10-01 11:13:22 +08:00
parent 57bf866eff
commit 392ed2e766
7 changed files with 47 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
db/ConfigBuilder.cpp
View File

@@ -648,7 +648,7 @@ namespace NekoRay {
dnsServers += QJsonObject{{"tag", "dns-direct"},
{"address_resolver", "dns-local"},
{"address", directDNSAddress.replace("+local://", "://")},
{"detour", "bypass"},};
{"detour", "direct"},};
// local
dnsServers += QJsonObject{{"tag", "dns-local"},
@@ -671,9 +671,13 @@ namespace NekoRay {
// Routing
// custom routing rule
// custom routing rule (top)
auto routingRules = QString2QJsonObject(dataStore->routing->custom)["rules"].toArray();
// dns hijack
routingRules += QJsonObject{{"protocol", "dns"},
{"outbound", "dns-out"}};
auto add_rule_route = [&](const QJsonArray &arr, bool isIP, const QString &out) {
auto rule = make_rule(arr, isIP);
if (rule.isEmpty()) return;
@@ -682,6 +686,18 @@ namespace NekoRay {
};
// ip user rule
for (const auto &line: SplitLines(dataStore->routing->block_ip)) {
if (line.startsWith("#")) continue;
status->ipListBlock += line;
}
for (const auto &line: SplitLines(dataStore->routing->proxy_ip)) {
if (line.startsWith("#")) continue;
status->ipListRemote += line;
}
for (const auto &line: SplitLines(dataStore->routing->direct_ip)) {
if (line.startsWith("#")) continue;
status->ipListDirect += line;
}
add_rule_route(status->ipListBlock, true, "block");
add_rule_route(status->ipListRemote, true, tagProxy);
add_rule_route(status->ipListDirect, true, "bypass");
@@ -691,15 +707,11 @@ namespace NekoRay {
add_rule_route(status->domainListRemote, false, tagProxy);
add_rule_route(status->domainListDirect, false, "bypass");
// dns hijack
routingRules += QJsonObject{{"protocol", "dns"},
{"outbound", "dns-out"}};
// geopath
auto geoip = FindCoreAsset("geoip.db");
auto geosite = FindCoreAsset("geosite.db");
if (geoip.isEmpty()) result->error = + "geoip.db not found";
if (geosite.isEmpty()) result->error = + "geosite.db not found";
if (geoip.isEmpty()) result->error = +"geoip.db not found";
if (geosite.isEmpty()) result->error = +"geosite.db not found";
// final add routing rule
QJSONARRAY_ADD(routingRules, QString2QJsonObject(dataStore->custom_route_global)["rules"].toArray())
@@ -715,7 +727,7 @@ namespace NekoRay {
result->coreConfig.insert("experimental", QJsonObject{
{"v2ray_api", QJsonObject{
{"listen", "127.0.0.1:" + Int2String(dataStore->inbound_socks_port + 10)},
{"stats", QJsonObject{
{"stats", QJsonObject{
{"enabled", true},
{"outbounds", QJsonArray{
tagProxy, "bypass", "block"