openwrt/openwrt-passwall2
1
0
Fork 0
mirror of https://github.com/xiaorouji/openwrt-passwall2.git synced 2025-05-01 13:00:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci: Xray DNS Add tag for DnsServerObject

Browse Source
This commit is contained in:
xiaorouji 2025-04-01 01:09:34 +08:00
parent 911620755e
commit 7c87d93956
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -1174,7 +1174,7 @@ function gen_config(var)
end
dns = {
tag = "dns-in1",
tag = "dns-global",
hosts = {},
disableCache = (dns_cache and dns_cache == "0") and true or false,
disableFallback = true,
@ -1210,7 +1210,7 @@ function gen_config(var)
local _remote_dns_ip = nil
local _remote_dns = {
_flag = "remote",
tag = "dns-in-remote",
queryStrategy = (remote_dns_query_strategy and remote_dns_query_strategy ~= "") and remote_dns_query_strategy or "UseIPv4"
}
@ -1271,7 +1271,7 @@ function gen_config(var)
table.insert(fakedns, fakedns6)
end
_remote_fakedns = {
_flag = "remote_fakedns",
tag = "dns-in-remote_fakedns",
address = "fakedns",
}
table.insert(dns.servers, _remote_fakedns)
@ -1292,7 +1292,7 @@ function gen_config(var)
end
_direct_dns = {
_flag = "direct",
tag = "dns-in-direct",
address = direct_dns_udp_server,
port = tonumber(direct_dns_udp_port) or 53,
queryStrategy = (direct_dns_query_strategy and direct_dns_query_strategy ~= "") and direct_dns_query_strategy or "UseIP",
@ -1357,21 +1357,21 @@ function gen_config(var)
})
end
local default_dns_flag = "remote"
local default_dns_tag = "dns-in-remote"
if (not COMMON.default_balancer_tag and not COMMON.default_outbound_tag) or COMMON.default_outbound_tag == "direct" then
default_dns_flag = "direct"
default_dns_tag = "dns-in-direct"
end
if dns.servers and #dns.servers > 0 then
local dns_servers = nil
for index, value in ipairs(dns.servers) do
if not dns_servers and value["_flag"] == default_dns_flag then
if value["_flag"] == "remote" and remote_dns_fake then
value["_flag"] = "default"
if not dns_servers and value.tag == default_dns_tag then
if value.tag == "dns-in-remote" and remote_dns_fake then
value.tag = "dns-in-default"
break
end
dns_servers = {
_flag = "default",
tag = "dns-in-default",
address = value.address,
port = value.port,
queryStrategy = value.queryStrategy
@ -1399,11 +1399,18 @@ function gen_config(var)
end
dns_server.domains = value.domain
if value.shunt_rule_name then
dns_server["_flag"] = value.shunt_rule_name
dns_server.tag = "dns-in-" .. value.shunt_rule_name
end
if dns_server then
table.insert(dns.servers, dns_server)
table.insert(routing.rules, {
inboundTag = {
dns_server.tag
},
outboundTag = value.outboundTag or nil,
balancerTag = value.balancerTag or nil
})
end
end
end
@ -1411,7 +1418,7 @@ function gen_config(var)
for i = #dns.servers, 1, -1 do
local v = dns.servers[i]
if v["_flag"] ~= "default" then
if v.tag ~= "dns-in-default" then
if not v.domains or #v.domains == 0 then
table.remove(dns.servers, i)
end
@ -1723,7 +1730,7 @@ function gen_dns_config(var)
}
dns = {
tag = "dns-in1",
tag = "dns-global",
hosts = {},
disableCache = (dns_cache == "1") and false or true,
disableFallback = true,
@ -1772,7 +1779,7 @@ function gen_dns_config(var)
end
local _remote_dns = {
_flag = "remote"
tag = "dns-in-remote"
}
if remote_dns_udp_server then
@ -1818,7 +1825,7 @@ function gen_dns_config(var)
})
local _direct_dns = {
_flag = "direct"
tag = "dns-in-direct"
}
if direct_dns_udp_server then
@ -1902,7 +1909,7 @@ function gen_dns_config(var)
table.insert(routing.rules, {
inboundTag = {
"dns-in1"
"dns-global"
},
outboundTag = dns_out_tag
})