diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 2cfab4bd10..c0525f5eb2 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -174,26 +174,6 @@ udp_node:value("tcp_", translate("Same as the tcp node")) s:tab("DNS", translate("DNS")) -o = s:taboption("DNS", Value, "up_china_dns", translate("Local DNS") .. "(UDP)") -o.description = translate("IP:Port mode acceptable, multi value split with english comma.") .. "
" .. translate("When the selection is not the default, this DNS is forced to be set to dnsmasq upstream DNS.") -o.default = "default" -o:value("default", translate("Default")) -if has_xray then - o:value("xray_doh", "Xray DNS(DoH)") -end -o:value("223.5.5.5", "223.5.5.5 (" .. translate("Ali") .. "DNS)") -o:value("114.114.114.114", "114.114.114.114 (114DNS)") -o:value("119.29.29.29", "119.29.29.29 (DNSPOD DNS)") -o:value("180.76.76.76", "180.76.76.76 (" .. translate("Baidu") .. "DNS)") - ----- DoH -o = s:taboption("DNS", Value, "up_china_dns_doh", translate("DoH request address")) -o:value("https://dns.alidns.com/dns-query,223.5.5.5", "AliDNS") -o:value("https://doh.pub/dns-query,119.29.29.29", "DNSPod") -o.default = "https://dns.alidns.com/dns-query,223.5.5.5" -o.validate = doh_validate -o:depends("up_china_dns", "xray_doh") - ---- DNS Forward Mode o = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode")) o.rmempty = false @@ -209,8 +189,8 @@ if has_xray then o:value("xray_doh", "Xray DNS(DoH)") end o:value("udp", translatef("Requery DNS By %s", translate("UDP Node"))) +o:value("custom", translate("Custom DNS") .. "(UDP)") o:value("nonuse", translate("No Filter")) -o:value("custom", translate("Custom DNS")) ---- Custom DNS o = s:taboption("DNS", Value, "custom_dns", translate("Custom DNS")) diff --git a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh index 9cfca3ff48..1f3cb08065 100755 --- a/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh @@ -324,7 +324,7 @@ load_config() { DNS_MODE=$(config_t_get global dns_mode pdnsd) DNS_FORWARD=$(config_t_get global dns_forward 8.8.4.4:53 | sed 's/:/#/g') DNS_CACHE=$(config_t_get global dns_cache 0) - LOCAL_DNS=$(config_t_get global up_china_dns default | sed 's/:/#/g') + LOCAL_DNS="default" if [ "${LOCAL_DNS}" = "default" ]; then DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' ',') if [ -z "${DEFAULT_DNS}" ]; then @@ -776,19 +776,6 @@ stop_crontab() { } start_dns() { - if [ "${LOCAL_DNS}" = "xray_doh" ]; then - _doh=$(config_t_get global up_china_dns_doh "https://dns.alidns.com/dns-query,223.5.5.5") - _doh_url=$(echo $_doh | awk -F ',' '{print $1}') - _doh_host_port=$(echo $_doh_url | sed "s/https:\/\///g" | awk -F '/' '{print $1}') - _doh_host=$(echo $_doh_host_port | awk -F ':' '{print $1}') - _doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}') - _doh_bootstrap=$(echo $_doh | cut -d ',' -sf 2-) - lua $API_GEN_XRAY -dns_listen_port "${LOCAL_DOH_PORT}" -dns_server "${_doh_bootstrap}" -doh_url "${_doh_url}" -doh_host "${_doh_host}" > $TMP_PATH/DNS1.json - ln_start_bin "$(first_type $(config_t_get global_app xray_file) xray)" xray $TMP_PATH/DNS1.log -config="$TMP_PATH/DNS1.json" - LOCAL_DNS="127.0.0.1#${LOCAL_DOH_PORT}" - unset _doh _doh_url _doh_bootstrap - fi - local pdnsd_forward other_port msg dns_listen_port=${DNS_PORT} pdnsd_forward=${DNS_FORWARD}