diff --git a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua index 3c61de030..5b958828c 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua @@ -165,8 +165,9 @@ end local dnsmasq_default_dns local cache_text = "" +local subscribe_proxy=uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0" local new_rules = luci.sys.exec("echo -n $(find /usr/share/passwall/rules -type f | xargs md5sum)") -local new_text = TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. REMOTE_FAKEDNS .. CHINADNS_DNS .. PROXY_MODE .. NO_PROXY_IPV6 .. new_rules +local new_text = TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. REMOTE_FAKEDNS .. CHINADNS_DNS .. PROXY_MODE .. NO_PROXY_IPV6 .. subscribe_proxy .. new_rules if fs.access(CACHE_TEXT_FILE) then for line in io.lines(CACHE_TEXT_FILE) do cache_text = line @@ -225,7 +226,7 @@ if not fs.access(CACHE_DNS_PATH) then local fwd_dns = LOCAL_DNS local ipset_flag = "whitelist,whitelist6" local no_ipv6 - if uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0" == "1" then + if subscribe_proxy == "1" then fwd_dns = TUN_DNS ipset_flag = "blacklist,blacklist6" if NO_PROXY_IPV6 == "1" then diff --git a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua index 615268633..1226c40b6 100644 --- a/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua +++ b/luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua @@ -146,8 +146,9 @@ local function check_excluded_domain(domain) end local cache_text = "" +local subscribe_proxy=uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0" local new_rules = luci.sys.exec("echo -n $(find /usr/share/passwall/rules -type f | xargs md5sum)") -local new_text = SMARTDNS_CONF .. LOCAL_GROUP .. REMOTE_GROUP .. REMOTE_FAKEDNS .. TUN_DNS .. PROXY_MODE .. NO_PROXY_IPV6 ..new_rules +local new_text = SMARTDNS_CONF .. LOCAL_GROUP .. REMOTE_GROUP .. REMOTE_FAKEDNS .. TUN_DNS .. PROXY_MODE .. NO_PROXY_IPV6 .. subscribe_proxy .. new_rules if fs.access(CACHE_TEXT_FILE) then for line in io.lines(CACHE_TEXT_FILE) do cache_text = line @@ -203,7 +204,7 @@ if not fs.access(CACHE_DNS_FILE) then local fwd_group = LOCAL_GROUP local ipset_flag = "#4:whitelist,#6:whitelist6" local no_ipv6 - if uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0" == "1" then + if subscribe_proxy == "1" then fwd_group = REMOTE_GROUP ipset_flag = "#4:blacklist,#6:blacklist6" if NO_PROXY_IPV6 == "1" then