From eb5b203669b93a744631aba95c675283d4af1795 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Tue, 1 Apr 2025 01:30:23 +0800
Subject: [PATCH] luci-app-passwall2: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall2/commit/7239bb4c45818ee7fc292934d68f95f18171a958
---
 .../luasrc/passwall2/util_xray.lua            | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/luci-app-passwall2/luasrc/passwall2/util_xray.lua b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
index 943d59f8c..597164f9a 100644
--- a/luci-app-passwall2/luasrc/passwall2/util_xray.lua
+++ b/luci-app-passwall2/luasrc/passwall2/util_xray.lua
@@ -1159,7 +1159,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,
@@ -1195,7 +1195,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"
 		}
 
@@ -1256,7 +1256,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)
@@ -1277,7 +1277,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",
@@ -1342,21 +1342,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
@@ -1384,11 +1384,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
@@ -1396,7 +1403,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
@@ -1708,7 +1715,7 @@ function gen_dns_config(var)
 		}
 	
 		dns = {
-			tag = "dns-in1",
+			tag = "dns-global",
 			hosts = {},
 			disableCache = (dns_cache == "1") and false or true,
 			disableFallback = true,
@@ -1757,7 +1764,7 @@ function gen_dns_config(var)
 			end
 
 			local _remote_dns = {
-				_flag = "remote"
+				tag = "dns-in-remote"
 			}
 	
 			if remote_dns_udp_server then
@@ -1803,7 +1810,7 @@ function gen_dns_config(var)
 			})
 
 			local _direct_dns = {
-				_flag = "direct"
+				tag = "dns-in-direct"
 			}
 	
 			if direct_dns_udp_server then
@@ -1887,7 +1894,7 @@ function gen_dns_config(var)
 	
 		table.insert(routing.rules, {
 			inboundTag = {
-				"dns-in1"
+				"dns-global"
 			},
 			outboundTag = dns_out_tag
 		})