update 05-12 19:42:58

2025-01-08 11:17:34 +08:00 · 2022-05-12 19:42:58 +08:00 · 2022-05-12 19:42:58 +08:00 · 6c0ed3bafb
commit 6c0ed3bafb
parent 5b953472fb
46 changed files with 4411 additions and 472 deletions
--- a/dns2tcp/Makefile
+++ b/dns2tcp/Makefile
@ -0,0 +1,43 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dns2tcp
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=3
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/zfl9/dns2tcp.git
+PKG_SOURCE_VERSION:=10ed687778f18d1b9c98bb51187a3a9086d3a0d9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_SOURCE_SUBDIR)
+
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=pexcn <i@pexcn.me>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dns2tcp
+	SECTION:=net
+	CATEGORY:=Network
+	TITLE:=Utility to convert DNS query from UDP to TCP
+	URL:=https://github.com/zfl9/dns2tcp
+endef
+
+define Package/dns2tcp/description
+Utility to convert DNS query from UDP to TCP.
+endef
+
+define Package/dns2tcp/conffiles
+/etc/config/dns2tcp
+endef
+
+define Package/dns2tcp/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dns2tcp $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,dns2tcp))
--- a/dns2tcp/patches/001-build-with-gcc-O3-optimizations.patch
+++ b/dns2tcp/patches/001-build-with-gcc-O3-optimizations.patch
@ -0,0 +1,31 @@
+From 01fc93331291ea55e8306374f6406c130de951a8 Mon Sep 17 00:00:00 2001
+From: pexcn <i@pexcn.me>
+Date: Sun, 5 Apr 2020 22:30:26 +0800
+Subject: [PATCH] build with gcc -O3 optimizations
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ae6c171..02b8587 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,12 +1,12 @@
+ CC = gcc
+-CFLAGS = -std=c99 -Wall -Wextra -O2
+CFLAGS = -std=c99 -Wall -Wextra -O3
+ LIBS = -lm
+ SRCS = dns2tcp.c
+ OBJS = $(SRCS:.c=.o)
+ MAIN = dns2tcp
+ DESTDIR = /usr/local/bin
+ 
+-EVCFLAGS = -w -O2
+EVCFLAGS = -w -O3
+ EVSRCFILE = libev/ev.c
+ EVOBJFILE = ev.o
+ 
+-- 
+2.25.1
+
--- a/luci-app-adguardhome/Makefile
+++ b/luci-app-adguardhome/Makefile
@ -0,0 +1,57 @@
+# Copyright (C) 2018-2019 Lienol
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-adguardhome
+PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
+
+LUCI_TITLE:=LuCI app for AdGuardHome
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome
+LUCI_DESCRIPTION:=LuCI support for AdGuardHome
+
+define Package/$(PKG_NAME)/config
+config PACKAGE_$(PKG_NAME)_INCLUDE_binary
+	bool "Include Binary File"
+	default y
+endef
+
+PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_binary
+
+define Package/luci-app-adguardhome/conffiles
+/usr/share/AdGuardHome/links.txt
+/etc/config/AdGuardHome
+/etc/AdGuardHome.yaml
+endef
+
+define Package/luci-app-adguardhome/postinst
+#!/bin/sh
+	/etc/init.d/AdGuardHome enable >/dev/null 2>&1
+	enable=$(uci get AdGuardHome.AdGuardHome.enabled 2>/dev/null)
+	if [ "$enable" == "1" ]; then
+		/etc/init.d/AdGuardHome reload
+	fi
+	rm -f /tmp/luci-indexcache
+	rm -f /tmp/luci-modulecache/*
+exit 0
+endef
+
+define Package/luci-app-adguardhome/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+     /etc/init.d/AdGuardHome disable
+     /etc/init.d/AdGuardHome stop
+uci -q batch <<-EOF >/dev/null 2>&1
+	delete ucitrack.@AdGuardHome[-1]
+	commit ucitrack
+EOF
+fi
+exit 0
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
+++ b/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua
@ -0,0 +1,130 @@
+module("luci.controller.AdGuardHome",package.seeall)
+local fs=require"nixio.fs"
+local http=require"luci.http"
+local uci=require"luci.model.uci".cursor()
+function index()
+local page = entry({"admin", "services", "AdGuardHome"},alias("admin", "services", "AdGuardHome", "base"),_("AdGuard Home"))
+page.order = 10
+page.dependent = true
+page.acl_depends = { "luci-app-adguardhome" }
+entry({"admin","services","AdGuardHome","base"},cbi("AdGuardHome/base"),_("Base Setting"),1).leaf = true
+entry({"admin","services","AdGuardHome","log"},form("AdGuardHome/log"),_("Log"),2).leaf = true
+entry({"admin","services","AdGuardHome","manual"},cbi("AdGuardHome/manual"),_("Manual Config"),3).leaf = true
+entry({"admin","services","AdGuardHome","status"},call("act_status")).leaf=true
+entry({"admin", "services", "AdGuardHome", "check"}, call("check_update"))
+entry({"admin", "services", "AdGuardHome", "doupdate"}, call("do_update"))
+entry({"admin", "services", "AdGuardHome", "getlog"}, call("get_log"))
+entry({"admin", "services", "AdGuardHome", "dodellog"}, call("do_dellog"))
+entry({"admin", "services", "AdGuardHome", "reloadconfig"}, call("reload_config"))
+entry({"admin", "services", "AdGuardHome", "gettemplateconfig"}, call("get_template_config"))
+end
+function get_template_config()
+	local b
+	local d=""
+	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
+		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
+		if (b~=nil) then
+			d=d.."  - "..b.."\n"
+		end
+	end
+	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
+	local tbl = {}
+	local a=""
+	while (1) do
+    	a=f:read("*l")
+		if (a=="#bootstrap_dns") then
+			a=d
+		elseif (a=="#upstream_dns") then
+			a=d
+		elseif (a==nil) then
+			break
+		end
+		table.insert(tbl, a)
+	end
+	f:close()
+	http.prepare_content("text/plain; charset=utf-8")
+	http.write(table.concat(tbl, "\n"))
+end
+function reload_config()
+	fs.remove("/tmp/AdGuardHometmpconfig.yaml")
+	http.prepare_content("application/json")
+	http.write('')
+end
+function act_status()
+	local e={}
+	local binpath=uci:get("AdGuardHome","AdGuardHome","binpath")
+	e.running=luci.sys.call("pgrep "..binpath.." >/dev/null")==0
+	e.redirect=(fs.readfile("/var/run/AdGredir")=="1")
+	http.prepare_content("application/json")
+	http.write_json(e)
+end
+function do_update()
+	fs.writefile("/var/run/lucilogpos","0")
+	http.prepare_content("application/json")
+	http.write('')
+	local arg
+	if luci.http.formvalue("force") == "1" then
+		arg="force"
+	else
+		arg=""
+	end
+	if fs.access("/var/run/update_core") then
+		if arg=="force" then
+			luci.sys.exec("kill $(pgrep /usr/share/AdGuardHome/update_core.sh) ; sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
+		end
+	else
+		luci.sys.exec("sh /usr/share/AdGuardHome/update_core.sh "..arg.." >/tmp/AdGuardHome_update.log 2>&1 &")
+	end
+end
+function get_log()
+	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
+	if (logfile==nil) then
+		http.write("no log available\n")
+		return
+	elseif (logfile=="syslog") then
+		if not fs.access("/var/run/AdGuardHomesyslog") then
+			luci.sys.exec("(/usr/share/AdGuardHome/getsyslog.sh &); sleep 1;")
+		end
+		logfile="/tmp/AdGuardHometmp.log"
+		fs.writefile("/var/run/AdGuardHomesyslog","1")
+	elseif not fs.access(logfile) then
+		http.write("")
+		return
+	end
+	http.prepare_content("text/plain; charset=utf-8")
+	local fdp
+	if fs.access("/var/run/lucilogreload") then
+		fdp=0
+		fs.remove("/var/run/lucilogreload")
+	else
+		fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
+	end
+	local f=io.open(logfile, "r+")
+	f:seek("set",fdp)
+	local a=f:read(2048000) or ""
+	fdp=f:seek()
+	fs.writefile("/var/run/lucilogpos",tostring(fdp))
+	f:close()
+	http.write(a)
+end
+function do_dellog()
+	local logfile=uci:get("AdGuardHome","AdGuardHome","logfile")
+	fs.writefile(logfile,"")
+	http.prepare_content("application/json")
+	http.write('')
+end
+function check_update()
+	http.prepare_content("text/plain; charset=utf-8")
+	local fdp=tonumber(fs.readfile("/var/run/lucilogpos")) or 0
+	local f=io.open("/tmp/AdGuardHome_update.log", "r+")
+	f:seek("set",fdp)
+	local a=f:read(2048000) or ""
+	fdp=f:seek()
+	fs.writefile("/var/run/lucilogpos",tostring(fdp))
+	f:close()
+if fs.access("/var/run/update_core") then
+	http.write(a)
+else
+	http.write(a.."\0")
+end
+end
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
@ -0,0 +1,304 @@
+require("luci.sys")
+require("luci.util")
+require("io")
+local m,s,o,o1
+local fs=require"nixio.fs"
+local uci=require"luci.model.uci".cursor()
+local configpath=uci:get("AdGuardHome","AdGuardHome","configpath") or "/etc/AdGuardHome.yaml"
+local binpath=uci:get("AdGuardHome","AdGuardHome","binpath") or "/usr/bin/AdGuardHome"
+httpport=uci:get("AdGuardHome","AdGuardHome","httpport") or "3000"
+m = Map("AdGuardHome", "AdGuard Home")
+m.description = translate("Free and open source, powerful network-wide ads & trackers blocking DNS server.")
+m:section(SimpleSection).template  = "AdGuardHome/AdGuardHome_status"
+
+s = m:section(TypedSection, "AdGuardHome")
+s.anonymous=true
+s.addremove=false
+---- enable
+o = s:option(Flag, "enabled", translate("Enable"))
+o.default = 0
+o.optional = false
+---- httpport
+o =s:option(Value,"httpport",translate("Browser management port"))
+o.placeholder=3000
+o.default=3000
+o.datatype="port"
+o.optional = false
+o.description = translate("<input type=\"button\" style=\"width:210px;border-color:Teal; text-align:center;font-weight:bold;color:Green;\" value=\"AdGuardHome Web:"..httpport.."\" onclick=\"window.open('http://'+window.location.hostname+':"..httpport.."/')\"/>")
+---- update warning not safe
+local binmtime=uci:get("AdGuardHome","AdGuardHome","binmtime") or "0"
+local e=""
+if not fs.access(configpath) then
+	e=e.." "..translate("no config")
+end
+if not fs.access(binpath) then
+	e=e.." "..translate("no core")
+else
+	local version=uci:get("AdGuardHome","AdGuardHome","version")
+	local testtime=fs.stat(binpath,"mtime")
+	if testtime~=tonumber(binmtime) or version==nil then
+		local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E 'v[0-9.]+' -o ")
+		version=string.sub(tmp, 1)
+		if version=="" then version="core error" end
+		uci:set("AdGuardHome","AdGuardHome","version",version)
+		uci:set("AdGuardHome","AdGuardHome","binmtime",testtime)
+		uci:save("AdGuardHome")
+	end
+	e=version..e
+end
+o=s:option(Button,"restart",translate("Update"))
+o.inputtitle=translate("Update core version")
+o.template = "AdGuardHome/AdGuardHome_check"
+o.showfastconfig=(not fs.access(configpath))
+o.description=string.format(translate("core version:").."<strong><font id=\"updateversion\" color=\"green\">%s </font></strong>",e)
+---- port warning not safe
+local port=luci.sys.exec("awk '/  port:/{printf($2);exit;}' "..configpath.." 2>nul")
+if (port=="") then port="?" end
+---- Redirect
+o = s:option(ListValue, "redirect", port..translate("Redirect"), translate("AdGuardHome redirect mode"))
+o.placeholder = "none"
+o:value("none", translate("none"))
+o:value("dnsmasq-upstream", translate("Run as dnsmasq upstream server"))
+o:value("redirect", translate("Redirect 53 port to AdGuardHome"))
+o:value("exchange", translate("Use port 53 replace dnsmasq"))
+o.default     = "none"
+o.optional = true
+---- bin path
+o = s:option(Value, "binpath", translate("Bin Path"), translate("AdGuardHome Bin path if no bin will auto download"))
+o.default     = "/usr/bin/AdGuardHome"
+o.datatype    = "string"
+o.optional = false
+o.rmempty=false
+o.validate=function(self, value)
+if value=="" then return nil end
+if fs.stat(value,"type")=="dir" then
+	fs.rmdir(value)
+end
+if fs.stat(value,"type")=="dir" then
+	if (m.message) then
+	m.message =m.message.."\nerror!bin path is a dir"
+	else
+	m.message ="error!bin path is a dir"
+	end
+	return nil
+end
+return value
+end
+--- upx
+o = s:option(ListValue, "upxflag", translate("use upx to compress bin after download"))
+o:value("", translate("none"))
+o:value("-1", translate("compress faster"))
+o:value("-9", translate("compress better"))
+o:value("--best", translate("compress best(can be slow for big files)"))
+o:value("--brute", translate("try all available compression methods & filters [slow]"))
+o:value("--ultra-brute", translate("try even more compression variants [very slow]"))
+o.default     = ""
+o.description=translate("bin use less space,but may have compatibility issues")
+o.rmempty = true
+---- config path
+o = s:option(Value, "configpath", translate("Config Path"), translate("AdGuardHome config path"))
+o.default     = "/etc/AdGuardHome.yaml"
+o.datatype    = "string"
+o.optional = false
+o.rmempty=false
+o.validate=function(self, value)
+if value==nil then return nil end
+if fs.stat(value,"type")=="dir" then
+	fs.rmdir(value)
+end
+if fs.stat(value,"type")=="dir" then
+	if m.message then
+	m.message =m.message.."\nerror!config path is a dir"
+	else
+	m.message ="error!config path is a dir"
+	end
+	return nil
+end
+return value
+end
+---- work dir
+o = s:option(Value, "workdir", translate("Work dir"), translate("AdGuardHome work dir include rules,audit log and database"))
+o.default     = "/etc/AdGuardHome"
+o.datatype    = "string"
+o.optional = false
+o.rmempty=false
+o.validate=function(self, value)
+if value=="" then return nil end
+if fs.stat(value,"type")=="reg" then
+	if m.message then
+	m.message =m.message.."\nerror!work dir is a file"
+	else
+	m.message ="error!work dir is a file"
+	end
+	return nil
+end
+if string.sub(value, -1)=="/" then
+	return string.sub(value, 1, -2)
+else
+	return value
+end
+end
+---- log file
+o = s:option(Value, "logfile", translate("Runtime log file"), translate("AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"))
+o.datatype    = "string"
+o.rmempty = true
+o.validate=function(self, value)
+if fs.stat(value,"type")=="dir" then
+	fs.rmdir(value)
+end
+if fs.stat(value,"type")=="dir" then
+	if m.message then
+	m.message =m.message.."\nerror!log file is a dir"
+	else
+	m.message ="error!log file is a dir"
+	end
+	return nil
+end
+return value
+end
+---- debug
+o = s:option(Flag, "verbose", translate("Verbose log"))
+o.default = 0
+o.optional = true
+---- gfwlist
+local a=luci.sys.call("grep -m 1 -q programadd "..configpath)
+if (a==0) then
+a="Added"
+else
+a="Not added"
+end
+o=s:option(Button,"gfwdel",translate("Del gfwlist"),translate(a))
+o.optional = true
+o.inputtitle=translate("Del")
+o.write=function()
+	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh del 2>&1")
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+end
+o=s:option(Button,"gfwadd",translate("Add gfwlist"),translate(a))
+o.optional = true
+o.inputtitle=translate("Add")
+o.write=function()
+	luci.sys.exec("sh /usr/share/AdGuardHome/gfw2adg.sh 2>&1")
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome"))
+end
+o = s:option(Value, "gfwupstream", translate("Gfwlist upstream dns server"), translate("Gfwlist domain upstream dns service")..translate(a))
+o.default     = "tcp://208.67.220.220:5353"
+o.datatype    = "string"
+o.optional = true
+---- chpass
+o = s:option(Value, "hashpass", translate("Change browser management password"), translate("Press load culculate model and culculate finally save/apply"))
+o.default     = ""
+o.datatype    = "string"
+o.template = "AdGuardHome/AdGuardHome_chpass"
+o.optional = true
+---- upgrade protect
+o = s:option(MultiValue, "upprotect", translate("Keep files when system upgrade"))
+o:value("$binpath",translate("core bin"))
+o:value("$configpath",translate("config file"))
+o:value("$logfile",translate("log file"))
+o:value("$workdir/data/sessions.db",translate("sessions.db"))
+o:value("$workdir/data/stats.db",translate("stats.db"))
+o:value("$workdir/data/querylog.json",translate("querylog.json"))
+o:value("$workdir/data/filters",translate("filters"))
+o.widget = "checkbox"
+o.default = nil
+o.optional=true
+---- wait net on boot
+o = s:option(Flag, "waitonboot", translate("On boot when network ok restart"))
+o.default = 1
+o.optional = true
+---- backup workdir on shutdown
+local workdir=uci:get("AdGuardHome","AdGuardHome","workdir") or "/etc/AdGuardHome"
+o = s:option(MultiValue, "backupfile", translate("Backup workdir files when shutdown"))
+o1 = s:option(Value, "backupwdpath", translate("Backup workdir path"))
+local name
+o:value("filters","filters")
+o:value("stats.db","stats.db")
+o:value("querylog.json","querylog.json")
+o:value("sessions.db","sessions.db")
+o1:depends ("backupfile", "filters")
+o1:depends ("backupfile", "stats.db")
+o1:depends ("backupfile", "querylog.json")
+o1:depends ("backupfile", "sessions.db")
+for name in fs.glob(workdir.."/data/*")
+do
+	name=fs.basename (name)
+	if name~="filters" and name~="stats.db" and name~="querylog.json" and name~="sessions.db" then
+		o:value(name,name)
+		o1:depends ("backupfile", name)
+	end
+end
+o.widget = "checkbox"
+o.default = nil
+o.optional=false
+o.description=translate("Will be restore when workdir/data is empty")
+----backup workdir path
+
+o1.default     = "/etc/AdGuardHome"
+o1.datatype    = "string"
+o1.optional = false
+o1.validate=function(self, value)
+if fs.stat(value,"type")=="reg" then
+	if m.message then
+	m.message =m.message.."\nerror!backup dir is a file"
+	else
+	m.message ="error!backup dir is a file"
+	end
+	return nil
+end
+if string.sub(value,-1)=="/" then
+	return string.sub(value, 1, -2)
+else
+	return value
+end
+end
+
+----Crontab
+o = s:option(MultiValue, "crontab", translate("Crontab task"),translate("Please change time and args in crontab"))
+o:value("autoupdate",translate("Auto update core"))
+o:value("cutquerylog",translate("Auto tail querylog"))
+o:value("cutruntimelog",translate("Auto tail runtime log"))
+o:value("autohost",translate("Auto update ipv6 hosts and restart adh"))
+o:value("autogfw",translate("Auto update gfwlist and restart adh"))
+o.widget = "checkbox"
+o.default = nil
+o.optional=true
+
+----downloadpath
+o = s:option(TextValue, "downloadlinks",translate("Download links for update"))
+o.optional = false
+o.rows = 4
+o.wrap = "soft"
+o.cfgvalue = function(self, section)
+	return fs.readfile("/usr/share/AdGuardHome/links.txt")
+end
+o.write = function(self, section, value)
+	fs.writefile("/usr/share/AdGuardHome/links.txt", value:gsub("\r\n", "\n"))
+end
+fs.writefile("/var/run/lucilogpos","0")
+function m.on_commit(map)
+	if (fs.access("/var/run/AdGserverdis")) then
+		io.popen("/etc/init.d/AdGuardHome reload &")
+		return
+	end
+	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
+	if ucitracktest=="1" then
+		return
+	elseif ucitracktest=="0" then
+		io.popen("/etc/init.d/AdGuardHome reload &")
+	else
+		if (fs.access("/var/run/AdGlucitest")) then
+			uci:set("AdGuardHome","AdGuardHome","ucitracktest","0")
+			io.popen("/etc/init.d/AdGuardHome reload &")
+		else
+			fs.writefile("/var/run/AdGlucitest","")
+			if (ucitracktest=="2") then
+				uci:set("AdGuardHome","AdGuardHome","ucitracktest","1")
+			else
+				uci:set("AdGuardHome","AdGuardHome","ucitracktest","2")
+			end
+		end
+		uci:save("AdGuardHome")
+	end
+end
+return m
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/log.lua
@ -0,0 +1,16 @@
+local fs=require"nixio.fs"
+local uci=require"luci.model.uci".cursor()
+local f,t
+f=SimpleForm("logview")
+f.reset = false
+f.submit = false
+t=f:field(TextValue,"conf")
+t.rmempty=true
+t.rows=20
+t.template="AdGuardHome/log"
+t.readonly="readonly"
+local logfile=uci:get("AdGuardHome","AdGuardHome","logfile") or ""
+t.timereplace=(logfile~="syslog" and logfile~="" )
+t.pollcheck=logfile~=""
+fs.writefile("/var/run/lucilogreload","")
+return f
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua
@ -0,0 +1,97 @@
+local m, s, o
+local fs = require "nixio.fs"
+local uci=require"luci.model.uci".cursor()
+local sys=require"luci.sys"
+require("string")
+require("io")
+require("table")
+function gen_template_config()
+	local b
+	local d=""
+	for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do
+		b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$")
+		if (b~=nil) then
+			d=d.."  - "..b.."\n"
+		end
+	end
+	local f=io.open("/usr/share/AdGuardHome/AdGuardHome_template.yaml", "r+")
+	local tbl = {}
+	local a=""
+	while (1) do
+    	a=f:read("*l")
+		if (a=="#bootstrap_dns") then
+			a=d
+		elseif (a=="#upstream_dns") then
+			a=d
+		elseif (a==nil) then
+			break
+		end
+		table.insert(tbl, a)
+	end
+	f:close()
+	return table.concat(tbl, "\n")
+end
+m = Map("AdGuardHome")
+local configpath = uci:get("AdGuardHome","AdGuardHome","configpath")
+local binpath = uci:get("AdGuardHome","AdGuardHome","binpath")
+s = m:section(TypedSection, "AdGuardHome")
+s.anonymous=true
+s.addremove=false
+--- config
+o = s:option(TextValue, "escconf")
+o.rows = 66
+o.wrap = "off"
+o.rmempty = true
+o.cfgvalue = function(self, section)
+	return  fs.readfile("/tmp/AdGuardHometmpconfig.yaml") or fs.readfile(configpath) or gen_template_config() or ""
+end
+o.validate=function(self, value)
+    fs.writefile("/tmp/AdGuardHometmpconfig.yaml", value:gsub("\r\n", "\n"))
+	if fs.access(binpath) then
+		if (sys.call(binpath.." -c /tmp/AdGuardHometmpconfig.yaml --check-config 2> /tmp/AdGuardHometest.log")==0) then
+			return value
+		end
+	else
+		return value
+	end
+	luci.http.redirect(luci.dispatcher.build_url("admin","services","AdGuardHome","manual"))
+	return nil
+end
+o.write = function(self, section, value)
+	fs.move("/tmp/AdGuardHometmpconfig.yaml",configpath)
+end
+o.remove = function(self, section, value)
+	fs.writefile(configpath, "")
+end
+--- js and reload button
+o = s:option(DummyValue, "")
+o.anonymous=true
+o.template = "AdGuardHome/yamleditor"
+if not fs.access(binpath) then
+	o.description=translate("WARNING!!! no bin found apply config will not be test")
+end
+--- log
+if (fs.access("/tmp/AdGuardHometmpconfig.yaml")) then
+local c=fs.readfile("/tmp/AdGuardHometest.log")
+if (c~="") then
+o = s:option(TextValue, "")
+o.readonly=true
+o.rows = 5
+o.rmempty = true
+o.name=""
+o.cfgvalue = function(self, section)
+	return fs.readfile("/tmp/AdGuardHometest.log")
+end
+end
+end
+function m.on_commit(map)
+	local ucitracktest=uci:get("AdGuardHome","AdGuardHome","ucitracktest")
+	if ucitracktest=="1" then
+		return
+	elseif ucitracktest=="0" then
+		io.popen("/etc/init.d/AdGuardHome reload &")
+	else
+		fs.writefile("/var/run/AdGlucitest","")
+	end
+end
+return m
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm
@ -0,0 +1,78 @@
+<%+cbi/valueheader%>
+<%local fs=require"nixio.fs"%>
+<input type="button" class="btn cbi-button cbi-button-apply" id="apply_update_button" value="<%:Update core version%>" onclick=" return apply_update() "/>
+<input type="button" class="btn cbi-button cbi-button-apply" id="apply_forceupdate_button" value="<%:Force update%>" onclick=" return apply_forceupdate()" style="display:none"/>
+<% if self.showfastconfig then %>
+<input type="button" class="btn cbi-button cbi-button-apply" id="to_configpage" value="<%:Fast config%>" onclick="location.href='<%=url([[admin]], [[services]], [[AdGuardHome]], [[manual]])%>'"/>
+<%end%>
+<div id="logview" style="display:none">
+<input type="checkbox" id="reversetag" value="reverse" onclick=" return reverselog()" style="vertical-align:middle;height: auto;"><%:reverse%></input>
+<textarea id="cbid.logview.1.conf" class="cbi-input-textarea" style="width: 100%;display:block;" data-update="change" rows="5" cols="60" readonly="readonly" > </textarea>
+</div>
+<script type="text/javascript">//<![CDATA[
+var updatebtn = document.getElementById('apply_update_button');
+var forceupdatebtn = document.getElementById('apply_forceupdate_button');
+var islogreverse = false;
+function apply_forceupdate(){
+	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[doupdate]])%>',{ force: 1 },function(x, data){}
+		);
+	updatebtn.disabled = true;
+	poll_check();
+	return
+}
+function reverselog(){
+	var lv = document.getElementById('cbid.logview.1.conf');
+	lv.innerHTML=lv.innerHTML.split('\n').reverse().join('\n')
+	if (islogreverse){
+	islogreverse=false;
+	}else{
+	islogreverse=true;
+	}
+	return
+}
+function apply_update(){
+	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[doupdate]])%>',null,function(x, data){}
+		);
+	updatebtn.disabled = true;
+	updatebtn.value    = '<%:Check...%>';
+	forceupdatebtn.style.display="inline"
+	poll_check();
+	return
+}
+function poll_check(){
+var tag = document.getElementById('logview');
+	tag.style.display="block"
+XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>', null,
+	function(x, data) {
+		var lv = document.getElementById('cbid.logview.1.conf');
+		if (x.responseText && lv) {
+			if (x.responseText=="\u0000"){
+				for(j = 0,len=this.XHR._q.length; j < len; j++) {
+					if (this.XHR._q[j].url == '<%=url([[admin]], [[services]], [[AdGuardHome]], [[check]])%>'){
+						this.XHR._q.splice(j,1);
+						updatebtn.disabled = false;
+						updatebtn.value    = '<%:Updated%>';
+						break;
+					}
+				}
+				return	
+			}
+			if (islogreverse){
+				lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;
+			}else{
+				lv.innerHTML += x.responseText;
+			}
+		}
+	}
+);}
+<% if fs.access("/var/run/update_core") then %>
+	updatebtn.disabled = true;
+	updatebtn.value    = '<%:Check...%>';
+	forceupdatebtn.style.display="inline"
+	poll_check();
+<%elseif fs.access("/var/run/update_core_error") then %>
+	poll_check();
+<%end%>
+//]]>
+</script>
+<%+cbi/valuefooter%>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm
@ -0,0 +1,49 @@
+<%+cbi/valueheader%>
+<script type="text/javascript">//<![CDATA[
+function chpass(btn)
+	{
+		btn.disabled = true;
+		btn.value    = '<%:loading...%>';
+		if (typeof bcryptloaded == 'undefined' ){
+		var theHead = document.getElementsByTagName('head').item(0);
+		//创建脚本的dom对象实例
+		var myScript = document.createElement('script');
+		myScript.src = '<%=resource%>/twin-bcrypt.min.js';            //指定脚本路径
+		myScript.type = 'text/javascript';    //指定脚本类型
+		myScript.defer = true;                //程序下载完后再解析和执行
+		theHead.appendChild(myScript);
+		bcryptloaded=1;
+		btn.value    = '<%:Culculate%>';
+		btn.disabled = false;
+		return
+		}
+		var lv = document.getElementById('cbid.AdGuardHome.AdGuardHome.hashpass');
+		if (lv.value != ""){
+		var hash = TwinBcrypt.hashSync(lv.value);
+		lv.value=hash;
+		btn.value    = '<%:Please save/apply%>';
+		}else{
+		btn.value    = '<%:is empty%>';
+		btn.disabled = false;
+		}
+	}
+//]]>
+</script> 
+		<input data-update="change"<%=
+		attr("id", cbid) ..
+		attr("name", cbid) ..
+		attr("type", self.password and "password" or "text") ..
+		attr("class", self.password and "cbi-input-password" or "cbi-input-text") ..
+		attr("value", self:cfgvalue(section) or self.default) ..
+		ifattr(self.size, "size") ..
+		ifattr(self.placeholder, "placeholder") ..
+		ifattr(self.readonly, "readonly") ..
+		ifattr(self.maxlength, "maxlength") ..
+		ifattr(self.datatype, "data-type", self.datatype) ..
+		ifattr(self.datatype, "data-optional", self.optional or self.rmempty) ..
+		ifattr(self.combobox_manual, "data-manual", self.combobox_manual) ..
+		ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
+	%> />
+	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
+	<input type="button" class="btn cbi-button cbi-button-apply" id="cbid.AdGuardHome.AdGuardHome.applychpass" value="<%:Load culculate model%>" onclick="return chpass(this)"/>
+<%+cbi/valuefooter%>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm
@ -0,0 +1,27 @@
+<script type="text/javascript">//<![CDATA[
+XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[status]])%>', null,
+	function(x, data) {
+		var tb = document.getElementById('AdGuardHome_status');
+		if (data && tb) {
+			if (data.running) {
+				tb.innerHTML = '<em><b><font color=green>AdGuardHome <%:RUNNING%></font></b></em>';
+			} else {
+				tb.innerHTML = '<em><b><font color=red>AdGuardHome <%:NOT RUNNING%></font></b></em>';
+			}
+			if (data.redirect)
+			{
+				tb.innerHTML+='<em><b><font color=green><%:Redirected%></font></b></em>'
+			} else {
+				tb.innerHTML+='<em><b><font color=red><%:Not redirect%></font></b></em>'	
+			}
+		}
+	}
+);
+//]]>
+</script>
+<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
+<fieldset class="cbi-section">
+	<p id="AdGuardHome_status">
+		<em><%:Collecting data...%></em>
+	</p>
+</fieldset>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm
@ -0,0 +1,111 @@
+<%+cbi/valueheader%>
+<input type="checkbox" name="NAME" value="reverse" onclick=" return reverselog()" style="vertical-align:middle;height: auto;" checked><%:reverse%></input>
+<%if self.timereplace then%>
+<input type="checkbox" name="NAME" value="localtime" onclick=" return chlogtime()" style="vertical-align:middle;height: auto;" checked><%:localtime%></input><br>
+<%end%>
+<textarea id="cbid.logview.1.conf" class="cbi-input-textarea" style="width: 100%;display:inline" data-update="change" rows="32" cols="60" readonly="readonly" > </textarea>
+<input type="button" class="btn cbi-button cbi-button-apply" id="apply_update_button" value="<%:dellog%>" onclick=" return apply_del_log() "/>
+<input type="button" class="btn cbi-button cbi-button-apply" value="<%:download log%>" style=" display:inline;" onclick=" return download_log()" />
+<script type="text/javascript">//<![CDATA[
+var islogreverse = true;
+var isutc2local = <%=tostring(self.timereplace)%>;
+function createAndDownloadFile(fileName, content) {
+    var aTag = document.createElement('a');
+    var blob = new Blob([content]);
+    aTag.download = fileName;
+    aTag.href = URL.createObjectURL(blob);
+    aTag.click();
+    URL.revokeObjectURL(blob);
+}
+function download_log(){
+	var lv = document.getElementById('cbid.logview.1.conf');
+	var dt = new Date();
+	var timestamp = (dt.getMonth()+1)+"-"+dt.getDate()+"-"+dt.getHours()+"_"+dt.getMinutes();
+	createAndDownloadFile("AdGuardHome"+timestamp+".log",lv.innerHTML)
+	return
+}
+function apply_del_log(){
+	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[dodellog]])%>',null,function(x, data){
+	var lv = document.getElementById('cbid.logview.1.conf');
+		lv.innerHTML="";
+	}
+		);
+	return
+}
+function chlogtime(){
+	var lv = document.getElementById('cbid.logview.1.conf');
+	if (isutc2local){
+	lv.innerHTML=line_toUTC(lv.innerHTML).join('\n');
+	isutc2local=false;
+	}else{
+	lv.innerHTML=line_tolocal(lv.innerHTML).join('\n');
+	isutc2local=true;
+	}
+	return
+}
+function reverselog(){
+	var lv = document.getElementById('cbid.logview.1.conf');
+	lv.innerHTML=lv.innerHTML.split('\n').reverse().join('\n')
+	if (islogreverse){
+	islogreverse=false;
+	}else{
+	islogreverse=true;
+	}
+	return
+}
+function p(s) {
+        return s < 10 ? '0' + s: s;
+}
+function line_tolocal(str){
+var strt=new Array();
+str.trim().split('\n').forEach(function(v, i) {
+var dt = new Date(v.substring(0,19)+" UTC");
+if (dt != "Invalid Date"){
+  strt[i]=dt.getFullYear()+"/"+p(dt.getMonth()+1)+"/"+p(dt.getDate())+" "+p(dt.getHours())+":"+p(dt.getMinutes())+":"+p(dt.getSeconds())+v.substring(19);
+}else{
+  strt[i]=v;}})
+return strt
+}
+function line_toUTC(str){
+var strt=new Array();
+str.trim().split('\n').forEach(function(v, i) {
+var dt = new Date(v.substring(0,19))
+if (dt != "Invalid Date"){
+  strt[i]=dt.getUTCFullYear()+"/"+p(dt.getUTCMonth()+1)+"/"+p(dt.getUTCDate())+" "+p(dt.getUTCHours())+":"+p(dt.getUTCMinutes())+":"+p(dt.getUTCSeconds())+v.substring(19);
+}else{
+  strt[i]=v;}})
+return strt
+}
+function poll_check(){
+XHR.poll(3, '<%=url([[admin]], [[services]], [[AdGuardHome]], [[getlog]])%>', null,
+	function(x, data) {
+		var lv = document.getElementById('cbid.logview.1.conf');
+		if (x.responseText && lv) {
+			if (isutc2local)
+			{
+				var lines=line_toUTC(x.responseText);
+				if (islogreverse){
+					lv.innerHTML = lines.reverse().join('\n')+lv.innerHTML;
+				}else{
+					lv.innerHTML += lines.join('\n');
+				}
+			lv.innerHTML=line_tolocal(lv.innerHTML).join('\n');
+			}else{
+				if (islogreverse){
+					lv.innerHTML = x.responseText.split('\n').reverse().join('\n')+lv.innerHTML;
+				}else{
+					lv.innerHTML += x.responseText;
+				}
+			}
+		}
+	}
+);}
+<%if self.pollcheck then%>
+poll_check();
+<%else%>
+var lv = document.getElementById('cbid.logview.1.conf');
+lv.innerHTML="<%:Please add log path in config to enable log%>"
+<%end%>
+//]]>
+</script>	
+<%+cbi/valuefooter%>
--- a/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
+++ b/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm
@ -0,0 +1,39 @@
+<%+cbi/valueheader%>
+<script src="/luci-static/resources/codemirror/lib/codemirror.js"></script>
+<link rel="stylesheet" href="/luci-static/resources/codemirror/lib/codemirror.css"/>
+<script src="/luci-static/resources/codemirror/mode/yaml/yaml.js"></script>
+<link rel="stylesheet" href="/luci-static/resources/codemirror/theme/dracula.css"/>
+<link rel="stylesheet" href="/luci-static/resources/codemirror/addon/fold/foldgutter.css"/>
+<script src="/luci-static/resources/codemirror/addon/fold/foldcode.js"></script>
+<script src="/luci-static/resources/codemirror/addon/fold/foldgutter.js"></script>
+<script src="/luci-static/resources/codemirror/addon/fold/indent-fold.js"></script>
+<script type="text/javascript">//<![CDATA[
+var editor = CodeMirror.fromTextArea(document.getElementById("cbid.AdGuardHome.AdGuardHome.escconf"), {
+mode: "text/yaml",    //实现groovy代码高亮
+styleActiveLine: true,
+lineNumbers: true,	//显示行号
+theme: "dracula",	//设置主题
+lineWrapping: true,	//代码折叠
+foldGutter: true,
+gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+matchBrackets: true //括号匹配
+}
+);
+function reload_config(){
+	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[reloadconfig]])%>', null,
+	function(x, data) {
+	location.reload();
+	});}
+function use_template(){
+	XHR.get('<%=url([[admin]], [[services]], [[AdGuardHome]], [[gettemplateconfig]])%>', null,
+	function(x, data) {
+	editor.setValue(x.responseText)
+	});}
+//]]>
+</script> 
+<%fs=require"nixio.fs"%>
+<%if fs.access("/tmp/AdGuardHometmpconfig.yaml") then%>
+<input type="button" id="apply_update_button" value="<%:Reload Config%>" onclick=" return reload_config() "/>
+<%end%>
+<input type="button" id="template_button" value="<%:Use template%>" onclick=" return use_template() "/>
+<%+cbi/valuefooter%>
--- a/luci-app-adguardhome/po/zh-cn
+++ b/luci-app-adguardhome/po/zh-cn
@ -0,0 +1 @@
+zh_Hans
--- a/luci-app-adguardhome/po/zh_Hans/adguardhome.po
+++ b/luci-app-adguardhome/po/zh_Hans/adguardhome.po
@ -0,0 +1,408 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_Hans\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:27
+msgid ""
+"<input type=\"button\" style=\"width:210px;border-color:Teal; text-align:"
+"center;font-weight:bold;color:Green;\" value=\"AdGuardHome Web:"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:6
+msgid "AdGuard Home"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:67
+msgid "AdGuardHome Bin path if no bin will auto download"
+msgstr "AdGuardHome 执行文件路径 如果没有执行文件将自动下载"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:99
+msgid "AdGuardHome config path"
+msgstr "AdGuardHome 配置文件路径"
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:58
+msgid "AdGuardHome redirect mode"
+msgstr "AdGuardHome重定向模式"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:142
+msgid ""
+"AdGuardHome runtime Log file if 'syslog': write to system log;if empty no log"
+msgstr "AdGuardHome 运行日志 如果填syslog将写入系统日志；如果空则不记录日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:120
+msgid "AdGuardHome work dir include rules,audit log and database"
+msgstr "AdGuardHome 工作目录包含规则，审计日志和数据库"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:179
+msgid "Add"
+msgstr "添加"
+
+# hide div
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:177
+msgid "Add gfwlist"
+msgstr "加入gfw列表"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:259
+msgid "Auto tail querylog"
+msgstr "自动截短查询日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:260
+msgid "Auto tail runtime log"
+msgstr "自动截短运行日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:258
+msgid "Auto update core"
+msgstr "自动升级核心"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:262
+msgid "Auto update gfwlist and restart adh"
+msgstr "自动更新gfw列表并重启adh"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:261
+msgid "Auto update ipv6 hosts and restart adh"
+msgstr "自动更新ipv6主机并重启adh"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:212
+msgid "Backup workdir files when shutdown"
+msgstr "在关机时备份工作目录文件"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:213
+msgid "Backup workdir path"
+msgstr "工作目录备份路径"
+
+# /cgi-bin/luci/admin/services/AdGuardHome
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:7
+msgid "Base Setting"
+msgstr "基础设置"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:67
+msgid "Bin Path"
+msgstr "执行文件路径"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:22
+msgid "Browser management port"
+msgstr "网页管理端口"
+
+# hide div
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:189
+msgid "Change browser management password"
+msgstr "改变网页登录密码"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:37
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:70
+msgid "Check..."
+msgstr "检查中..."
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:25
+msgid "Collecting data..."
+msgstr "获取数据中..."
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:99
+msgid "Config Path"
+msgstr "配置文件路径"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:257
+msgid "Crontab task"
+msgstr "计划任务"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:16
+msgid "Culculate"
+msgstr "计算"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:172
+msgid "Del"
+msgstr "删除"
+
+# hide div
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:170
+msgid "Del gfwlist"
+msgstr "删除gfw列表"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:268
+msgid "Download links for update"
+msgstr "升级用的下载链接"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:18
+msgid "Enable"
+msgstr "启用"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:6
+msgid "Fast config"
+msgstr "快速配置"
+
+# button hide
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:4
+msgid "Force update"
+msgstr "强制更新"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:11
+msgid ""
+"Free and open source, powerful network-wide ads & trackers blocking DNS "
+"server."
+msgstr "免费开源，功能强大的全网络广告和跟踪程序拦截DNS服务器"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:184
+msgid "Gfwlist domain upstream dns service"
+msgstr "gfw列表域名上游服务器"
+
+# hide div
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:184
+msgid "Gfwlist upstream dns server"
+msgstr "gfw列表上游服务器"
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:195
+msgid "Keep files when system upgrade"
+msgstr "系统升级时保留文件"
+
+# #button change
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:48
+msgid "Load culculate model"
+msgstr "载入计算模块"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:8
+msgid "Log"
+msgstr "日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua:9
+msgid "Manual Config"
+msgstr "手动设置"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:9
+msgid "NOT RUNNING"
+msgstr "未运行"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:15
+msgid "Not redirect"
+msgstr "未重定向"
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:207
+msgid "On boot when network ok restart"
+msgstr "开机后网络准备好时重启"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:106
+msgid "Please add log path in config to enable log"
+msgstr "请在设置里填写日志路径以启用日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:257
+msgid "Please change time and args in crontab"
+msgstr "请在计划任务中修改时间和参数"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:24
+msgid "Please save/apply"
+msgstr "请提交"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:189
+msgid "Press load culculate model and culculate finally save/apply"
+msgstr "按载入计算模块 然后计算 最后保存/提交"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:7
+msgid "RUNNING"
+msgstr "运行中"
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:58
+msgid "Redirect"
+msgstr "重定向"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:62
+msgid "Redirect 53 port to AdGuardHome"
+msgstr "重定向53端口到AdGuardHome"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_status.htm:13
+msgid "Redirected"
+msgstr "已重定向"
+
+# hide button
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm:36
+msgid "Reload Config"
+msgstr "重新载入配置"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:47
+msgid "Reveal/hide password"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:61
+msgid "Run as dnsmasq upstream server"
+msgstr "作为dnsmasq的上游服务器"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:142
+msgid "Runtime log file"
+msgstr "运行日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:49
+msgid "Update"
+msgstr "更新"
+
+# button change
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:50
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:3
+msgid "Update core version"
+msgstr "更新核心版本"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:54
+msgid "Updated"
+msgstr "已更新"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:63
+msgid "Use port 53 replace dnsmasq"
+msgstr "使用53端口替换dnsmasq"
+
+# /cgi-bin/luci//admin/services/AdGuardHome/manual/
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/yamleditor.htm:38
+msgid "Use template"
+msgstr "使用模板"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:160
+msgid "Verbose log"
+msgstr "详细日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua:71
+msgid "WARNING!!! no bin found apply config will not be test"
+msgstr "警告！！！未找到执行文件，提交配置将不会进行校验"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:234
+msgid "Will be restore when workdir/data is empty"
+msgstr "在工作目录/data为空的时候恢复"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:120
+msgid "Work dir"
+msgstr "工作目录"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:96
+msgid "bin use less space,but may have compatibility issues"
+msgstr "减小执行文件空间占用，但是可能压缩后有兼容性问题"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:92
+msgid "compress best(can be slow for big files)"
+msgstr "最好的压缩(大文件可能慢)"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:91
+msgid "compress better"
+msgstr "更好的压缩"
+
+# inlist
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:90
+msgid "compress faster"
+msgstr "快速压缩"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:197
+msgid "config file"
+msgstr "配置文件"
+
+# checkbox
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:196
+msgid "core bin"
+msgstr "核心执行文件"
+
+#
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:53
+msgid "core version:"
+msgstr "核心版本:"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:7
+msgid "dellog"
+msgstr "删除日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:8
+msgid "download log"
+msgstr "下载日志"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:202
+msgid "filters"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:26
+msgid "is empty"
+msgstr "为空"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_chpass.htm:6
+msgid "loading..."
+msgstr "载入中"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:4
+msgid "localtime"
+msgstr "本地时间"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:198
+msgid "log file"
+msgstr "日志文件"
+
+# description change
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:32
+msgid "no config"
+msgstr "没有配置文件"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:35
+msgid "no core"
+msgstr "没有核心"
+
+# inlist
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:60
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:89
+msgid "none"
+msgstr "无"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:201
+msgid "querylog.json"
+msgstr "审计日志.json"
+
+# /cgi-bin/luci/admin/services/AdGuardHome/log/
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/AdGuardHome_check.htm:9
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/view/AdGuardHome/log.htm:2
+msgid "reverse"
+msgstr "逆序"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:199
+msgid "sessions.db"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:200
+msgid "stats.db"
+msgstr ""
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:93
+msgid "try all available compression methods & filters [slow]"
+msgstr "尝试所有可能的压缩方法和过滤器[慢]"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:94
+msgid "try even more compression variants [very slow]"
+msgstr "尝试更多变体压缩手段[很慢]"
+
+#: /mnt/A/openwrt-latest/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua:88
+msgid "use upx to compress bin after download"
+msgstr "下载后使用upx压缩执行文件"
+
+#~ msgid "Added"
+#~ msgstr "已添加"
+
+#~ msgid "Not added"
+#~ msgstr "未添加"
+
+# unused
+#~ msgid "Change browser management username"
+#~ msgstr "改变网页登录用户名"
+
+#~ msgid "Username"
+#~ msgstr "用户名"
+
+#~ msgid "Check Config"
+#~ msgstr "检查配置"
+
+#~ msgid "unknown"
+#~ msgstr "未知"
+
+#~ msgid "Keep database when system upgrade"
+#~ msgstr "系统升级时保留数据"
+
+#~ msgid "Boot delay until network ok"
+#~ msgstr "开机时直到网络准备好再启动"
--- a/luci-app-adguardhome/root/etc/config/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/config/AdGuardHome
@ -0,0 +1,11 @@
+config AdGuardHome 'AdGuardHome'
+	option enabled '0'
+	option httpport '3000'
+	option redirect 'none'
+	option configpath '/etc/AdGuardHome.yaml'
+	option workdir '/etc/AdGuardHome'
+	option logfile '/tmp/AdGuardHome.log'
+	option verbose '0'
+	option binpath '/usr/bin/AdGuardHome'
+	option upxflag ''
+
--- a/luci-app-adguardhome/root/etc/init.d/AdGuardHome
+++ b/luci-app-adguardhome/root/etc/init.d/AdGuardHome
@ -0,0 +1,642 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+
+START=95
+STOP=01
+
+CONFIGURATION=AdGuardHome
+CRON_FILE=/etc/crontabs/root
+
+extra_command "do_redirect" "0 or 1"
+extra_command "testbackup" "backup or restore"
+extra_command "test_crontab"
+extra_command "force_reload"
+extra_command "isrunning"
+
+set_forward_dnsmasq()
+{
+	local PORT="$1"
+	addr="127.0.0.1#$PORT"
+	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		return
+	fi
+	uci delete dhcp.@dnsmasq[0].server 2>/dev/null
+	uci add_list dhcp.@dnsmasq[0].server=$addr
+	for server in $OLD_SERVER; do
+		if [ "$server" = "$addr" ]; then
+			continue
+		fi
+		# uci add_list dhcp.@dnsmasq[0].server=$server
+	done
+	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
+	uci set dhcp.@dnsmasq[0].noresolv=1
+	uci commit dhcp
+	/etc/init.d/dnsmasq restart
+}
+
+stop_forward_dnsmasq()
+{
+	local OLD_PORT="$1"
+	addr="127.0.0.1#$OLD_PORT"
+	OLD_SERVER="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	echo $OLD_SERVER | grep "^$addr" >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		return
+	fi
+
+	uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
+	addrlist="`uci get dhcp.@dnsmasq[0].server 2>/dev/null`"
+	if [ -z "$addrlist" ] ; then
+		uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
+		uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
+	fi
+	uci commit dhcp
+	/etc/init.d/dnsmasq restart
+}
+
+set_iptable()
+{
+	local ipv6_server=$1
+	local tcp_server=$2
+	uci -q batch <<-EOF >/dev/null 2>&1
+	delete firewall.AdGuardHome
+	set firewall.AdGuardHome=include
+	set firewall.AdGuardHome.type=script
+	set firewall.AdGuardHome.path=/usr/share/AdGuardHome/firewall.start
+	set firewall.AdGuardHome.reload=1
+	commit firewall
+EOF
+
+	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
+	for IP in $IPS
+	do
+		if [ "$tcp_server" == "1" ]; then
+			iptables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
+		fi
+		iptables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
+	done
+
+	if [ "$ipv6_server" == 0 ]; then
+		return
+	fi
+
+	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
+	for IP in $IPS
+	do
+		if [ "$tcp_server" == "1" ]; then
+			ip6tables -t nat -A PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
+		fi
+		ip6tables -t nat -A PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $AdGuardHome_PORT >/dev/null 2>&1
+	done
+}
+
+clear_iptable()
+{
+	uci -q batch <<-EOF >/dev/null 2>&1
+	delete firewall.AdGuardHome
+	commit firewall
+EOF
+	local OLD_PORT="$1"
+	local ipv6_server=$2
+	IPS="`ifconfig | grep "inet addr" | grep -v ":127" | grep "Bcast" | awk '{print $2}' | awk -F : '{print $2}'`"
+	for IP in $IPS
+	do
+		iptables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		iptables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+	done
+
+	if [ "$ipv6_server" == 0 ]; then
+		return
+	fi
+	echo "warn ip6tables nat mod is needed"
+	IPS="`ifconfig | grep "inet6 addr" | grep -v " fe80::" | grep -v " ::1" | grep "Global" | awk '{print $3}'`"
+	for IP in $IPS
+	do
+		ip6tables -t nat -D PREROUTING -p udp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+		ip6tables -t nat -D PREROUTING -p tcp -d $IP --dport 53 -j REDIRECT --to-ports $OLD_PORT >/dev/null 2>&1
+	done
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONFIGURATION"
+	[ "$(uci get AdGuardHome.AdGuardHome.redirect)" == "redirect" ] && procd_add_reload_trigger firewall
+}
+
+isrunning(){
+	config_load "${CONFIGURATION}"
+	_isrunning
+	local r=$?
+	([ "$r" == "0" ] && echo "running") || ([ "$r" == "1" ] && echo "not run" ) || echo "no bin"
+	return $r
+}
+
+_isrunning(){
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	[ ! -f "$binpath" ] && return 2
+	pgrep $binpath 2>&1 >/dev/null && return 0
+	return 1
+}
+
+force_reload(){
+	config_load "${CONFIGURATION}"
+	_isrunning && procd_send_signal "$CONFIGURATION" || start
+}
+
+get_tz()
+{
+	SET_TZ=""
+
+	if [ -e "/etc/localtime" ]; then
+		return
+	fi
+
+	for tzfile in /etc/TZ /var/etc/TZ
+	do
+		if [ ! -e "$tzfile" ]; then
+			continue
+		fi
+
+		tz="`cat $tzfile 2>/dev/null`"
+	done
+
+	if [ -z "$tz" ]; then
+		return
+	fi
+
+	SET_TZ=$tz
+}
+
+rm_port53()
+{
+	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
+	if [ -z "$dnsmasq_port" ]; then
+	dnsmasq_port="53"
+	fi
+	if [ "$dnsmasq_port" == "$AdGuardHome_PORT" ]; then
+		if [ "$dnsmasq_port" == "53" ]; then
+			dnsmasq_port="1745"
+		fi
+	elif [ "$dnsmasq_port" == "53" ]; then
+		return
+	fi
+	config_editor "dns.port" "$dnsmasq_port" "$configpath"
+	uci set dhcp.@dnsmasq[0].port="53"
+	uci commit dhcp
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	killall -9 $binpath
+	/etc/init.d/dnsmasq restart
+}
+
+use_port53()
+{
+	local AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+	dnsmasq_port=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
+	if [ -z "$dnsmasq_port" ]; then
+		dnsmasq_port="53"
+	fi
+	if [ "$dnsmasq_port" == "$AdGuardHome_PORT" ]; then
+		if [ "$dnsmasq_port" == "53" ]; then
+			AdGuardHome_PORT="1745"
+		fi
+	elif [ "$AdGuardHome_PORT" == "53" ]; then
+		return
+	fi
+	config_editor "dns.port" "53" "$configpath"
+	uci set dhcp.@dnsmasq[0].port="$AdGuardHome_PORT"
+	uci commit dhcp
+	/etc/init.d/dnsmasq reload
+}
+
+do_redirect()
+{
+	config_load "${CONFIGURATION}"
+	_do_redirect $1
+}
+
+_do_redirect()
+{
+	local section="$CONFIGURATION"
+	args=""
+	ipv6_server=1
+	tcp_server=0
+	enabled=$1
+	if [ "$enabled" == "1" ]; then
+		echo -n "1">/var/run/AdGredir
+	else
+		echo -n "0">/var/run/AdGredir
+	fi
+	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+	AdGuardHome_PORT=$(config_editor "dns.port" "" "$configpath" "1")
+	if [ ! -s "$configpath" ]; then
+		cp -f /usr/share/AdGuardHome/AdGuardHome_template.yaml $configpath
+	fi
+	if [ -z "$AdGuardHome_PORT" ]; then
+		AdGuardHome_PORT="0"
+	fi
+	config_get "redirect" "$section" "redirect" "none"
+	config_get "old_redirect" "$section" "old_redirect" "none"
+	config_get "old_port" "$section" "old_port" "0"
+	config_get "old_enabled" "$section" "old_enabled" "0"
+	uci get dhcp.@dnsmasq[0].port >/dev/null 2>&1 || uci set dhcp.@dnsmasq[0].port="53" >/dev/null 2>&1
+	if [ "$old_enabled" = "1" -a "$old_redirect" == "exchange" ]; then
+		AdGuardHome_PORT=$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)
+	fi
+
+	if [ "$old_redirect" != "$redirect" ] || [ "$old_port" != "$AdGuardHome_PORT" ] || [ "$old_enabled" = "1" -a "$enabled" = "0" ]; then
+		if [ "$old_redirect" != "none" ]; then
+			if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
+				clear_iptable "$old_port" "$ipv6_server"
+			elif [ "$old_redirect" == "dnsmasq-upstream" ]; then
+				stop_forward_dnsmasq "$old_port"
+			elif [ "$old_redirect" == "exchange" ]; then
+				rm_port53
+			fi
+		fi
+	elif [ "$old_enabled" = "1" -a "$enabled" = "1" ]; then
+		if [  "$old_redirect" == "redirect" -a "$old_port" != "0" ]; then
+			clear_iptable "$old_port" "$ipv6_server"
+		fi
+	fi
+	uci delete AdGuardHome.@AdGuardHome[0].old_redirect 2>/dev/null
+	uci delete AdGuardHome.@AdGuardHome[0].old_port 2>/dev/null
+	uci delete AdGuardHome.@AdGuardHome[0].old_enabled 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_redirect="$redirect" 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_port="$AdGuardHome_PORT" 2>/dev/null
+	uci add_list AdGuardHome.@AdGuardHome[0].old_enabled="$enabled" 2>/dev/null
+	uci commit AdGuardHome
+	[ "$enabled" == "0" ] && return 1
+	if [ "$AdGuardHome_PORT" == "0" ]; then
+		return 1
+	fi
+	if [ "$redirect" = "redirect" ]; then
+		set_iptable $ipv6_server $tcp_server
+	elif [ "$redirect" = "dnsmasq-upstream" ]; then
+		set_forward_dnsmasq "$AdGuardHome_PORT"
+	elif [ "$redirect" == "exchange" -a "$(uci get dhcp.@dnsmasq[0].port 2>/dev/null)" == "53" ]; then
+		use_port53
+	fi
+}
+
+get_filesystem()
+{
+# print out path filesystem
+    echo $1 | awk '
+    BEGIN{
+    while (("mount"| getline ret) > 0)
+    {
+    split(ret,d);
+    fs[d[3]]=d[5];
+    m=index(d[1],":")
+    if (m==0)
+    {
+        pt[d[3]]=d[1]
+    }else{
+        pt[d[3]]=substr(d[1],m+1)
+    }}}{
+    split($0,d,"/");
+    if ("/" in fs)
+    {
+    result1=fs["/"];
+    }
+    if ("/" in pt)
+    {
+    result2=pt["/"];
+    }
+    for (i=2;i<=length(d);i++)
+    {
+       p[i]=p[i-1]"/"d[i];
+       if (p[i] in fs)
+        {
+        result1=fs[p[i]];
+        result2=pt[p[i]];
+        }
+    }
+    if (result2 in fs){
+        result=fs[result2]}
+    else{
+        result=result1}
+    print(result);}'
+}
+
+config_editor()
+{
+	awk -v yaml="$1" -v value="$2" -v file="$3" -v ro="$4" '
+	BEGIN{split(yaml,part,"\.");s="";i=1;l=length(part);}
+    {
+        if (match($0,s""part[i]":"))
+        {
+            if (i==l)
+            {
+                split($0,t,": ");
+				if (ro==""){
+				system("sed -i '\''"FNR"c \\"t[1]": "value"'\'' "file);
+				}else{
+				print(t[2]);
+				}
+				exit;
+            }
+            s=s"[- ]{2}";
+            i++;
+        }
+    }' $3
+}
+
+boot_service() {
+	rm /var/run/AdGserverdis >/dev/null 2>&1
+	config_load "${CONFIGURATION}"
+	config_get waitonboot $CONFIGURATION waitonboot "0"
+	config_get_bool enabled $CONFIGURATION enabled 0
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+	[ -f "$binpath" ] && start_service
+	if [ "$enabled" == "1" ] && [ "$waitonboot" == "1" ]; then
+		procd_open_instance "waitnet"
+		procd_set_param command "/usr/share/AdGuardHome/waitnet.sh"
+		procd_close_instance
+		echo "no net start pinging"
+	fi
+}
+
+testbackup(){
+	config_load "${CONFIGURATION}"
+	if [ "$1" == "backup" ]; then
+		backup
+	elif [ "$1" == "restore" ]; then
+		restore
+	fi
+}
+
+restore()
+{
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	cp -u -r -f $backupwdpath/data $workdir
+}
+
+backup() {
+	config_get backupwdpath $CONFIGURATION backupwdpath "/etc/AdGuardHome"
+	mkdir -p $backupwdpath/data
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get backupfile $CONFIGURATION backupfile ""
+	for one in $backupfile;
+	do
+		while :
+		do
+			if [ -d "$backupwdpath/data/$one" ]; then
+				cpret=$(cp -u -r -f $workdir/data/$one $backupwdpath/data 2>&1)
+			else
+				cpret=$(cp -u -r -f $workdir/data/$one $backupwdpath/data/$one 2>&1)
+			fi
+			echo "$cpret"
+			echo "$cpret" | grep "no space left on device"
+			if [ "$?" == "0" ]; then
+				echo "磁盘已满,删除log重试中"
+				del_querylog && continue
+				rm -f -r $backupwdpath/data/filters
+				rm -f -r $workdir/data/filters && continue
+				echo "backup failed"
+			fi
+			break
+		done
+	done
+}
+
+start_service() {
+	# Reading config
+	rm /var/run/AdGserverdis >/dev/null 2>&1
+	config_load "${CONFIGURATION}"
+	# update password
+	config_get hashpass $CONFIGURATION hashpass ""
+	config_get configpath $CONFIGURATION configpath "/etc/AdGuardHome.yaml"
+	if [ -n "$hashpass" ]; then
+		config_editor "users.password" "$hashpass" "$configpath"
+		uci set $CONFIGURATION.$CONFIGURATION.hashpass=""
+	fi
+	local enabled
+	config_get_bool enabled $CONFIGURATION enabled 0
+	# update crontab
+	do_crontab
+	if [ "$enabled" == "0" ]; then
+		_do_redirect 0
+		return
+	fi
+	#what need to do before reload
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+
+	config_get backupfile $CONFIGURATION backupfile ""
+	mkdir -p $workdir/data
+	if [ -n "$backupfile" ] && [ ! -d "$workdir/data" ]; then
+		restore
+	fi
+	# for overlay data-stk-oo not suppport
+	local cwdfs=$(get_filesystem $workdir)
+	echo "workdir is a $cwdfs filesystem"
+	if [ "$cwdfs" == "jffs2" ]; then
+		echo "fs error ln db to tmp $workdir $cwdfs"
+		logger "AdGuardHome" "warning db redirect to tmp"
+		touch $workdir/data/stats.db
+		if [ ! -L $workdir/data/stats.db ]; then
+		mv -f $workdir/data/stats.db /tmp/stats.db 2>/dev/null
+		ln -s /tmp/stats.db $workdir/data/stats.db 2>/dev/null
+		fi
+		touch $workdir/data/sessions.db
+		if [ ! -L $workdir/data/sessions.db ]; then
+		mv -f $workdir/data/sessions.db /tmp/sessions.db 2>/dev/null
+		ln -s /tmp/sessions.db $workdir/data/sessions.db 2>/dev/null
+		fi
+	fi
+	local ADDITIONAL_ARGS=""
+	config_get binpath $CONFIGURATION binpath "/usr/bin/AdGuardHome"
+
+	mkdir -p ${binpath%/*}
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -c $configpath"
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -w $workdir"
+	config_get httpport $CONFIGURATION httpport 3000
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS -p $httpport"
+
+	# hack to save config file when upgrade system
+	config_get upprotect $CONFIGURATION upprotect ""
+	eval upprotect=${upprotect// /\\\\n}
+	echo -e "$upprotect">/lib/upgrade/keep.d/luci-app-adguardhome
+
+	config_get logfile $CONFIGURATION logfile ""
+	if [ -n "$logfile" ]; then
+		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -l $logfile"
+	fi
+
+	if [ ! -f "$binpath" ]; then
+		_do_redirect 0
+		/usr/share/AdGuardHome/update_core.sh 2>&1 >/tmp/AdGuardHome_update.log &
+		exit 0
+	fi
+
+	config_get_bool verbose $CONFIGURATION verbose 0
+	if [ "$verbose" -eq 1 ]; then
+		ADDITIONAL_ARGS="$ADDITIONAL_ARGS -v"
+	fi
+
+	procd_open_instance
+	get_tz
+	if [ -n "$SET_TZ" ]; then
+		procd_set_param env TZ="$SET_TZ"
+	fi
+	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+	procd_set_param limits core="unlimited" nofile="65535 65535"
+	procd_set_param stderr 1
+	procd_set_param command $binpath $ADDITIONAL_ARGS
+	procd_set_param file "$configpath" "/etc/hosts" "/etc/config/AdGuardHome"
+	procd_close_instance
+	if [ -f "$configpath" ]; then
+		_do_redirect 1
+	else
+		_do_redirect 0
+		config_get "redirect" "AdGuardHome" "redirect" "none"
+		if [ "$redirect" != "none" ]; then
+			procd_open_instance "waitconfig"
+			procd_set_param command "/usr/share/AdGuardHome/watchconfig.sh"
+			procd_close_instance
+			echo "no config start watching"
+		fi
+	fi
+	echo "AdGuardHome service enabled"
+	echo "luci enable switch=$enabled"
+	(sleep 10 && [ -z "$(pgrep $binpath)" ] && logger "AdGuardHome" "no process in 10s cancel redirect" && _do_redirect 0 )&
+	if [[ "`uci get bypass.@global[0].global_server 2>/dev/null`" && "`uci get bypass.@global[0].adguardhome 2>/dev/null`" == 1 && "$(uci get dhcp.@dnsmasq[0].port)" == "53" ]]; then
+	 uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
+	 uci commit AdGuardHome
+	 do_redirect 1
+	fi
+}
+
+reload_service()
+{
+	rm /var/run/AdGlucitest >/dev/null 2>&1
+	echo "AdGuardHome reloading"
+	start
+}
+
+del_querylog(){
+	local btarget=$(ls $backupwdpath/data | grep -F "querylog.json" | sort -r | head -n 1)
+	local wtarget=$(ls $workdir/data | grep -F "querylog.json" | sort -r | head -n 1)
+	if [ "$btarget"x == "$wtarget"x ]; then
+		[ -z "$btarget" ] && return 1
+		rm -f $workdir/data/$wtarget
+		rm -f $backupwdpath/data/$btarget
+		return 0
+	fi
+	if [ "$btarget" \> "$wtarget" ]; then
+		rm -f $backupwdpath/data/$btarget
+		return 0
+	else
+		rm -f $workdir/data/$wtarget
+		return 0
+	fi
+}
+
+stop_service()
+{
+	config_load "${CONFIGURATION}"
+	_do_redirect 0
+	do_crontab
+	if [ "$1" != "nobackup" ]; then
+		config_get backupfile $CONFIGURATION backupfile "0"
+		if [ -n "$backupfile" ]; then
+			backup
+		fi
+	fi
+	echo "AdGuardHome service disabled"
+	touch /var/run/AdGserverdis
+}
+
+boot() {
+	rc_procd boot_service "$@"
+	if eval "type service_started" 2>/dev/null >/dev/null; then
+		service_started
+	fi
+}
+
+test_crontab(){
+	config_load "${CONFIGURATION}"
+	do_crontab
+}
+
+do_crontab(){
+	config_get_bool enabled $CONFIGURATION enabled 0
+	config_get crontab $CONFIGURATION crontab ""
+	local findstr default cronenable replace commit
+	local cronreload=0
+	local commit=0
+	findstr="/usr/share/AdGuardHome/update_core.sh"
+	default="30 3 * * * /usr/share/AdGuardHome/update_core.sh 2>&1"
+	[ "$enabled" == "0" ] || [ "${crontab//autoupdate/}" == "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+
+	config_get workdir $CONFIGURATION workdir "/etc/AdGuardHome"
+	config_get lastworkdir $CONFIGURATION lastworkdir "/etc/AdGuardHome"
+	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
+	#[ -n "$lastworkdir" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastworkdir/data/querylog.json" && [ "$lastworkdir" != "$workdir" ] && replace="${lastworkdir//\//\\/}/${workdir//\//\\/}"
+	default="0 * * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.workdir)/data/querylog.json"
+	[ "$enabled" == "0" ] || [ "${crontab//cutquerylog/}" == "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+	#[ "$lastworkdir" != "$workdir" ] && uci set AdGuardHome.AdGuardHome.lastworkdir="$workdir" && commit=1
+
+	config_get logfile $CONFIGURATION logfile ""
+	config_get lastlogfile $CONFIGURATION lastlogfile ""
+	findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* \$(uci get AdGuardHome.AdGuardHome.logfile)"
+	default="30 3 * * * /usr/share/AdGuardHome/tailto.sh 2000 \$(uci get AdGuardHome.AdGuardHome.logfile)"
+	#[ -n "$lastlogfile" ] && findstr="/usr/share/AdGuardHome/tailto.sh [0-9]* $lastlogfile" && [ -n "$logfile" ] && [ "$lastlogfile" != "$logfile" ] && replace="${lastlogfile//\//\\/}/${logfile//\//\\/}"
+	[ "$logfile" == "syslog" ] || [ "$logfile" == "" ] || [ "$enabled" == "0" ] || [ "${crontab//cutruntimelog/}" == "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+	#[ -n "$logfile" ] && [ "$lastlogfile" != "$logfile" ] && uci set AdGuardHome.AdGuardHome.lastlogfile="$logfile" && commit=1
+
+	findstr="/usr/share/AdGuardHome/addhost.sh"
+	default="0 * * * * /usr/share/AdGuardHome/addhost.sh"
+	[ "$enabled" == "0" ] || [ "${crontab//autohost/}" == "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+	[ "$cronenable" == "0" ] && /usr/share/AdGuardHome/addhost.sh "del" "noreload" || /usr/share/AdGuardHome/addhost.sh "" "noreload"
+
+	findstr="/usr/share/AdGuardHome/gfw2adg.sh"
+	default="30 3 * * * /usr/share/AdGuardHome/gfw2adg.sh"
+	[ "$enabled" == "0" ] || [ "${crontab//autogfw/}" == "$crontab" ] && cronenable=0 || cronenable=1
+	crontab_editor
+	[ "$cronreload" -gt 0 ] && /etc/init.d/cron restart
+	#[ "$commit" -gt 0 ] && uci commit AdGuardHome
+}
+
+crontab_editor(){
+	#usage input:
+	#findstr=
+	#default=
+	#cronenable=
+	#replace="${last//\//\\/}/${now//\//\\/}"
+	#output:cronreload:if >1 please /etc/init.d/cron restart manual
+	local testline reload
+	local line="$(grep "$findstr" $CRON_FILE)"
+	[ -n "$replace" ] && [ -n "$line" ] && eval testline="\${line//$replace}" && [ "$testline" != "$line" ] && line="$testline" && reload="1" && replace=""
+	if [ "${line:0:1}" != "#" ]; then
+		if [ $cronenable -eq 1 ]; then
+			[ -z "$line" ] && line="$default" && reload="1"
+			if [ -n "$reload" ]; then
+				sed -i "\,$findstr,d" $CRON_FILE
+				echo "$line" >> $CRON_FILE
+				cronreload=$((cronreload+1))
+			fi
+		elif [ -n "$line" ]; then
+			sed -i "\,$findstr,d" $CRON_FILE
+			echo "#$line" >> $CRON_FILE
+			cronreload=$((cronreload+1))
+		fi
+	else
+		if [ $cronenable -eq 1 ]; then
+			sed -i "\,$findstr,d" $CRON_FILE
+			echo "${line:1}" >> $CRON_FILE
+			cronreload=$((cronreload+1))
+		elif [ -z "$reload" ]; then
+			sed -i "\,$findstr,d" $CRON_FILE
+			echo "$line" >> $CRON_FILE
+		fi
+	fi
+}
--- a/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
+++ b/luci-app-adguardhome/root/etc/uci-defaults/40_luci-AdGuardHome
@ -0,0 +1,15 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null 2>&1
+	delete ucitrack.@AdGuardHome[-1]
+	add ucitrack AdGuardHome
+	set ucitrack.@AdGuardHome[-1].init=AdGuardHome
+	commit ucitrack
+	delete AdGuardHome.AdGuardHome.ucitracktest
+	/etc/init.d/AdGuardHome restart
+EOF
+
+rm -f /tmp/luci-indexcache
+
+chmod +x /etc/init.d/AdGuardHome /usr/share/AdGuardHome/*
+exit 0
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/AdGuardHome_template.yaml
@ -0,0 +1,131 @@
+bind_host: 0.0.0.0
+bind_port: 3000
+beta_bind_port: 0
+users:
+- name: root
+  password: $2y$10$dwn0hTYoECQMZETBErGlzOId2VANOVsPHsuH13TM/8KnysM5Dh/ve
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: zh-cn
+debug_pprof: false
+web_session_ttl: 720
+dns:
+  bind_hosts:
+  - 0.0.0.0
+  port: 1745
+  statistics_interval: 30
+  querylog_enabled: true
+  querylog_file_enabled: true
+  querylog_interval: 6h
+  querylog_size_memory: 1000
+  anonymize_client_ip: false
+  protection_enabled: true
+  blocking_mode: default
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_response_ttl: 60
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  ratelimit: 0
+  ratelimit_whitelist: []
+  refuse_any: false
+  upstream_dns:
+  - 223.5.5.5
+  upstream_dns_file: ""
+  bootstrap_dns:
+  - 119.29.29.29
+  - 223.5.5.5
+  all_servers: false
+  fastest_addr: false
+  fastest_timeout: 1s
+  allowed_clients: []
+  disallowed_clients: []
+  blocked_hosts:
+  - version.bind
+  - id.server
+  - hostname.bind
+  trusted_proxies:
+  - 127.0.0.0/8
+  - ::1/128
+  cache_size: 4194304
+  cache_ttl_min: 0
+  cache_ttl_max: 0
+  cache_optimistic: true
+  bogus_nxdomain: []
+  aaaa_disabled: false
+  enable_dnssec: false
+  edns_client_subnet: false
+  max_goroutines: 300
+  ipset: []
+  filtering_enabled: true
+  filters_update_interval: 24
+  parental_enabled: false
+  safesearch_enabled: false
+  safebrowsing_enabled: false
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  rewrites: []
+  blocked_services: []
+  upstream_timeout: 10s
+  local_domain_name: lan
+  resolve_clients: true
+  use_private_ptr_resolvers: true
+  local_ptr_upstreams: []
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 784
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  strict_sni_check: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+filters:
+- enabled: true
+  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+  name: AdGuard DNS filter
+  id: 1628750870
+- enabled: true
+  url: https://anti-ad.net/easylist.txt
+  name: 'CHN: anti-AD'
+  id: 1628750871
+whitelist_filters: []
+user_rules: []
+dhcp:
+  enabled: false
+  interface_name: ""
+  dhcpv4:
+    gateway_ip: ""
+    subnet_mask: ""
+    range_start: ""
+    range_end: ""
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: []
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+clients: []
+log_compress: false
+log_localtime: false
+log_max_backups: 0
+log_max_size: 100
+log_max_age: 3
+log_file: ""
+verbose: false
+os:
+  group: ""
+  user: ""
+  rlimit_nofile: 0
+schema_version: 12
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/addhost.sh
@ -0,0 +1,35 @@
+#!/bin/sh
+
+checkmd5(){
+local nowmd5=$(md5sum /etc/hosts)
+nowmd5=${nowmd5%% *}
+local lastmd5=$(uci get AdGuardHome.AdGuardHome.hostsmd5 2>/dev/null)
+if [ "$nowmd5" != "$lastmd5" ]; then
+	uci set AdGuardHome.AdGuardHome.hostsmd5="$nowmd5"
+	uci commit AdGuardHome
+	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
+fi
+}
+
+[ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' /etc/hosts && checkmd5 "$2" && exit 0
+/usr/bin/awk 'BEGIN{
+while ((getline < "/tmp/dhcp.leases") > 0)
+{
+    a[$2]=$4;
+}
+while (("ip -6 neighbor show | grep -v fe80" | getline) > 0)
+{
+    if (a[$5]) {print $1" "a[$5] >"/tmp/tmphost"; }
+}
+print "#programaddend" >"/tmp/tmphost";
+}'
+grep programaddstart /etc/hosts >/dev/null 2>&1
+if [ "$?" == "0" ]; then
+	sed -i '/programaddstart/,/programaddend/c\#programaddstart' /etc/hosts
+	sed -i '/programaddstart/'r/tmp/tmphost /etc/hosts
+else
+	echo "#programaddstart" >>/etc/hosts
+	cat /tmp/tmphost >> /etc/hosts
+fi
+rm /tmp/tmphost
+checkmd5 "$2"
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/firewall.start
@ -0,0 +1,8 @@
+#!/bin/sh
+
+AdGuardHome_enable=$(uci get AdGuardHome.AdGuardHome.enabled)
+redirect=$(uci get AdGuardHome.AdGuardHome.redirect)
+
+if [ $AdGuardHome_enable -eq 1 -a "$redirect" == "redirect" ]; then
+	/etc/init.d/AdGuardHome do_redirect 1
+fi
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/getsyslog.sh
@ -0,0 +1,20 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+logread -e AdGuardHome > /tmp/AdGuardHometmp.log
+logread -e AdGuardHome -f >> /tmp/AdGuardHometmp.log &
+pid=$!
+echo "1">/var/run/AdGuardHomesyslog
+while true
+do
+	sleep 12
+	watchdog=$(cat /var/run/AdGuardHomesyslog)
+	if [ "$watchdog"x == "0"x ]; then
+		kill $pid
+		rm /tmp/AdGuardHometmp.log
+		rm /var/run/AdGuardHomesyslog
+		exit 0
+	else
+		echo "0">/var/run/AdGuardHomesyslog
+	fi
+done
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/gfw2adg.sh
@ -0,0 +1,89 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+
+checkmd5(){
+local nowmd5=$(md5sum /tmp/adguard.list 2>/dev/null)
+nowmd5=${nowmd5%% *}
+local lastmd5=$(uci get AdGuardHome.AdGuardHome.gfwlistmd5 2>/dev/null)
+if [ "$nowmd5" != "$lastmd5" ]; then
+	uci set AdGuardHome.AdGuardHome.gfwlistmd5="$nowmd5"
+	uci commit AdGuardHome
+	[ "$1" == "noreload" ] || /etc/init.d/AdGuardHome reload
+fi
+}
+
+configpath=$(uci get AdGuardHome.AdGuardHome.configpath 2>/dev/null)
+[ "$1" == "del" ] && sed -i '/programaddstart/,/programaddend/d' $configpath && checkmd5 "$2" && exit 0
+gfwupstream=$(uci get AdGuardHome.AdGuardHome.gfwupstream 2>/dev/null)
+if [ -z $gfwupstream ]; then
+gfwupstream="tcp://208.67.220.220:5353"
+fi
+if [ ! -f "$configpath" ]; then
+	echo "please make a config first"
+	exit 1
+fi
+wget-ssl --no-check-certificate https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt -O- | base64 -d > /tmp/gfwlist.txt
+cat /tmp/gfwlist.txt | awk -v upst="$gfwupstream" 'BEGIN{getline;}{
+s1=substr($0,1,1);
+if (s1=="!")
+{next;}
+if (s1=="@"){
+    $0=substr($0,3);
+    s1=substr($0,1,1);
+    white=1;}
+else{
+    white=0;
+}
+
+if (s1=="|")
+    {s2=substr($0,2,1);
+    if (s2=="|")
+    {
+        $0=substr($0,3);
+        split($0,d,"/");
+        $0=d[1];
+    }else{
+        split($0,d,"/");
+        $0=d[3];
+    }}
+else{
+    split($0,d,"/");
+    $0=d[1];
+}
+star=index($0,"*");
+if (star!=0)
+{
+    $0=substr($0,star+1);
+    dot=index($0,".");
+    if (dot!=0)
+        $0=substr($0,dot+1);
+    else
+        next;
+    s1=substr($0,1,1);
+}
+if (s1==".")
+{fin=substr($0,2);}
+else{fin=$0;}
+if (index(fin,".")==0) next;
+if (index(fin,"%")!=0) next;
+if (index(fin,":")!=0) next;
+match(fin,"^[0-9\.]+")
+if (RSTART==1 && RLENGTH==length(fin)) {print "ipset add gfwlist "fin>"/tmp/doipset.sh";next;}
+if (fin=="" || finl==fin) next;
+finl=fin;
+if (white==0)
+    {print("  - '\''[/"fin"/]"upst"'\''");}
+else{
+    print("  - '\''[/"fin"/]#'\''");}
+}END{print("  - '\''[/programaddend/]#'\''")}' > /tmp/adguard.list
+grep programaddstart $configpath
+if [ "$?" == "0" ]; then
+	sed -i '/programaddstart/,/programaddend/c\  - '\''\[\/programaddstart\/\]#'\''' $configpath
+	sed -i '/programaddstart/'r/tmp/adguard.list $configpath
+else
+	sed -i '1i\  - '\''[/programaddstart/]#'\''' /tmp/adguard.list
+	sed -i '/upstream_dns:/'r/tmp/adguard.list $configpath
+fi
+checkmd5 "$2"
+rm -f /tmp/gfwlist.txt /tmp/adguard.list
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/links.txt
@ -0,0 +1,3 @@
+https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_${Arch}.tar.gz
+https://github.com/AdguardTeam/AdGuardHome/releases/download/${latest_ver}/AdGuardHome_linux_${Arch}.tar.gz
+https://static.adguard.com/adguardhome/release/AdGuardHome_linux_${Arch}.tar.gz
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/tailto.sh
@ -0,0 +1,5 @@
+#!/bin/sh
+
+tail -n $1 "$2" > /var/run/tailtmp
+cat /var/run/tailtmp > "$2"
+rm /var/run/tailtmp
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/update_core.sh
@ -0,0 +1,236 @@
+#!/bin/bash
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+binpath=$(uci get AdGuardHome.AdGuardHome.binpath)
+if [ -z "$binpath" ]; then
+uci set AdGuardHome.AdGuardHome.binpath="/tmp/AdGuardHome/AdGuardHome"
+binpath="/tmp/AdGuardHome/AdGuardHome"
+fi
+mkdir -p ${binpath%/*}
+upxflag=$(uci get AdGuardHome.AdGuardHome.upxflag 2>/dev/null)
+
+check_if_already_running(){
+	running_tasks="$(ps |grep "AdGuardHome" |grep "update_core" |grep -v "grep" |awk '{print $1}' |wc -l)"
+	[ "${running_tasks}" -gt "2" ] && echo -e "\nA task is already running."  && EXIT 2
+}
+
+check_wgetcurl(){
+	which curl && downloader="curl -L -k --retry 2 --connect-timeout 20 -o" && return
+	which wget-ssl && downloader="wget-ssl --no-check-certificate -t 2 -T 20 -O" && return
+	[ -z "$1" ] && opkg update || (echo error opkg && EXIT 1)
+	[ -z "$1" ] && (opkg remove wget wget-nossl --force-depends ; opkg install wget ; check_wgetcurl 1 ;return)
+	[ "$1" == "1" ] && (opkg install curl ; check_wgetcurl 2 ; return)
+	echo error curl and wget && EXIT 1
+}
+
+check_latest_version(){
+	check_wgetcurl
+	latest_ver="$($downloader - https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E 'v[0-9.]+' -o 2>/dev/null)"
+	if [ -z "${latest_ver}" ]; then
+		echo -e "\nFailed to check latest version, please try again later."  && EXIT 1
+	fi
+	now_ver="$($binpath -c /dev/null --check-config 2>&1| grep -m 1 -E 'v[0-9.]+' -o)"
+	if [ "${latest_ver}"x != "${now_ver}"x ] || [ "$1" == "force" ]; then
+		echo -e "Local version: ${now_ver}., cloud version: ${latest_ver}."
+		doupdate_core
+	else
+		echo -e "\nLocal version: ${now_ver}, cloud version: ${latest_ver}."
+		echo -e "You're already using the latest version."
+		if [ ! -z "$upxflag" ]; then
+			filesize=$(ls -l $binpath | awk '{ print $5 }')
+			if [ $filesize -gt 8000000 ]; then
+				echo -e "start upx may take a long time"
+				doupx
+				mkdir -p "/tmp/AdGuardHomeupdate/AdGuardHome" >/dev/null 2>&1
+				rm -fr /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
+				/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $binpath -o /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/}
+				rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
+				/etc/init.d/AdGuardHome stop nobackup
+				rm $binpath
+				mv -f /tmp/AdGuardHomeupdate/AdGuardHome/${binpath##*/} $binpath
+				/etc/init.d/AdGuardHome start
+				echo -e "finished"
+			fi
+		fi
+		EXIT 0
+	fi
+}
+
+doupx(){
+	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
+	case $Archt in
+	"i386")
+		Arch="i386"
+		;;
+	"i686")
+		Arch="i386"
+		echo -e "i686 use $Arch may have bug"
+		;;
+	"x86")
+		Arch="amd64"
+		;;
+	"mipsel")
+		Arch="mipsel"
+		;;
+	"mips64el")
+		Arch="mips64el"
+		Arch="mipsel"
+		echo -e "mips64el use $Arch may have bug"
+		;;
+	"mips")
+		Arch="mips"
+		;;
+	"mips64")
+		Arch="mips64"
+		Arch="mips"
+		echo -e "mips64 use $Arch may have bug"
+		;;
+	"arm")
+		Arch="arm"
+		;;
+	"armeb")
+		Arch="armeb"
+		;;
+	"aarch64")
+		Arch="arm64"
+		;;
+	"powerpc")
+		Arch="powerpc"
+		;;
+	"powerpc64")
+		Arch="powerpc64"
+		;;
+	*)
+		echo -e "error not support $Archt if you can use offical release please issue a bug"
+		EXIT 1
+		;;
+	esac
+	upx_latest_ver="$($downloader - https://api.github.com/repos/upx/upx/releases/latest 2>/dev/null|grep -E 'tag_name' |grep -E '[0-9.]+' -o 2>/dev/null)"
+	$downloader /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz "https://github.com/upx/upx/releases/download/v${upx_latest_ver}/upx-${upx_latest_ver}-${Arch}_linux.tar.xz" 2>&1
+	#tar xvJf
+	which xz || (opkg list | grep ^xz || opkg update && opkg install xz) || (echo "xz download fail" && EXIT 1)
+	mkdir -p /tmp/upx-${upx_latest_ver}-${Arch}_linux
+	xz -d -c /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz| tar -x -C "/tmp" >/dev/null 2>&1
+	if [ ! -e "/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx" ]; then
+		echo -e "Failed to download upx."
+		EXIT 1
+	fi
+	rm /tmp/upx-${upx_latest_ver}-${Arch}_linux.tar.xz
+}
+
+doupdate_core(){
+	echo -e "Updating core..."
+	mkdir -p "/tmp/AdGuardHomeupdate"
+	rm -rf /tmp/AdGuardHomeupdate/* >/dev/null 2>&1
+	Archt="$(opkg info kernel | grep Architecture | awk -F "[ _]" '{print($2)}')"
+	case $Archt in
+	"i386")
+		Arch="386"
+		;;
+	"i686")
+		Arch="386"
+		;;
+	"x86")
+		Arch="amd64"
+		;;
+	"mipsel")
+		Arch="mipsle"
+		;;
+	"mips64el")
+		Arch="mips64le"
+		Arch="mipsle"
+		echo -e "mips64el use $Arch may have bug"
+		;;
+	"mips")
+		Arch="mips"
+		;;
+	"mips64")
+		Arch="mips64"
+		Arch="mips"
+		echo -e "mips64 use $Arch may have bug"
+		;;
+	"arm")
+		Arch="arm"
+		;;
+	"aarch64")
+		Arch="arm64"
+		;;
+	"powerpc")
+		Arch="ppc"
+		echo -e "error not support $Archt"
+		EXIT 1
+		;;
+	"powerpc64")
+		Arch="ppc64"
+		echo -e "error not support $Archt"
+		EXIT 1
+		;;
+	*)
+		echo -e "error not support $Archt if you can use offical release please issue a bug"
+		EXIT 1
+		;;
+	esac
+	echo -e "start download"
+	grep -v "^#" /usr/share/AdGuardHome/links.txt >/tmp/run/AdHlinks.txt
+	while read link
+	do
+		eval link="$link"
+		$downloader /tmp/AdGuardHomeupdate/${link##*/} "$link" 2>&1
+		if [ "$?" != "0" ]; then
+			echo "download failed try another download"
+			rm -f /tmp/AdGuardHomeupdate/${link##*/}
+		else
+			local success="1"
+			break
+		fi
+	done < "/tmp/run/AdHlinks.txt"
+	rm /tmp/run/AdHlinks.txt
+	[ -z "$success" ] && echo "no download success" && EXIT 1
+	if [ "${link##*.}" == "gz" ]; then
+		tar -zxf "/tmp/AdGuardHomeupdate/${link##*/}" -C "/tmp/AdGuardHomeupdate/"
+		if [ ! -e "/tmp/AdGuardHomeupdate/AdGuardHome" ]; then
+			echo -e "Failed to download core."
+			rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
+			EXIT 1
+		fi
+		downloadbin="/tmp/AdGuardHomeupdate/AdGuardHome/AdGuardHome"
+	else
+		downloadbin="/tmp/AdGuardHomeupdate/${link##*/}"
+	fi
+	chmod 755 $downloadbin
+	echo -e "download success start copy"
+	if [ -n "$upxflag" ]; then
+		echo -e "start upx may take a long time"
+		doupx
+		/tmp/upx-${upx_latest_ver}-${Arch}_linux/upx $upxflag $downloadbin
+		rm -rf /tmp/upx-${upx_latest_ver}-${Arch}_linux
+	fi
+	echo -e "start copy"
+	/etc/init.d/AdGuardHome stop nobackup
+	rm "$binpath"
+	mv -f "$downloadbin" "$binpath"
+	if [ "$?" == "1" ]; then
+		echo "mv failed maybe not enough space please use upx or change bin to /tmp/AdGuardHome"
+		EXIT 1
+	fi
+	/etc/init.d/AdGuardHome start
+	rm -rf "/tmp/AdGuardHomeupdate" >/dev/null 2>&1
+	echo -e "Succeeded in updating core."
+	echo -e "Local version: ${latest_ver}, cloud version: ${latest_ver}.\n"
+	EXIT 0
+}
+
+EXIT(){
+	rm /var/run/update_core 2>/dev/null
+	[ "$1" != "0" ] && touch /var/run/update_core_error
+	exit $1
+}
+
+main(){
+	check_if_already_running
+	check_latest_version $1
+}
+	trap "EXIT 1" SIGTERM SIGINT
+	touch /var/run/update_core
+	rm /var/run/update_core_error 2>/dev/null
+	main $1
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/waitnet.sh
@ -0,0 +1,35 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+count=0
+while :
+do
+	ping -c 1 -W 1 -q www.baidu.com 1>/dev/null 2>&1
+	if [ "$?" == "0" ]; then
+		/etc/init.d/AdGuardHome force_reload
+		break
+	fi
+	ping -c 1 -W 1 -q 202.108.22.5 1>/dev/null 2>&1
+	if [ "$?" == "0" ]; then
+		/etc/init.d/AdGuardHome force_reload
+		break
+	fi
+	sleep 5
+	ping -c 1 -W 1 -q www.google.com 1>/dev/null 2>&1
+	if [ "$?" == "0" ]; then
+		/etc/init.d/AdGuardHome force_reload
+		break
+	fi
+	ping -c 1 -W 1 -q 8.8.8.8 1>/dev/null 2>&1
+	if [ "$?" == "0" ]; then
+		/etc/init.d/AdGuardHome force_reload
+		break
+	fi
+	sleep 5
+	count=$((count+1))
+	if [ $count -gt 18 ]; then
+		/etc/init.d/AdGuardHome force_reload
+		break
+	fi
+done
+return 0
--- a/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
+++ b/luci-app-adguardhome/root/usr/share/AdGuardHome/watchconfig.sh
@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+configpath=$(uci get AdGuardHome.AdGuardHome.configpath)
+while :
+do
+	sleep 10
+	if [ -f "$configpath" ]; then
+		/etc/init.d/AdGuardHome do_redirect 1
+		break
+	fi
+done
+return 0
--- a/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
+++ b/luci-app-adguardhome/root/usr/share/rpcd/acl.d/luci-app-adguardhome.json
@ -0,0 +1,11 @@
+{
+	"luci-app-adguardhome": {
+		"description": "Grant UCI access for luci-app-adguardhome",
+		"read": {
+			"uci": [ "AdGuardHome" ]
+		},
+		"write": {
+			"uci": [ "AdGuardHome" ]
+		}
+	}
+}
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldcode.js
@ -0,0 +1 @@
+!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(n){"use strict";function e(e,o,i,t){if(i&&i.call){var l=i;i=null}else l=r(e,i,"rangeFinder");"number"==typeof o&&(o=n.Pos(o,0));var f=r(e,i,"minFoldSize");function d(n){var r=l(e,o);if(!r||r.to.line-r.from.line<f)return null;for(var i=e.findMarksAt(r.from),d=0;d<i.length;++d)if(i[d].__isFold&&"fold"!==t){if(!n)return null;r.cleared=!0,i[d].clear()}return r}var u=d(!0);if(r(e,i,"scanUp"))for(;!u&&o.line>e.firstLine();)o=n.Pos(o.line-1,0),u=d(!1);if(u&&!u.cleared&&"unfold"!==t){var a=function(n,e){var o=r(n,e,"widget");if("string"==typeof o){var i=document.createTextNode(o);(o=document.createElement("span")).appendChild(i),o.className="CodeMirror-foldmarker"}else o&&(o=o.cloneNode(!0));return o}(e,i);n.on(a,"mousedown",function(e){c.clear(),n.e_preventDefault(e)});var c=e.markText(u.from,u.to,{replacedWith:a,clearOnEnter:r(e,i,"clearOnEnter"),__isFold:!0});c.on("clear",function(o,r){n.signal(e,"unfold",e,o,r)}),n.signal(e,"fold",e,u.from,u.to)}}n.newFoldFunction=function(n,o){return function(r,i){e(r,i,{rangeFinder:n,widget:o})}},n.defineExtension("foldCode",function(n,o,r){e(this,n,o,r)}),n.defineExtension("isFolded",function(n){for(var e=this.findMarksAt(n),o=0;o<e.length;++o)if(e[o].__isFold)return!0}),n.commands.toggleFold=function(n){n.foldCode(n.getCursor())},n.commands.fold=function(n){n.foldCode(n.getCursor(),null,"fold")},n.commands.unfold=function(n){n.foldCode(n.getCursor(),null,"unfold")},n.commands.foldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"fold")})},n.commands.unfoldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"unfold")})},n.registerHelper("fold","combine",function(){var n=Array.prototype.slice.call(arguments,0);return function(e,o){for(var r=0;r<n.length;++r){var i=n[r](e,o);if(i)return i}}}),n.registerHelper("fold","auto",function(n,e){for(var o=n.getHelpers(e,"fold"),r=0;r<o.length;r++){var i=o[r](n,e);if(i)return i}});var o={rangeFinder:n.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(n,e,r){if(e&&void 0!==e[r])return e[r];var i=n.options.foldOptions;return i&&void 0!==i[r]?i[r]:o[r]}n.defineOption("foldOptions",null),n.defineExtension("foldOption",function(n,e){return r(this,n,e)})});
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.css
@ -0,0 +1 @@
+.CodeMirror-foldmarker{color:blue;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-open,.CodeMirror-foldgutter-folded{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/foldgutter.js
@ -0,0 +1 @@
+!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],t):t(CodeMirror)}(function(t){"use strict";t.defineOption("foldGutter",!1,function(o,e,r){r&&r!=t.Init&&(o.clearGutter(o.state.foldGutter.options.gutter),o.state.foldGutter=null,o.off("gutterClick",a),o.off("changes",d),o.off("viewportChange",u),o.off("fold",l),o.off("unfold",l),o.off("swapDoc",d)),e&&(o.state.foldGutter=new function(t){this.options=t,this.from=this.to=0}(function(t){!0===t&&(t={});null==t.gutter&&(t.gutter="CodeMirror-foldgutter");null==t.indicatorOpen&&(t.indicatorOpen="CodeMirror-foldgutter-open");null==t.indicatorFolded&&(t.indicatorFolded="CodeMirror-foldgutter-folded");return t}(e)),f(o),o.on("gutterClick",a),o.on("changes",d),o.on("viewportChange",u),o.on("fold",l),o.on("unfold",l),o.on("swapDoc",d))});var o=t.Pos;function e(t,e){for(var r=t.findMarks(o(e,0),o(e+1,0)),n=0;n<r.length;++n)if(r[n].__isFold){var i=r[n].find(-1);if(i&&i.line===e)return r[n]}}function r(t){if("string"==typeof t){var o=document.createElement("div");return o.className=t+" CodeMirror-guttermarker-subtle",o}return t.cloneNode(!0)}function n(t,n,f){var a=t.state.foldGutter.options,d=n-1,u=t.foldOption(a,"minFoldSize"),l=t.foldOption(a,"rangeFinder"),c="string"==typeof a.indicatorFolded&&i(a.indicatorFolded),s="string"==typeof a.indicatorOpen&&i(a.indicatorOpen);t.eachLine(n,f,function(n){++d;var i=null,f=n.gutterMarkers;if(f&&(f=f[a.gutter]),e(t,d)){if(c&&f&&c.test(f.className))return;i=r(a.indicatorFolded)}else{var p=o(d,0),m=l&&l(t,p);if(m&&m.to.line-m.from.line>=u){if(s&&f&&s.test(f.className))return;i=r(a.indicatorOpen)}}(i||f)&&t.setGutterMarker(n,a.gutter,i)})}function i(t){return new RegExp("(^|\\s)"+t+"(?:$|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){n(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function a(t,r,n){var i=t.state.foldGutter;if(i){var f=i.options;if(n==f.gutter){var a=e(t,r);a?a.clear():t.foldCode(o(r,0),f)}}}function d(t){var o=t.state.foldGutter;if(o){var e=o.options;o.from=o.to=0,clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){f(t)},e.foldOnChangeTimeSpan||600)}}function u(t){var o=t.state.foldGutter;if(o){var e=o.options;clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){var e=t.getViewport();o.from==o.to||e.from-o.to>20||o.from-e.to>20?f(t):t.operation(function(){e.from<o.from&&(n(t,e.from,o.from),o.from=e.from),e.to>o.to&&(n(t,o.to,e.to),o.to=e.to)})},e.updateViewportTimeSpan||400)}}function l(t,o){var e=t.state.foldGutter;if(e){var r=o.line;r>=e.from&&r<e.to&&n(t,r,r+1)}}});
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/addon/fold/indent-fold.js
@ -0,0 +1 @@
+!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";function n(n,t){var i=n.getLine(t),o=i.search(/\S/);return-1==o||/\bcomment\b/.test(n.getTokenTypeAt(e.Pos(t,o+1)))?-1:e.countColumn(i,null,n.getOption("tabSize"))}e.registerHelper("fold","indent",function(t,i){var o=n(t,i.line);if(!(o<0)){for(var r=null,l=i.line+1,f=t.lastLine();l<=f;++l){var u=n(t,l);if(-1==u);else{if(!(u>o))break;r=l}}return r?{from:e.Pos(i.line,t.getLine(i.line).length),to:e.Pos(r,t.getLine(r).length)}:void 0}})});
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.css
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/lib/codemirror.js
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/mode/yaml/yaml.js
@ -0,0 +1 @@
+!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("yaml",function(){var e=new RegExp("\\b(("+["true","false","on","off","yes","no"].join(")|(")+"))$","i");return{token:function(i,t){var r=i.peek(),n=t.escaped;if(t.escaped=!1,"#"==r&&(0==i.pos||/\s/.test(i.string.charAt(i.pos-1))))return i.skipToEnd(),"comment";if(i.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string";if(t.literal&&i.indentation()>t.keyCol)return i.skipToEnd(),"string";if(t.literal&&(t.literal=!1),i.sol()){if(t.keyCol=0,t.pair=!1,t.pairStart=!1,i.match(/---/))return"def";if(i.match(/\.\.\./))return"def";if(i.match(/\s*-\s+/))return"meta"}if(i.match(/^(\{|\}|\[|\])/))return"{"==r?t.inlinePairs++:"}"==r?t.inlinePairs--:"["==r?t.inlineList++:t.inlineList--,"meta";if(t.inlineList>0&&!n&&","==r)return i.next(),"meta";if(t.inlinePairs>0&&!n&&","==r)return t.keyCol=0,t.pair=!1,t.pairStart=!1,i.next(),"meta";if(t.pairStart){if(i.match(/^\s*(\||\>)\s*/))return t.literal=!0,"meta";if(i.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2";if(0==t.inlinePairs&&i.match(/^\s*-?[0-9\.\,]+\s?$/))return"number";if(t.inlinePairs>0&&i.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number";if(i.match(e))return"keyword"}return!t.pair&&i.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(t.pair=!0,t.keyCol=i.indentation(),"atom"):t.pair&&i.match(/^:\s*/)?(t.pairStart=!0,"meta"):(t.pairStart=!1,t.escaped="\\"==r,i.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}},lineComment:"#",fold:"indent"}}),e.defineMIME("text/x-yaml","yaml"),e.defineMIME("text/yaml","yaml")});
--- a/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
+++ b/luci-app-adguardhome/root/www/luci-static/resources/codemirror/theme/dracula.css
@ -0,0 +1 @@
+.cm-s-dracula.CodeMirror,.cm-s-dracula .CodeMirror-gutters{background-color:#282a36 !important;color:#f8f8f2 !important;border:0}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,0.10)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:white}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-variable-3,.cm-s-dracula span.cm-type{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,0.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:white !important}
--- a/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
+++ b/luci-app-adguardhome/root/www/luci-static/resources/twin-bcrypt.min.js
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-passwall
 PKG_VERSION:=4.54
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \
@ -17,7 +17,6 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \
-	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client \
@ -35,7 +34,7 @@ PKG_CONFIG_DEPENDS:= \
 LUCI_TITLE:=LuCI support for PassWall
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
-	+dns2socks +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \
+	+dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \
 	+microsocks +resolveip +tcping +unzip \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Brook:brook \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \
@ -43,7 +42,6 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat:ip6tables-mod-nat \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD:pdnsd-alt \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
@ -102,10 +100,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
 	depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
 	default n

-config PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD
-	bool "Include PDNSD"
-	default y
-
 config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
 	bool "Include Shadowsocks Libev Client"
 	default y
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@ -190,8 +190,8 @@ o.default = "0"
 dns_mode = s:taboption("DNS", ListValue, "dns_mode", translate("Filter Mode"))
 dns_mode.rmempty = false
 dns_mode:reset_values()
-if api.is_finded("pdnsd") then
-    dns_mode:value("pdnsd", "pdnsd " .. translatef("Requery DNS By %s", translate("TCP Node")))
+if api.is_finded("dns2tcp") then
+    dns_mode:value("dns2tcp", translatef("Requery DNS By %s", "TCP"))
 end
 if api.is_finded("dns2socks") then
    dns_mode:value("dns2socks", "dns2socks")
@ -243,7 +243,7 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)")
 o:value("208.67.220.220", "208.67.220.220 (OpenDNS)")
 o:value("208.67.222.222", "208.67.222.222 (OpenDNS)")
 o:depends({dns_mode = "dns2socks"})
-o:depends({dns_mode = "pdnsd"})
+o:depends({dns_mode = "dns2tcp"})
 o:depends({dns_mode = "udp"})
 o:depends({v2ray_dns_mode = "tcp"})

@ -272,7 +272,6 @@ o:depends("v2ray_dns_mode", "doh")
 o = s:taboption("DNS", Flag, "dns_cache", translate("Cache Resolved"))
 o.default = "1"
 o:depends({dns_mode = "dns2socks"})
-o:depends({dns_mode = "pdnsd"})
 o:depends({dns_mode = "v2ray", v2ray_dns_mode = "tcp"})
 o:depends({dns_mode = "v2ray", v2ray_dns_mode = "doh"})
 o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"})
@ -284,7 +283,7 @@ if has_chnlist and api.is_finded("chinadns-ng") then
    o.default = "0"
    if api.is_finded("smartdns") then
        o:depends({dns_shunt = "dnsmasq", dns_mode = "dns2socks"})
-        o:depends({dns_shunt = "dnsmasq", dns_mode = "pdnsd"})
+        o:depends({dns_shunt = "dnsmasq", dns_mode = "dns2tcp"})
        o:depends({dns_shunt = "dnsmasq", dns_mode = "v2ray", v2ray_dns_mode = "tcp"})
        o:depends({dns_shunt = "dnsmasq", dns_mode = "v2ray", v2ray_dns_mode = "doh"})
        o:depends({dns_shunt = "dnsmasq", dns_mode = "xray", v2ray_dns_mode = "tcp"})
@ -292,7 +291,7 @@ if has_chnlist and api.is_finded("chinadns-ng") then
        o:depends({dns_shunt = "dnsmasq", dns_mode = "udp"})
    else
        o:depends({dns_mode = "dns2socks"})
-        o:depends({dns_mode = "pdnsd"})
+        o:depends({dns_mode = "dns2tcp"})
        o:depends({dns_mode = "v2ray", v2ray_dns_mode = "tcp"})
        o:depends({dns_mode = "v2ray", v2ray_dns_mode = "doh"})
        o:depends({dns_mode = "xray", v2ray_dns_mode = "tcp"})
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@ -4,7 +4,7 @@ config global
 	option socks_enabled '0'
 	option tcp_node 'nil'
 	option udp_node 'nil'
-	option dns_mode 'pdnsd'
+	option dns_mode 'dns2tcp'
 	option remote_dns '1.1.1.1'
 	option filter_proxy_ipv6 '0'
 	option tcp_proxy_mode 'chnroute'
@ -102,12 +102,14 @@ config shunt_rules 'Netflix'
 	option remarks 'Netflix'
 	option domain_list 'fast.com
 netflix
+netflix.ca
 netflix.com
 netflix.net
 nflxso.net
 nflxext.com
 nflximg.com
 nflximg.net
+nflxsearch.net
 nflxvideo.net
 netflixdnstest0.com
 netflixdnstest1.com
@ -118,7 +120,8 @@ netflixdnstest5.com
 netflixdnstest6.com
 netflixdnstest7.com
 netflixdnstest8.com
-netflixdnstest9.com'
+netflixdnstest9.com
+netflixdnstest10.com'

 config shunt_rules 'TVB'
 	option remarks 'TVB'
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@ -1129,11 +1129,10 @@ start_dns() {
 			run_v2ray ${_v2ray_args}
 		}
 	;;
-	pdnsd)
+	dns2tcp)
 		use_tcp_node_resolve_dns=1
-		gen_pdnsd_config "${dns_listen_port}" "${REMOTE_DNS}" "${DNS_CACHE}"
-		ln_run "$(first_type pdnsd)" pdnsd "/dev/null" --daemon -c "${TMP_PATH}/pdnsd/pdnsd.conf" -d
-		echolog "  - 域名解析：pdnsd + 使用(TCP节点)解析域名..."
+		ln_run "$(first_type dns2tcp)" dns2tcp "/dev/null" -L "${TUN_DNS}" -R "$(get_first_dns REMOTE_DNS 53)" -v
+		echolog "  - 域名解析：dns2tcp + 使用(TCP节点)解析域名..."
 	;;
 	udp)
 		use_udp_node_resolve_dns=1
@ -1188,71 +1187,6 @@ start_dns() {
 	}
 }

-gen_pdnsd_config() {
-	local listen_port=${1}
-	local up_dns=${2}
-	local cache=${3}
-	local pdnsd_dir=${TMP_PATH}/pdnsd
-	local perm_cache=2048
-	local _cache="on"
-	local query_method="tcp_only"
-	local reject_ipv6_dns=
-	[ "${cache}" = "0" ] && _cache="off" && perm_cache=0
-
-	mkdir -p "${pdnsd_dir}"
-	touch "${pdnsd_dir}/pdnsd.cache"
-	chown -R root.nogroup "${pdnsd_dir}"
-	if [ $PROXY_IPV6 == "0" ]; then
-		reject_ipv6_dns=$(cat <<- 'EOF'
-
-				reject = ::/0;
-				reject_policy = negate;
-		EOF
-		)
-	fi
-	cat > "${pdnsd_dir}/pdnsd.conf" <<-EOF
-		global {
-			perm_cache = $perm_cache;
-			cache_dir = "$pdnsd_dir";
-			run_as = "root";
-			server_ip = 127.0.0.1;
-			server_port = ${listen_port};
-			status_ctl = on;
-			query_method = ${query_method};
-			min_ttl = 1h;
-			max_ttl = 1w;
-			timeout = 10;
-			par_queries = 2;
-			neg_domain_pol = off;
-			udpbufsize = 1024;
-			proc_limit = 2;
-			procq_limit = 8;
-		}
-
-	EOF
-	echolog "  + [$?]Pdnsd (127.0.0.1:${listen_port})..."
-
-	append_pdnsd_updns() {
-		[ -z "${2}" ] && echolog "  | - 略过错误 : ${1}" && return 0
-		cat >> $pdnsd_dir/pdnsd.conf <<-EOF
-			server {
-				label = "node-${2}_${3}";
-				ip = ${2};
-				edns_query = on;
-				port = ${3};
-				timeout = 4;
-				interval = 10m;
-				uptest = none;
-				purge_cache = off;
-				proxy_only = on;
-				caching = $_cache;${reject_ipv6_dns}
-			}
-		EOF
-		echolog "  | - [$?]上游DNS：${2}:${3}"
-	}
-	hosts_foreach up_dns append_pdnsd_updns 53
-}
-
 add_ip2route() {
 	local ip=$(get_host_ip "ipv4" $1)
 	[ -z "$ip" ] && {
@ -1486,7 +1420,7 @@ chnlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${L
 gfwlist=$(echo "${TCP_PROXY_MODE}${LOCALHOST_TCP_PROXY_MODE}${UDP_PROXY_MODE}${LOCALHOST_UDP_PROXY_MODE}" | grep "gfwlist")
 DNS_SHUNT=$(config_t_get global dns_shunt dnsmasq)
 [ -z "$(first_type $DNS_SHUNT)" ] && DNS_SHUNT="dnsmasq"
-DNS_MODE=$(config_t_get global dns_mode pdnsd)
+DNS_MODE=$(config_t_get global dns_mode dns2tcp)
 DNS_CACHE=$(config_t_get global dns_cache 0)
 REMOTE_DNS=$(config_t_get global remote_dns 1.1.1.1:53 | sed 's/#/:/g' | sed -E 's/\:([^:]+)$/#\1/g')
 CHINADNS_NG=$(config_t_get global chinadns_ng 0)
--- a/luci-app-passwall/root/usr/share/passwall/rules/chnlist
+++ b/luci-app-passwall/root/usr/share/passwall/rules/chnlist
--- a/luci-app-passwall/root/usr/share/passwall/rules/chnroute
+++ b/luci-app-passwall/root/usr/share/passwall/rules/chnroute
@ -877,6 +877,7 @@
 103.186.136.0/23
 103.186.158.0/23
 103.186.162.0/23
+103.186.228.0/23
 103.186.4.0/23
 103.19.12.0/22
 103.19.232.0/22
@ -1275,7 +1276,6 @@
 103.213.88.0/22
 103.213.92.0/22
 103.213.96.0/22
-103.214.168.0/22
 103.214.212.0/22
 103.214.240.0/22
 103.214.244.0/22
@ -2575,7 +2575,6 @@
 103.49.20.0/22
 103.49.72.0/22
 103.49.76.0/22
-103.49.92.0/22
 103.49.96.0/22
 103.5.152.0/22
 103.5.168.0/22
@ -3117,7 +3116,6 @@
 103.84.48.0/22
 103.84.64.0/22
 103.84.72.0/22
-103.84.92.0/22
 103.85.136.0/22
 103.85.144.0/22
 103.85.164.0/22
@ -7036,8 +7034,8 @@
 42.99.96.0/20
 43.136.0.0/13
 43.144.0.0/13
-43.160.0.0/11
-43.195.0.0/16
+43.176.0.0/12
+43.192.0.0/14
 43.196.0.0/15
 43.224.100.0/22
 43.224.12.0/22
@ -8159,7 +8157,6 @@
 45.252.40.0/22
 45.252.44.0/22
 45.252.48.0/22
-45.252.60.0/22
 45.252.8.0/22
 45.252.84.0/22
 45.252.88.0/22
--- a/luci-app-passwall/root/usr/share/passwall/rules/chnroute6
+++ b/luci-app-passwall/root/usr/share/passwall/rules/chnroute6
@ -254,6 +254,7 @@
 2400:7440::/32
 2400:74c0::/32
 2400:7540::/32
+2400:75a0::/28
 2400:75c0::/32
 2400:7640::/32
 2400:7680::/32
@ -1760,7 +1761,6 @@
 2406:fd80::/32
 2406:fe80::/32
 2406:ff00::/32
-2407:1180::/32
 2407:17c0::/32
 2407:1900::/32
 2407:1d00::/32
--- a/luci-app-passwall/root/usr/share/passwall/rules/gfwlist
+++ b/luci-app-passwall/root/usr/share/passwall/rules/gfwlist
--- a/natflow/Makefile
+++ b/natflow/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=natflow
-PKG_VERSION:=20220503
+PKG_VERSION:=20220512

 PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
 PKG_HASH:=skip
				`@ -0,0 +1 @@`
				!function(n){"object"==typeof exports&&"object"==typeof module?n(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],n):n(CodeMirror)}(function(n){"use strict";function e(e,o,i,t){if(i&&i.call){var l=i;i=null}else l=r(e,i,"rangeFinder");"number"==typeof o&&(o=n.Pos(o,0));var f=r(e,i,"minFoldSize");function d(n){var r=l(e,o);if(!r\|\|r.to.line-r.from.line<f)return null;for(var i=e.findMarksAt(r.from),d=0;d<i.length;++d)if(i[d].__isFold&&"fold"!==t){if(!n)return null;r.cleared=!0,i[d].clear()}return r}var u=d(!0);if(r(e,i,"scanUp"))for(;!u&&o.line>e.firstLine();)o=n.Pos(o.line-1,0),u=d(!1);if(u&&!u.cleared&&"unfold"!==t){var a=function(n,e){var o=r(n,e,"widget");if("string"==typeof o){var i=document.createTextNode(o);(o=document.createElement("span")).appendChild(i),o.className="CodeMirror-foldmarker"}else o&&(o=o.cloneNode(!0));return o}(e,i);n.on(a,"mousedown",function(e){c.clear(),n.e_preventDefault(e)});var c=e.markText(u.from,u.to,{replacedWith:a,clearOnEnter:r(e,i,"clearOnEnter"),__isFold:!0});c.on("clear",function(o,r){n.signal(e,"unfold",e,o,r)}),n.signal(e,"fold",e,u.from,u.to)}}n.newFoldFunction=function(n,o){return function(r,i){e(r,i,{rangeFinder:n,widget:o})}},n.defineExtension("foldCode",function(n,o,r){e(this,n,o,r)}),n.defineExtension("isFolded",function(n){for(var e=this.findMarksAt(n),o=0;o<e.length;++o)if(e[o].__isFold)return!0}),n.commands.toggleFold=function(n){n.foldCode(n.getCursor())},n.commands.fold=function(n){n.foldCode(n.getCursor(),null,"fold")},n.commands.unfold=function(n){n.foldCode(n.getCursor(),null,"unfold")},n.commands.foldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"fold")})},n.commands.unfoldAll=function(e){e.operation(function(){for(var o=e.firstLine(),r=e.lastLine();o<=r;o++)e.foldCode(n.Pos(o,0),null,"unfold")})},n.registerHelper("fold","combine",function(){var n=Array.prototype.slice.call(arguments,0);return function(e,o){for(var r=0;r<n.length;++r){var i=n[r](e,o);if(i)return i}}}),n.registerHelper("fold","auto",function(n,e){for(var o=n.getHelpers(e,"fold"),r=0;r<o.length;r++){var i=o[r](n,e);if(i)return i}});var o={rangeFinder:n.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(n,e,r){if(e&&void 0!==e[r])return e[r];var i=n.options.foldOptions;return i&&void 0!==i[r]?i[r]:o[r]}n.defineOption("foldOptions",null),n.defineExtension("foldOption",function(n,e){return r(this,n,e)})});
				`@ -0,0 +1 @@`
				`.CodeMirror-foldmarker{color:blue;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-open,.CodeMirror-foldgutter-folded{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}`
				`@ -0,0 +1 @@`
				!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],t):t(CodeMirror)}(function(t){"use strict";t.defineOption("foldGutter",!1,function(o,e,r){r&&r!=t.Init&&(o.clearGutter(o.state.foldGutter.options.gutter),o.state.foldGutter=null,o.off("gutterClick",a),o.off("changes",d),o.off("viewportChange",u),o.off("fold",l),o.off("unfold",l),o.off("swapDoc",d)),e&&(o.state.foldGutter=new function(t){this.options=t,this.from=this.to=0}(function(t){!0===t&&(t={});null==t.gutter&&(t.gutter="CodeMirror-foldgutter");null==t.indicatorOpen&&(t.indicatorOpen="CodeMirror-foldgutter-open");null==t.indicatorFolded&&(t.indicatorFolded="CodeMirror-foldgutter-folded");return t}(e)),f(o),o.on("gutterClick",a),o.on("changes",d),o.on("viewportChange",u),o.on("fold",l),o.on("unfold",l),o.on("swapDoc",d))});var o=t.Pos;function e(t,e){for(var r=t.findMarks(o(e,0),o(e+1,0)),n=0;n<r.length;++n)if(r[n].__isFold){var i=r[n].find(-1);if(i&&i.line===e)return r[n]}}function r(t){if("string"==typeof t){var o=document.createElement("div");return o.className=t+" CodeMirror-guttermarker-subtle",o}return t.cloneNode(!0)}function n(t,n,f){var a=t.state.foldGutter.options,d=n-1,u=t.foldOption(a,"minFoldSize"),l=t.foldOption(a,"rangeFinder"),c="string"==typeof a.indicatorFolded&&i(a.indicatorFolded),s="string"==typeof a.indicatorOpen&&i(a.indicatorOpen);t.eachLine(n,f,function(n){++d;var i=null,f=n.gutterMarkers;if(f&&(f=f[a.gutter]),e(t,d)){if(c&&f&&c.test(f.className))return;i=r(a.indicatorFolded)}else{var p=o(d,0),m=l&&l(t,p);if(m&&m.to.line-m.from.line>=u){if(s&&f&&s.test(f.className))return;i=r(a.indicatorOpen)}}(i\|\|f)&&t.setGutterMarker(n,a.gutter,i)})}function i(t){return new RegExp("(^\|\\s)"+t+"(?:$\|\\s)\\s*")}function f(t){var o=t.getViewport(),e=t.state.foldGutter;e&&(t.operation(function(){n(t,o.from,o.to)}),e.from=o.from,e.to=o.to)}function a(t,r,n){var i=t.state.foldGutter;if(i){var f=i.options;if(n==f.gutter){var a=e(t,r);a?a.clear():t.foldCode(o(r,0),f)}}}function d(t){var o=t.state.foldGutter;if(o){var e=o.options;o.from=o.to=0,clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){f(t)},e.foldOnChangeTimeSpan\|\|600)}}function u(t){var o=t.state.foldGutter;if(o){var e=o.options;clearTimeout(o.changeUpdate),o.changeUpdate=setTimeout(function(){var e=t.getViewport();o.from==o.to\|\|e.from-o.to>20\|\|o.from-e.to>20?f(t):t.operation(function(){e.from<o.from&&(n(t,e.from,o.from),o.from=e.from),e.to>o.to&&(n(t,o.to,e.to),o.to=e.to)})},e.updateViewportTimeSpan\|\|400)}}function l(t,o){var e=t.state.foldGutter;if(e){var r=o.line;r>=e.from&&r<e.to&&n(t,r,r+1)}}});
				`@ -0,0 +1 @@`
				!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(e){"use strict";function n(n,t){var i=n.getLine(t),o=i.search(/\S/);return-1==o\|\|/\bcomment\b/.test(n.getTokenTypeAt(e.Pos(t,o+1)))?-1:e.countColumn(i,null,n.getOption("tabSize"))}e.registerHelper("fold","indent",function(t,i){var o=n(t,i.line);if(!(o<0)){for(var r=null,l=i.line+1,f=t.lastLine();l<=f;++l){var u=n(t,l);if(-1==u);else{if(!(u>o))break;r=l}}return r?{from:e.Pos(i.line,t.getLine(i.line).length),to:e.Pos(r,t.getLine(r).length)}:void 0}})});
				`@ -0,0 +1 @@`
				.cm-s-dracula.CodeMirror,.cm-s-dracula .CodeMirror-gutters{background-color:#282a36 !important;color:#f8f8f2 !important;border:0}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,0.10)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,0.10)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:white}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-variable-3,.cm-s-dracula span.cm-type{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,0.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:white !important}