OpenWrt/roacn-packages
1
0
Fork 0
mirror of https://github.com/roacn/openwrt-packages.git synced 2025-01-07 03:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎈 Sync 2024-12-21 16:27

Browse Source
This commit is contained in:
github-actions[bot] 2024-12-21 16:27:55 +08:00
parent 1292e436a8
commit 0d8d081cdc
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-passwall2/root/usr/share/passwall2/app.sh
View File

@ -794,7 +794,7 @@ run_global() {
-DEFAULT_DNS ${AUTO_DNS} -LOCAL_DNS ${LOCAL_DNS:-${AUTO_DNS}} -TUN_DNS ${TUN_DNS} \ -DEFAULT_DNS ${AUTO_DNS} -LOCAL_DNS ${LOCAL_DNS:-${AUTO_DNS}} -TUN_DNS ${TUN_DNS} \
-NFTFLAG ${nftflag:-0} \ -NFTFLAG ${nftflag:-0} \
-NO_LOGIC_LOG ${NO_LOGIC_LOG:-0} -NO_LOGIC_LOG ${NO_LOGIC_LOG:-0}
/etc/init.d/dnsmasq restart >/dev/null 2>&1 lua $APP_PATH/helper_dnsmasq.lua logic_restart -LOG 1
else else
#Run a copy dnsmasq instance, DNS hijack for that need proxy devices. #Run a copy dnsmasq instance, DNS hijack for that need proxy devices.
GLOBAL_DNSMASQ_PORT=$(get_new_port 11400) GLOBAL_DNSMASQ_PORT=$(get_new_port 11400)
@ -1256,7 +1256,7 @@ start() {
uci -q commit ${CONFIG} uci -q commit ${CONFIG}
uci -q set dhcp.@dnsmasq[0].dns_redirect='0' uci -q set dhcp.@dnsmasq[0].dns_redirect='0'
uci -q commit dhcp uci -q commit dhcp
/etc/init.d/dnsmasq restart >/dev/null 2>&1 lua $APP_PATH/helper_dnsmasq.lua restart -LOG 0
} }
fi fi
[ "$ENABLED_DEFAULT_ACL" == 1 ] && run_global [ "$ENABLED_DEFAULT_ACL" == 1 ] && run_global

6
luci-app-passwall2/root/usr/share/passwall2/helper_dnsmasq.lua
View File

@ -102,10 +102,8 @@ function logic_restart(var)
tinsert(dns_table, v) tinsert(dns_table, v)
end end
end end
if dns_table and #dns_table > 0 then uci:set_list("dhcp", "@dnsmasq[0]", "server", dns_table)
uci:set_list("dhcp", "@dnsmasq[0]", "server", dns_table) uci:commit("dhcp")
uci:commit("dhcp")
end
end end
sys.call("/etc/init.d/dnsmasq restart >/dev/null 2>&1") sys.call("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
restore_servers() restore_servers()