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

fix

Browse Source
This commit is contained in:
arm64v8a
2023-04-10 11:43:08 +09:00
parent 287f378d0d
commit c9ed162f81
3 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
db/ConfigBuilder.cpp
View File

@@ -607,8 +607,16 @@ namespace NekoRay {
}
// Bypass Lookup for the first profile
if (isFirstProfile && !IsIpAddress(ent->bean->serverAddress)) {
status->domainListDNSDirect += "full:" + ent->bean->serverAddress;
auto serverAddress = ent->bean->serverAddress;
auto customBean = dynamic_cast<fmt::CustomBean *>(ent->bean.get());
if (customBean != nullptr && customBean->core == "internal") {
auto server = QString2QJsonObject(customBean->config_simple)["server"].toString();
if (!server.isEmpty()) serverAddress = server;
}
if (isFirstProfile && !IsIpAddress(serverAddress)) {
status->domainListDNSDirect += "full:" + serverAddress;
}
status->outbounds += outbound;
@@ -713,15 +721,15 @@ namespace NekoRay {
if (item.startsWith("geosite:")) {
geosite += item.replace("geosite:", "");
} else if (item.startsWith("full:")) {
domain_full += item.replace("full:", "");
domain_full += item.replace("full:", "").toLower();
} else if (item.startsWith("domain:")) {
domain_subdomain += item.replace("domain:", "");
domain_subdomain += item.replace("domain:", "").toLower();
} else if (item.startsWith("regexp:")) {
domain_regexp += item.replace("regexp:", "");
domain_regexp += item.replace("regexp:", "").toLower();
} else if (item.startsWith("keyword:")) {
domain_keyword += item.replace("keyword:", "");
domain_keyword += item.replace("keyword:", "").toLower();
} else {
domain_full += item;
domain_full += item.toLower();
}
}
}
@@ -751,7 +759,7 @@ namespace NekoRay {
if (!status->forTest)
dnsServers += QJsonObject{
{"tag", "dns-remote"},
{"address_resolver", "dns-underlying"},
{"address_resolver", "dns-local"},
{"strategy", dataStore->remote_dns_strategy},
{"address", dataStore->remote_dns},
{"detour", tagProxy},
@@ -766,7 +774,7 @@ namespace NekoRay {
if (!status->forTest)
dnsServers += QJsonObject{
{"tag", "dns-direct"},
{"address_resolver", "dns-underlying"},
{"address_resolver", "dns-local"},
{"strategy", dataStore->direct_dns_strategy},
{"address", directDNSAddress.replace("+local://", "://")},
{"detour", "direct"},
@@ -774,7 +782,7 @@ namespace NekoRay {
// Underlying 100% Working DNS
dnsServers += QJsonObject{
{"tag", "dns-underlying"},
{"tag", "dns-local"},
{"address", underlyingStr},
{"detour", "direct"},
};

8
libs/build_public_res.sh
View File

@@ -7,10 +7,10 @@ rm -rf $DEST
mkdir -p $DEST
#### Download geodata ####
curl -Lso $DEST/geoip.dat "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat"
curl -Lso $DEST/geosite.dat "https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat"
curl -Lso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db"
curl -Lso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
curl -fLso $DEST/geoip.dat "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat"
curl -fLso $DEST/geosite.dat "https://github.com/v2fly/domain-list-community/releases/latest/download/dlc.dat"
curl -fLso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db"
curl -fLso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
#### copy res/public ####
cp res/public/* $DEST

47
ui/dialog_manage_routes.ui
View File

@@ -103,29 +103,12 @@
<widget class="QLineEdit" name="dns_direct"/>
</item>
<item>
<widget class="QPushButton" name="queryStrategy">
<property name="text">
<string>Query Strategy</string>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QWidget" name="domain_v2ray" native="true">
<layout class="QHBoxLayout" name="_2" stretch="0,0,0,1,0,1">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="dns_routing">
<property name="sizePolicy">
@@ -140,12 +123,29 @@
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
<widget class="QPushButton" name="queryStrategy">
<property name="text">
<string>Query Strategy</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QWidget" name="domain_v2ray" native="true">
<layout class="QHBoxLayout" name="_2" stretch="0,1,0,1">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
@@ -465,6 +465,7 @@
<tabstop>dns_remote</tabstop>
<tabstop>dns_direct</tabstop>
<tabstop>dns_routing</tabstop>
<tabstop>queryStrategy</tabstop>
<tabstop>domainStrategyCombo</tabstop>
<tabstop>domainMatcherCombo</tabstop>
<tabstop>preset</tabstop>