🛸 Sync 2023-02-09 09:50

2025-04-04 23:53:33 +08:00 · 2023-02-09 09:50:03 +08:00 · 2023-02-09 09:50:03 +08:00 · 0cd6e7a9b2
commit 0cd6e7a9b2
parent 1f519dff8c
54 changed files with 2569 additions and 329 deletions
--- a/UnblockNeteaseMusic/Makefile
+++ b/UnblockNeteaseMusic/Makefile
@ -0,0 +1,52 @@
+# SPDX-Identifier-License: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=UnblockNeteaseMusic
+PKG_BASE_VERSION:=0.27.0
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
+PKG_SOURCE_DATE:=2022-10-09
+PKG_SOURCE_VERSION:=253dc89329ebd16ff22175d9d0ab9382ed8aaccc
+PKG_MIRROR_HASH:=c2ed5f269c1935575c57ed5489504ef37f453b2a512209bf0762a55fc3eb4b29
+
+PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
+
+PKG_LICENSE:=LGPL-3.0-only
+PKG_LICENSE_FILE:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/UnblockNeteaseMusic
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
+  TITLE:=Revive Netease Cloud Music (NodeJS)
+  URL:=https://github.com/nondanee/UnblockNeteaseMusic
+  DEPENDS:=+node
+  PKGARCH:=all
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	xzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
+
+define Build/Configure
+	echo -e $(PKG_BASE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/core_ver
+	echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/local_ver
+endef
+
+define Build/Compile
+endef
+
+define Package/UnblockNeteaseMusic/install
+	$(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusic
+	$(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/UnblockNeteaseMusic
+endef
+
+$(eval $(call BuildPackage,UnblockNeteaseMusic))
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@ -0,0 +1,19 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-mosdns
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=2
+
+LUCI_TITLE:=LuCI Support for mosdns
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+mosdns +jsonfilter +luci-compat +curl +v2ray-geoip +v2ray-geosite
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/mosdns
+/etc/mosdns/config_custom.yaml
+/etc/mosdns/rule
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-mosdns/luasrc/controller/mosdns.lua
+++ b/luci-app-mosdns/luasrc/controller/mosdns.lua
@ -0,0 +1,42 @@
+module("luci.controller.mosdns", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/mosdns") then
+		return
+	end
+
+	local page = entry({"admin", "services", "mosdns"}, alias("admin", "services", "mosdns", "basic"), _("MosDNS"), 30)
+	page.dependent = true
+	page.acl_depends = { "luci-app-mosdns" }
+
+	entry({"admin", "services", "mosdns", "basic"}, cbi("mosdns/basic"), _("Basic Setting"), 1).leaf = true
+	entry({"admin", "services", "mosdns", "rule_list"}, cbi("mosdns/rule_list"), _("Rule List"), 2).leaf = true
+	entry({"admin", "services", "mosdns", "update"}, cbi("mosdns/update"), _("Geodata Update"), 3).leaf = true
+	entry({"admin", "services", "mosdns", "log"}, cbi("mosdns/log"), _("Logs"), 4).leaf = true
+	entry({"admin", "services", "mosdns", "status"}, call("act_status")).leaf = true
+	entry({"admin", "services", "mosdns", "get_log"}, call("get_log")).leaf = true
+	entry({"admin", "services", "mosdns", "clear_log"}, call("clear_log")).leaf = true
+	entry({"admin", "services", "mosdns", "geo_update"}, call("geo_update")).leaf = true
+end
+
+function act_status()
+	local e = {}
+	e.running = luci.sys.call("pgrep -f mosdns >/dev/null") == 0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end
+
+function get_log()
+	luci.http.write(luci.sys.exec("cat $(/usr/share/mosdns/mosdns.sh logfile)"))
+end
+
+function clear_log()
+	luci.sys.call("cat /dev/null > $(/usr/share/mosdns/mosdns.sh logfile)")
+end
+
+function geo_update()
+	local e = {}
+	e.updating = luci.sys.call("/usr/share/mosdns/mosdns.sh geodata >/dev/null") == 0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end
--- a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
+++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
@ -0,0 +1,136 @@
+m = Map("mosdns")
+m.title = translate("MosDNS")
+m.description = translate("MosDNS is a 'programmable' DNS forwarder.")
+
+m:section(SimpleSection).template = "mosdns/mosdns_status"
+
+s = m:section(TypedSection, "mosdns")
+s.addremove = false
+s.anonymous = true
+
+enable = s:option(Flag, "enabled", translate("Enable"))
+enable.rmempty = false
+
+configfile = s:option(ListValue, "configfile", translate("Config File"))
+configfile:value("/etc/mosdns/config.yaml", translate("Default Config"))
+configfile:value("/etc/mosdns/config_custom.yaml", translate("Custom Config"))
+configfile.default = "/etc/mosdns/config.yaml"
+
+listenport = s:option(Value, "listen_port", translate("Listen port"))
+listenport.datatype = "and(port,min(1))"
+listenport.default = 5335
+listenport:depends( "configfile", "/etc/mosdns/config.yaml")
+
+loglevel = s:option(ListValue, "log_level", translate("Log Level"))
+loglevel:value("debug", translate("Debug"))
+loglevel:value("info", translate("Info"))
+loglevel:value("warn", translate("Warning"))
+loglevel:value("error", translate("Error"))
+loglevel.default = "info"
+loglevel:depends( "configfile", "/etc/mosdns/config.yaml")
+
+logfile = s:option(Value, "logfile", translate("Log File"))
+logfile.placeholder = "/tmp/mosdns.log"
+logfile.default = "/tmp/mosdns.log"
+logfile:depends( "configfile", "/etc/mosdns/config.yaml")
+
+redirect = s:option(Flag, "redirect", translate("DNS Forward"), translate("Forward Dnsmasq Domain Name resolution requests to MosDNS"))
+redirect.default = true
+
+custom_local_dns = s:option(Flag, "custom_local_dns", translate("Local DNS"), translate("Follow WAN interface DNS if not enabled"))
+custom_local_dns:depends( "configfile", "/etc/mosdns/config.yaml")
+custom_local_dns.default = false
+
+custom_local_dns = s:option(DynamicList, "local_dns", translate("Upstream DNS servers"))
+custom_local_dns:value("119.29.29.29", "119.29.29.29 (DNSPod Primary)")
+custom_local_dns:value("119.28.28.28", "119.28.28.28 (DNSPod Secondary)")
+custom_local_dns:value("223.5.5.5", "223.5.5.5 (AliDNS Primary)")
+custom_local_dns:value("223.6.6.6", "223.6.6.6 (AliDNS Secondary)")
+custom_local_dns:value("114.114.114.114", "114.114.114.114 (114DNS Primary)")
+custom_local_dns:value("114.114.115.115", "114.114.115.115 (114DNS Secondary)")
+custom_local_dns:value("180.76.76.76", "180.76.76.76 (Baidu DNS)")
+custom_local_dns:depends("custom_local_dns", "1")
+
+custom_local_dns = s:option(ListValue, "bootstrap_dns", translate("Bootstrap DNS servers"), translate("Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams"))
+custom_local_dns:value("119.29.29.29", "119.29.29.29 (DNSPod Primary)")
+custom_local_dns:value("119.28.28.28", "119.28.28.28 (DNSPod Secondary)")
+custom_local_dns:value("223.5.5.5", "223.5.5.5 (AliDNS Primary)")
+custom_local_dns:value("223.6.6.6", "223.6.6.6 (AliDNS Secondary)")
+custom_local_dns:value("114.114.114.114", "114.114.114.114 (114DNS Primary)")
+custom_local_dns:value("114.114.115.115", "114.114.115.115 (114DNS Secondary)")
+custom_local_dns:value("180.76.76.76", "180.76.76.76 (Baidu DNS)")
+custom_local_dns.default = "119.29.29.29"
+custom_local_dns:depends("custom_local_dns", "1")
+
+remote_dns = s:option(DynamicList, "remote_dns", translate("Remote DNS"))
+remote_dns:value("tls://1.1.1.1", "1.1.1.1 (CloudFlare DNS)")
+remote_dns:value("tls://1.0.0.1", "1.0.0.1 (CloudFlare DNS)")
+remote_dns:value("tls://8.8.8.8", "8.8.8.8 (Google DNS)")
+remote_dns:value("tls://8.8.4.4", "8.8.4.4 (Google DNS)")
+remote_dns:value("tls://9.9.9.9", "9.9.9.9 (Quad9 DNS)")
+remote_dns:value("tls://149.112.112.112", "149.112.112.112 (Quad9 DNS)")
+remote_dns:value("tls://45.11.45.11", "45.11.45.11 (DNS.SB)")
+remote_dns:value("tls://208.67.222.222", "208.67.222.222 (Open DNS)")
+remote_dns:value("tls://208.67.220.220", "208.67.220.220 (Open DNS)")
+remote_dns:depends( "configfile", "/etc/mosdns/config.yaml")
+
+remote_dns_pipeline = s:option(Flag, "enable_pipeline", translate("Remote DNS Connection Multiplexing"), translate("Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"))
+remote_dns_pipeline.rmempty = false
+remote_dns_pipeline.default = false
+remote_dns_pipeline:depends( "configfile", "/etc/mosdns/config.yaml")
+
+cache_size = s:option(Value, "cache_size", translate("DNS Cache Size"))
+cache_size.datatype = "and(uinteger,min(0))"
+cache_size.default = "200000"
+cache_size:depends( "configfile", "/etc/mosdns/config.yaml")
+
+cache_size = s:option(Value, "cache_survival_time", translate("Cache Survival Time"))
+cache_size.datatype = "and(uinteger,min(0))"
+cache_size.default = "259200"
+cache_size:depends( "configfile", "/etc/mosdns/config.yaml")
+
+minimal_ttl = s:option(Value, "minimal_ttl", translate("Minimum TTL"))
+minimal_ttl.datatype = "and(uinteger,min(0))"
+minimal_ttl.datatype = "and(uinteger,max(3600))"
+minimal_ttl.default = "0"
+minimal_ttl:depends( "configfile", "/etc/mosdns/config.yaml")
+
+maximum_ttl = s:option(Value, "maximum_ttl", translate("Maximum TTL"))
+maximum_ttl.datatype = "and(uinteger,min(0))"
+maximum_ttl.default = "0"
+maximum_ttl:depends( "configfile", "/etc/mosdns/config.yaml")
+
+adblock = s:option(Flag, "adblock", translate("Enable DNS ADblock"))
+adblock:depends( "configfile", "/etc/mosdns/config.yaml")
+adblock.default = false
+
+adblock = s:option(Value, "ad_source", translate("ADblock Source"))
+adblock:depends("adblock", "1")
+adblock.default = "https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt"
+adblock:value("geosite.dat", "v2ray-geosite")
+adblock:value("https://raw.githubusercontent.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt", "anti-AD")
+adblock:value("https://raw.githubusercontent.com/sjhgvr/oisd/main/dbl_basic.txt", "oisd (basic)")
+adblock:value("https://raw.githubusercontent.com/QiuSimons/openwrt-mos/master/dat/serverlist.txt", "QiuSimons/openwrt-mos")
+
+reload_service = s:option( Button, "_reload", translate("Reload Service"), translate("Reload service to take effect of new configuration"))
+reload_service.write = function()
+  luci.sys.exec("/etc/init.d/mosdns reload")
+end
+reload_service:depends( "configfile", "/etc/mosdns/config_custom.yaml")
+
+config = s:option(TextValue, "manual-config")
+config.description = translate("<font color=\"ff0000\"><strong>View the Custom YAML Configuration file used by this MosDNS. You can edit it as you own need.</strong></font>")
+config.template = "cbi/tvalue"
+config.rows = 25
+config:depends( "configfile", "/etc/mosdns/config_custom.yaml")
+
+function config.cfgvalue(self, section)
+  return nixio.fs.readfile("/etc/mosdns/config_custom.yaml")
+end
+
+function config.write(self, section, value)
+  value = value:gsub("\r\n?", "\n")
+  nixio.fs.writefile("/etc/mosdns/config_custom.yaml", value)
+end
+
+return m
--- a/luci-app-mosdns/luasrc/model/cbi/mosdns/log.lua
+++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/log.lua
@ -0,0 +1,5 @@
+m = Map("mosdns")
+
+m:append(Template("mosdns/mosdns_log"))
+
+return m
--- a/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
+++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
@ -0,0 +1,87 @@
+local datatypes = require "luci.cbi.datatypes"
+
+local white_list_file = "/etc/mosdns/rule/whitelist.txt"
+local block_list_file = "/etc/mosdns/rule/blocklist.txt"
+local grey_list_file = "/etc/mosdns/rule/greylist.txt"
+local hosts_list_file = "/etc/mosdns/rule/hosts.txt"
+local redirect_list_file = "/etc/mosdns/rule/redirect.txt"
+local local_ptr_file = "/etc/mosdns/rule/local-ptr.txt"
+
+m = Map("mosdns")
+
+s = m:section(TypedSection, "mosdns", translate("Rule Settings"))
+s.anonymous = true
+
+s:tab("white_list", translate("White Lists"))
+s:tab("block_list", translate("Block Lists"))
+s:tab("grey_list", translate("Grey Lists"))
+s:tab("hosts_list", translate("Hosts"))
+s:tab("redirect_list", translate("Redirect"))
+s:tab("local_ptr_list", translate("Block PTR"))
+
+o = s:taboption("white_list", TextValue, "whitelist", "", "<font color='red'>" .. translate("These domain names allow DNS resolution with the highest priority. Please input the domain names of websites, every line can input only one website domain. For example: hm.baidu.com.") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(white_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(white_list_file , value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(white_list_file , "") end
+o.validate = function(self, value)
+    return value
+end
+
+o = s:taboption("block_list", TextValue, "blocklist", "", "<font color='red'>" .. translate("These domains are blocked from DNS resolution. Please input the domain names of websites, every line can input only one website domain. For example: baidu.com.") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(block_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(block_list_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(block_list_file, "") end
+o.validate = function(self, value)
+    return value
+end
+
+o = s:taboption("grey_list", TextValue, "greylist", "", "<font color='red'>" .. translate("These domains are always resolved using remote DNS. Please input the domain names of websites, every line can input only one website domain. For example: google.com.") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(grey_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(grey_list_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(grey_list_file, "") end
+o.validate = function(self, value)
+    return value
+end
+
+o = s:taboption("hosts_list", TextValue, "hosts", "", "<font color='red'>" .. translate("Hosts For example: baidu.com 10.0.0.1") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(hosts_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(hosts_list_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(hosts_list_file, "") end
+o.validate = function(self, value)
+    return value
+end
+
+o = s:taboption("redirect_list", TextValue, "redirect", "", "<font color='red'>" .. translate("The domain name to redirect the request to. Requests domain A, but returns records for domain B. example: a.com b.com") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(redirect_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(redirect_list_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(redirect_list_file, "") end
+o.validate = function(self, value)
+    return value
+end
+
+o = s:taboption("local_ptr_list", TextValue, "local_ptr", "", "<font color='red'>" .. translate("These domains are blocked from PTR requests") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(local_ptr_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(local_ptr_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(local_ptr_file, "") end
+o.validate = function(self, value)
+    return value
+end
+
+local apply = luci.http.formvalue("cbi.apply")
+if apply then
+    luci.sys.exec("/etc/init.d/mosdns reload")
+end
+
+return m
--- a/luci-app-mosdns/luasrc/model/cbi/mosdns/update.lua
+++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/update.lua
@ -0,0 +1,31 @@
+m = Map("mosdns")
+
+s = m:section(TypedSection, "mosdns", translate("Update GeoIP & GeoSite dat"))
+s.addremove = false
+s.anonymous = true
+
+enable = s:option(Flag, "geo_auto_update", translate("Enable Auto Database Update"))
+enable.rmempty = false
+
+o = s:option(ListValue, "geo_update_week_time", translate("Update Cycle"))
+o:value("*", translate("Every Day"))
+o:value("1", translate("Every Monday"))
+o:value("2", translate("Every Tuesday"))
+o:value("3", translate("Every Wednesday"))
+o:value("4", translate("Every Thursday"))
+o:value("5", translate("Every Friday"))
+o:value("6", translate("Every Saturday"))
+o:value("7", translate("Every Sunday"))
+o.default = "*"
+
+update_time = s:option(ListValue, "geo_update_day_time", translate("Update Time"))
+for t = 0, 23 do
+  update_time:value(t, t..":00")
+end
+update_time.default = 0
+
+data_update = s:option(Button, "geo_update_database", translate("Database Update"))
+data_update.rawhtml = true
+data_update.template = "mosdns/geo_update"
+
+return m
--- a/luci-app-mosdns/luasrc/view/mosdns/geo_update.htm
+++ b/luci-app-mosdns/luasrc/view/mosdns/geo_update.htm
@ -0,0 +1,34 @@
+<%+cbi/valueheader%>
+<script type="text/javascript">//<![CDATA[
+	function update_data(btn, dataname)
+	{
+		btn.disabled = true;
+		btn.value = '<%:Updating...%> ';
+		st=dataname;
+		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "mosdns", "geo_update")%>',
+			{ set:st },
+			function(x,data)
+			{
+			var tb = document.getElementById(dataname+'-status');
+			if (tb)
+			{
+				switch (data.updating)
+				{
+					case true:
+						tb.innerHTML = "<font color='green'>" + "<%:Update success%>" + "</font>";
+						break;
+					case false:
+						tb.innerHTML = "<font color='red'>" + "<%:Update failed, Please check the network status%>" + "</font>";
+						break;
+				}
+			}
+				btn.disabled = false;
+				btn.value    = '<%:Check And Update%>';
+			}
+		);
+		return false;
+	}
+//]]></script>
+<input type="button" class="btn cbi-button cbi-button-reload" value="<%:Check And Update%>" onclick="return update_data(this,'<%=self.option%>')" />
+<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
+<%+cbi/valuefooter%>
--- a/luci-app-mosdns/luasrc/view/mosdns/mosdns_log.htm
+++ b/luci-app-mosdns/luasrc/view/mosdns/mosdns_log.htm
@ -0,0 +1,29 @@
+<script type="text/javascript">
+	//<![CDATA[
+	function clear_log(btn) {
+		XHR.get('<%=url([[admin]], [[services]], [[mosdns]], [[clear_log]])%>', null,
+			function(x, data) {
+				if(x && x.status == 200) {
+					var log_textarea = document.getElementById('log_textarea');
+					log_textarea.innerHTML = "";
+					log_textarea.scrollTop = log_textarea.scrollHeight;
+				}
+				location.reload();
+			}
+		);
+	}
+	XHR.poll(1, '<%=url([[admin]], [[services]], [[mosdns]], [[get_log]])%>', null,
+		function(x, data) {
+			if(x && x.status == 200) {
+				var log_textarea = document.getElementById('log_textarea');
+				log_textarea.innerHTML = x.responseText;
+				log_textarea.scrollTop = log_textarea.scrollHeight;
+			}
+		}
+	);
+	//]]>
+</script>
+<fieldset class="cbi-section" id="_log_fieldset">
+	<input class="cbi-button cbi-input-remove" type="button" onclick="clear_log()" value="<%:Clear logs%>" style="margin-left: 10px; margin-top: 10px;">
+	<textarea id="log_textarea" class="cbi-input-textarea" style="width: calc(100% - 20px); height: 600px; margin: 10px;" data-update="change" rows="5" wrap="off" readonly="readonly"></textarea>
+</fieldset>
--- a/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm
+++ b/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm
@ -0,0 +1,28 @@
+<script type="text/javascript">
+	//<![CDATA[
+	XHR.poll(3, '<%=url([[admin]], [[services]], [[mosdns]], [[status]])%>', null,
+		function(x, data) {
+			var tb = document.getElementById('mosdns_status');
+			if (data && tb) {
+				if (data.running) {
+					var links = '<em><b style=color:green>MosDNS <%:RUNNING%></b></em>';
+					tb.innerHTML = links;
+				} else {
+					tb.innerHTML = '<em><b style=color:red>MosDNS <%:NOT RUNNING%></b></em>';
+				}
+			}
+		}
+	);
+	//]]>
+</script>
+<style>
+	.mar-10 {
+		margin-left: 50px;
+		margin-right: 10px;
+	}
+</style>
+<fieldset class="cbi-section">
+	<p id="mosdns_status">
+		<em><%:Collecting data...%></em>
+	</p>
+</fieldset>
--- a/luci-app-mosdns/po/zh-cn/mosdns.po
+++ b/luci-app-mosdns/po/zh-cn/mosdns.po
@ -0,0 +1,194 @@
+msgid "Basic Setting"
+msgstr "基本设置"
+
+msgid "MosDNS is a 'programmable' DNS forwarder."
+msgstr "MosDNS 是一个插件化的 DNS 转发/分流器。"
+
+msgid "RUNNING"
+msgstr "运行中"
+
+msgid "NOT RUNNING"
+msgstr "未运行"
+
+msgid "Collecting data..."
+msgstr "获取数据中..."
+
+msgid "Enable"
+msgstr "启用"
+
+msgid "Listen port"
+msgstr "监听端口"
+
+msgid "Log Level"
+msgstr "日志等级"
+
+msgid "DNS Forward"
+msgstr "DNS 转发"
+
+msgid "Forward Dnsmasq Domain Name resolution requests to MosDNS"
+msgstr "将 Dnsmasq 域名解析请求转发到 MosDNS 服务器"
+
+msgid "Enable DNS ADblock"
+msgstr "启用 DNS 广告过滤"
+
+msgid "ADblock Source"
+msgstr "广告过滤来源"
+
+msgid "Reload Service"
+msgstr "重载服务"
+
+msgid "Reload service to take effect of new configuration"
+msgstr "重载 MosDNS 服务生效配置文件"
+
+msgid "<font color=\"ff0000\"><strong>View the Custom YAML Configuration file used by this MosDNS. You can edit it as you own need.</strong></font>"
+msgstr "<font color=\"ff0000\"><strong>注意！此页的更改仅当配置文件为 “自定义” 时才会生效</strong></font>"
+
+msgid "Geodata Update"
+msgstr "更新数据库"
+
+msgid "Update GeoIP & GeoSite dat"
+msgstr "更新 GeoIP & GeoSite 数据库"
+
+msgid "Update Time"
+msgstr "更新时间"
+
+msgid "Update Cycle"
+msgstr "更新周期"
+
+msgid "Every Day"
+msgstr "每天"
+
+msgid "Every Monday"
+msgstr "每周一"
+
+msgid "Every Tuesday"
+msgstr "每周二"
+
+msgid "Every Wednesday"
+msgstr "每周三"
+
+msgid "Every Thursday"
+msgstr "每周四"
+
+msgid "Every Friday"
+msgstr "每周五"
+
+msgid "Every Saturday"
+msgstr "每周六"
+
+msgid "Every Sunday"
+msgstr "每周日"
+
+msgid "Database Update"
+msgstr "数据库更新"
+
+msgid "Check And Update"
+msgstr "检查并更新"
+
+msgid "Enable Auto Database Update"
+msgstr "启用自动更新"
+
+msgid "Updating..."
+msgstr "正在更新..."
+
+msgid "Update success"
+msgstr "更新成功"
+
+msgid "Update failed, Please check the network status"
+msgstr "更新失败，请检查网络状态"
+
+msgid "Config File"
+msgstr "配置文件"
+
+msgid "Default Config"
+msgstr "内置预设"
+
+msgid "Custom Config"
+msgstr "自定义"
+
+msgid "Log File"
+msgstr "日志文件"
+
+msgid "Local DNS"
+msgstr "本地 DNS"
+
+msgid "Follow WAN interface DNS if not enabled"
+msgstr "不启用则遵循 WAN 接口 DNS"
+
+msgid "Upstream DNS servers"
+msgstr "上游 DNS 服务器"
+
+msgid "Bootstrap DNS servers"
+msgstr "Bootstrap DNS 服务器"
+
+msgid "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams"
+msgstr "Bootstrap DNS 服务器用于解析所指定为上游的 DoH / DoT 解析器的 IP 地址"
+
+msgid "Remote DNS"
+msgstr "远程 DNS"
+
+msgid "Remote DNS Connection Multiplexing"
+msgstr "远程 DNS 连接复用"
+
+msgid "Enable TCP/DoT RFC 7766 new Query Pipelining connection multiplexing mode"
+msgstr "启用 TCP/DoT RFC 7766 新型 Query Pipelining 连接复用模式"
+
+msgid "DNS Cache Size"
+msgstr "DNS 缓存大小（条）"
+
+msgid "Cache Survival Time"
+msgstr "缓存生存时间（秒）"
+
+msgid "Minimum TTL"
+msgstr "覆盖最小 TTL 值（默认 0）"
+
+msgid "Maximum TTL"
+msgstr "覆盖最大 TTL 值（默认 0）"
+
+msgid "Logs"
+msgstr "日志"
+
+msgid "Clear logs"
+msgstr "清空日志"
+
+msgid "Rule List"
+msgstr "规则列表"
+
+msgid "Rule Settings"
+msgstr "自定义规则列表"
+
+msgid "<br>The list of rules only apply to 'Default Config' profiles."
+msgstr "<br>规则列表仅适用于 “内置预设” 配置文件"
+
+msgid "White Lists"
+msgstr "白名单"
+
+msgid "These domain names allow DNS resolution with the highest priority. Please input the domain names of websites, every line can input only one website domain. For example: hm.baidu.com."
+msgstr "加入的域名始终允许使用 “本地 DNS” 进行解析，且优先级最高（每个域名一行，支持域名匹配规则）"
+
+msgid "Block Lists"
+msgstr "黑名单"
+
+msgid "These domains are blocked from DNS resolution. Please input the domain names of websites, every line can input only one website domain. For example: baidu.com."
+msgstr "加入的域名将屏蔽 DNS 解析（每个域名一行，支持域名匹配规则）"
+
+msgid "Grey Lists"
+msgstr "灰名单"
+
+msgid "These domains are always resolved using remote DNS. Please input the domain names of websites, every line can input only one website domain. For example: google.com."
+msgstr "加入的域名始终使用 “远程 DNS” 进行解析（每个域名一行，支持域名匹配规则）"
+
+msgid "Hosts For example: baidu.com 10.0.0.1"
+msgstr "自定义 Hosts 重写，如：baidu.com 10.0.0.1（每个规则一行）"
+
+msgid "Redirect"
+msgstr "重定向"
+
+msgid "The domain name to redirect the request to. Requests domain A, but returns records for domain B. example: a.com b.com"
+msgstr "重定向请求的域名。请求域名 A，但返回域名 B 的记录，如：baidu.com qq.com（每个规则一行）"
+
+msgid "Block PTR"
+msgstr "PTR 黑名单"
+
+msgid "These domains are blocked from PTR requests"
+msgstr "加入的域名将阻止 PTR 请求（每个域名一行，支持域名匹配规则）"
--- a/luci-app-mosdns/po/zh_Hans
+++ b/luci-app-mosdns/po/zh_Hans
@ -0,0 +1 @@
+zh-cn
--- a/luci-app-mosdns/root/etc/config/mosdns
+++ b/luci-app-mosdns/root/etc/config/mosdns
@ -0,0 +1,21 @@
+
+config mosdns 'config'
+	option enabled '0'
+	option listen_port '5335'
+	option geo_auto_update '0'
+	option geo_update_week_time '*'
+	option geo_update_day_time '2'
+	option redirect '1'
+	option adblock '0'
+	option configfile '/etc/mosdns/config.yaml'
+	option log_level 'info'
+	option logfile '/tmp/mosdns.log'
+	option cache_size '200000'
+	option cache_survival_time '259200'
+	option minimal_ttl '0'
+	option maximum_ttl '0'
+	option custom_local_dns '0'
+	option enable_pipeline '0'
+	list remote_dns 'tls://8.8.8.8'
+	list remote_dns 'tls://1.1.1.1'
+
--- a/luci-app-mosdns/root/etc/hotplug.d/iface/99-mosdns
+++ b/luci-app-mosdns/root/etc/hotplug.d/iface/99-mosdns
@ -0,0 +1,2 @@
+#!/bin/sh
+[ "$ACTION" = ifup ] && /etc/init.d/mosdns restart
--- a/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/luci-app-mosdns/root/etc/init.d/mosdns
@ -0,0 +1,157 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2020-2022, IrineSistiana
+#
+# This file is part of mosdns.
+#
+# mosdns is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# mosdns is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+START=99
+USE_PROCD=1
+
+PROG=/usr/bin/mosdns
+CONF=$(uci -q get mosdns.config.configfile)
+CRON_FILE=/etc/crontabs/root
+
+get_config() {
+	config_get enabled $1 enabled 0
+	config_get adblock $1 adblock 0
+	config_get ad_source $1 ad_source ""
+	config_get cache_size $1 cache_size 200000
+	config_get cache_survival_time $1 cache_survival_time 259200
+	config_get enable_pipeline $1 enable_pipeline 0
+	config_get geo_auto_update $1 geo_auto_update 0
+	config_get geo_update_day_time $1 geo_update_day_time 2
+	config_get geo_update_week_time $1 geo_update_week_time "*"
+	config_get listen_port $1 listen_port 5335
+	config_get log_file $1 logfile "/tmp/mosdns.log"
+	config_get log_level $1 log_level "info"
+	config_get maximum_ttl_custom $1 maximum_ttl 0
+	config_get minimal_ttl_custom $1 minimal_ttl 0
+	config_get redirect $1 redirect 0
+	config_get remote_dns $1 remote_dns "tls://8.8.8.8 tls://1.1.1.1"
+	config_get custom_local_dns $1 custom_local_dns 0
+	config_get bootstrap_dns $1 bootstrap_dns "119.29.29.29"
+}
+
+init_yaml() {
+	tmpdir=$(mktemp -d) || exit 1
+	adlist=$(/usr/share/mosdns/mosdns.sh ad)
+	[ $enable_pipeline = 1 ] && enable_pipeline=true || enable_pipeline=false
+	local_dns=$(/usr/share/mosdns/mosdns.sh dns | xargs -n1 echo "        - addr:")
+	remote_dns=$(echo $remote_dns | awk '{for(i=1;i<=NF;i++)printf "%s- addr: %s\n%s  enable_pipeline: '${enable_pipeline}'\n",s,$i,s}' s='        ')
+	sed "s,log_level,$log_level,g;s,log_file,$log_file,g; \
+	s,listen_port,$listen_port,g;s,cache_size,$cache_size,g; \
+	s,cache_survival_time,$cache_survival_time,g; \
+	s,minimal_ttl_custom,$minimal_ttl_custom,g; \
+	s,maximum_ttl_custom,$maximum_ttl_custom,g; \
+	s,adblock,$adlist,g;s,remote_dns_pipeline,$enable_pipeline,g" \
+	/usr/share/mosdns/default.yaml > $CONF
+	[ "$custom_local_dns" -eq 0 ] && sed -i "/bootstrap/d" $CONF || \
+	sed -i "s,bootstrap_dns,$bootstrap_dns,g" $CONF
+	echo "${local_dns}" > $tmpdir/local_dns.txt
+	echo "${remote_dns}" > $tmpdir/remote_dns.txt
+	sed -i -e '/- addr: local_dns/{r '$tmpdir/local_dns.txt -e';d};/- addr: remote_dns/{r '$tmpdir/remote_dns.txt -e';d}' \
+	$CONF
+	rm -rf $tmpdir
+}
+
+service_triggers() {
+	procd_add_reload_trigger "mosdns"
+}
+
+restore_setting() {
+	rm -f /etc/mosdns/redirect.lock
+	sed -i "/list server/d" /etc/config/dhcp
+	uci set dhcp.@dnsmasq[0].noresolv='0'
+	uci del dhcp.@dnsmasq[0].cachesize
+	uci commit dhcp
+}
+
+redirect_setting() {
+	if [ "${CONF}" = "/etc/mosdns/config.yaml" ]; then
+		sed -i "/list server/d" /etc/config/dhcp
+		uci add_list dhcp.@dnsmasq[0].server="127.0.0.1#$listen_port"
+		uci set dhcp.@dnsmasq[0].rebind_protection='0'
+		uci set dhcp.@dnsmasq[0].noresolv="1"
+		uci set dhcp.@dnsmasq[0].cachesize='0'
+		uci commit dhcp
+	else
+		sed -i "/list server/d" /etc/config/dhcp
+		uci add_list dhcp.@dnsmasq[0].server="127.0.0.1#$(cat /etc/mosdns/config_custom.yaml | awk -F'[:" ]+' '/^\s+addr:/{for(i=1;i<=NF;i++){if($i~/^[0-9]+$/){print $i;exit}}}')"
+		uci set dhcp.@dnsmasq[0].rebind_protection='0'
+		uci set dhcp.@dnsmasq[0].noresolv="1"
+		uci set dhcp.@dnsmasq[0].cachesize='0'
+		uci commit dhcp
+	fi
+	touch /etc/mosdns/redirect.lock
+}
+
+reload_others() {
+	/etc/init.d/network reload
+	/etc/init.d/dnsmasq reload
+}
+
+reload_service() {
+	stop
+	sleep 1
+	start
+}
+
+setcron() {
+	sed -i '/mosdns.sh/d' $CRON_FILE 2>/dev/null
+	[ "$geo_auto_update" -eq 1 ] && echo "0 $geo_update_day_time * * $geo_update_week_time /usr/share/mosdns/mosdns.sh geodata" >>$CRON_FILE
+	crontab $CRON_FILE
+}
+
+delcron() {
+	sed -i '/mosdns.sh/d' $CRON_FILE 2>/dev/null
+	crontab $CRON_FILE
+}
+
+start_service() {
+	config_load "mosdns"
+	config_foreach get_config "mosdns"
+	[ $enabled != 1 ] && return 1
+	delcron
+	setcron
+	[ "${CONF}" = "/etc/mosdns/config.yaml" ] && init_yaml
+	:> $(/usr/share/mosdns/mosdns.sh logfile)
+	procd_open_instance mosdns
+	procd_set_param command $PROG start -c "$CONF"
+	procd_set_param user root
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
+	procd_close_instance mosdns
+	[ "$redirect" -ne 1 ] && [ -f "/etc/mosdns/redirect.lock" ] && restore_setting
+	[ "$redirect" -eq 1 ] && redirect_setting
+	reload_others
+	update_list=0
+	[ "$adblock" -eq 1 ] && [ "$ad_source" != "geosite.dat" ] && {
+		[ -s "/etc/mosdns/rule/adlist.txt" ] && [ -f "/etc/mosdns/rule/.ad_source" ] && url_adlist=$(cat /etc/mosdns/rule/.ad_source) || update_list=1
+		[ "$ad_source" != "$url_adlist" ] && update_list=1
+	}
+	[ "$update_list" -eq 1 ] && /usr/share/mosdns/mosdns.sh adlist_update &> /dev/null &
+}
+
+stop_service() {
+	pgrep -f /usr/bin/mosdns | xargs kill -9 >/dev/null 2>&1
+	config_load "mosdns"
+	config_foreach get_config "mosdns"
+	[ "$enabled" = "0" ] && [ -f "/etc/mosdns/redirect.lock" ] && restore_setting
+	reload_others
+	delcron
+}
--- a/luci-app-mosdns/root/etc/mosdns/config_custom.yaml
+++ b/luci-app-mosdns/root/etc/mosdns/config_custom.yaml
@ -0,0 +1,162 @@
+log:
+  level: info
+  file: "/tmp/mosdns.log"
+
+include: []
+
+data_providers:
+  - tag: geoip
+    file: "/usr/share/v2ray/geoip.dat"
+    auto_reload: true
+
+  - tag: geosite
+    file: "/usr/share/v2ray/geosite.dat"
+    auto_reload: true
+
+  - tag: whitelist
+    file: "/etc/mosdns/rule/whitelist.txt"
+    auto_reload: true
+
+  - tag: blocklist
+    file: "/etc/mosdns/rule/blocklist.txt"
+    auto_reload: true
+
+  - tag: hosts
+    file: "/etc/mosdns/rule/hosts.txt"
+    auto_reload: true
+
+  - tag: redirect
+    file: "/etc/mosdns/rule/redirect.txt"
+    auto_reload: true
+
+plugins:
+  - tag: lazy_cache
+    type: cache
+    args:
+      size: 200000
+      lazy_cache_ttl: 259200
+
+  - tag: modify_ttl
+    type: ttl
+    args:
+      minimal_ttl: 0
+      maximum_ttl: 0
+
+  - tag: "forward_local"
+    type: fast_forward
+    args:
+      upstream:
+        - addr: 119.29.29.29
+        - addr: 114.114.114.114
+
+  - tag: "forward_remote"
+    type: fast_forward
+    args:
+      upstream:
+        - addr: tls://8.8.8.8
+        - addr: tls://1.1.1.1
+
+  - tag: query_is_whitelist_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:whitelist"
+
+  - tag: query_is_blocklist_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:blocklist"
+
+  - tag: query_is_hosts_domain
+    type: hosts
+    args:
+      hosts:
+        - "provider:hosts"
+
+  - tag: query_is_redirect_domain
+    type: redirect
+    args:
+      rule:
+        - "provider:redirect"
+
+  - tag: query_is_local_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:geosite:cn"
+
+  - tag: query_is_non_local_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:geosite:geolocation-!cn"
+
+  - tag: response_has_local_ip
+    type: response_matcher
+    args:
+      ip:
+        - "provider:geoip:cn"
+
+  - tag: query_is_ad_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:geosite:category-ads-all"
+
+  - tag: match_qtype65
+    type: query_matcher
+    args:
+      qtype: [65]
+
+  - tag: "main_sequence"
+    type: "sequence"
+    args:
+      exec:
+        - _misc_optm
+        - query_is_hosts_domain
+        - query_is_redirect_domain
+
+        - if: query_is_whitelist_domain
+          exec:
+            - forward_local
+            - modify_ttl
+            - _return
+
+        - if: "query_is_blocklist_domain || query_is_ad_domain || match_qtype65"
+          exec:
+            - _new_nxdomain_response
+            - _return
+
+        - lazy_cache
+
+        - if: query_is_local_domain
+          exec:
+            - forward_local
+            - modify_ttl
+            - _return
+
+        - if: query_is_non_local_domain
+          exec:
+            - _prefer_ipv4
+            - forward_remote
+            - modify_ttl
+            - _return
+        - primary:
+            - forward_local
+            - if: "(! response_has_local_ip) && [_response_valid_answer]"
+              exec:
+                - _drop_response
+          secondary:
+            - _prefer_ipv4
+            - forward_remote
+            - modify_ttl
+          fast_fallback: 200
+
+servers:
+  - exec: main_sequence
+    listeners:
+      - protocol: udp
+        addr: ":5335"
+      - protocol: tcp
+        addr: ":5335"
--- a/luci-app-mosdns/root/etc/mosdns/rule/adlist.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/adlist.txt
--- a/luci-app-mosdns/root/etc/mosdns/rule/blocklist.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/blocklist.txt
--- a/luci-app-mosdns/root/etc/mosdns/rule/greylist.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/greylist.txt
@ -0,0 +1,3 @@
+domain:gstatic.com
+domain:kernel.org
+keyword:github
--- a/luci-app-mosdns/root/etc/mosdns/rule/hosts.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/hosts.txt
--- a/luci-app-mosdns/root/etc/mosdns/rule/local-ptr.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/local-ptr.txt
@ -0,0 +1,87 @@
+0.in-addr.arpa
+10.in-addr.arpa
+127.in-addr.arpa
+16.172.in-addr.arpa
+17.172.in-addr.arpa
+18.172.in-addr.arpa
+19.172.in-addr.arpa
+20.172.in-addr.arpa
+21.172.in-addr.arpa
+22.172.in-addr.arpa
+23.172.in-addr.arpa
+24.172.in-addr.arpa
+25.172.in-addr.arpa
+26.172.in-addr.arpa
+27.172.in-addr.arpa
+28.172.in-addr.arpa
+29.172.in-addr.arpa
+30.172.in-addr.arpa
+31.172.in-addr.arpa
+64.100.in-addr.arpa
+65.100.in-addr.arpa
+66.100.in-addr.arpa
+67.100.in-addr.arpa
+68.100.in-addr.arpa
+69.100.in-addr.arpa
+70.100.in-addr.arpa
+71.100.in-addr.arpa
+72.100.in-addr.arpa
+73.100.in-addr.arpa
+74.100.in-addr.arpa
+75.100.in-addr.arpa
+76.100.in-addr.arpa
+77.100.in-addr.arpa
+78.100.in-addr.arpa
+79.100.in-addr.arpa
+80.100.in-addr.arpa
+81.100.in-addr.arpa
+82.100.in-addr.arpa
+83.100.in-addr.arpa
+84.100.in-addr.arpa
+85.100.in-addr.arpa
+86.100.in-addr.arpa
+87.100.in-addr.arpa
+88.100.in-addr.arpa
+89.100.in-addr.arpa
+90.100.in-addr.arpa
+91.100.in-addr.arpa
+92.100.in-addr.arpa
+93.100.in-addr.arpa
+94.100.in-addr.arpa
+95.100.in-addr.arpa
+96.100.in-addr.arpa
+97.100.in-addr.arpa
+98.100.in-addr.arpa
+99.100.in-addr.arpa
+100.100.in-addr.arpa
+101.100.in-addr.arpa
+102.100.in-addr.arpa
+103.100.in-addr.arpa
+104.100.in-addr.arpa
+105.100.in-addr.arpa
+106.100.in-addr.arpa
+107.100.in-addr.arpa
+108.100.in-addr.arpa
+109.100.in-addr.arpa
+110.100.in-addr.arpa
+111.100.in-addr.arpa
+112.100.in-addr.arpa
+113.100.in-addr.arpa
+114.100.in-addr.arpa
+115.100.in-addr.arpa
+116.100.in-addr.arpa
+117.100.in-addr.arpa
+118.100.in-addr.arpa
+119.100.in-addr.arpa
+120.100.in-addr.arpa
+121.100.in-addr.arpa
+122.100.in-addr.arpa
+123.100.in-addr.arpa
+124.100.in-addr.arpa
+125.100.in-addr.arpa
+126.100.in-addr.arpa
+127.100.in-addr.arpa
+2.0.192.in-addr.arpa
+168.192.in-addr.arpa
+255.255.255.255.in-addr.arpa
+domain:ip6.arpa
--- a/luci-app-mosdns/root/etc/mosdns/rule/redirect.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/redirect.txt
--- a/luci-app-mosdns/root/etc/mosdns/rule/whitelist.txt
+++ b/luci-app-mosdns/root/etc/mosdns/rule/whitelist.txt
@ -0,0 +1,24 @@
+domain:bing.com
+domain:live.com
+domain:msn.com
+domain:ntp.org
+domain:office.com
+domain:qlogo.cn
+domain:qq.com
+domain:redhat.com
+keyword:aaplimg
+keyword:aicdn
+keyword:akadns
+keyword:akamai
+keyword:apple
+keyword:douyin
+keyword:fclouddns
+keyword:icloud
+keyword:itunes
+keyword:microsoft
+keyword:mzstatic
+keyword:ssrcdn
+keyword:windows
+keyword:xxpkg
+keyword:yximgs
+keyword:yxygslb
--- a/luci-app-mosdns/root/etc/uci-defaults/luci-mosdns
+++ b/luci-app-mosdns/root/etc/uci-defaults/luci-mosdns
@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@mosdns[-1]
+	add ucitrack mosdns
+	set ucitrack.@mosdns[-1].init=mosdns
+	commit ucitrack
+EOF
+
+rm -rf /tmp/luci-*
+exit 0
--- a/luci-app-mosdns/root/usr/share/mosdns/default.yaml
+++ b/luci-app-mosdns/root/usr/share/mosdns/default.yaml
@ -0,0 +1,193 @@
+log:
+  level: log_level
+  file: "log_file"
+
+include: []
+
+data_providers:
+  - tag: geoip
+    file: "/usr/share/v2ray/geoip.dat"
+    auto_reload: true
+
+  - tag: geosite
+    file: "/usr/share/v2ray/geosite.dat"
+    auto_reload: true
+
+  - tag: whitelist
+    file: "/etc/mosdns/rule/whitelist.txt"
+    auto_reload: true
+
+  - tag: blocklist
+    file: "/etc/mosdns/rule/blocklist.txt"
+    auto_reload: true
+
+  - tag: greylist
+    file: "/etc/mosdns/rule/greylist.txt"
+    auto_reload: true
+
+  - tag: hosts
+    file: "/etc/mosdns/rule/hosts.txt"
+    auto_reload: true
+
+  - tag: redirect
+    file: "/etc/mosdns/rule/redirect.txt"
+    auto_reload: true
+
+  - tag: local_ptr
+    file: "/etc/mosdns/rule/local-ptr.txt"
+    auto_reload: true
+
+  - tag: adlist
+    file: "/etc/mosdns/rule/adlist.txt"
+    auto_reload: true
+
+plugins:
+  - tag: lazy_cache
+    type: cache
+    args:
+      size: cache_size
+      lazy_cache_ttl: cache_survival_time
+
+  - tag: modify_ttl
+    type: ttl
+    args:
+      minimal_ttl: minimal_ttl_custom
+      maximum_ttl: maximum_ttl_custom
+
+  - tag: "forward_local"
+    type: forward
+    args:
+      upstream:
+        - addr: local_dns
+      bootstrap:
+        - "bootstrap_dns"
+
+  - tag: "forward_remote"
+    type: fast_forward
+    args:
+      upstream:
+        - addr: remote_dns
+
+  - tag: query_is_whitelist_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:whitelist"
+
+  - tag: query_is_blocklist_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:blocklist"
+
+  - tag: query_is_greylist_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:greylist"
+
+  - tag: query_is_hosts_domain
+    type: hosts
+    args:
+      hosts:
+        - "provider:hosts"
+
+  - tag: query_is_redirect_domain
+    type: redirect
+    args:
+      rule:
+        - "provider:redirect"
+
+  - tag: query_is_local_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:geosite:cn"
+
+  - tag: query_is_non_local_domain
+    type: query_matcher
+    args:
+      domain:
+        - "provider:geosite:geolocation-!cn"
+
+  - tag: response_has_local_ip
+    type: response_matcher
+    args:
+      ip:
+        - "provider:geoip:cn"
+
+  - tag: query_is_ad_domain
+    type: query_matcher
+    args:
+      domain:
+        - "adblock"
+
+  - tag: match_local_ptr
+    type: query_matcher
+    args:
+      qtype: [12]
+      domain:
+        - "provider:local_ptr"
+
+  - tag: match_qtype65
+    type: query_matcher
+    args:
+      qtype: [65]
+
+  - tag: "main_sequence"
+    type: "sequence"
+    args:
+      exec:
+        - _misc_optm
+        - query_is_hosts_domain
+        - query_is_redirect_domain
+
+        - if: query_is_whitelist_domain
+          exec:
+            - forward_local
+            - modify_ttl
+            - _return
+
+        - if: "query_is_blocklist_domain || query_is_ad_domain || match_local_ptr || match_qtype65"
+          exec:
+            - _new_nxdomain_response
+            - _return
+
+        - lazy_cache
+
+        - if: query_is_greylist_domain
+          exec:
+            - forward_remote
+            - modify_ttl
+            - _return
+
+        - if: query_is_local_domain
+          exec:
+            - forward_local
+            - modify_ttl
+            - _return
+
+        - if: query_is_non_local_domain
+          exec:
+            - _prefer_ipv4
+            - forward_remote
+            - modify_ttl
+            - _return
+        - primary:
+            - forward_local
+            - if: "(! response_has_local_ip) && [_response_valid_answer]"
+              exec:
+                - _drop_response
+          secondary:
+            - _prefer_ipv4
+            - forward_remote
+            - modify_ttl
+          fast_fallback: 200
+
+servers:
+  - exec: main_sequence
+    listeners:
+      - protocol: udp
+        addr: ":listen_port"
+      - protocol: tcp
+        addr: ":listen_port"
--- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
+++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
@ -0,0 +1,102 @@
+#!/bin/sh
+
+script_action=${1}
+
+logfile_path() (
+	configfile=$(uci -q get mosdns.config.configfile)
+	if [ "$configfile" = "/etc/mosdns/config.yaml" ]; then
+		uci -q get mosdns.config.logfile
+	else
+		[ ! -f /etc/mosdns/config_custom.yaml ] && exit 1
+		awk '/^log:/{f=1;next}f==1{if($0~/file:/){print;exit}if($0~/^[^ ]/)exit}' /etc/mosdns/config_custom.yaml | grep -Eo "/[^'\"]+"
+	fi
+)
+
+interface_dns() (
+	if [ "$(uci -q get mosdns.config.custom_local_dns)" -eq 1 ]; then
+		uci -q get mosdns.config.local_dns
+	else
+		peerdns=$(uci -q get network.wan.peerdns)
+		proto=$(uci -q get network.wan.proto)
+		if [ "$peerdns" = 0 ] || [ "$proto" = "static" ]; then
+			uci -q get network.wan.dns
+		else
+			interface_status=$(ubus call network.interface.wan status)
+			echo $interface_status | jsonfilter -e "@['dns-server'][0]"
+			echo $interface_status | jsonfilter -e "@['dns-server'][1]"
+		fi
+		[ $? -ne 0 ] && echo "119.29.29.29"
+	fi
+)
+
+ad_block() (
+	adblock=$(uci -q get mosdns.config.adblock)
+	if [ "$adblock" -eq 1 ]; then
+		ad_source=$(uci -q get mosdns.config.ad_source)
+		if [ "$ad_source" = "geosite.dat" ]; then
+			echo "provider:geosite:category-ads-all"
+		else
+			echo "provider:adlist"
+		fi
+	else
+		echo "full:disable-category-ads-all.null"
+	fi
+)
+
+adlist_update() (
+	ad_source=$(uci -q get mosdns.config.ad_source)
+	[ "$ad_source" = "geosite.dat" ] || [ -z "$ad_source" ] && exit 0
+	AD_TMPDIR=$(mktemp -d) || exit 1
+	if echo "$ad_source" | grep -Eq "^https://raw.githubusercontent.com" ; then
+		google_status=$(curl -I -4 -m 3 -o /dev/null -s -w %{http_code} http://www.google.com/generate_204)
+		[ "$google_status" -ne "204" ] && mirror="https://ghproxy.com/"
+	fi
+	echo -e "\e[1;32mDownloading $mirror$ad_source\e[0m"
+	curl --connect-timeout 60 -m 90 --ipv4 -fSLo "$AD_TMPDIR/adlist.txt" "$mirror$ad_source"
+	if [ $? -ne 0 ]; then
+		rm -rf "$AD_TMPDIR"
+		exit 1
+	else
+		\cp "$AD_TMPDIR/adlist.txt" /etc/mosdns/rule/adlist.txt
+		echo "$ad_source" > /etc/mosdns/rule/.ad_source
+		rm -rf "$AD_TMPDIR"
+	fi
+)
+
+geodat_update() (
+	geodat_download() (
+		google_status=$(curl -I -4 -m 3 -o /dev/null -s -w %{http_code} http://www.google.com/generate_204)
+		[ "$google_status" -ne "204" ] && mirror="https://ghproxy.com/"
+		echo -e "\e[1;32mDownloading "$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/$1\e[0m"
+		curl --connect-timeout 60 -m 900 --ipv4 -fSLo "$TMPDIR/$1" ""$mirror"https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/$1"
+	)
+	TMPDIR=$(mktemp -d) || exit 1
+	geodat_download geoip.dat && geodat_download geosite.dat
+	if [ $? -ne 0 ]; then
+		rm -rf "$TMPDIR"
+		exit 1
+	fi
+	cp -f "$TMPDIR"/* /usr/share/v2ray
+	rm -rf "$TMPDIR"
+)
+
+case $script_action in
+	"dns")
+		interface_dns
+	;;
+	"ad")
+		ad_block
+	;;
+	"geodata")
+		geodat_update && adlist_update
+	;;
+	"logfile")
+		logfile_path
+	;;
+	"adlist_update")
+		adlist_update
+	;;
+	*)
+		exit 0
+	;;
+esac
--- a/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
+++ b/luci-app-mosdns/root/usr/share/rpcd/acl.d/luci-app-mosdns.json
@ -0,0 +1,11 @@
+{
+	"luci-app-mosdns": {
+		"description": "Grant UCI access for luci-app-mosdns",
+		"read": {
+			"uci": [ "mosdns" ]
+		},
+		"write": {
+			"uci": [ "mosdns" ]
+		}
+	}
+}
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/api.lua
@ -8,8 +8,7 @@ jsonc = require "luci.jsonc"
 i18n = require "luci.i18n"

 appname = "passwall"
-curl = "/usr/bin/curl"
-curl_args = {"-skfL", "--connect-timeout 3", "--retry 3", "-m 60"}
+curl_args = { "-skfL", "--connect-timeout 3", "--retry 3", "-m 60" }
 command_timeout = 300
 LEDE_BOARD = nil
 DISTRIB_TARGET = nil
@ -34,6 +33,39 @@ function base64Decode(text)
 	end
 end

+function curl_base(url, file, args)
+    if not args then args = {} end
+    if file then
+        args[#args + 1] = "-o " .. file
+    end
+	local cmd = string.format('curl %s "%s"', table_join(args), url)
+    if file then
+        return luci.sys.call(cmd .. " > /dev/null")
+    else
+        return trim(luci.sys.exec(cmd))
+    end
+end
+
+function curl_proxy(url, file, args)
+    --使用代理
+    local socks_server = luci.sys.exec("[ -f /tmp/etc/passwall/TCP_SOCKS_server ] && echo -n $(cat /tmp/etc/passwall/TCP_SOCKS_server) || echo -n ''")
+    if socks_server ~= "" then
+        if not args then args = {} end
+        local tmp_args = clone(args)
+        tmp_args[#tmp_args + 1] = "-x socks5h://" .. socks_server
+        return curl_base(url, file, tmp_args)
+    end
+    return nil
+end
+
+function curl_logic(url, file, args)
+    local result = curl_proxy(url, file, args)
+    if not result then
+        result = curl_base(url, file, args)
+    end
+    return result
+end
+
 function url(...)
    local url = string.format("admin/services/%s", appname)
    local args = { ... }
@ -455,6 +487,17 @@ function _unpack(t, i)
    if t[i] ~= nil then return t[i], _unpack(t, i + 1) end
 end

+function table_join(t, s)
+    if not s then
+        s = " "
+    end
+    local str = ""
+    for index, value in ipairs(t) do
+        str = str .. t[index] .. (index == #t and "" or s)
+    end
+    return str
+end
+
 function exec(cmd, args, writer, timeout)
    local os = require "os"
    local nixio = require "nixio"
@ -585,7 +628,7 @@ end

 function get_api_json(url)
    local jsonc = require "luci.jsonc"
-    local json_content = luci.sys.exec(curl .. " " .. _unpack(curl_args) .. " " .. url)
+    local json_content = curl_logic(url, nil, curl_args)
    if json_content == "" then return {} end
    return jsonc.parse(json_content) or {}
 end
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/brook.lua
@ -63,7 +63,7 @@ function to_download(url, size)
        end
    end

-    result = api.exec(api.curl, {api._unpack(api.curl_args), "-o", tmp_file, url}, nil, api.command_timeout) == 0
+    result = api.curl_logic(url, tmp_file, api.curl_args) == 0

    if not result then
        api.exec("/bin/rm", {"-f", tmp_file})
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/hysteria.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/hysteria.lua
@ -63,7 +63,7 @@ function to_download(url, size)
        end
    end

-    result = api.exec(api.curl, {api._unpack(api.curl_args), "-o", tmp_file, url}, nil, api.command_timeout) == 0
+    result = api.curl_logic(url, tmp_file, api.curl_args) == 0

    if not result then
        api.exec("/bin/rm", {"-f", tmp_file})
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/trojan_go.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/trojan_go.lua
@ -71,7 +71,7 @@ function to_download(url, size)
        end
    end

-    result = api.exec(api.curl, {api._unpack(api.curl_args), "-o", tmp_file, url}, nil, api.command_timeout) == 0
+    result = api.curl_logic(url, tmp_file, api.curl_args) == 0

    if not result then
        api.exec("/bin/rm", {"-f", tmp_file})
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/v2ray.lua
@ -69,7 +69,7 @@ function to_download(url, size)
        end
    end

-    result = api.exec(api.curl, {api._unpack(api.curl_args), "-o", tmp_file, url}, nil, api.command_timeout) == 0
+    result = api.curl_logic(url, tmp_file, api.curl_args) == 0

    if not result then
        api.exec("/bin/rm", {"-f", tmp_file})
--- a/luci-app-passwall/luasrc/model/cbi/passwall/api/xray.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/xray.lua
@ -69,7 +69,7 @@ function to_download(url, size)
        end
    end

-    result = api.exec(api.curl, {api._unpack(api.curl_args), "-o", tmp_file, url}, nil, api.command_timeout) == 0
+    result = api.curl_logic(url, tmp_file, api.curl_args) == 0

    if not result then
        api.exec("/bin/rm", {"-f", tmp_file})
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@ -13,18 +13,18 @@ for k, e in ipairs(api.get_valid_nodes()) do
    nodes_table[#nodes_table + 1] = e
 end

+local tcp_socks_server = "127.0.0.1" .. ":" .. (uci:get(appname, "@global[0]", "tcp_node_socks_port") or "1070")
 local socks_table = {}
+socks_table[#socks_table + 1] = {
+    id = tcp_socks_server,
+    remarks = tcp_socks_server .. " - " .. translate("TCP Node")
+}
 uci:foreach(appname, "socks", function(s)
    if s.enabled == "1" and s.node then
        local id, remarks
-        local same, i = s.node:match("^(tcp)")
-        if same then
-            remarks = translatef("Same as the tcp node")
-        else
-            for k, n in pairs(nodes_table) do
-                if (s.node == n.id) then
-                    remarks = n["remark"]; break
-                end
+        for k, n in pairs(nodes_table) do
+            if (s.node == n.id) then
+                remarks = n["remark"]; break
            end
        end
        id = "127.0.0.1" .. ":" .. s.port
@ -169,6 +169,19 @@ udp_node = s:taboption("Main", ListValue, "udp_node", "<a style='color: red'>" .
 udp_node:value("nil", translate("Close"))
 udp_node:value("tcp", translate("Same as the tcp node"))

+tcp_node_socks_port = s:taboption("Main", Value, "tcp_node_socks_port", translate("TCP Node") .. " Socks " .. translate("Listen Port"))
+tcp_node_socks_port.default = 1070
+tcp_node_socks_port.datatype = "port"
+
+--[[
+if has_v2ray or has_xray then
+    tcp_node_http_port = s:taboption("Main", Value, "tcp_node_http_port", translate("TCP Node") .. " HTTP " .. translate("Listen Port") .. " " .. translate("0 is not use"))
+    tcp_node_http_port.default = 0
+    tcp_node_http_port.datatype = "port"
+end
+]]--
+
+
 s:tab("DNS", translate("DNS"))

 o = s:taboption("DNS", Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature."))
@ -211,6 +224,7 @@ end

 o = s:taboption("DNS", Value, "socks_server", translate("Socks Server"), translate("Make sure socks service is available on this address."))
 for k, v in pairs(socks_table) do o:value(v.id, v.remarks) end
+o.default = socks_table[1].id
 o.validate = function(self, value, t)
    if not datatypes.ipaddrport(value) then
        return nil, translate("Socks Server") .. " " .. translate("Not valid IP format, please re-enter!")
@ -398,9 +412,8 @@ o.default = 1
 o.rmempty = false

 socks_node = s:option(ListValue, "node", translate("Socks Node"))
-socks_node:value("tcp", translate("Same as the tcp node"))

-local n = 0
+local n = 1
 uci:foreach(appname, "socks", function(s)
    if s[".name"] == section then
        return false
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
@ -35,11 +35,6 @@ m = Map(appname)
 s = m:section(TypedSection, "global_subscribe", "")
 s.anonymous = true

---- Subscribe via proxy
-o = s:option(Flag, "subscribe_proxy", translate("Subscribe via proxy"))
-o.default = 0
-o.rmempty = false
-
 o = s:option(ListValue, "filter_keyword_mode", translate("Filter keyword Mode"))
 o:value("0", translate("Close"))
 o:value("1", translate("Discard List"))
--- a/luci-app-passwall/luasrc/view/passwall/global/footer.htm
+++ b/luci-app-passwall/luasrc/view/passwall/global/footer.htm
@ -45,49 +45,52 @@ local auto_switch = api.uci_get_type("auto_switch", "enable", 0)
 			for (var i = 0; i < node.childNodes.length; i++) {
 				if (node.childNodes[i].childNodes && node.childNodes[i].childNodes.length > 0) {
 					for (var k = 0; k < node.childNodes[i].childNodes.length; k++) {
-						var dom = node.childNodes[i].childNodes[k];
-						if (dom.id) {
-							var s = dom.id.match(reg1);
-							if (s) {
-								dom_id = dom.id.split("cbi-").join("cbid-").split("-").join(".");
-								var node_select = document.getElementsByName(dom_id)[0];
-								var node_select_value = node_select.value;
-								if (node_select_value && node_select_value != "nil" && node_select_value.indexOf("_default") != 0 && node_select_value.indexOf("_direct") != 0 && node_select_value.indexOf("_blackhole") != 0) {
-									if (global_id != null && node_select_value.indexOf("tcp") == 0) {
-										var d = global_id + "-tcp_node";
-										d = d.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
-										var dom = document.getElementsByName(d)[0];
-										var _node_select_value = dom.value;
-										if (_node_select_value && _node_select_value != "nil") {
-											node_select_value = _node_select_value;
+						try {
+							var dom = node.childNodes[i].childNodes[k];
+							if (dom.id) {
+								var s = dom.id.match(reg1);
+								if (s) {
+									dom_id = dom.id.split("cbi-").join("cbid-").split("-").join(".");
+									var node_select = document.getElementsByName(dom_id)[0];
+									var node_select_value = node_select.value;
+									if (node_select_value && node_select_value != "nil" && node_select_value.indexOf("_default") != 0 && node_select_value.indexOf("_direct") != 0 && node_select_value.indexOf("_blackhole") != 0) {
+										if (global_id != null && node_select_value.indexOf("tcp") == 0) {
+											var d = global_id + "-tcp_node";
+											d = d.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
+											var dom = document.getElementsByName(d)[0];
+											var _node_select_value = dom.value;
+											if (_node_select_value && _node_select_value != "nil") {
+												node_select_value = _node_select_value;
+											}
 										}
+										var v = document.getElementById(dom_id + "-" + node_select_value);
+										if (v) {
+											node_select.title = v.text;
+										} else {
+											node_select.title = node_select.options[node_select.options.selectedIndex].text;
+										}
+										
+										var new_html = "";
+										
+										var new_a = document.createElement("a");
+										new_a.innerHTML = "<%:Edit%>";
+										new_a.href = "#";
+										new_a.setAttribute("onclick", "location.href='" + '<%=api.url("node_config")%>' + "/" + node_select_value + "'");
+										new_html = new_a.outerHTML;
+										
+										if (s[0] == "tcp" || s[0] == "udp") {
+											var log_a = document.createElement("a");
+											log_a.innerHTML = "<%:Log%>";
+											log_a.href = "#";
+											log_a.setAttribute("onclick", "window.open('" + '<%=api.url("get_redir_log")%>' + "?proto=" + s[0] + "', '_blank')");
+											new_html += "&nbsp&nbsp" + log_a.outerHTML;
+										}
+										
+										node_select.insertAdjacentHTML("afterend", "&nbsp&nbsp" + new_html);
 									}
-									var v = document.getElementById(dom_id + "-" + node_select_value);
-									if (v) {
-										node_select.title = v.text;
-									} else {
-										node_select.title = node_select.options[node_select.options.selectedIndex].text;
-									}
-									
-									var new_html = "";
-									
-									var new_a = document.createElement("a");
-									new_a.innerHTML = "<%:Edit%>";
-									new_a.href = "#";
-									new_a.setAttribute("onclick", "location.href='" + '<%=api.url("node_config")%>' + "/" + node_select_value + "'");
-									new_html = new_a.outerHTML;
-									
-									if (s[0] == "tcp" || s[0] == "udp") {
-										var log_a = document.createElement("a");
-										log_a.innerHTML = "<%:Log%>";
-										log_a.href = "#";
-										log_a.setAttribute("onclick", "window.open('" + '<%=api.url("get_redir_log")%>' + "?proto=" + s[0] + "', '_blank')");
-										new_html += "&nbsp&nbsp" + log_a.outerHTML;
-									}
-									
-									node_select.insertAdjacentHTML("afterend", "&nbsp&nbsp" + new_html);
 								}
 							}
+						} catch(err) {
 						}
 					}
 				}
@ -102,37 +105,31 @@ local auto_switch = api.uci_get_type("auto_switch", "enable", 0)
 			descr.outerHTML = socks_enabled_dom.outerHTML;
 			rows = socks.getElementsByClassName("cbi-section-table-row");
 			for (var i = 0; i < rows.length; i++) {
-				var row = rows[i];
-				var id = row.id;
-				if (!id) continue;
-				var dom_id = id + "-node";
-				var node = document.getElementById(dom_id);
-				var dom_id = dom_id.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
-				var node_select = document.getElementsByName(dom_id)[0];
-				var node_select_value = node_select.value;
-				if (node_select_value && node_select_value != "nil") {
-					if (global_id != null && node_select_value.indexOf("tcp") == 0) {
-						var d = global_id + "-tcp_node";
-						d = d.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
-						var dom = document.getElementsByName(d)[0];
-						var _node_select_value = dom.value;
-						if (_node_select_value && _node_select_value != "nil") {
-							node_select_value = _node_select_value;
+				try {
+					var row = rows[i];
+					var id = row.id;
+					if (!id) continue;
+					var dom_id = id + "-node";
+					var node = document.getElementById(dom_id);
+					var dom_id = dom_id.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
+					var node_select = document.getElementsByName(dom_id)[0];
+					var node_select_value = node_select.value;
+					if (node_select_value && node_select_value != "nil") {
+						var v = document.getElementById(dom_id + "-" + node_select_value);
+						if (v) {
+							node_select.title = v.text;
+						} else {
+							node_select.title = node_select.options[node_select.options.selectedIndex].text;
 						}
+						
+						var new_a = document.createElement("a");
+						new_a.innerHTML = "<%:Edit%>";
+						new_a.href = "#";
+						new_a.setAttribute("onclick","location.href='" + '<%=api.url("node_config")%>' + "/" + node_select_value + "'");
+						
+						node_select.insertAdjacentHTML("afterend", "&nbsp&nbsp" + new_a.outerHTML);
 					}
-					var v = document.getElementById(dom_id + "-" + node_select_value);
-					if (v) {
-						node_select.title = v.text;
-					} else {
-						node_select.title = node_select.options[node_select.options.selectedIndex].text;
-					}
-					
-					var new_a = document.createElement("a");
-					new_a.innerHTML = "<%:Edit%>";
-					new_a.href = "#";
-					new_a.setAttribute("onclick","location.href='" + '<%=api.url("node_config")%>' + "/" + node_select_value + "'");
-					
-					node_select.insertAdjacentHTML("afterend", "&nbsp&nbsp" + new_a.outerHTML);
+				} catch(err) {
 				}
 			}
 		}
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@ -4,6 +4,7 @@ config global
 	option socks_enabled '0'
 	option tcp_node 'nil'
 	option udp_node 'nil'
+	option tcp_node_socks_port '1070'
 	option dns_mode 'dns2tcp'
 	option remote_dns '1.1.1.1'
 	option filter_proxy_ipv6 '0'
@ -67,7 +68,6 @@ config global_app
 	option hysteria_file '/usr/bin/hysteria'

 config global_subscribe
-	option subscribe_proxy '0'
 	option filter_keyword_mode '1'
 	list filter_discard_list '过期时间'
 	list filter_discard_list '剩余流量'
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@ -658,12 +658,12 @@ run_redir() {
 			[ "$tcp_node_socks" = "1" ] && {
 				tcp_node_socks_flag=1
 				_v2ray_args="${_v2ray_args} socks_port=${tcp_node_socks_port}"
-				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS_$tcp_node_socks_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS/g")
 			}
 			[ "$tcp_node_http" = "1" ] && {
 				tcp_node_http_flag=1
 				_v2ray_args="${_v2ray_args} http_port=${tcp_node_http_port}"
-				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP_$tcp_node_http_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP/g")
 			}
 			[ "$TCP_UDP" = "1" ] && {
 				UDP_REDIR_PORT=$local_port
@ -767,12 +767,12 @@ run_redir() {
 			[ "$tcp_proxy_way" = "tproxy" ] && _extra_param="${_extra_param} -tcp_tproxy true"
 			[ "$tcp_node_socks" = "1" ] && {
 				tcp_node_socks_flag=1
-				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS_$tcp_node_socks_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS/g")
 				_extra_param="${_extra_param} -local_socks_port ${tcp_node_socks_port}"
 			}
 			[ "$tcp_node_http" = "1" ] && {
 				tcp_node_http_flag=1
-				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP_$tcp_node_http_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP/g")
 				_extra_param="${_extra_param} -local_http_port ${tcp_node_http_port}"
 			}
 			[ "$TCP_UDP" = "1" ] && {
@ -788,12 +788,12 @@ run_redir() {
 			local _extra_param="-local_tcp_redir_port $local_port"
 			[ "$tcp_node_socks" = "1" ] && {
 				tcp_node_socks_flag=1
-				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS_$tcp_node_socks_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_SOCKS/g")
 				_extra_param="${_extra_param} -local_socks_port ${tcp_node_socks_port}"
 			}
 			[ "$tcp_node_http" = "1" ] && {
 				tcp_node_http_flag=1
-				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP_$tcp_node_http_id/g")
+				config_file=$(echo $config_file | sed "s/TCP/TCP_HTTP/g")
 				_extra_param="${_extra_param} -local_http_port ${tcp_node_http_port}"
 			}
 			[ "$TCP_UDP" = "1" ] && {
@ -826,16 +826,20 @@ run_redir() {
 		[ -z "$tcp_node_socks_flag" ] && {
 			[ "$tcp_node_socks" = "1" ] && {
 				local port=$tcp_node_socks_port
-				local config_file="SOCKS_$tcp_node_socks_id.json"
-				local log_file="SOCKS_$tcp_node_socks_id.log"
+				local config_file="SOCKS_TCP.json"
+				local log_file="SOCKS_TCP.log"
 				local http_port=0
-				local http_config_file="HTTP2SOCKS_$tcp_node_http_id.json"
+				local http_config_file="HTTP2SOCKS_TCP.json"
 				[ "$tcp_node_http" = "1" ] && [ -z "$tcp_node_http_flag" ] && {
 					http_port=$tcp_node_http_port
 				}
-				run_socks flag=$tcp_node_socks_id node=$node bind=0.0.0.0 socks_port=$port config_file=$config_file http_port=$http_port http_config_file=$http_config_file
+				run_socks flag=TCP node=$node bind=0.0.0.0 socks_port=$port config_file=$config_file http_port=$http_port http_config_file=$http_config_file
 			}
 		}
+		
+		[ "$tcp_node_socks" = "1" ] && {
+			echo "127.0.0.1:$tcp_node_socks_port" > $TMP_PATH/TCP_SOCKS_server
+		}
 	;;
 	esac
 	unset tcp_node_socks_flag tcp_node_http_flag
@ -856,26 +860,6 @@ node_switch() {
 		local log_file="${FLAG}.log"
 		local port=$(cat $TMP_PORT_PATH/${FLAG})
 		
-		[ "$SOCKS_ENABLED" = "1" ] && {
-			local ids=$(uci show $CONFIG | grep "=socks" | awk -F '.' '{print $2}' | awk -F '=' '{print $1}')
-			for id in $ids; do
-				[ "$(config_n_get $id enabled 0)" = "0" ] && continue
-				[ "$(config_n_get $id node nil)" != "tcp" ] && continue
-				local socks_port=$(config_n_get $id port)
-				local http_port=$(config_n_get $id http_port 0)
-				pgrep -af "${TMP_PATH}.*${id}" | awk 'BEGIN{IGNORECASE=1}/SOCKS/{print $1}' | xargs kill -9 >/dev/null 2>&1
-				tcp_node_socks=1
-				tcp_node_socks_port=$socks_port
-				tcp_node_socks_id=$id
-				[ "$http_port" != "0" ] && {
-					tcp_node_http=1
-					tcp_node_http_port=$http_port
-					tcp_node_http_id=$id
-				}
-				break
-			done
-		}
-		
 		[ "$shunt_logic" != "0" ] && {
 			local node=$(config_t_get global ${flag}_node nil)
 			[ "$(config_n_get $node protocol nil)" = "_shunt" ] && {
@ -939,6 +923,10 @@ start_redir() {
 }

 start_socks() {
+	tcp_node_socks=1
+	tcp_node_socks_port=$(config_t_get global tcp_node_socks_port 1070)
+	tcp_node_http_port=$(config_t_get global tcp_node_http_port 0)
+	[ "$tcp_node_http_port" != "0" ] && tcp_node_http=1
 	[ "$SOCKS_ENABLED" = "1" ] && {
 		local ids=$(uci show $CONFIG | grep "=socks" | awk -F '.' '{print $2}' | awk -F '=' '{print $1}')
 		[ -n "$ids" ] && {
@ -953,17 +941,6 @@ start_socks() {
 				local log_file="SOCKS_${id}.log"
 				local http_port=$(config_n_get $id http_port 0)
 				local http_config_file="HTTP2SOCKS_${id}.json"
-				[ "$node" == "tcp" ] && {
-					tcp_node_socks=1
-					tcp_node_socks_port=$port
-					tcp_node_socks_id=$id
-					[ "$http_port" != "0" ] && {
-						tcp_node_http=1
-						tcp_node_http_port=$http_port
-						tcp_node_http_id=$id
-					}
-					continue
-				}
 				run_socks flag=$id node=$node bind=0.0.0.0 socks_port=$port config_file=$config_file http_port=$http_port http_config_file=$http_config_file
 				echo $node > $TMP_ID_PATH/SOCKS_${id}
 			done
--- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua
+++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq_add.lua
@ -166,9 +166,8 @@ end
 local dnsmasq_default_dns

 local cache_text = ""
-local subscribe_proxy=uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0"
 local new_rules = luci.sys.exec("echo -n $(find /usr/share/passwall/rules -type f | xargs md5sum)")
-local new_text = TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. REMOTE_FAKEDNS .. CHINADNS_DNS .. PROXY_MODE .. NO_PROXY_IPV6 .. subscribe_proxy .. new_rules .. NFTFLAG
+local new_text = TMP_DNSMASQ_PATH .. DNSMASQ_CONF_FILE .. DEFAULT_DNS .. LOCAL_DNS .. TUN_DNS .. REMOTE_FAKEDNS .. CHINADNS_DNS .. PROXY_MODE .. NO_PROXY_IPV6 .. new_rules .. NFTFLAG
 if fs.access(CACHE_TEXT_FILE) then
    for line in io.lines(CACHE_TEXT_FILE) do
        cache_text = line
@ -227,33 +226,9 @@ if not fs.access(CACHE_DNS_PATH) then
    end
    log(string.format("  - 域名白名单(whitelist)：%s", LOCAL_DNS or "默认"))

-    local fwd_dns = LOCAL_DNS
-    local ipset_flag = setflag_4 .. "whitelist," .. setflag_6 .. "whitelist6"
+    local fwd_dns
+    local ipset_flag
    local no_ipv6
-    if subscribe_proxy == "1" then
-        fwd_dns = TUN_DNS
-        ipset_flag = setflag_4 .. "blacklist," .. setflag_6 .. "blacklist6"
-        if NO_PROXY_IPV6 == "1" then
-            ipset_flag = setflag_4 .. "blacklist"
-            no_ipv6 = true
-        end
-        if not only_global then
-            if REMOTE_FAKEDNS == "1" then
-                ipset_flag = nil
-            end
-        end
-    end
-    uci:foreach(appname, "subscribe_list", function(t)
-        local domain = get_domain_from_url(t.url)
-        if domain then
-            if no_ipv6 then
-                set_domain_address(domain, "::")
-            end
-            set_domain_dns(domain, fwd_dns)
-            set_domain_ipset(domain, ipset_flag)
-        end
-    end)
-    log(string.format("  - 节点订阅域名(blacklist)：%s", fwd_dns or "默认"))

    --始终使用远程DNS解析代理（黑名单）列表
    for line in io.lines("/usr/share/passwall/rules/proxy_host") do
--- a/luci-app-passwall/root/usr/share/passwall/iptables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh
@ -1137,10 +1137,6 @@ add_firewall_rule() {
 			msg="Socks 服务 [:${port}]"
 			if [ "$node" == "nil" ] || [ "$port" == "0" ]; then
 				msg="${msg} 未配置完全，略过"
-			elif [ "$(echo $node | grep ^tcp)" ]; then
-				#eval "node=\${TCP_NODE}"
-				#msg="${msg} 使用与 TCP 代理自动切换${num} 相同的节点，延后处理"
-				continue
 			else
 				filter_node $node TCP > /dev/null 2>&1 &
 				filter_node $node UDP > /dev/null 2>&1 &
@ -1155,7 +1151,7 @@ add_firewall_rule() {
 		eval "node=\${${stream}_NODE}"
 		eval "port=\${${stream}_REDIR_PORT}"
 		#echolog "分析 $stream 代理自动切换..."
-		[ "$node" == "tcp" ] && [ "$stream" == "UDP" ] && {
+		[ "$stream" == "UDP" ] && [ "$node" == "tcp" ] && {
 			eval "node=\${TCP_NODE}"
 			eval "port=\${TCP_REDIR_PORT}"
 		}
--- a/luci-app-passwall/root/usr/share/passwall/nftables.sh
+++ b/luci-app-passwall/root/usr/share/passwall/nftables.sh
@ -1143,10 +1143,6 @@ add_firewall_rule() {
 			msg="Socks 服务 [:${port}]"
 			if [ "$node" == "nil" ] || [ "$port" == "0" ]; then
 				msg="${msg} 未配置完全，略过"
-			elif [ "$(echo $node | grep ^tcp)" ]; then
-				#eval "node=\${TCP_NODE}"
-				#msg="${msg} 使用与 TCP 代理自动切换${num} 相同的节点，延后处理"
-				continue
 			else
 				filter_node $node TCP > /dev/null 2>&1 &
 				filter_node $node UDP > /dev/null 2>&1 &
@ -1161,7 +1157,7 @@ add_firewall_rule() {
 		eval "node=\${${stream}_NODE}"
 		eval "port=\${${stream}_REDIR_PORT}"
 		#echolog "分析 $stream 代理自动切换..."
-		[ "$node" == "tcp" ] && [ "$stream" == "UDP" ] && {
+		[ "$stream" == "UDP" ] && [ "$node" == "tcp" ] && {
 			eval "node=\${TCP_NODE}"
 			eval "port=\${TCP_REDIR_PORT}"
 		}
--- a/luci-app-passwall/root/usr/share/passwall/rule_update.lua
+++ b/luci-app-passwall/root/usr/share/passwall/rule_update.lua
@ -57,19 +57,21 @@ end

 -- curl
 local function curl(url, file, valifile)
-	local cmd = "curl -skL -w %{http_code} --retry 3 --connect-timeout 3 '" .. url .. "'"
+	local args = {
+		"-sKL", "-w %{http_code}", "--retry 3", "--connect-timeout 3"
+	}
 	if file then
-		cmd = cmd .. " -o " .. file
+		args[#args + 1] = "-o " .. file
 	end
 	if valifile then
-		cmd = cmd .. " --dump-header " .. valifile
+		args[#args + 1] = "--dump-header " .. valifile
 	end
-	local stdout = luci.sys.exec(cmd)
+	local result = api.curl_logic(url, nil, args)

 	if file then
-		return tonumber(trim(stdout))
+		return tonumber(trim(result))
 	else
-		return trim(stdout)
+		return trim(result)
 	end
 end

--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@ -830,30 +830,15 @@ local function processData(szType, content, add_mode, add_from)
 	return result
 end

-- curl
 local function curl(url, file, ua)
 	if not ua or ua == "" then
 		ua = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.122 Safari/537.36"
 	end
-	local stdout = ""
-	local cmd = string.format('curl -skL --user-agent "%s" --retry 3 --connect-timeout 3 "%s"', ua, url)
-	if file then
-		cmd = cmd .. " -o " .. file
-		stdout = luci.sys.call(cmd .. " > /dev/null")
-		return stdout
-	else
-		stdout = luci.sys.exec(cmd)
-		return trim(stdout)
-	end
-
-	if not stdout or #stdout <= 0 then
-		if uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0" == "1" and uci:get(appname, "@global[0]", "enabled") or "0" == "1" then
-			log('通过代理订阅失败，尝试关闭代理订阅。')
-			luci.sys.call("/etc/init.d/" .. appname .. " stop > /dev/null")
-			stdout = luci.sys.exec(string.format('curl -skL --user-agent "%s" -k --retry 3 --connect-timeout 3 "%s"', ua, url))
-		end
-	end
-	return trim(stdout)
+	local args = {
+		"-skL", "--retry 3", "--connect-timeout 3", '--user-agent "' .. ua .. '"'
+	}
+	local result = api.curl_logic(url, file, args)
+    return result
 end

 local function truncate_nodes(add_from)
@ -1146,7 +1131,7 @@ end
 local execute = function()
 	do
 		local subscribe_list = {}
-		local retry = {}
+		local fail_list = {}
 		if arg[2] then
 			string.gsub(arg[2], '[^' .. "," .. ']+', function(w)
 				subscribe_list[#subscribe_list + 1] = uci:get_all(appname, w) or {}
@ -1201,7 +1186,7 @@ local execute = function()
 				os.remove("/tmp/" .. cfgid)
 				parse_link(raw, "2", remark)
 			else
-				retry[#retry + 1] = value
+				fail_list[#fail_list + 1] = value
 			end
 			allowInsecure_default = nil
 			filter_keyword_mode_default = uci:get(appname, "@global_subscribe[0]", "filter_keyword_mode") or "0"
@ -1211,13 +1196,9 @@ local execute = function()
 			trojan_type_default = uci:get(appname, "@global_subscribe[0]", "trojan_type") or "trojan-plus"
 		end

-		if #retry > 0 then
-			for index, value in ipairs(retry) do
-				if (uci:get(appname, "@global_subscribe[0]", "subscribe_proxy") or "0") == "1" and (uci:get(appname, "@global[0]", "enabled") or "0") == "1" then
-					log(value.remark .. '订阅失败，请尝试关闭代理后再订阅。')
-				else
-					log(value.remark .. '订阅失败，可能是订阅地址失效，或是网络问题，请诊断！')
-				end
+		if #fail_list > 0 then
+			for index, value in ipairs(fail_list) do
+				log(value.remark .. '订阅失败，可能是订阅地址失效，或是网络问题，请诊断！')
 			end
 		end
 		update_node(0)
--- a/luci-app-passwall2/Makefile
+++ b/luci-app-passwall2/Makefile
@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-passwall2
-PKG_VERSION:=1.7
+PKG_VERSION:=1.8
 PKG_RELEASE:=1

 PKG_CONFIG_DEPENDS:= \
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray.lua
@ -19,19 +19,10 @@ local local_http_username = var["-local_http_username"]
 local local_http_password = var["-local_http_password"]
 local dns_listen_port = var["-dns_listen_port"]
 local dns_query_strategy = var["-dns_query_strategy"]
-local direct_dns_server = var["-direct_dns_server"]
 local direct_dns_port = var["-direct_dns_port"]
 local direct_dns_udp_server = var["-direct_dns_udp_server"]
-local direct_dns_tcp_server = var["-direct_dns_tcp_server"]
-local direct_dns_doh_url = var["-direct_dns_doh_url"]
-local direct_dns_doh_host = var["-direct_dns_doh_host"]
-local remote_dns_server = var["-remote_dns_server"]
 local remote_dns_port = var["-remote_dns_port"]
 local remote_dns_udp_server = var["-remote_dns_udp_server"]
-local remote_dns_tcp_server = var["-remote_dns_tcp_server"]
-local remote_dns_doh_url = var["-remote_dns_doh_url"]
-local remote_dns_doh_host = var["-remote_dns_doh_host"]
-local remote_dns_client_ip = var["-remote_dns_client_ip"]
 local remote_dns_fake = var["-remote_dns_fake"]
 local dns_cache = var["-dns_cache"]
 local dns_direct_domains = {}
@ -595,7 +586,7 @@ if true then
    end
 end

-if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
+if remote_dns_udp_server or remote_dns_fake then
    local rules = {}
    local _remote_dns_proto

@ -613,7 +604,6 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
        disableFallback = true,
        disableFallbackIfMatch = true,
        servers = {},
-        clientIp = (remote_dns_client_ip and remote_dns_client_ip ~= "") and remote_dns_client_ip or nil,
        queryStrategy = (dns_query_strategy and dns_query_strategy ~= "") and dns_query_strategy or "UseIPv4"
    }

@ -652,25 +642,19 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
            _remote_dns.address = remote_dns_udp_server
            _remote_dns.port = tonumber(remote_dns_port) or 53
            _remote_dns_proto = "udp"
-        end

-        if remote_dns_tcp_server then
-            _remote_dns.address = remote_dns_tcp_server
-            _remote_dns.port = tonumber(remote_dns_port) or 53
-            _remote_dns_proto = "tcp"
-        end
-
-        if remote_dns_doh_url and remote_dns_doh_host then
-            if remote_dns_server and remote_dns_doh_host ~= remote_dns_server and not api.is_ip(remote_dns_doh_host) then
-                dns.hosts[remote_dns_doh_host] = remote_dns_server
-            end
-            _remote_dns.address = remote_dns_doh_url
-            _remote_dns.port = tonumber(remote_dns_port) or 443
-            _remote_dns_proto = "tcp"
+            table.insert(routing.rules, 1, {
+                type = "field",
+                ip = {
+                    remote_dns_udp_server
+                },
+                port = tonumber(remote_dns_port) or 53,
+                network = "udp",
+                outboundTag = "direct"
+            })
        end

        if remote_dns_fake then
-            remote_dns_server = "1.1.1.1"
            fakedns = {}
            fakedns[#fakedns + 1] = {
                ipPool = "198.18.0.0/16",
@ -714,19 +698,6 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
            })
        end

-        if direct_dns_tcp_server then
-            _direct_dns.address = direct_dns_tcp_server:gsub("tcp://", "tcp+local://")
-            _direct_dns.port = tonumber(direct_dns_port) or 53
-        end
-
-        if direct_dns_doh_url and direct_dns_doh_host then
-            if direct_dns_server and direct_dns_doh_host ~= direct_dns_server and not api.is_ip(direct_dns_doh_host) then
-                dns.hosts[direct_dns_doh_host] = direct_dns_server
-            end
-            _direct_dns.address = direct_dns_doh_url:gsub("https://", "https+local://")
-            _direct_dns.port = tonumber(direct_dns_port) or 443
-        end
-
        table.insert(dns.servers, _direct_dns)
    end

@ -737,7 +708,7 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
            protocol = "dokodemo-door",
            tag = "dns-in",
            settings = {
-                address = remote_dns_server or "1.1.1.1",
+                address = "1.1.1.1",
                port = 53,
                network = "tcp,udp"
            }
@ -747,7 +718,7 @@ if remote_dns_server or remote_dns_doh_url or remote_dns_fake then
            tag = "dns-out",
            protocol = "dns",
            settings = {
-                address = remote_dns_server or "1.1.1.1",
+                address = "1.1.1.1",
                port = tonumber(remote_dns_port) or 53,
                network = _remote_dns_proto or "tcp",
            }
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray_dns.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/api/gen_v2ray_dns.lua
@ -0,0 +1,245 @@
+module("luci.model.cbi.passwall2.api.gen_v2ray_dns", package.seeall)
+local api = require "luci.model.cbi.passwall2.api.api"
+
+local var = api.get_args(arg)
+local dns_listen_port = var["-dns_listen_port"]
+local dns_query_strategy = var["-dns_query_strategy"]
+local dns_out_tag = var["-dns_out_tag"]
+local dns_client_ip = var["-dns_client_ip"]
+local direct_dns_server = var["-direct_dns_server"]
+local direct_dns_port = var["-direct_dns_port"]
+local direct_dns_udp_server = var["-direct_dns_udp_server"]
+local direct_dns_tcp_server = var["-direct_dns_tcp_server"]
+local direct_dns_doh_url = var["-direct_dns_doh_url"]
+local direct_dns_doh_host = var["-direct_dns_doh_host"]
+local remote_dns_server = var["-remote_dns_server"]
+local remote_dns_port = var["-remote_dns_port"]
+local remote_dns_udp_server = var["-remote_dns_udp_server"]
+local remote_dns_tcp_server = var["-remote_dns_tcp_server"]
+local remote_dns_doh_url = var["-remote_dns_doh_url"]
+local remote_dns_doh_host = var["-remote_dns_doh_host"]
+local remote_dns_outbound_socks_address = var["-remote_dns_outbound_socks_address"]
+local remote_dns_outbound_socks_port = var["-remote_dns_outbound_socks_port"]
+local remote_dns_fake = var["-remote_dns_fake"]
+local dns_cache = var["-dns_cache"]
+local loglevel = var["-loglevel"] or "warning"
+
+local jsonc = api.jsonc
+local dns = nil
+local fakedns = nil
+local inbounds = {}
+local outbounds = {}
+local routing = nil
+
+function gen_outbound(tag, proto, address, port, username, password)
+    local result = {
+        tag = tag,
+        protocol = proto,
+        streamSettings = {
+            network = "tcp",
+            security = "none"
+        },
+        settings = {
+            servers = {
+                {
+                    address = address,
+                    port = tonumber(port),
+                    users = (username and password) and {
+                        {
+                            user = username,
+                            pass = password
+                        }
+                    } or nil
+                }
+            }
+        }
+    }
+    return result
+end
+
+if dns_listen_port then
+    routing = {
+        domainStrategy = "IPOnDemand",
+        rules = {}
+    }
+
+    dns = {
+        tag = "dns-in1",
+        hosts = {},
+        disableCache = (dns_cache and dns_cache == "0") and true or false,
+        disableFallback = true,
+        disableFallbackIfMatch = true,
+        servers = {},
+        clientIp = (dns_client_ip and dns_client_ip ~= "") and dns_client_ip or nil,
+        queryStrategy = (dns_query_strategy and dns_query_strategy ~= "") and dns_query_strategy or "UseIPv4"
+    }
+
+    local tmp_dns_server, tmp_dns_port, tmp_dns_proto
+
+    if dns_out_tag == "remote" then
+        local _remote_dns = {
+            _flag = "remote"
+        }
+
+        if remote_dns_udp_server then
+            _remote_dns.address = remote_dns_udp_server
+            _remote_dns.port = tonumber(remote_dns_port) or 53
+            tmp_dns_proto = "udp"
+        end
+
+        if remote_dns_tcp_server then
+            _remote_dns.address = remote_dns_tcp_server
+            _remote_dns.port = tonumber(remote_dns_port) or 53
+            tmp_dns_proto = "tcp"
+        end
+
+        if remote_dns_doh_url and remote_dns_doh_host then
+            if remote_dns_server and remote_dns_doh_host ~= remote_dns_server and not api.is_ip(remote_dns_doh_host) then
+                dns.hosts[remote_dns_doh_host] = remote_dns_server
+            end
+            _remote_dns.address = remote_dns_doh_url
+            _remote_dns.port = tonumber(remote_dns_port) or 443
+            tmp_dns_proto = "tcp"
+        end
+
+        if remote_dns_fake then
+            remote_dns_server = "1.1.1.1"
+            fakedns = {}
+            fakedns[#fakedns + 1] = {
+                ipPool = "198.18.0.0/16",
+                poolSize = 65535
+            }
+            if dns_query_strategy == "UseIP" then
+                fakedns[#fakedns + 1] = {
+                    ipPool = "fc00::/18",
+                    poolSize = 65535
+                }
+            end
+            _remote_dns.address = "fakedns"
+        end
+
+        tmp_dns_server = remote_dns_server
+
+        tmp_dns_port = remote_dns_port
+
+        table.insert(dns.servers, _remote_dns)
+
+        table.insert(outbounds, 1, gen_outbound("remote", "socks", remote_dns_outbound_socks_address, remote_dns_outbound_socks_port))
+    elseif dns_out_tag == "direct" then
+        local _direct_dns = {
+            _flag = "direct"
+        }
+
+        if direct_dns_udp_server then
+            _direct_dns.address = direct_dns_udp_server
+            _direct_dns.port = tonumber(direct_dns_port) or 53
+            table.insert(routing.rules, 1, {
+                type = "field",
+                ip = {
+                    direct_dns_udp_server
+                },
+                port = tonumber(direct_dns_port) or 53,
+                network = "udp",
+                outboundTag = "direct"
+            })
+        end
+
+        if direct_dns_tcp_server then
+            _direct_dns.address = direct_dns_tcp_server:gsub("tcp://", "tcp+local://")
+            _direct_dns.port = tonumber(direct_dns_port) or 53
+        end
+
+        if direct_dns_doh_url and direct_dns_doh_host then
+            if direct_dns_server and direct_dns_doh_host ~= direct_dns_server and not api.is_ip(direct_dns_doh_host) then
+                dns.hosts[direct_dns_doh_host] = direct_dns_server
+            end
+            _direct_dns.address = direct_dns_doh_url:gsub("https://", "https+local://")
+            _direct_dns.port = tonumber(direct_dns_port) or 443
+        end
+
+        tmp_dns_server = direct_dns_server
+
+        tmp_dns_port = direct_dns_port
+
+        table.insert(dns.servers, _direct_dns)
+
+        table.insert(outbounds, 1, {
+            protocol = "freedom",
+            tag = "direct",
+            settings = {
+                domainStrategy = (dns_query_strategy and dns_query_strategy ~= "") and dns_query_strategy or "UseIPv4"
+            },
+            streamSettings = {
+                sockopt = {
+                    mark = 255
+                }
+            }
+        })
+    end
+
+    local dns_hosts_len = 0
+    for key, value in pairs(dns.hosts) do
+        dns_hosts_len = dns_hosts_len + 1
+    end
+
+    if dns_hosts_len == 0 then
+        dns.hosts = nil
+    end
+
+    table.insert(inbounds, {
+        listen = "127.0.0.1",
+        port = tonumber(dns_listen_port),
+        protocol = "dokodemo-door",
+        tag = "dns-in",
+        settings = {
+            address = tmp_dns_server or "1.1.1.1",
+            port = 53,
+            network = "tcp,udp"
+        }
+    })
+
+    table.insert(outbounds, {
+        tag = "dns-out",
+        protocol = "dns",
+        settings = {
+            address = tmp_dns_server or "1.1.1.1",
+            port = tonumber(tmp_dns_port) or 53,
+            network = tmp_dns_proto or "tcp",
+        }
+    })
+
+    table.insert(routing.rules, 1, {
+        type = "field",
+        inboundTag = {
+            "dns-in"
+        },
+        outboundTag = "dns-out"
+    })
+
+    table.insert(routing.rules, {
+        type = "field",
+        inboundTag = {
+            "dns-in1"
+        },
+        outboundTag = dns_out_tag
+    })
+end
+
+if inbounds or outbounds then
+    local config = {
+        log = {
+            --dnsLog = true,
+            loglevel = loglevel
+        },
+        -- DNS
+        dns = dns,
+        fakedns = fakedns,
+        -- 传入连接
+        inbounds = inbounds,
+        -- 传出连接
+        outbounds = outbounds,
+        -- 路由
+        routing = routing
+    }
+    print(jsonc.stringify(config, 1))
+end
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/acl_config.lua
@ -212,6 +212,20 @@ o:value("https://223.5.5.5/dns-query", "AliDNS")
 o.validate = doh_validate
 o:depends("direct_dns_protocol", "doh")

+o = s:option(Value, "direct_dns_client_ip", translate("Direct DNS EDNS Client Subnet"))
+o.description = translate("Notify the DNS server when the DNS query is notified, the location of the client (cannot be a private IP address).") .. "<br />" ..
+                translate("This feature requires the DNS server to support the Edns Client Subnet (RFC7871).")
+o.datatype = "ipaddr"
+o:depends("direct_dns_protocol", "tcp")
+o:depends("direct_dns_protocol", "doh")
+
+o = s:option(ListValue, "direct_dns_query_strategy", translate("Direct Query Strategy"))
+o.default = "UseIP"
+o:value("UseIP")
+o:value("UseIPv4")
+o:value("UseIPv6")
+o:depends({ node = "default",  ['!reverse'] = true })
+
 o = s:option(ListValue, "remote_dns_protocol", translate("Remote DNS Protocol"))
 o:value("tcp", "TCP")
 o:value("doh", "DoH")
@ -259,14 +273,16 @@ o.datatype = "ipaddr"
 o:depends("remote_dns_protocol", "tcp")
 o:depends("remote_dns_protocol", "doh")

-o = s:option(ListValue, "dns_query_strategy", translate("Query Strategy"))
+o = s:option(ListValue, "remote_dns_query_strategy", translate("Remote Query Strategy"))
 o.default = "UseIPv4"
 o:value("UseIP")
 o:value("UseIPv4")
--o:value("UseIPv6")
+o:value("UseIPv6")
+o:depends({ node = "default",  ['!reverse'] = true })

 hosts = s:option(TextValue, "dns_hosts", translate("Domain Override"))
 hosts.rows = 5
 hosts.wrap = "off"
+hosts:depends({ node = "default",  ['!reverse'] = true })

 return m
--- a/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
+++ b/luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua
@ -171,6 +171,19 @@ o:value("https://223.5.5.5/dns-query", "AliDNS")
 o.validate = doh_validate
 o:depends("direct_dns_protocol", "doh")

+o = s:taboption("DNS", Value, "direct_dns_client_ip", translate("Direct DNS EDNS Client Subnet"))
+o.description = translate("Notify the DNS server when the DNS query is notified, the location of the client (cannot be a private IP address).") .. "<br />" ..
+                translate("This feature requires the DNS server to support the Edns Client Subnet (RFC7871).")
+o.datatype = "ipaddr"
+o:depends("direct_dns_protocol", "tcp")
+o:depends("direct_dns_protocol", "doh")
+
+o = s:taboption("DNS", ListValue, "direct_dns_query_strategy", translate("Direct Query Strategy"))
+o.default = "UseIP"
+o:value("UseIP")
+o:value("UseIPv4")
+o:value("UseIPv6")
+
 o = s:taboption("DNS", ListValue, "remote_dns_protocol", translate("Remote DNS Protocol"))
 o:value("tcp", "TCP")
 o:value("doh", "DoH")
@ -217,11 +230,11 @@ o.datatype = "ipaddr"
 o:depends("remote_dns_protocol", "tcp")
 o:depends("remote_dns_protocol", "doh")

-o = s:taboption("DNS", ListValue, "dns_query_strategy", translate("Query Strategy"))
+o = s:taboption("DNS", ListValue, "remote_dns_query_strategy", translate("Remote Query Strategy"))
 o.default = "UseIPv4"
 o:value("UseIP")
 o:value("UseIPv4")
--o:value("UseIPv6")
+o:value("UseIPv6")

 hosts = s:taboption("DNS", TextValue, "dns_hosts", translate("Domain Override"))
 hosts.rows = 5
--- a/luci-app-passwall2/po/zh-cn/passwall2.po
+++ b/luci-app-passwall2/po/zh-cn/passwall2.po
@ -112,6 +112,9 @@ msgstr "直连 DNS"
 msgid "Direct DNS DoH"
 msgstr "直连 DNS DoH"

+msgid "Direct DNS EDNS Client Subnet"
+msgstr "直连 DNS EDNS Client Subnet"
+
 msgid "Remote DNS Protocol"
 msgstr "远程 DNS 协议"

@ -136,8 +139,11 @@ msgstr "用于 DNS 查询时通知 DNS 服务器，客户端所在的地理位
 msgid "This feature requires the DNS server to support the Edns Client Subnet (RFC7871)."
 msgstr "此功能需要 DNS 服务器支持 EDNS Client Subnet（RFC7871）。"

-msgid "Query Strategy"
-msgstr "查询策略"
+msgid "Direct Query Strategy"
+msgstr "直连查询策略"
+
+msgid "Remote Query Strategy"
+msgstr "远程查询策略"

 msgid "Domain Override"
 msgstr "域名重写"
--- a/luci-app-passwall2/root/usr/share/passwall2/0_default_config
+++ b/luci-app-passwall2/root/usr/share/passwall2/0_default_config
@ -6,9 +6,10 @@ config global
 	option socks_enabled '0'
 	option node 'myshunt'
 	option direct_dns_protocol 'auto'
+	option direct_dns_query_strategy 'UseIP'
 	option remote_dns_protocol 'tcp'
 	option remote_dns '1.1.1.1'
-	option dns_query_strategy 'UseIPv4'
+	option remote_dns_query_strategy 'UseIPv4'
 	option dns_hosts 'cloudflare-dns.com 1.1.1.1
 dns.google.com 8.8.8.8'
 	option close_log '0'
--- a/luci-app-passwall2/root/usr/share/passwall2/app.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh
@ -28,6 +28,7 @@ PROXY_IPV6_UDP=0
 LUA_API_PATH=/usr/lib/lua/luci/model/cbi/$CONFIG/api
 API_GEN_SS=$LUA_API_PATH/gen_shadowsocks.lua
 API_GEN_V2RAY=$LUA_API_PATH/gen_v2ray.lua
+API_GEN_V2RAY_DNS=$LUA_API_PATH/gen_v2ray_dns.lua
 API_GEN_V2RAY_PROTO=$LUA_API_PATH/gen_v2ray_proto.lua
 API_GEN_NAIVE=$LUA_API_PATH/gen_naiveproxy.lua
 API_GEN_HYSTERIA=$LUA_API_PATH/gen_hysteria.lua
@ -266,7 +267,7 @@ lua_api() {

 run_v2ray() {
 	local flag node redir_port socks_address socks_port socks_username socks_password http_address http_port http_username http_password
-	local dns_listen_port direct_dns_protocol direct_dns_udp_server direct_dns_tcp_server direct_dns_doh remote_dns_protocol remote_dns_udp_server remote_dns_tcp_server remote_dns_doh remote_dns_client_ip dns_query_strategy dns_cache
+	local dns_listen_port direct_dns_protocol direct_dns_udp_server direct_dns_tcp_server direct_dns_doh direct_dns_client_ip direct_dns_query_strategy remote_dns_protocol remote_dns_udp_server remote_dns_tcp_server remote_dns_doh remote_dns_client_ip remote_dns_query_strategy dns_cache
 	local loglevel log_file config_file
 	local _extra_param=""
 	eval_set_val $@
@ -291,10 +292,6 @@ run_v2ray() {
 	[ -n "$http_address" ] && _extra_param="${_extra_param} -local_http_address $http_address"
 	[ -n "$http_port" ] && _extra_param="${_extra_param} -local_http_port $http_port"
 	[ -n "$http_username" ] && [ -n "$http_password" ] && _extra_param="${_extra_param} -local_http_username $http_username -local_http_password $http_password"
-	[ -n "$dns_listen_port" ] && _extra_param="${_extra_param} -dns_listen_port ${dns_listen_port}"
-	[ -n "$dns_query_strategy" ] && _extra_param="${_extra_param} -dns_query_strategy ${dns_query_strategy}"
-	[ -n "$remote_dns_client_ip" ] && _extra_param="${_extra_param} -remote_dns_client_ip ${remote_dns_client_ip}"
-	[ -n "$dns_cache" ] && _extra_param="${_extra_param} -dns_cache ${dns_cache}"
 	local sniffing=$(config_t_get global_forwarding sniffing 1)
 	[ "${sniffing}" = "1" ] && {
 		_extra_param="${_extra_param} -sniffing 1"
@ -303,74 +300,113 @@ run_v2ray() {
 	}
 	local buffer_size=$(config_t_get global_forwarding buffer_size)
 	[ -n "${buffer_size}" ] && _extra_param="${_extra_param} -buffer_size ${buffer_size}"
-	[ "$direct_dns_protocol" = "auto" ] && {
-		direct_dns_protocol="udp"
-		direct_dns_udp_server=${AUTO_DNS}
-	}
-	case "$direct_dns_protocol" in
-		udp)
-			local _dns=$(get_first_dns direct_dns_udp_server 53 | sed 's/#/:/g')
-			local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
-			local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
-			_extra_param="${_extra_param} -direct_dns_server ${_dns_address} -direct_dns_port ${_dns_port} -direct_dns_udp_server ${_dns_address}"
-		;;
-		tcp)
-			local _dns=$(get_first_dns direct_dns_tcp_server 53 | sed 's/#/:/g')
-			local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
-			local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
-			_extra_param="${_extra_param} -direct_dns_server ${_dns_address} -direct_dns_port ${_dns_port} -direct_dns_tcp_server tcp://${_dns}"
-		;;
-		doh)
-			local _doh_url=$(echo $direct_dns_doh | awk -F ',' '{print $1}')
-			local _doh_host_port=$(lua_api "get_domain_from_url(\"${_doh_url}\")")
-			#local _doh_host_port=$(echo $_doh_url | sed "s/https:\/\///g" | awk -F '/' '{print $1}')
-			local _doh_host=$(echo $_doh_host_port | awk -F ':' '{print $1}')
-			local is_ip=$(lua_api "is_ip(\"${_doh_host}\")")
-			local _doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}')
-			[ -z "${_doh_port}" ] && _doh_port=443
-			local _doh_bootstrap=$(echo $direct_dns_doh | cut -d ',' -sf 2-)
-			[ "${is_ip}" = "true" ] && _doh_bootstrap=${_doh_host}
-			[ -n "$_doh_bootstrap" ] && _extra_param="${_extra_param} -direct_dns_server ${_doh_bootstrap}"
-			_extra_param="${_extra_param} -direct_dns_port ${_doh_port} -direct_dns_doh_url ${_doh_url} -direct_dns_doh_host ${_doh_host}"
-		;;
-	esac
-	case "$remote_dns_protocol" in
-		udp)
-			local _dns=$(get_first_dns remote_dns_udp_server 53 | sed 's/#/:/g')
-			local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
-			local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
-			_extra_param="${_extra_param} -remote_dns_server ${_dns_address} -remote_dns_port ${_dns_port} -remote_dns_udp_server ${_dns_address}"
-		;;
-		tcp)
-			local _dns=$(get_first_dns remote_dns_tcp_server 53 | sed 's/#/:/g')
-			local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
-			local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
-			_extra_param="${_extra_param} -remote_dns_server ${_dns_address} -remote_dns_port ${_dns_port} -remote_dns_tcp_server tcp://${_dns}"
-		;;
-		doh)
-			local _doh_url=$(echo $remote_dns_doh | awk -F ',' '{print $1}')
-			local _doh_host_port=$(lua_api "get_domain_from_url(\"${_doh_url}\")")
-			#local _doh_host_port=$(echo $_doh_url | sed "s/https:\/\///g" | awk -F '/' '{print $1}')
-			local _doh_host=$(echo $_doh_host_port | awk -F ':' '{print $1}')
-			local is_ip=$(lua_api "is_ip(\"${_doh_host}\")")
-			local _doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}')
-			[ -z "${_doh_port}" ] && _doh_port=443
-			local _doh_bootstrap=$(echo $remote_dns_doh | cut -d ',' -sf 2-)
-			[ "${is_ip}" = "true" ] && _doh_bootstrap=${_doh_host}
-			[ -n "$_doh_bootstrap" ] && _extra_param="${_extra_param} -remote_dns_server ${_doh_bootstrap}"
-			_extra_param="${_extra_param} -remote_dns_port ${_doh_port} -remote_dns_doh_url ${_doh_url} -remote_dns_doh_host ${_doh_host}"
-		;;
-		fakedns)
-			_extra_param="${_extra_param} -remote_dns_fake 1"
-		;;
-	esac
-	lua $API_GEN_V2RAY -node $node -redir_port $redir_port -tcp_proxy_way $tcp_proxy_way -loglevel $loglevel ${_extra_param} > $config_file
-	ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $log_file run -c "$config_file"
 	
 	local protocol=$(config_n_get $node protocol)
 	[ "$protocol" == "_iface" ] && {
 		IFACES="$IFACES $(config_n_get $node iface)"
 	}
+	
+	[ -n "$dns_listen_port" ] && {
+		V2RAY_DNS_DIRECT_CONFIG="${TMP_PATH}/${flag}_dns_direct.json"
+		V2RAY_DNS_DIRECT_LOG="${TMP_PATH}/${flag}_dns_direct.log"
+		V2RAY_DNS_DIRECT_ARGS="-dns_out_tag direct"
+		dns_direct_listen_port=$(get_new_port $(expr $dns_listen_port + 1) udp)
+		V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -dns_listen_port ${dns_direct_listen_port}"
+		[ "$direct_dns_protocol" = "auto" ] && {
+			direct_dns_protocol="udp"
+			direct_dns_udp_server=${AUTO_DNS}
+		}
+		case "$direct_dns_protocol" in
+			udp)
+				local _dns=$(get_first_dns direct_dns_udp_server 53 | sed 's/#/:/g')
+				local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
+				local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
+				V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -direct_dns_server ${_dns_address} -direct_dns_port ${_dns_port} -direct_dns_udp_server ${_dns_address}"
+			;;
+			tcp)
+				local _dns=$(get_first_dns direct_dns_tcp_server 53 | sed 's/#/:/g')
+				local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
+				local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
+				V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -direct_dns_server ${_dns_address} -direct_dns_port ${_dns_port} -direct_dns_tcp_server tcp://${_dns}"
+			;;
+			doh)
+				local _doh_url=$(echo $direct_dns_doh | awk -F ',' '{print $1}')
+				local _doh_host_port=$(lua_api "get_domain_from_url(\"${_doh_url}\")")
+				#local _doh_host_port=$(echo $_doh_url | sed "s/https:\/\///g" | awk -F '/' '{print $1}')
+				local _doh_host=$(echo $_doh_host_port | awk -F ':' '{print $1}')
+				local is_ip=$(lua_api "is_ip(\"${_doh_host}\")")
+				local _doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}')
+				[ -z "${_doh_port}" ] && _doh_port=443
+				local _doh_bootstrap=$(echo $direct_dns_doh | cut -d ',' -sf 2-)
+				[ "${is_ip}" = "true" ] && _doh_bootstrap=${_doh_host}
+				[ -n "$_doh_bootstrap" ] && V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -direct_dns_server ${_doh_bootstrap}"
+				V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -direct_dns_port ${_doh_port} -direct_dns_doh_url ${_doh_url} -direct_dns_doh_host ${_doh_host}"
+			;;
+		esac
+		[ -n "$direct_dns_query_strategy" ] && V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -dns_query_strategy ${direct_dns_query_strategy}"
+		[ -n "$direct_dns_client_ip" ] && V2RAY_DNS_DIRECT_ARGS="${V2RAY_DNS_DIRECT_ARGS} -dns_client_ip ${direct_dns_client_ip}"
+		
+		lua $API_GEN_V2RAY_DNS ${V2RAY_DNS_DIRECT_ARGS} > $V2RAY_DNS_DIRECT_CONFIG
+		ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $V2RAY_DNS_DIRECT_LOG run -c "$V2RAY_DNS_DIRECT_CONFIG"
+		
+		[ "$remote_dns_protocol" != "fakedns" ] && {
+			V2RAY_DNS_REMOTE_CONFIG="${TMP_PATH}/${flag}_dns_remote.json"
+			V2RAY_DNS_REMOTE_LOG="${TMP_PATH}/${flag}_dns_remote.log"
+			V2RAY_DNS_REMOTE_ARGS="-dns_out_tag remote"
+			dns_remote_listen_port=$(get_new_port $(expr $dns_listen_port + 2) udp)
+			V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -dns_listen_port ${dns_remote_listen_port}"
+			case "$remote_dns_protocol" in
+				udp)
+					local _dns=$(get_first_dns remote_dns_udp_server 53 | sed 's/#/:/g')
+					local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
+					local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
+					V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_server ${_dns_address} -remote_dns_port ${_dns_port} -remote_dns_udp_server ${_dns_address}"
+				;;
+				tcp)
+					local _dns=$(get_first_dns remote_dns_tcp_server 53 | sed 's/#/:/g')
+					local _dns_address=$(echo ${_dns} | awk -F ':' '{print $1}')
+					local _dns_port=$(echo ${_dns} | awk -F ':' '{print $2}')
+					V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_server ${_dns_address} -remote_dns_port ${_dns_port} -remote_dns_tcp_server tcp://${_dns}"
+				;;
+				doh)
+					local _doh_url=$(echo $remote_dns_doh | awk -F ',' '{print $1}')
+					local _doh_host_port=$(lua_api "get_domain_from_url(\"${_doh_url}\")")
+					#local _doh_host_port=$(echo $_doh_url | sed "s/https:\/\///g" | awk -F '/' '{print $1}')
+					local _doh_host=$(echo $_doh_host_port | awk -F ':' '{print $1}')
+					local is_ip=$(lua_api "is_ip(\"${_doh_host}\")")
+					local _doh_port=$(echo $_doh_host_port | awk -F ':' '{print $2}')
+					[ -z "${_doh_port}" ] && _doh_port=443
+					local _doh_bootstrap=$(echo $remote_dns_doh | cut -d ',' -sf 2-)
+					[ "${is_ip}" = "true" ] && _doh_bootstrap=${_doh_host}
+					[ -n "$_doh_bootstrap" ] && V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_server ${_doh_bootstrap}"
+					V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_port ${_doh_port} -remote_dns_doh_url ${_doh_url} -remote_dns_doh_host ${_doh_host}"
+				;;
+				fakedns)
+					V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_fake 1"
+				;;
+			esac
+			
+			[ -n "$remote_dns_query_strategy" ] && V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -dns_query_strategy ${remote_dns_query_strategy}"
+			[ -n "$remote_dns_client_ip" ] && V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -dns_client_ip ${remote_dns_client_ip}"
+			
+			V2RAY_DNS_REMOTE_ARGS="${V2RAY_DNS_REMOTE_ARGS} -remote_dns_outbound_socks_address 127.0.0.1 -remote_dns_outbound_socks_port ${socks_port}"
+			lua $API_GEN_V2RAY_DNS ${V2RAY_DNS_REMOTE_ARGS} > $V2RAY_DNS_REMOTE_CONFIG
+			ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $V2RAY_DNS_REMOTE_LOG run -c "$V2RAY_DNS_REMOTE_CONFIG"
+		}
+		
+		[ -n "$dns_listen_port" ] && _extra_param="${_extra_param} -dns_listen_port ${dns_listen_port}"
+		[ -n "$dns_cache" ] && _extra_param="${_extra_param} -dns_cache ${dns_cache}"
+		_extra_param="${_extra_param} -dns_query_strategy UseIP"
+		_extra_param="${_extra_param} -direct_dns_port ${dns_direct_listen_port} -direct_dns_udp_server 127.0.0.1"
+		if [ "$remote_dns_protocol" == "fakedns" ]; then
+			_extra_param="${_extra_param} -remote_dns_fake 1"
+		else
+			_extra_param="${_extra_param} -remote_dns_port ${dns_remote_listen_port} -remote_dns_udp_server 127.0.0.1"
+		fi
+	}
+	
+	lua $API_GEN_V2RAY -node $node -redir_port $redir_port -tcp_proxy_way $tcp_proxy_way -loglevel $loglevel ${_extra_param} > $config_file
+	ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $log_file run -c "$config_file"
 }

 run_socks() {
@ -552,7 +588,8 @@ run_global() {
 		echolog "开启实验性IPv6透明代理(TProxy)，请确认您的节点及类型支持IPv6！"
 		PROXY_IPV6_UDP=1
 	fi
-	V2RAY_ARGS="flag=global node=$NODE redir_port=$REDIR_PORT dns_listen_port=${TUN_DNS_PORT} dns_query_strategy=${DNS_QUERY_STRATEGY} dns_cache=${DNS_CACHE}"
+	V2RAY_ARGS="flag=global node=$NODE redir_port=$REDIR_PORT"
+	V2RAY_ARGS="${V2RAY_ARGS} dns_listen_port=${TUN_DNS_PORT} direct_dns_query_strategy=${DIRECT_DNS_QUERY_STRATEGY} remote_dns_query_strategy=${REMOTE_DNS_QUERY_STRATEGY} dns_cache=${DNS_CACHE}"
 	local msg="${TUN_DNS} （"
 	[ -n "$DIRECT_DNS_PROTOCOL" ] && {
 		V2RAY_ARGS="${V2RAY_ARGS} direct_dns_protocol=${DIRECT_DNS_PROTOCOL}"
@ -575,6 +612,8 @@ run_global() {
 				msg="${msg} 直连DNS：${DIRECT_DNS_DOH}"
 			;;
 		esac
+		local _direct_dns_client_ip=$(config_t_get global direct_dns_client_ip)
+		[ -n "${_direct_dns_client_ip}" ] && V2RAY_ARGS="${V2RAY_ARGS} direct_dns_client_ip=${_direct_dns_client_ip}"
 	}

 	[ -n "$REMOTE_DNS_PROTOCOL" ] && {
@ -824,9 +863,10 @@ UDP_PROXY_MODE="global"
 LOCALHOST_PROXY=$(config_t_get global localhost_proxy '1')
 DIRECT_DNS_PROTOCOL=$(config_t_get global direct_dns_protocol tcp)
 DIRECT_DNS=$(config_t_get global direct_dns 119.29.29.29:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g')
+DIRECT_DNS_QUERY_STRATEGY=$(config_t_get global direct_dns_query_strategy UseIP)
 REMOTE_DNS_PROTOCOL=$(config_t_get global remote_dns_protocol tcp)
 REMOTE_DNS=$(config_t_get global remote_dns 1.1.1.1:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g')
-DNS_QUERY_STRATEGY=$(config_t_get global dns_query_strategy UseIPv4)
+REMOTE_DNS_QUERY_STRATEGY=$(config_t_get global remote_dns_query_strategy UseIPv4)
 DNS_CACHE=$(config_t_get global dns_cache 1)

 DEFAULT_DNS=$(uci show dhcp | grep "@dnsmasq" | grep "\.server=" | awk -F '=' '{print $2}' | sed "s/'//g" | tr ' ' '\n' | grep -v "\/" | head -2 | sed ':label;N;s/\n/,/;b label')
--- a/luci-app-passwall2/root/usr/share/passwall2/iptables.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/iptables.sh
@ -180,7 +180,7 @@ load_acl() {
 		dnsmasq_port=11400
 		echolog "访问控制："
 		for item in $items; do
-			local enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node direct_dns_protocol direct_dns direct_dns_doh remote_dns_protocol only_proxy_fakedns remote_dns remote_dns_doh remote_dns_client_ip dns_query_strategy
+			local enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node direct_dns_protocol direct_dns direct_dns_doh direct_dns_client_ip direct_dns_query_strategy remote_dns_protocol only_proxy_fakedns remote_dns remote_dns_doh remote_dns_client_ip remote_dns_query_strategy
 			local _ip _mac _iprange _ipset _ip_or_mac rule_list node_remark config_file
 			sid=$(uci -q show "${CONFIG}.${item}" | grep "=acl_rule" | awk -F '=' '{print $1}' | awk -F '.' '{print $2}')
 			eval $(uci -q show "${CONFIG}.${item}" | cut -d'.' -sf 3-)
@ -209,13 +209,14 @@ load_acl() {
 			tcp_proxy_mode="global"
 			udp_proxy_mode="global"
 			node=${node:-default}
-			dns_query_strategy=${dns_query_strategy:-UseIPv4}
 			direct_dns_protocol=${direct_dns_protocol:-auto}
 			direct_dns=${direct_dns:-119.29.29.29}
 			[ "$direct_dns_protocol" = "doh" ] && direct_dns=${direct_dns_doh:-https://223.5.5.5/dns-query}
+			direct_dns_query_strategy=${direct_dns_query_strategy:-UseIP}
 			remote_dns_protocol=${remote_dns_protocol:-tcp}
 			remote_dns=${remote_dns:-1.1.1.1}
 			[ "$remote_dns_protocol" = "doh" ] && remote_dns=${remote_dns_doh:-https://1.1.1.1/dns-query}
+			remote_dns_query_strategy=${remote_dns_query_strategy:-UseIPv4}
 			[ "$tcp_no_redir_ports" = "default" ] && tcp_no_redir_ports=$TCP_NO_REDIR_PORTS
 			[ "$udp_no_redir_ports" = "default" ] && udp_no_redir_ports=$UDP_NO_REDIR_PORTS
 			[ "$tcp_redir_ports" = "default" ] && tcp_redir_ports=$TCP_REDIR_PORTS
@ -236,7 +237,7 @@ load_acl() {
 							if [ -n "${type}" ] && ([ "${type}" = "v2ray" ] || [ "${type}" = "xray" ]); then
 								config_file=$TMP_ACL_PATH/${node}_TCP_UDP_DNS_${redir_port}.json
 								dns_port=$(get_new_port $(expr $dns_port + 1))
-								run_v2ray flag=acl_$sid node=$node redir_port=$redir_port dns_listen_port=${dns_port} direct_dns_protocol=${direct_dns_protocol} direct_dns_udp_server=${direct_dns} direct_dns_tcp_server=${direct_dns} direct_dns_doh="${direct_dns}" remote_dns_protocol=${remote_dns_protocol} remote_dns_tcp_server=${remote_dns} remote_dns_udp_server=${remote_dns} remote_dns_doh="${remote_dns}" remote_dns_client_ip=${remote_dns_client_ip} dns_query_strategy=${dns_query_strategy} config_file=${config_file}
+								run_v2ray flag=acl_$sid node=$node redir_port=$redir_port dns_listen_port=${dns_port} direct_dns_protocol=${direct_dns_protocol} direct_dns_udp_server=${direct_dns} direct_dns_tcp_server=${direct_dns} direct_dns_doh="${direct_dns}" direct_dns_client_ip=${direct_dns_client_ip} direct_dns_query_strategy=${direct_dns_query_strategy} remote_dns_protocol=${remote_dns_protocol} remote_dns_tcp_server=${remote_dns} remote_dns_udp_server=${remote_dns} remote_dns_doh="${remote_dns}" remote_dns_client_ip=${remote_dns_client_ip} remote_dns_query_strategy=${remote_dns_query_strategy} config_file=${config_file}
 							fi
 							dnsmasq_port=$(get_new_port $(expr $dnsmasq_port + 1))
 							redirect_dns_port=$dnsmasq_port
@ -357,7 +358,7 @@ load_acl() {
 				$ipt_m -A PSW2 $(comment "$remarks") ${_ipt_source} -p udp -j RETURN
 				$ip6t_m -A PSW2 $(comment "$remarks") ${_ipt_source} -p udp -j RETURN 2>/dev/null
 			done
-			unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node direct_dns_protocol direct_dns direct_dns_doh remote_dns_protocol remote_dns remote_dns_doh remote_dns_client_ip dns_query_strategy
+			unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node direct_dns_protocol direct_dns direct_dns_doh direct_dns_client_ip direct_dns_query_strategy remote_dns_protocol remote_dns remote_dns_doh remote_dns_client_ip remote_dns_query_strategy
 			unset _ip _mac _iprange _ipset _ip_or_mac rule_list node_remark config_file
 			unset ipt_tmp msg msg2
 			unset redirect_dns_port
--- a/mosdns/Makefile
+++ b/mosdns/Makefile
@ -0,0 +1,45 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mosdns
+PKG_VERSION:=4.5.3
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/IrineSistiana/mosdns/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=2a13b1b1d862731cf946a8ceaa99523a0eb0eaae56045dd31207b61a5a6d47ae
+
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILE:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/IrineSistiana/mosdns
+GO_PKG_LDFLAGS_X:=main.version=v$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
+
+define Package/mosdns
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  TITLE:=A plug-in DNS forwarder/splitter
+  URL:=https://github.com/IrineSistiana/mosdns
+  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
+endef
+
+GO_PKG_TARGET_VARS:=$(filter-out CGO_ENABLED=%,$(GO_PKG_TARGET_VARS)) CGO_ENABLED=0
+
+define Package/mosdns/install
+	$(call GoPackage/Package/Install/Bin,$(1))
+endef
+
+$(eval $(call GoBinPackage,mosdns))
+$(eval $(call BuildPackage,mosdns))
--- a/mosdns/patches/001-go1.20.patch
+++ b/mosdns/patches/001-go1.20.patch
@ -0,0 +1,496 @@
+diff --git a/go.mod b/go.mod
+index f44519b..81928ae 100644
+--- a/go.mod
+++ b/go.mod
+@@ -3,27 +3,26 @@ module github.com/IrineSistiana/mosdns/v4
+ go 1.18
+ 
+ require (
+-	github.com/AdguardTeam/dnsproxy v0.46.2
+ 	github.com/Knetic/govaluate v3.0.0+incompatible
+ 	github.com/fsnotify/fsnotify v1.6.0
+ 	github.com/go-redis/redis/v8 v8.11.5
+ 	github.com/golang/snappy v0.0.4
+-	github.com/google/nftables v0.0.0-20221029063419-3ad45c080caa
+	github.com/google/nftables v0.1.0
+ 	github.com/kardianos/service v1.2.2
+-	github.com/lucas-clemente/quic-go v0.30.0
+ 	github.com/miekg/dns v1.1.50
+ 	github.com/mitchellh/mapstructure v1.5.0
+ 	github.com/nadoo/ipset v0.5.0
+ 	github.com/pires/go-proxyproto v0.6.2
+ 	github.com/prometheus/client_golang v1.13.0
+	github.com/quic-go/quic-go v0.32.0
+ 	github.com/spf13/cobra v1.6.1
+ 	github.com/spf13/viper v1.13.0
+-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
+ 	go.uber.org/zap v1.23.0
+-	golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f
+-	golang.org/x/net v0.1.0
+	golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9
+	golang.org/x/net v0.5.0
+ 	golang.org/x/sync v0.1.0
+-	golang.org/x/sys v0.1.0
+	golang.org/x/sys v0.4.0
+ 	google.golang.org/protobuf v1.28.1
+ 	gopkg.in/yaml.v3 v3.0.1
+ )
+@@ -31,12 +30,18 @@ require (
+ replace github.com/nadoo/ipset v0.5.0 => github.com/IrineSistiana/ipset v0.5.1-0.20220703061533-6e0fc3b04c0a
+ 
+ require (
+-	github.com/AdguardTeam/golibs v0.11.2 // indirect
+	github.com/AdguardTeam/golibs v0.11.4 // indirect
+	github.com/Potterli20/dnscrypt-go v0.0.0-20230127121635-686bceceab0b // indirect
+	github.com/Potterli20/dnsproxy-go-fork v0.0.0-20230204013503-c9a1291ce56d // indirect
+	github.com/Potterli20/go-flags-fork v0.0.0-20230105121328-343499d19367 // indirect
+	github.com/Potterli20/golibs-fork v0.0.0-20230126184335-257157f1aac9 // indirect
+ 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
+ 	github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
+ 	github.com/ameshkov/dnscrypt/v2 v2.2.5 // indirect
+ 	github.com/ameshkov/dnsstamps v1.0.3 // indirect
+	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
+ 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bluele/gcache v0.0.2 // indirect
+ 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ 	github.com/davecgh/go-spew v1.1.1 // indirect
+ 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+@@ -44,7 +49,7 @@ require (
+ 	github.com/golang/mock v1.6.0 // indirect
+ 	github.com/golang/protobuf v1.5.2 // indirect
+ 	github.com/google/go-cmp v0.5.9 // indirect
+-	github.com/google/pprof v0.0.0-20221010195024-131d412537ea // indirect
+	github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
+ 	github.com/hashicorp/hcl v1.0.0 // indirect
+ 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+ 	github.com/josharian/native v1.0.0 // indirect
+@@ -55,13 +60,19 @@ require (
+ 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ 	github.com/mdlayher/netlink v1.6.2 // indirect
+ 	github.com/mdlayher/socket v0.2.3 // indirect
+-	github.com/onsi/ginkgo/v2 v2.4.0 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/ginkgo/v2 v2.8.0 // indirect
+ 	github.com/pelletier/go-toml v1.9.5 // indirect
+ 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+ 	github.com/pmezard/go-difflib v1.0.0 // indirect
+ 	github.com/prometheus/client_model v0.3.0 // indirect
+ 	github.com/prometheus/common v0.37.0 // indirect
+ 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
+	github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
+	github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
+ 	github.com/spf13/afero v1.9.2 // indirect
+ 	github.com/spf13/cast v1.5.0 // indirect
+ 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+@@ -70,10 +81,12 @@ require (
+ 	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+ 	go.uber.org/atomic v1.10.0 // indirect
+ 	go.uber.org/multierr v1.8.0 // indirect
+-	golang.org/x/crypto v0.1.0 // indirect
+-	golang.org/x/mod v0.6.0 // indirect
+-	golang.org/x/text v0.4.0 // indirect
+-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/mod v0.7.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/tools v0.5.0 // indirect
+ 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+ 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	zgo.at/zcache v1.2.0 // indirect
+ )
+diff --git a/go.sum b/go.sum
+index 588e416..d6b92e4 100644
+--- a/go.sum
+++ b/go.sum
+@@ -36,20 +36,24 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
+ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
+ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+-github.com/AdguardTeam/dnsproxy v0.46.1 h1:ej9iRorG+vekaXGYB854waAiS+q8OfswYZ1MQRZolHk=
+-github.com/AdguardTeam/dnsproxy v0.46.1/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA=
+-github.com/AdguardTeam/dnsproxy v0.46.2 h1:ZUKM713Ts5meYQqk6cJkUBMCFSWqFPXTgjXkN4RI1Vo=
+-github.com/AdguardTeam/dnsproxy v0.46.2/go.mod h1:PAmRzFqls0E92XTglyY2ESAqMAzZJhHKErG1ZpRnpjA=
+-github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
+-github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
+ github.com/AdguardTeam/golibs v0.11.2 h1:JbQB1Dg2JWStXgHh1QqBbOLWnP4t9oDjppoBH6TVXSE=
+ github.com/AdguardTeam/golibs v0.11.2/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
+github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
+github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
+ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+ github.com/IrineSistiana/ipset v0.5.1-0.20220703061533-6e0fc3b04c0a h1:GQdh/h0q0ni3L//CXusyk+7QdhBL289vdNaes1WKkHI=
+ github.com/IrineSistiana/ipset v0.5.1-0.20220703061533-6e0fc3b04c0a/go.mod h1:rYF5DQLRGGoQ8ZSWeK+6eX5amAuPqwFkWjhQlEITGJQ=
+ github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
+ github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/Potterli20/dnscrypt-go v0.0.0-20230127121635-686bceceab0b h1:QTTqfdCou16jhebgjEKpl2GjXLVK5SSOqpZYhgHd/Eo=
+github.com/Potterli20/dnscrypt-go v0.0.0-20230127121635-686bceceab0b/go.mod h1:sOoffGWwhCnUbi9PaynkrxF/ZgfSPXl9aYI0SxJOKGA=
+github.com/Potterli20/dnsproxy-go-fork v0.0.0-20230204013503-c9a1291ce56d h1:6NBKMT8/wQ1BDMb8Dj+JQyMuFqyOiZvgHrbZjIW8zw4=
+github.com/Potterli20/dnsproxy-go-fork v0.0.0-20230204013503-c9a1291ce56d/go.mod h1:WYCA2ec2vGYiMur6WA6/a26DCVwClW01SSbGUdjH7pQ=
+github.com/Potterli20/go-flags-fork v0.0.0-20230105121328-343499d19367 h1:Fk/zliZUUzmrTBBhP1jZIUemLRaTC50pUqxzDsI0BKc=
+github.com/Potterli20/go-flags-fork v0.0.0-20230105121328-343499d19367/go.mod h1:fxgCKaAiZ5s1gvXFfhymGvLZiOqERySJgz1hMWjb3fs=
+github.com/Potterli20/golibs-fork v0.0.0-20230126184335-257157f1aac9 h1:Lor82lC1jWhea/F+4VLV2U9pMy4ndtK3rJGCfVb1EqQ=
+github.com/Potterli20/golibs-fork v0.0.0-20230126184335-257157f1aac9/go.mod h1:hFpRVMkn7pYG91D/u3iFJ8B4nxnDUHqT4dJioQTvjA0=
+ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
+ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
+ github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
+@@ -63,11 +67,15 @@ github.com/ameshkov/dnscrypt/v2 v2.2.5 h1:Ju1gQeez+6XLtk/b/k3RoJ2t+Ls+BSItLTZjZe
+ github.com/ameshkov/dnscrypt/v2 v2.2.5/go.mod h1:Cu5GgMvCR10BeXgACiGDwXyOpfMktsSIidml1XBp6uM=
+ github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
+ github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
+github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
+github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
+ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
+github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
+ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+ github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+@@ -92,6 +100,8 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
+ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+ github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+@@ -105,6 +115,7 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
+ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+ github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+ github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+@@ -162,10 +173,10 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
+ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+ github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+-github.com/google/nftables v0.0.0-20221015190445-4f5cd5826fbd h1:EWP0uTXu3ItJlSimbOvSFVejL5/Bc8eMui48EESr9R4=
+-github.com/google/nftables v0.0.0-20221015190445-4f5cd5826fbd/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc=
+ github.com/google/nftables v0.0.0-20221029063419-3ad45c080caa h1:29BM9lwE2zPdn0c0iaiqF/faXQn2IS2Ck/wrlwxKi40=
+ github.com/google/nftables v0.0.0-20221029063419-3ad45c080caa/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc=
+github.com/google/nftables v0.1.0 h1:T6lS4qudrMufcNIZ8wSRrL+iuwhsKxpN+zFLxhUWOqk=
+github.com/google/nftables v0.1.0/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc=
+ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+@@ -178,6 +189,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
+ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+ github.com/google/pprof v0.0.0-20221010195024-131d412537ea h1:R3VfsTXMMK4JCWZDdxScmnTzu9n9YRsDvguLis0U/b8=
+ github.com/google/pprof v0.0.0-20221010195024-131d412537ea/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
+github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f h1:gl1DCiSk+mrXXBGPm6CEeS2MkJuMVzAOrXg34oVj1QI=
+github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
+ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+@@ -187,6 +200,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
+ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+ github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
+@@ -211,11 +225,10 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+-github.com/lucas-clemente/quic-go v0.30.0 h1:nwLW0h8ahVQ5EPTIM7uhl/stHqQDea15oRlYKZmw2O0=
+-github.com/lucas-clemente/quic-go v0.30.0/go.mod h1:ssOrRsOmdxa768Wr78vnh2B8JozgLsMzG/g+0qEC7uk=
+ github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+ github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE=
+@@ -225,8 +238,6 @@ github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u
+ github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
+ github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
+ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+-github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
+-github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+ github.com/mdlayher/netlink v1.6.2 h1:D2zGSkvYsJ6NreeED3JiVTu1lj2sIYATqSaZlhPzUgQ=
+@@ -245,14 +256,21 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
+ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+-github.com/onsi/ginkgo/v2 v2.3.1 h1:8SbseP7qM32WcvE6VaN6vfXxv698izmsJ1UQX9ve7T8=
+-github.com/onsi/ginkgo/v2 v2.3.1/go.mod h1:Sv4yQXwG5VmF7tm3Q5Z+RWUpPo24LF1mpnz2crUb8Ys=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+ github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
+ github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
+-github.com/onsi/gomega v1.22.0 h1:AIg2/OntwkBiCg5Tt1ayyiF1ArFrWFoCSMtMi/wdApk=
+github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI=
+github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+ github.com/onsi/gomega v1.22.1 h1:pY8O4lBfsHKZHM/6nrxkhVPUznOlIu3quZcKP/M20KI=
+github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
+ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+ github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+ github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
+@@ -292,6 +310,16 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
+ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+ github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
+github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
+github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
+github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
+github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
+github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
+github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
+github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
+ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+ github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+@@ -302,8 +330,6 @@ github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
+ github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+ github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+-github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
+-github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+ github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
+ github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+@@ -315,6 +341,7 @@ github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+z
+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+@@ -323,6 +350,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
+ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+ github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
+ github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+ github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
+@@ -354,8 +383,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+-golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+ golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+@@ -366,10 +397,10 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
+ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+-golang.org/x/exp v0.0.0-20221019170559-20944726eadf h1:nFVjjKDgNY37+ZSYCJmtYf7tOlfQswHqplG2eosjOMg=
+-golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+-golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f h1:Al51T6tzvuh3oiwX11vex3QgJ2XTedFPGmbEVh8cdoc=
+-golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9 h1:frX3nT9RkKybPnjyI+yvZh6ZucTZatCCEm9D47sZ2zo=
+golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+@@ -396,8 +427,11 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+ golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
+ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+@@ -420,6 +454,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
+ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+@@ -435,8 +470,10 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx
+ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+ golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
+-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+@@ -464,6 +501,7 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -474,7 +512,10 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -500,6 +541,7 @@ golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -515,8 +557,10 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
+ golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+@@ -527,8 +571,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+@@ -576,6 +622,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u
+ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+@@ -583,6 +630,8 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+ golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+ golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
+ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
+golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+@@ -685,9 +734,11 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+@@ -709,3 +760,5 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
+ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+zgo.at/zcache v1.2.0 h1:++0dNWOrmUBa10WSja+eHx5bEO2PzZLRY6MJlBD47yk=
+zgo.at/zcache v1.2.0/go.mod h1:xWQo2ha/bamTmx8CbfrZl9Nf8AoT5uNh2hWfbQi8TiE=
+diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
+index 29bc5bb..9050a6b 100644
+--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
+@@ -22,7 +22,7 @@ package server
+ import (
+ 	"crypto/rand"
+ 	"crypto/tls"
+-	"github.com/AdguardTeam/dnsproxy/upstream"
+	"github.com/Potterli20/dnsproxy-go-fork/upstream"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/server/dns_handler"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/server/http_handler"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/utils"
+diff --git a/pkg/upstream/h3roundtripper/h3roundtripper.go b/pkg/upstream/h3roundtripper/h3roundtripper.go
+index f32eafd..2ff9460 100644
+--- a/pkg/upstream/h3roundtripper/h3roundtripper.go
+++ b/pkg/upstream/h3roundtripper/h3roundtripper.go
+@@ -22,8 +22,8 @@ package h3roundtripper
+ import (
+ 	"context"
+ 	"crypto/tls"
+-	"github.com/lucas-clemente/quic-go"
+-	"github.com/lucas-clemente/quic-go/http3"
+	"github.com/quic-go/quic-go"
+	"github.com/quic-go/quic-go/http3"
+ 	"go.uber.org/zap"
+ 	"net/http"
+ 	"sync"
+diff --git a/pkg/upstream/upstream.go b/pkg/upstream/upstream.go
+index 5acddd9..4f47b55 100644
+--- a/pkg/upstream/upstream.go
+++ b/pkg/upstream/upstream.go
+@@ -28,7 +28,7 @@ import (
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/upstream/doh"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/upstream/h3roundtripper"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/upstream/transport"
+-	"github.com/lucas-clemente/quic-go"
+	"github.com/quic-go/quic-go"
+ 	"github.com/miekg/dns"
+ 	"go.uber.org/zap"
+ 	"golang.org/x/net/http2"
+diff --git a/plugin/executable/forward/forward.go b/plugin/executable/forward/forward.go
+index a11e852..804bd9f 100644
+--- a/plugin/executable/forward/forward.go
+++ b/plugin/executable/forward/forward.go
+@@ -23,7 +23,7 @@ import (
+ 	"context"
+ 	"errors"
+ 	"fmt"
+-	"github.com/AdguardTeam/dnsproxy/upstream"
+	"github.com/Potterli20/dnsproxy-go-fork/upstream"
+ 	"github.com/IrineSistiana/mosdns/v4/coremain"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/executable_seq"
+ 	"github.com/IrineSistiana/mosdns/v4/pkg/query_context"