zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: fix lost logic

Browse Source
This commit is contained in:
xiaorouji 2023-04-04 12:19:16 +08:00 committed by sbwml
parent ab8bdd4926
commit 521efc0ee9
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.62 PKG_VERSION:=4.62
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

2
luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -1063,6 +1063,7 @@ start_dns() {
DNSMASQ_FILTER_IPV6=$FILTER_PROXY_IPV6 DNSMASQ_FILTER_IPV6=$FILTER_PROXY_IPV6
echolog "过滤服务配置：准备接管域名解析..." echolog "过滤服务配置：准备接管域名解析..."
[ "$ENABLED_ACLS" == 1 ] && {
local items=$(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1) local items=$(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1)
[ -n "$items" ] && { [ -n "$items" ] && {
for item in $items; do for item in $items; do
@ -1087,6 +1088,7 @@ start_dns() {
} }
done done
} }
}
case "$DNS_MODE" in case "$DNS_MODE" in
dns2socks) dns2socks)

6
luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua
View File

@ -163,11 +163,11 @@ local gfwlist = PROXY_MODE:find("gfwlist")
local only_global local only_global
local dnsmasq_default_dns local dnsmasq_default_dns
if CHNROUTE_MODE_DEFAULT_DNS ~= "nil" and (chnlist or gfwlist) then if CHNROUTE_MODE_DEFAULT_DNS ~= "nil" then
if CHNROUTE_MODE_DEFAULT_DNS == "remote" then if chnlist and CHNROUTE_MODE_DEFAULT_DNS == "remote" then
dnsmasq_default_dns = TUN_DNS dnsmasq_default_dns = TUN_DNS
end end
if CHNROUTE_MODE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then if (chnlist or gfwlist) and CHNROUTE_MODE_DEFAULT_DNS == "chinadns_ng" and CHINADNS_DNS ~= "0" then
dnsmasq_default_dns = CHINADNS_DNS dnsmasq_default_dns = CHINADNS_DNS
end end
end end