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

luci: remove V2ray DNS option

Browse Source 
Configuration is not compatible with Xray and has bugs, so are temporarily removed.
This commit is contained in:
xiaorouji 2023-02-09 15:36:22 +08:00 committed by sbwml
parent 21051b44a1
commit 94d0a16dbf
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,9 +197,6 @@ end
if api.is_finded("dns2socks") then if api.is_finded("dns2socks") then
dns_mode:value("dns2socks", "dns2socks") dns_mode:value("dns2socks", "dns2socks")
end end
if has_v2ray then
dns_mode:value("v2ray", "V2ray")
end
if has_xray then if has_xray then
dns_mode:value("xray", "Xray") dns_mode:value("xray", "Xray")
end end
@ -209,7 +206,6 @@ o = s:taboption("DNS", ListValue, "v2ray_dns_mode", " ")
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("doh", "DoH") o:value("doh", "DoH")
o:value("fakedns", "FakeDNS") o:value("fakedns", "FakeDNS")
o:depends("dns_mode", "v2ray")
o:depends("dns_mode", "xray") o:depends("dns_mode", "xray")
o.validate = function(self, value, t) o.validate = function(self, value, t)
if value == "fakedns" then if value == "fakedns" then
@ -275,8 +271,6 @@ o:depends("v2ray_dns_mode", "doh")
o = s:taboption("DNS", Flag, "dns_cache", translate("Cache Resolved")) o = s:taboption("DNS", Flag, "dns_cache", translate("Cache Resolved"))
o.default = "1" o.default = "1"
o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "dns2socks"})
o:depends({dns_mode = "v2ray", v2ray_dns_mode = "tcp"})
o:depends({dns_mode = "v2ray", v2ray_dns_mode = "doh"})
o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"}) o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"})
o:depends({dns_mode = "xray", v2ray_dns_mode = "doh"}) o:depends({dns_mode = "xray", v2ray_dns_mode = "doh"})
o.rmempty = false o.rmempty = false
@ -286,8 +280,6 @@ if has_chnlist and api.is_finded("chinadns-ng") then
o.default = "0" o.default = "0"
o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "dns2socks"})
o:depends({dns_mode = "dns2tcp"}) o:depends({dns_mode = "dns2tcp"})
o:depends({dns_mode = "v2ray", v2ray_dns_mode = "tcp"})
o:depends({dns_mode = "v2ray", v2ray_dns_mode = "doh"})
o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"}) o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"})
o:depends({dns_mode = "xray", v2ray_dns_mode = "doh"}) o:depends({dns_mode = "xray", v2ray_dns_mode = "doh"})
o:depends({dns_mode = "udp"}) o:depends({dns_mode = "udp"})

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

@ -1079,7 +1079,7 @@ start_dns() {
local config_file=$TMP_PATH/DNS.json local config_file=$TMP_PATH/DNS.json
local log_file=$TMP_PATH/DNS.log local log_file=$TMP_PATH/DNS.log
local log_file=/dev/null local log_file=/dev/null
local _v2ray_args="config_file=$config_file log_file=$log_file" local _v2ray_args="type=$DNS_MODE config_file=$config_file log_file=$log_file"
[ "${DNS_CACHE}" == "0" ] && _v2ray_args="${_v2ray_args} dns_cache=0" [ "${DNS_CACHE}" == "0" ] && _v2ray_args="${_v2ray_args} dns_cache=0"
_v2ray_args="${_v2ray_args} dns_query_strategy=${DNS_QUERY_STRATEGY}" _v2ray_args="${_v2ray_args} dns_query_strategy=${DNS_QUERY_STRATEGY}"
local _dns_client_ip=$(config_t_get global dns_client_ip) local _dns_client_ip=$(config_t_get global dns_client_ip)