luci: add hint when set dnsmasq failure.

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

@@ -37,6 +37,20 @@ end
 
 function act_status()
 	local e={}
+	local ipv6_server;
+	local dnsmasq_server = luci.sys.exec("uci get dhcp.@dnsmasq[0].server")
+	local auto_set_dnsmasq = smartdns.get_config_option("smartdns", "smartdns", "auto_set_dnsmasq", nil);
+	
+	e.auto_set_dnsmasq = auto_set_dnsmasq
+	e.dnsmasq_server = dnsmasq_server
+	e.local_port = smartdns.get_config_option("smartdns", "smartdns", "port", nil);
+	if e.local_port ~= nil and e.local_port ~= "53" and auto_set_dnsmasq ~= nil and auto_set_dnsmasq == "1" then
+		local str;
+		str = "127.0.0.1#" .. e.local_port 
+		if string.sub(dnsmasq_server,1,string.len(str)) ~= str then 
+			e.dnsmasq_redirect_failure = 1
+		end
+	end
 	e.running = is_running()
 	luci.http.prepare_content("application/json")
 	luci.http.write_json(e)

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

@@ -52,6 +52,9 @@ msgstr "协议类型"
 msgid "DNS domain result cache size"
 msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
 
+msgid "Dnsmasq Forwared To Smartdns Failure"
+msgstr "重定向dnsmasq到smartdns失败"
+
 msgid "Do not check certificate."
 msgstr "不校验证书的合法性。"
 

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

@@ -6,6 +6,9 @@ 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.dnsmasq_redirect_failure == 1) {
+					links += "<br></br><b><font color=red><%:Dnsmasq Forwared To Smartdns Failure%></font></b>"
+				}
 			} else {
 				links = '<b><font color=red>SmartDNS - <%:NOT RUNNING%></font></b>';
 			}

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

@@ -52,6 +52,9 @@ msgstr "协议类型"
 msgid "DNS domain result cache size"
 msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
 
+msgid "Dnsmasq Forwared To Smartdns Failure"
+msgstr "重定向dnsmasq到smartdns失败"
+
 msgid "Do not check certificate."
 msgstr "不校验证书的合法性。"
 

package/luci/files/root/www/luci-static/resources/view/smartdns/smartdns.js

@@ -54,6 +54,11 @@
 	var renderHTML = "";
 	var isRunning = res[0];
 
+	var autoSetDnsmasq = uci.get_first('smartdns', 'smartdns', 'auto_set_dnsmasq');
+	var smartdnsPort = uci.get_first('smartdns', 'smartdns', 'port');
+	var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server');
+	uci.unload('dhcp');
+
 	if (isRunning) {
 		renderHTML += "<span style=\"color:green;font-weight:bold\">SmartDNS - " + _("RUNNING") + "</span>";
 	} else {
@@ -61,14 +66,23 @@
 		return renderHTML;
 	}
 
+	if (autoSetDnsmasq === '1' && smartdnsPort != '53') {
+		var matchLine = "127.0.0.1#" + smartdnsPort;
+		var dnsmasqServer = uci.get_first('dhcp', 'dnsmasq', 'server') || "";
+
+		if (dnsmasqServer.indexOf(matchLine) < 0) {
+			renderHTML += "<br /><span style=\"color:red;font-weight:bold\">" + _("Dnsmasq Forwared To Smartdns Failure") + "</span>";
+		}
+	}
+
 	return renderHTML;
 }
 
 return view.extend({
 	load: function () {
 		return Promise.all([
+			uci.load('dhcp'),
 			uci.load('smartdns'),
-			 uci.load('dhcp')
 		]);
 	},
 	render: function (stats) {
@@ -461,4 +475,3 @@
 		return m.render();
 	}
 });
- 

src/Makefile

@@ -23,9 +23,9 @@ ifndef CFLAGS
 CFLAGS =-O2 -g -Wall -Wstrict-prototypes -fno-omit-frame-pointer -Wstrict-aliasing -funwind-tables -Wmissing-prototypes -Wshadow -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough
 endif
 override CFLAGS +=-Iinclude
-override CFLAGS += -DBASE_FILE_NAME=\"$(notdir $<)\"
+override CFLAGS += -DBASE_FILE_NAME='"$(notdir $<)"'
 ifdef VER
-override CFLAGS += -DSMARTDNS_VERION=\"$(VER)\"
+override CFLAGS += -DSMARTDNS_VERION='"$(VER)"'
 endif
 
 CXXFLAGS=-O2 -g -Wall -std=c++11