support set smartdns as dnsmasq upstream server

package/luci/files/luci/controller/smartdns.lua

@@ -22,13 +22,24 @@ end
 function act_status()
 	local e={}
 	local ipv6_server;
+	local redirect_mode="none";
+
 	e.ipv6_works = 2;
 	e.ipv4_works = 2;
 	e.ipv6_server = 1;
-	e.redirect = smartdns.get_config_option("smartdns", "smartdns", "redirect", nil);
+	e.dnsmasq_forward = 0;
+	redirect_mode = smartdns.get_config_option("smartdns", "smartdns", "redirect", nil);
+	if redirect_mode == "redirect" then
+		e.redirect = 1
+	elseif redirect_mode == "dnsmasq-upstream" then
+		e.redirect = 2
+	else
+		e.redirect = 0
+	end
+
 	e.local_port = smartdns.get_config_option("smartdns", "smartdns", "port", nil);
 	ipv6_server = smartdns.get_config_option("smartdns", "smartdns", "ipv6_server", nil);
-	if e.redirect == "1" then 
+	if e.redirect == 1 then 
 		if e.local_port ~= nil and e.local_port ~= "53" then
 			e.ipv4_works = luci.sys.call("iptables -t nat -nL PREROUTING 2>/dev/null | grep REDIRECT | grep dpt:53 | grep %q >/dev/null 2>&1" % e.local_port) == 0
 			if ipv6_server == "1" then
@@ -39,6 +50,15 @@ function act_status()
 		else
 			e.redirect = 0
 		end
+	elseif e.redirect == 2 then
+		local str;
+		local dnsmasq_server = luci.sys.exec("uci get dhcp.@dnsmasq[0].server")
+		if e.local_port ~= nil then
+			str = "127.0.0.1#" .. e.local_port 
+			if  string.sub(dnsmasq_server,1,string.len(str)) == str then 
+				e.dnsmasq_forward = 1
+			end
+		end
 	end
 	e.running = is_running()
 

package/luci/files/luci/i18n/smartdns.zh-cn.po

@@ -40,6 +40,9 @@ msgstr "IPV4 53端口重定向失败"
 msgid "IPV6 53 Port Redirect Failure"
 msgstr "IPV6 53端口重定向失败"
 
+msgid "Dnsmasq Forwared To Smartdns Failure"
+msgstr "重定向dnsmasq到smartdns失败"
+
 msgid "TCP Server"
 msgstr "TCP服务器"
 
@@ -55,8 +58,14 @@ msgstr "启用IPV6服务器"
 msgid "Redirect"
 msgstr "重定向"
 
-msgid "Redirect standard dns query from 53 to smartdns, as default DNS server"
-msgstr "将53端口的DNS请求重定向到SmartDNS, 替换默认DNS服务"
+msgid "SmartDNS redirect mode"
+msgstr "SmartDNS 重定向模式"
+
+msgid "Run as dnsmasq upstream server"
+msgstr "作为dnsmasq的上游服务器"
+
+msgid "Redirect 53 port to SmartDNS"
+msgstr "重定向53端口到SmartDNS"
 
 msgid "Cache Size"
 msgstr "缓存大小"

package/luci/files/luci/model/cbi/smartdns.lua

@@ -31,8 +31,8 @@ o.rempty      = false
 
 ---- Port
 o = s:taboption("settings", Value, "port", translate("Local Port"), translate("Smartdns local server port"))
-o.placeholder = 5053
-o.default     = 5053
+o.placeholder = 6053
+o.default     = 6053
 o.datatype    = "port"
 o.rempty      = false
 
@@ -52,12 +52,14 @@ o.cfgvalue    = function(...)
     return Flag.cfgvalue(...) or "1"
 end
 
-o = s:taboption("settings", Flag, "redirect", translate("Redirect"), translate("Redirect standard dns query from 53 to smartdns, as default DNS server"))
-o.rmempty     = false
-o.default     = o.enabled
-o.cfgvalue    = function(...)
-    return Flag.cfgvalue(...) or "1"
-end
+---- Redirect
+o = s:taboption("settings", ListValue, "redirect", translate("Redirect"), translate("SmartDNS 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 SmartDNS"))
+o.default     = "none"
+o.rempty      = false
 
 ---- cache-size
 o = s:taboption("settings", Value, "cache_size", translate("Cache Size"), translate("DNS domain result cache size"))
@@ -93,7 +95,6 @@ function custom.write(self, section, value)
 	nixio.fs.writefile("/etc/smartdns/custom.conf", value)
 end
 
-
 -- Upstream servers
 s = m:section(TypedSection, "server", translate("Upstream Servers"), translate("Upstream Servers, support UDP, TCP protocol. " ..
 	"Please configure multiple DNS servers, including multiple foreign DNS servers."))

package/luci/files/luci/view/smartdns/smartdns_status.htm

@@ -6,14 +6,20 @@ XHR.poll(3, '<%=luci.dispatcher.build_url("admin", "services", "smartdns", "stat
 			var links = "";
 			if (data.running) {
 				links = '<b><font color=green>SmartDNS - <%:RUNNING%></font></b></em>';
-				if (data.redirect && data.redirect == 1) {
-					if (data.ipv4_works == 0) {
-						links += "<br></br><b><font color=red><%:IPV4 53 Port Redirect Failure%></font></b>"
-					}
-					
-					if (data.ipv6_works != 2) {
-						if (data.ipv6_works == 0) {
-							links += "<br></br><b><font color=red><%:IPV6 53 Port Redirect Failure%></font></b>"
+				if (data.redirect) {
+					if (data.redirect == 1) {
+						if (data.ipv4_works == 0) {
+							links += "<br></br><b><font color=red><%:IPV4 53 Port Redirect Failure%></font></b>"
+						}
+						
+						if (data.ipv6_works != 2) {
+							if (data.ipv6_works == 0) {
+								links += "<br></br><b><font color=red><%:IPV6 53 Port Redirect Failure%></font></b>"
+							}
+						}
+					} else if (data.redirect == 2) {
+						if (data.dnsmasq_forward == 0) {
+							links += "<br></br><b><font color=red><%:Dnsmasq Forwared To Smartdns Failure%></font></b>"
 						}
 					}
 				}