update 2026-10-02 07:38:12

luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.lua

@@ -193,7 +193,7 @@ function add_rule(var)
 	local CACHE_TEXT_FILE = CACHE_DNS_PATH .. ".txt"
 	local USE_CHINADNS_NG = "0"
 	local IS_SHUNT_NODE = api.uci_get_c(NODE, "protocol") == "_shunt"
-	local USE_GEOVIEW = api.uci_get_c("@global_rules[0]", "enable_geoview") or "0"
+	local USE_GEOVIEW = api.uci_get_c("@global_rules[0]", "enable_geoview")
 
 	local list1 = {}
 	local excluded_domain = {}
@@ -351,13 +351,13 @@ function add_rule(var)
 			local t = api.uci_get_c(NODE)
 			api.uci_foreach_c("shunt_rules", function(s)
 				local _node_id = t[s[".name"]]
-				if _node_id and _node_id ~= "_blackhole" and t["shunt_group"] == s.group then
-					SHUNT_LIST = SHUNT_LIST .. (s.domain_list or "") .. _node_id
+				if _node_id and t["shunt_group"] == s.group then
+					SHUNT_LIST = SHUNT_LIST .. (s.domain_list or "") .. (_node_id:sub(1, 1) == "_" and "not-node" or "node")
 				end
 			end)
 		end
 		new_rules = new_rules .. api.md5_string(SHUNT_LIST)
-		return TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. USE_DEFAULT_DNS .. CHINADNS_DNS .. USE_DIRECT_LIST .. USE_PROXY_LIST .. USE_BLOCK_LIST .. USE_GFW_LIST .. CHN_LIST .. DEFAULT_PROXY_MODE .. NO_PROXY_IPV6 .. address_md5 .. new_rules .. NFTFLAG .. USE_GEOVIEW
+		return TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. USE_DEFAULT_DNS .. CHINADNS_DNS .. USE_DIRECT_LIST .. USE_PROXY_LIST .. USE_BLOCK_LIST .. USE_GFW_LIST .. CHN_LIST .. DEFAULT_PROXY_MODE .. NO_PROXY_IPV6 .. address_md5 .. new_rules .. NFTFLAG
 	end
 
 	local dnsmasq_default_dns
@@ -655,50 +655,27 @@ function add_rule(var)
 		end
 
 		--分流规则
-		if IS_SHUNT_NODE and USE_CHINADNS_NG == "0" then
+		if IS_SHUNT_NODE and USE_CHINADNS_NG == "0" and only_global ~= 1 then
 			local t = api.uci_get_c(NODE)
 			local default_node_id = t["default_node"] or "_direct"
 			api.uci_foreach_c("shunt_rules", function(s)
 				local _node_id = t[s[".name"]]
-				if _node_id and _node_id ~= "_blackhole" and t["shunt_group"] == s.group then
+				if _node_id and t["shunt_group"] == s.group then
 					if _node_id == "_default" then
 						_node_id = default_node_id
 					end
 
-					fwd_dns = nil
-					no_ipv6 = nil
+					fwd_dns = TUN_DNS
 
-					local sets = {}
-
-					if _node_id == "_direct" then
-						fwd_dns = LOCAL_DNS
-						if USE_DIRECT_LIST == "1" then
-							table.insert(sets, setflag_4 .. "psw_white")
-							table.insert(sets, setflag_6 .. "psw_white6")
-						else
-							local set_name = "psw_shunt"
-							local set6_name = "psw_shunt6"
-							if FLAG ~= "default" then
-								set_name = "psw_" .. FLAG .. "_shunt"
-								set6_name = "psw_" .. FLAG .. "_shunt6"
-							end
-							table.insert(sets, setflag_4 .. set_name)
-							table.insert(sets, setflag_6 .. set6_name)
-						end
-					else
-						local set_name = "psw_shunt"
-						local set6_name = "psw_shunt6"
-						if FLAG ~= "default" then
-							set_name = "psw_" .. FLAG .. "_shunt"
-							set6_name = "psw_" .. FLAG .. "_shunt6"
-						end
-						fwd_dns = TUN_DNS
-						table.insert(sets, setflag_4 .. set_name)
-						if NO_PROXY_IPV6 ~= "1" then
-							table.insert(sets, setflag_6 .. set6_name)
-						else
-							no_ipv6 = true
-						end
+					local sets = {
+						setflag_4 .. "psw_shunt",
+						setflag_6 .. "psw_shunt6"
+					}
+					if FLAG ~= "default" then
+						sets = {
+							setflag_4 .. "psw_" .. FLAG .. "_shunt",
+							setflag_6 .. "psw_" .. FLAG .. "_shunt6"
+						}
 					end
 
 					local domain_list = s.domain_list or ""
@@ -714,10 +691,6 @@ function add_rule(var)
 								end
 								line = api.get_std_domain(line)
 								add_excluded_domain(line)
-
-								if no_ipv6 then
-									set_domain_address(line, "::")
-								end
 								set_domain_dns(line, fwd_dns)
 								set_domain_ipset(line, table.concat(sets, ","))
 							end
@@ -727,18 +700,13 @@ function add_rule(var)
 					if USE_GFW_LIST == "1" and CHN_LIST == "0" and USE_GEOVIEW == "1" and geosite_arg ~= "" then  --仅GFW模式解析geosite
 						foreach_geosite(geosite_arg, function(line)
 							add_excluded_domain(line)
-							if no_ipv6 then
-								set_domain_address(line, "::")
-							end
 							set_domain_dns(line, fwd_dns)
 							set_domain_ipset(line, table.concat(sets, ","))
 						end)
 						log(string.format("  - 解析分流规则(%s) Geosite 完成", s.remarks))
 					end
 
-					if _node_id ~= "_direct" then
-						log(string.format("  - Sing-Box/Xray分流规则(%s)：%s", s.remarks, fwd_dns or "默认"))
-					end
+					log(string.format("  - Sing-Box/Xray分流规则(%s)：%s", s.remarks, fwd_dns or "默认"))
 				end
 			end)
 		elseif only_global == 1 and NO_PROXY_IPV6 == "1" then