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

luci-app-passwall: sync upstream

Browse Source 
last commit: 605daed731
This commit is contained in:
gitea-action 2025-02-03 01:00:31 +08:00
parent 119435e0ca
commit 01913c55a7
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -352,15 +352,15 @@ o:value("119.28.28.28")
o:depends("direct_dns_mode", "tcp") o:depends("direct_dns_mode", "tcp")
o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT"))
o.default = "tls://dot.pub@1.12.12.12" o.default = "tls://1.12.12.12"
o:value("tls://dot.pub@1.12.12.12") o:value("tls://1.12.12.12")
o:value("tls://dot.pub@120.53.53.53") o:value("tls://120.53.53.53")
o:value("tls://dot.360.cn@36.99.170.86") o:value("tls://36.99.170.86")
o:value("tls://dot.360.cn@101.198.191.4") o:value("tls://101.198.191.4")
o:value("tls://dns.alidns.com@223.5.5.5") o:value("tls://223.5.5.5")
o:value("tls://dns.alidns.com@223.6.6.6") o:value("tls://223.6.6.6")
o:value("tls://dns.alidns.com@2400:3200::1") o:value("tls://2400:3200::1")
o:value("tls://dns.alidns.com@2400:3200:baba::1") o:value("tls://2400:3200:baba::1")
o.validate = chinadns_dot_validate o.validate = chinadns_dot_validate
o:depends("direct_dns_mode", "dot") o:depends("direct_dns_mode", "dot")
@ -508,17 +508,17 @@ o:depends({singbox_dns_mode = "tcp"})
---- DoT ---- DoT
o = s:taboption("DNS", Value, "remote_dns_dot", translate("Remote DNS DoT")) o = s:taboption("DNS", Value, "remote_dns_dot", translate("Remote DNS DoT"))
o.default = "tls://dns.google@8.8.4.4" o.default = "tls://1.1.1.1"
o:value("tls://1dot1dot1dot1.cloudflare-dns.com@1.0.0.1", "1.0.0.1 (CloudFlare)") o:value("tls://1.0.0.1", "1.0.0.1 (CloudFlare)")
o:value("tls://1dot1dot1dot1.cloudflare-dns.com@1.1.1.1", "1.1.1.1 (CloudFlare)") o:value("tls://1.1.1.1", "1.1.1.1 (CloudFlare)")
o:value("tls://dns.google@8.8.4.4", "8.8.4.4 (Google)") o:value("tls://8.8.4.4", "8.8.4.4 (Google)")
o:value("tls://dns.google@8.8.8.8", "8.8.8.8 (Google)") o:value("tls://8.8.8.8", "8.8.8.8 (Google)")
o:value("tls://dns.quad9.net@9.9.9.9", "9.9.9.9 (Quad9)") o:value("tls://9.9.9.9", "9.9.9.9 (Quad9)")
o:value("tls://dns.quad9.net@149.112.112.112", "149.112.112.112 (Quad9)") o:value("tls://149.112.112.112", "149.112.112.112 (Quad9)")
o:value("tls://dns.adguard.com@94.140.14.14", "94.140.14.14 (AdGuard)") o:value("tls://94.140.14.14", "94.140.14.14 (AdGuard)")
o:value("tls://dns.adguard.com@94.140.15.15", "94.140.15.15 (AdGuard)") o:value("tls://94.140.15.15", "94.140.15.15 (AdGuard)")
o:value("tls://dns.opendns.com@208.67.222.222", "208.67.222.222 (OpenDNS)") o:value("tls://208.67.222.222", "208.67.222.222 (OpenDNS)")
o:value("tls://dns.opendns.com@208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("tls://208.67.220.220", "208.67.220.220 (OpenDNS)")
o.validate = chinadns_dot_validate o.validate = chinadns_dot_validate
o:depends("dns_mode", "dot") o:depends("dns_mode", "dot")

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

@ -919,7 +919,7 @@ run_redir() {
_args="${_args} direct_dns_tcp_server=$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g')" _args="${_args} direct_dns_tcp_server=$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g')"
;; ;;
dot) dot)
local tmp_dot_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") local tmp_dot_dns=$(config_t_get global direct_dns_dot "tls://1.12.12.12")
local tmp_dot_ip=$(echo "$tmp_dot_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p') local tmp_dot_ip=$(echo "$tmp_dot_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p')
local tmp_dot_port=$(echo "$tmp_dot_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p') local tmp_dot_port=$(echo "$tmp_dot_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p')
_args="${_args} direct_dns_dot_server=$tmp_dot_ip#${tmp_dot_port:-853}" _args="${_args} direct_dns_dot_server=$tmp_dot_ip#${tmp_dot_port:-853}"
@ -1397,7 +1397,7 @@ start_dns() {
;; ;;
dot) dot)
if [ "$chinadns_tls" != "nil" ]; then if [ "$chinadns_tls" != "nil" ]; then
local DIRECT_DNS=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") local DIRECT_DNS=$(config_t_get global direct_dns_dot "tls://1.12.12.12")
china_ng_local_dns=${DIRECT_DNS} china_ng_local_dns=${DIRECT_DNS}
#当全局（包括访问控制节点）开启chinadns-ng时，不启动新进程。 #当全局（包括访问控制节点）开启chinadns-ng时，不启动新进程。
@ -1519,7 +1519,7 @@ start_dns() {
TCP_PROXY_DNS=1 TCP_PROXY_DNS=1
if [ "$chinadns_tls" != "nil" ]; then if [ "$chinadns_tls" != "nil" ]; then
local china_ng_listen_port=${NEXT_DNS_LISTEN_PORT} local china_ng_listen_port=${NEXT_DNS_LISTEN_PORT}
local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://dns.google@8.8.4.4") local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://1.1.1.1")
local tmp_dot_ip=$(echo "$china_ng_trust_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p') local tmp_dot_ip=$(echo "$china_ng_trust_dns" | sed -n 's/.*:\/\/\([^@#]*@\)*\([^@#]*\).*/\2/p')
local tmp_dot_port=$(echo "$china_ng_trust_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p') local tmp_dot_port=$(echo "$china_ng_trust_dns" | sed -n 's/.*#\([0-9]\+\).*/\1/p')
REMOTE_DNS="$tmp_dot_ip#${tmp_dot_port:-853}" REMOTE_DNS="$tmp_dot_ip#${tmp_dot_port:-853}"
@ -1864,7 +1864,7 @@ acl_app() {
;; ;;
dot) dot)
if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then
_chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") _chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://1.12.12.12")
fi fi
;; ;;
esac esac

2
patch-luci-app-passwall.patch
View File

@ -20,7 +20,7 @@ index 6c16b44..4f42c00 100644
define Package/$(PKG_NAME)/postrm define Package/$(PKG_NAME)/postrm
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 3e98ec5..17184a5 100644 index 5687101..174df8b 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -493,6 +493,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") @@ -493,6 +493,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")