From 94d0a16dbf7c4057cba6a78161e0653195cb64cb Mon Sep 17 00:00:00 2001
From: xiaorouji <60100640+xiaorouji@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:36:22 +0800
Subject: [PATCH] luci: remove `V2ray` DNS option

Configuration is not compatible with Xray and has bugs, so are temporarily removed.
---
 .../luasrc/model/cbi/passwall/client/global.lua           | 8 --------
 luci-app-passwall/root/usr/share/passwall/app.sh          | 2 +-
 2 files changed, 1 insertion(+), 9 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 85e5438ca..b210ab0c4 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -197,9 +197,6 @@ end
 if api.is_finded("dns2socks") then
     dns_mode:value("dns2socks", "dns2socks")
 end
-if has_v2ray then
-    dns_mode:value("v2ray", "V2ray")
-end
 if has_xray then
     dns_mode:value("xray", "Xray")
 end
@@ -209,7 +206,6 @@ o = s:taboption("DNS", ListValue, "v2ray_dns_mode", " ")
 o:value("tcp", "TCP")
 o:value("doh", "DoH")
 o:value("fakedns", "FakeDNS")
-o:depends("dns_mode", "v2ray")
 o:depends("dns_mode", "xray")
 o.validate = function(self, value, t)
     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.default = "1"
 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 = "doh"})
 o.rmempty = false
@@ -286,8 +280,6 @@ if has_chnlist and api.is_finded("chinadns-ng") then
     o.default = "0"
 	o:depends({dns_mode = "dns2socks"})
 	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 = "doh"})
 	o:depends({dns_mode = "udp"})
diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh
index caa146269..79e9b85d8 100755
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -1079,7 +1079,7 @@ start_dns() {
 			local config_file=$TMP_PATH/DNS.json
 			local log_file=$TMP_PATH/DNS.log
 			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"
 			_v2ray_args="${_v2ray_args} dns_query_strategy=${DNS_QUERY_STRATEGY}"
 			local _dns_client_ip=$(config_t_get global dns_client_ip)