From 2408706937f2a6b9803f31c4857249da52f82528 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Fri, 18 Apr 2025 10:30:29 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/ce011d127d6e4a7f23e83436e07f57dfb476fcae --- .../model/cbi/passwall/client/global.lua | 40 +++++++++---------- .../root/usr/share/passwall/app.sh | 8 ++-- patch-luci-app-passwall.patch | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) 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 f8f2d9b11..f36e6c368 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -365,15 +365,15 @@ o:value("119.28.28.28") o:depends("direct_dns_mode", "tcp") o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) -o.default = "tls://1.12.12.12" -o:value("tls://1.12.12.12") -o:value("tls://120.53.53.53") -o:value("tls://36.99.170.86") -o:value("tls://101.198.191.4") -o:value("tls://223.5.5.5") -o:value("tls://223.6.6.6") -o:value("tls://2400:3200::1") -o:value("tls://2400:3200:baba::1") +o.default = "tls://dot.pub@1.12.12.12" +o:value("tls://dot.pub@1.12.12.12") +o:value("tls://dot.pub@120.53.53.53") +o:value("tls://dot.360.cn@36.99.170.86") +o:value("tls://dot.360.cn@101.198.191.4") +o:value("tls://dns.alidns.com@223.5.5.5") +o:value("tls://dns.alidns.com@223.6.6.6") +o:value("tls://dns.alidns.com@2400:3200::1") +o:value("tls://dns.alidns.com@2400:3200:baba::1") o.validate = chinadns_dot_validate o:depends("direct_dns_mode", "dot") @@ -521,17 +521,17 @@ o:depends({singbox_dns_mode = "tcp"}) ---- DoT o = s:taboption("DNS", Value, "remote_dns_dot", translate("Remote DNS DoT")) -o.default = "tls://1.1.1.1" -o:value("tls://1.0.0.1", "1.0.0.1 (CloudFlare)") -o:value("tls://1.1.1.1", "1.1.1.1 (CloudFlare)") -o:value("tls://8.8.4.4", "8.8.4.4 (Google)") -o:value("tls://8.8.8.8", "8.8.8.8 (Google)") -o:value("tls://9.9.9.9", "9.9.9.9 (Quad9)") -o:value("tls://149.112.112.112", "149.112.112.112 (Quad9)") -o:value("tls://94.140.14.14", "94.140.14.14 (AdGuard)") -o:value("tls://94.140.15.15", "94.140.15.15 (AdGuard)") -o:value("tls://208.67.222.222", "208.67.222.222 (OpenDNS)") -o:value("tls://208.67.220.220", "208.67.220.220 (OpenDNS)") +o.default = "tls://dns.google@8.8.4.4" +o:value("tls://1dot1dot1dot1.cloudflare-dns.com@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://dns.google@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://dns.quad9.net@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://dns.adguard.com@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://dns.opendns.com@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.validate = chinadns_dot_validate o:depends("dns_mode", "dot") diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index 0c5321d24..e7306ddeb 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -933,7 +933,7 @@ run_redir() { _args="${_args} direct_dns_tcp_server=$(config_t_get global direct_dns_tcp 223.5.5.5 | sed 's/:/#/g')" ;; dot) - local tmp_dot_dns=$(config_t_get global direct_dns_dot "tls://1.12.12.12") + local tmp_dot_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") 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') _args="${_args} direct_dns_dot_server=$tmp_dot_ip#${tmp_dot_port:-853}" @@ -1420,7 +1420,7 @@ start_dns() { ;; dot) if [ "$chinadns_tls" != "nil" ]; then - local DIRECT_DNS=$(config_t_get global direct_dns_dot "tls://1.12.12.12") + local DIRECT_DNS=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") china_ng_local_dns=${DIRECT_DNS} #当全局（包括访问控制节点）开启chinadns-ng时，不启动新进程。 @@ -1542,7 +1542,7 @@ start_dns() { TCP_PROXY_DNS=1 if [ "$chinadns_tls" != "nil" ]; then local china_ng_listen_port=${NEXT_DNS_LISTEN_PORT} - local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://1.1.1.1") + local china_ng_trust_dns=$(config_t_get global remote_dns_dot "tls://dns.google@8.8.4.4") 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') REMOTE_DNS="$tmp_dot_ip#${tmp_dot_port:-853}" @@ -1887,7 +1887,7 @@ acl_app() { ;; dot) if [ "$(chinadns-ng -V | grep -i wolfssl)" != "nil" ]; then - _chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://1.12.12.12") + _chinadns_local_dns=$(config_t_get global direct_dns_dot "tls://dot.pub@1.12.12.12") fi ;; esac diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 7f4f29cf1..6edcf2fe1 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,7 +20,7 @@ index 485b59c..6d2ddf4 100644 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 -index 425cd70..f8f2d9b 100644 +index 06be506..f36e6c3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -506,6 +506,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")