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

@@ -17,448 +17,461 @@
  */
 
 
- 'use strict';
- 'require fs';
- 'require uci';
- 'require form';
- 'require view';
- 'require poll';
- 'require rpc';
- 
- var conf = 'smartdns';
- var callServiceList = rpc.declare({
-	 object: 'service',
-	 method: 'list',
-	 params: ['name'],
-	 expect: { '': {} }
- });
- 
- function getServiceStatus() {
-	 return L.resolveDefault(callServiceList(conf), {})
-		 .then(function (res) {
-			 var isrunning = false;
-			 try {
-				 isrunning = res[conf]['instances']['smartdns']['running'];
-			 } catch (e) { }
-			 return isrunning;
-		 });
- }
- 
- function smartdnsServiceStatus() {
-	 return Promise.all([
-		 getServiceStatus()
-	 ]);
- }
- 
- function smartdnsRenderStatus(res) {
-	 var renderHTML = "";
-	 var isRunning = res[0];
- 
-	 if (isRunning) {
-		 renderHTML += "<span style=\"color:green;font-weight:bold\">SmartDNS - " + _("RUNNING") + "</span>";
-	 } else {
-		 renderHTML += "<span style=\"color:red;font-weight:bold\">SmartDNS - " + _("NOT RUNNING") + "</span>";
-		 return renderHTML;
-	 }
- 
-	 return renderHTML;
- }
- 
- return view.extend({
-	 load: function () {
-		 return Promise.all([
-			 uci.load('smartdns'),
-			 uci.load('dhcp')
-		 ]);
-	 },
-	 render: function (stats) {
-		 var m, s, o;
- 
-		 m = new form.Map('smartdns', _('SmartDNS'));
-		 m.title = _("SmartDNS Server");
-		 m.description = _("SmartDNS is a local high-performance DNS server, supports finding fastest IP, "
-			 + "supports ad filtering, and supports avoiding DNS poisoning.");
- 
-		 s = m.section(form.NamedSection, '_status');
-		 s.anonymous = true;
-		 s.render = function (section_id) {
-			 var renderStatus = function () {
-				 return L.resolveDefault(smartdnsServiceStatus()).then(function (res) {
-					 var view = document.getElementById("service_status");
-					 if (view == null) {
-						 return;
-					 }
- 
-					 view.innerHTML = smartdnsRenderStatus(res);
-				 });
-			 }
-			 poll.add(renderStatus);
-			 setTimeout(renderStatus, 1000);
- 
-			 return E('div', { class: 'cbi-map' },
-				 E('div', { class: 'cbi-section' }, [
-					 E('div', { id: 'service_status' },
-						 _('Collecting data ...'))
-				 ])
-			 );
-		 }
- 
-		 // Basic;
-		 s = m.section(form.TypedSection, "smartdns", _("Settings"), _("General Settings"));
-		 s.anonymous = true;
- 
-		 s.tab("settings", _("General Settings"));
-		 s.tab("seconddns", _("Second Server Settings"));
-		 s.tab("custom", _("Custom Settings"));
- 
-		 o = s.taboption("settings", form.Flag, "enabled", _("Enable"), _("Enable or disable smartdns server"));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // server name;
-		 o = s.taboption("settings", form.Value, "server_name", _("Server Name"), _("Smartdns server name"));
-		 o.default = "smartdns";
-		 o.datatype = "hostname";
-		 o.rempty = false;
- 
-		 // Port;
-		 o = s.taboption("settings", form.Value, "port", _("Local Port"), 
-		 	_("Smartdns local server port, smartdns will be automatically set as main dns when the port is 53."));
-		 o.placeholder = 53;
-		 o.default = 53;
-		 o.datatype = "port";
-		 o.rempty = false;
- 
-		 // Enable TCP server;
-		 o = s.taboption("settings", form.Flag, "tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // Support IPV6;
-		 o = s.taboption("settings", form.Flag, "ipv6_server", _("IPV6 Server"), _("Enable IPV6 DNS Server"));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // Support DualStack ip selection;
-		 o = s.taboption("settings", form.Flag, "dualstack_ip_selection", _("Dual-stack IP Selection"),
-			 _("Enable IP selection between IPV4 and IPV6"));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // Domain prefetch load ;
-		 o = s.taboption("settings", form.Flag, "prefetch_domain", _("Domain prefetch"),
-			 _("Enable domain prefetch, accelerate domain response speed."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // Domain Serve expired
-		 o = s.taboption("settings", form.Flag, "serve_expired", _("Serve expired"),
-			 _("Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // cache-size;
-		 o = s.taboption("settings", form.Value, "cache_size", _("Cache Size"), _("DNS domain result cache size"));
-		 o.rempty = true;
- 
-		 // cache-size;
-		 o = s.taboption("settings", form.Flag, "resolve_local_hostnames", _("Resolve Local Hostnames"), _("Resolve local hostnames by reading Dnsmasq lease file."));
-		 o.rmempty = false;
-		 o.default = o.enabled;
-
-		 // auto-conf-dnsmasq;
-		 o = s.taboption("settings", form.Flag, "auto_set_dnsmasq", _("Automatically Set Dnsmasq"), _("Automatically set as upstream of dnsmasq when port changes."));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // Force AAAA SOA
-		 o = s.taboption("settings", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // Force HTTPS SOA
-		 o = s.taboption("settings", form.Flag, "force_https_soa", _("Force HTTPS SOA"), _("Force HTTPS SOA."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // rr-ttl;
-		 o = s.taboption("settings", form.Value, "rr_ttl", _("Domain TTL"), _("TTL for all domain result."));
-		 o.rempty = true;
- 
-		 // rr-ttl-min;
-		 o = s.taboption("settings", form.Value, "rr_ttl_min", _("Domain TTL Min"),
-			 _("Minimum TTL for all domain result."));
-		 o.rempty = true;
-		 o.placeholder = "600";
-		 o.default = 600;
-		 o.optional = true;
- 
-		 // rr-ttl-max;
-		 o = s.taboption("settings", form.Value, "rr_ttl_max", _("Domain TTL Max"),
-		 _("Maximum TTL for all domain result."));
-		 o.rempty = true;
- 
-		 // rr-ttl-reply-max;
-		 o = s.taboption("settings", form.Value, "rr_ttl_reply_max", _("Reply Domain TTL Max"),
-		 _("Reply maximum TTL for all domain result."));
-		 o.rempty = true;
-		 
-		 // second dns server;
-		 // Eanble;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_enabled", _("Enable"),
-			 _("Enable or disable second DNS server."));
-		 o.default = o.disabled;
-		 o.rempty = false;
- 
-		 // Port;
-		 o = s.taboption("seconddns", form.Value, "seconddns_port", _("Local Port"), _("Smartdns local server port"));
-		 o.placeholder = 6553;
-		 o.default = 6553;
-		 o.datatype = "port";
-		 o.rempty = false;
- 
-		 // Enable TCP server;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
-		 o.rmempty = false;
-		 o.default = o.enabled;
- 
-		 // dns server group;
-		 o = s.taboption("seconddns", form.Value, "seconddns_server_group", _("Server Group"),
-			 _("Query DNS through specific dns server group, such as office, home."));
-		 o.rmempty = true;
-		 o.placeholder = "default";
-		 o.datatype = "hostname";
-		 o.rempty = true;
- 
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_speed_check", _("Skip Speed Check"),
-			 _("Do not check speed."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // skip address rules;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_addr", _("Skip Address Rules"),
-			 _("Skip address rules."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // skip name server rules;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_nameserver", _("Skip Nameserver Rule"),
-			 _("Skip nameserver rules."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // skip ipset rules;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_ipset", _("Skip Ipset Rule"),
-			 _("Skip ipset rules."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // skip soa address rule;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_soa", _("Skip SOA Address Rule"),
-			 _("Skip SOA address rules."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_dualstack_selection", _("Skip Dualstack Selection"),
-			 _("Skip Dualstack Selection."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // skip cache;
-		 o = s.taboption("seconddns", form.Flag, "seconddns_no_cache", _("Skip Cache"), _("Skip Cache."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // Force AAAA SOA
-		 o = s.taboption("seconddns", form.Flag, "seconddns_force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
- 
-		 // custom settings;
-		 o = s.taboption("custom", form.TextValue, "custom_conf",
-			 "", _("smartdns custom settings"));
- 
-		 o.rows = 20;
-		 o.cfgvalue = function (section_id) {
-			 return fs.trimmed('/etc/smartdns/custom.conf');
-		 };
-		 o.write = function (section_id, formvalue) {
-			 return fs.write('/etc/smartdns/custom.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
-		 };
- 
-		 o = s.taboption("custom", form.Flag, "coredump", _("Generate Coredump"),
-			 _("Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."));
-		 o.rmempty = false;
-		 o.default = o.disabled;
-		 // Upstream servers;
-		 s = m.section(form.GridSection, "server", _("Upstream Servers"),
-			 _("Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, "
-				 + "including multiple foreign DNS servers."));
-		 s.anonymous = true;
-		 s.addremove = true;
- 
-		 s.tab('general', _('General Settings'));
-		 s.tab('advanced', _('Advanced Settings'));
- 
-		 // enable flag;
-		 o = s.taboption("general", form.Flag, "enabled", _("Enable"), _("Enable"));
-		 o.rmempty = false;
-		 o.default = o.enabled;
-		 o.editable = true;
- 
-		 // name;
-		 o = s.taboption("general", form.Value, "name", _("DNS Server Name"), _("DNS Server Name"));
- 
-		 // IP address;
-		 o = s.taboption("general", form.Value, "ip", _("ip"), _("DNS Server ip"));
-		 o.datatype = "or(ipaddr, string)";
-		 o.rmempty = false;
- 
-		 // port;
-		 o = s.taboption("general", form.Value, "port", _("port"), _("DNS Server port"));
-		 o.placeholder = "default";
-		 o.datatype = "port";
-		 o.rempty = true;
-		 o.depends("type", "udp");
-		 o.depends("type", "tcp");
-		 o.depends("type", "tls");
- 
-		 // type;
-		 o = s.taboption("general", form.ListValue, "type", _("type"), _("DNS Server type"));
-		 o.placeholder = "udp";
-		 o.value("udp", _("udp"));
-		 o.value("tcp", _("tcp"));
-		 o.value("tls", _("tls"));
-		 o.value("https", _("https"));
-		 o.default = "udp";
-		 o.rempty = false;
- 
-		 // Advanced Options
-		 // server group
-		 o = s.taboption("advanced", form.Value, "server_group", _("Server Group"), _("DNS Server group belongs to, "
-			 + "used with nameserver, such as office, home."))
-		 o.rmempty = true
-		 o.placeholder = "default"
-		 o.datatype = "hostname"
-		 o.rempty = true
-		 o.modalonly = true;
- 
-		 // blacklist_ip
-		 o = s.taboption("advanced", form.Flag, "blacklist_ip", _("IP Blacklist Filtering"),
-			 _("Filtering IP with blacklist"))
-		 o.rmempty = false
-		 o.default = o.disabled
-		 o.modalonly = true;
- 
-		 // TLS host verify
-		 o = s.taboption("advanced", form.Value, "tls_host_verify", _("TLS Hostname Verify"),
-			 _("Set TLS hostname to verify."))
-		 o.default = ""
-		 o.datatype = "string"
-		 o.rempty = true
-		 o.modalonly = true;
-		 o.depends("type", "tls")
-		 o.depends("type", "https")
- 
-		 // certificate verify
-		 o = s.taboption("advanced", form.Flag, "no_check_certificate", _("No check certificate"),
-			 _("Do not check certificate."))
-		 o.rmempty = false
-		 o.default = o.disabled
-		 o.modalonly = true;
-		 o.depends("type", "tls")
-		 o.depends("type", "https")
- 
-		 // SNI host name
-		 o = s.taboption("advanced", form.Value, "host_name", _("TLS SNI name"),
-			 _("Sets the server name indication for query."))
-		 o.default = ""
-		 o.datatype = "hostname"
-		 o.rempty = true
-		 o.modalonly = true;
-		 o.depends("type", "tls")
-		 o.depends("type", "https")
- 
-		 // http host
-		 o = s.taboption("advanced", form.Value, "http_host", _("HTTP Host"),
-			 _("Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."))
-		 o.default = ""
-		 o.datatype = "hostname"
-		 o.rempty = true
-		 o.modalonly = true;
-		 o.depends("type", "https")
- 
-		 // SPKI pin
-		 o = s.taboption("advanced", form.Value, "spki_pin", _("TLS SPKI Pinning"),
-			 _("Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, "
-				 + "leaving blank to indicate that the validity of TLS is not verified."))
-		 o.default = ""
-		 o.datatype = "string"
-		 o.rempty = true
-		 o.modalonly = true;
-		 o.depends("type", "tls")
-		 o.depends("type", "https")
- 
-		 // other args
-		 o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"),
-			 _("Additional Args for upstream dns servers"))
-		 o.default = ""
-		 o.rempty = true
-		 o.modalonly = true;
- 
-		 // Doman addresss;
-		 s = m.section(form.TypedSection, "smartdns", _("Advanced Settings"), _("Advanced Settings"));
-		 s.anonymous = true;
- 
-		 s.tab("domain-address", _("Domain Address"), _("Set Specific domain ip address."));
-		 s.tab("blackip-list", _("IP Blacklist"), _("Set Specific ip blacklist."));
- 
-		 o = s.taboption("domain-address", form.TextValue, "address_conf",
-			 "",
-			 _("Specify an IP address to return for any host in the given domains, Queries in the domains are never "
-				 + "forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."));
-		 o.rows = 20;
-		 o.cfgvalue = function (section_id) {
-			 return fs.trimmed('/etc/smartdns/address.conf');
-		 };
-		 o.write = function (section_id, formvalue) {
-			 return fs.write('/etc/smartdns/address.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
-		 };
- 
-		 // IP Blacklist;
-		 // blacklist;
-		 o = s.taboption("blackip-list", form.TextValue, "blackip_ip_conf",
-			 "", _("Configure IP blacklists that will be filtered from the results of specific DNS server."));
-		 o.rows = 20;
-		 o.cfgvalue = function (section_id) {
-			 return fs.trimmed('/etc/smartdns/blacklist-ip.conf');
-		 };
-		 o.write = function (section_id, formvalue) {
-			 return fs.write('/etc/smartdns/blacklist-ip.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
-		 };
- 
-		 // Doman addresss;
-		 s = m.section(form.TypedSection, "smartdns", _("Technical Support"),
-			 _("If you like this software, please buy me a cup of coffee."));
-		 s.anonymous = true;
- 
-		 o = s.option(form.Button, "web");
-		 o.title = _("SmartDNS official website");
-		 o.inputtitle = _("open website");
-		 o.inputstyle = "apply";
-		 o.onclick = function () {
-			 window.open("https://pymumu.github.io/smartdns", '_blank');
-		 };
- 
-		 o = s.option(form.Button, "Donate");
-		 o.title = _("Donate to smartdns");
-		 o.inputtitle = _("Donate");
-		 o.inputstyle = "apply";
-		 o.onclick = function () {
-			 window.open("https://pymumu.github.io/smartdns/#donate", '_blank');
-		 };
- 
-		 return m.render();
-	 }
- });
- 
+'use strict';
+'require fs';
+'require uci';
+'require form';
+'require view';
+'require poll';
+'require rpc';
+
+var conf = 'smartdns';
+var callServiceList = rpc.declare({
+	object: 'service',
+	method: 'list',
+	params: ['name'],
+	expect: { '': {} }
+});
+
+function getServiceStatus() {
+	return L.resolveDefault(callServiceList(conf), {})
+		.then(function (res) {
+			var isrunning = false;
+			try {
+				isrunning = res[conf]['instances']['smartdns']['running'];
+			} catch (e) { }
+			return isrunning;
+		});
+}
+
+function smartdnsServiceStatus() {
+	return Promise.all([
+		getServiceStatus()
+	]);
+}
+
+function smartdnsRenderStatus(res) {
+	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 {
+		renderHTML += "<span style=\"color:red;font-weight:bold\">SmartDNS - " + _("NOT RUNNING") + "</span>";
+		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'),
+		]);
+	},
+	render: function (stats) {
+		var m, s, o;
+
+		m = new form.Map('smartdns', _('SmartDNS'));
+		m.title = _("SmartDNS Server");
+		m.description = _("SmartDNS is a local high-performance DNS server, supports finding fastest IP, "
+			+ "supports ad filtering, and supports avoiding DNS poisoning.");
+
+		s = m.section(form.NamedSection, '_status');
+		s.anonymous = true;
+		s.render = function (section_id) {
+			var renderStatus = function () {
+				return L.resolveDefault(smartdnsServiceStatus()).then(function (res) {
+					var view = document.getElementById("service_status");
+					if (view == null) {
+						return;
+					}
+
+					view.innerHTML = smartdnsRenderStatus(res);
+				});
+			}
+			poll.add(renderStatus);
+			setTimeout(renderStatus, 1000);
+
+			return E('div', { class: 'cbi-map' },
+				E('div', { class: 'cbi-section' }, [
+					E('div', { id: 'service_status' },
+						_('Collecting data ...'))
+				])
+			);
+		}
+
+		// Basic;
+		s = m.section(form.TypedSection, "smartdns", _("Settings"), _("General Settings"));
+		s.anonymous = true;
+
+		s.tab("settings", _("General Settings"));
+		s.tab("seconddns", _("Second Server Settings"));
+		s.tab("custom", _("Custom Settings"));
+
+		o = s.taboption("settings", form.Flag, "enabled", _("Enable"), _("Enable or disable smartdns server"));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// server name;
+		o = s.taboption("settings", form.Value, "server_name", _("Server Name"), _("Smartdns server name"));
+		o.default = "smartdns";
+		o.datatype = "hostname";
+		o.rempty = false;
+
+		// Port;
+		o = s.taboption("settings", form.Value, "port", _("Local Port"),
+			_("Smartdns local server port, smartdns will be automatically set as main dns when the port is 53."));
+		o.placeholder = 53;
+		o.default = 53;
+		o.datatype = "port";
+		o.rempty = false;
+
+		// Enable TCP server;
+		o = s.taboption("settings", form.Flag, "tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Support IPV6;
+		o = s.taboption("settings", form.Flag, "ipv6_server", _("IPV6 Server"), _("Enable IPV6 DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Support DualStack ip selection;
+		o = s.taboption("settings", form.Flag, "dualstack_ip_selection", _("Dual-stack IP Selection"),
+			_("Enable IP selection between IPV4 and IPV6"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Domain prefetch load ;
+		o = s.taboption("settings", form.Flag, "prefetch_domain", _("Domain prefetch"),
+			_("Enable domain prefetch, accelerate domain response speed."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// Domain Serve expired
+		o = s.taboption("settings", form.Flag, "serve_expired", _("Serve expired"),
+			_("Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish."));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// cache-size;
+		o = s.taboption("settings", form.Value, "cache_size", _("Cache Size"), _("DNS domain result cache size"));
+		o.rempty = true;
+
+		// cache-size;
+		o = s.taboption("settings", form.Flag, "resolve_local_hostnames", _("Resolve Local Hostnames"), _("Resolve local hostnames by reading Dnsmasq lease file."));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// auto-conf-dnsmasq;
+		o = s.taboption("settings", form.Flag, "auto_set_dnsmasq", _("Automatically Set Dnsmasq"), _("Automatically set as upstream of dnsmasq when port changes."));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// Force AAAA SOA
+		o = s.taboption("settings", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// Force HTTPS SOA
+		o = s.taboption("settings", form.Flag, "force_https_soa", _("Force HTTPS SOA"), _("Force HTTPS SOA."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// rr-ttl;
+		o = s.taboption("settings", form.Value, "rr_ttl", _("Domain TTL"), _("TTL for all domain result."));
+		o.rempty = true;
+
+		// rr-ttl-min;
+		o = s.taboption("settings", form.Value, "rr_ttl_min", _("Domain TTL Min"),
+			_("Minimum TTL for all domain result."));
+		o.rempty = true;
+		o.placeholder = "600";
+		o.default = 600;
+		o.optional = true;
+
+		// rr-ttl-max;
+		o = s.taboption("settings", form.Value, "rr_ttl_max", _("Domain TTL Max"),
+			_("Maximum TTL for all domain result."));
+		o.rempty = true;
+
+		// rr-ttl-reply-max;
+		o = s.taboption("settings", form.Value, "rr_ttl_reply_max", _("Reply Domain TTL Max"),
+			_("Reply maximum TTL for all domain result."));
+		o.rempty = true;
+
+		// second dns server;
+		// Eanble;
+		o = s.taboption("seconddns", form.Flag, "seconddns_enabled", _("Enable"),
+			_("Enable or disable second DNS server."));
+		o.default = o.disabled;
+		o.rempty = false;
+
+		// Port;
+		o = s.taboption("seconddns", form.Value, "seconddns_port", _("Local Port"), _("Smartdns local server port"));
+		o.placeholder = 6553;
+		o.default = 6553;
+		o.datatype = "port";
+		o.rempty = false;
+
+		// Enable TCP server;
+		o = s.taboption("seconddns", form.Flag, "seconddns_tcp_server", _("TCP Server"), _("Enable TCP DNS Server"));
+		o.rmempty = false;
+		o.default = o.enabled;
+
+		// dns server group;
+		o = s.taboption("seconddns", form.Value, "seconddns_server_group", _("Server Group"),
+			_("Query DNS through specific dns server group, such as office, home."));
+		o.rmempty = true;
+		o.placeholder = "default";
+		o.datatype = "hostname";
+		o.rempty = true;
+
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_speed_check", _("Skip Speed Check"),
+			_("Do not check speed."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip address rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_addr", _("Skip Address Rules"),
+			_("Skip address rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip name server rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_nameserver", _("Skip Nameserver Rule"),
+			_("Skip nameserver rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip ipset rules;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_ipset", _("Skip Ipset Rule"),
+			_("Skip ipset rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip soa address rule;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_soa", _("Skip SOA Address Rule"),
+			_("Skip SOA address rules."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_dualstack_selection", _("Skip Dualstack Selection"),
+			_("Skip Dualstack Selection."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// skip cache;
+		o = s.taboption("seconddns", form.Flag, "seconddns_no_cache", _("Skip Cache"), _("Skip Cache."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// Force AAAA SOA
+		o = s.taboption("seconddns", form.Flag, "seconddns_force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
+		o.rmempty = false;
+		o.default = o.disabled;
+
+		// custom settings;
+		o = s.taboption("custom", form.TextValue, "custom_conf",
+			"", _("smartdns custom settings"));
+
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/custom.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/custom.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		o = s.taboption("custom", form.Flag, "coredump", _("Generate Coredump"),
+			_("Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."));
+		o.rmempty = false;
+		o.default = o.disabled;
+		// Upstream servers;
+		s = m.section(form.GridSection, "server", _("Upstream Servers"),
+			_("Upstream Servers, support UDP, TCP protocol. Please configure multiple DNS servers, "
+				+ "including multiple foreign DNS servers."));
+		s.anonymous = true;
+		s.addremove = true;
+
+		s.tab('general', _('General Settings'));
+		s.tab('advanced', _('Advanced Settings'));
+
+		// enable flag;
+		o = s.taboption("general", form.Flag, "enabled", _("Enable"), _("Enable"));
+		o.rmempty = false;
+		o.default = o.enabled;
+		o.editable = true;
+
+		// name;
+		o = s.taboption("general", form.Value, "name", _("DNS Server Name"), _("DNS Server Name"));
+
+		// IP address;
+		o = s.taboption("general", form.Value, "ip", _("ip"), _("DNS Server ip"));
+		o.datatype = "or(ipaddr, string)";
+		o.rmempty = false;
+
+		// port;
+		o = s.taboption("general", form.Value, "port", _("port"), _("DNS Server port"));
+		o.placeholder = "default";
+		o.datatype = "port";
+		o.rempty = true;
+		o.depends("type", "udp");
+		o.depends("type", "tcp");
+		o.depends("type", "tls");
+
+		// type;
+		o = s.taboption("general", form.ListValue, "type", _("type"), _("DNS Server type"));
+		o.placeholder = "udp";
+		o.value("udp", _("udp"));
+		o.value("tcp", _("tcp"));
+		o.value("tls", _("tls"));
+		o.value("https", _("https"));
+		o.default = "udp";
+		o.rempty = false;
+
+		// Advanced Options
+		// server group
+		o = s.taboption("advanced", form.Value, "server_group", _("Server Group"), _("DNS Server group belongs to, "
+			+ "used with nameserver, such as office, home."))
+		o.rmempty = true
+		o.placeholder = "default"
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+
+		// blacklist_ip
+		o = s.taboption("advanced", form.Flag, "blacklist_ip", _("IP Blacklist Filtering"),
+			_("Filtering IP with blacklist"))
+		o.rmempty = false
+		o.default = o.disabled
+		o.modalonly = true;
+
+		// TLS host verify
+		o = s.taboption("advanced", form.Value, "tls_host_verify", _("TLS Hostname Verify"),
+			_("Set TLS hostname to verify."))
+		o.default = ""
+		o.datatype = "string"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// certificate verify
+		o = s.taboption("advanced", form.Flag, "no_check_certificate", _("No check certificate"),
+			_("Do not check certificate."))
+		o.rmempty = false
+		o.default = o.disabled
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// SNI host name
+		o = s.taboption("advanced", form.Value, "host_name", _("TLS SNI name"),
+			_("Sets the server name indication for query."))
+		o.default = ""
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// http host
+		o = s.taboption("advanced", form.Value, "http_host", _("HTTP Host"),
+			_("Set the HTTP host used for the query. Use this parameter when the host of the URL address is an IP address."))
+		o.default = ""
+		o.datatype = "hostname"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "https")
+
+		// SPKI pin
+		o = s.taboption("advanced", form.Value, "spki_pin", _("TLS SPKI Pinning"),
+			_("Used to verify the validity of the TLS server, The value is Base64 encoded SPKI fingerprint, "
+				+ "leaving blank to indicate that the validity of TLS is not verified."))
+		o.default = ""
+		o.datatype = "string"
+		o.rempty = true
+		o.modalonly = true;
+		o.depends("type", "tls")
+		o.depends("type", "https")
+
+		// other args
+		o = s.taboption("advanced", form.Value, "addition_arg", _("Additional Server Args"),
+			_("Additional Args for upstream dns servers"))
+		o.default = ""
+		o.rempty = true
+		o.modalonly = true;
+
+		// Doman addresss;
+		s = m.section(form.TypedSection, "smartdns", _("Advanced Settings"), _("Advanced Settings"));
+		s.anonymous = true;
+
+		s.tab("domain-address", _("Domain Address"), _("Set Specific domain ip address."));
+		s.tab("blackip-list", _("IP Blacklist"), _("Set Specific ip blacklist."));
+
+		o = s.taboption("domain-address", form.TextValue, "address_conf",
+			"",
+			_("Specify an IP address to return for any host in the given domains, Queries in the domains are never "
+				+ "forwarded and always replied to with the specified IP address which may be IPv4 or IPv6."));
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/address.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/address.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		// IP Blacklist;
+		// blacklist;
+		o = s.taboption("blackip-list", form.TextValue, "blackip_ip_conf",
+			"", _("Configure IP blacklists that will be filtered from the results of specific DNS server."));
+		o.rows = 20;
+		o.cfgvalue = function (section_id) {
+			return fs.trimmed('/etc/smartdns/blacklist-ip.conf');
+		};
+		o.write = function (section_id, formvalue) {
+			return fs.write('/etc/smartdns/blacklist-ip.conf', formvalue.trim().replace(/\r\n/g, '\n') + '\n');
+		};
+
+		// Doman addresss;
+		s = m.section(form.TypedSection, "smartdns", _("Technical Support"),
+			_("If you like this software, please buy me a cup of coffee."));
+		s.anonymous = true;
+
+		o = s.option(form.Button, "web");
+		o.title = _("SmartDNS official website");
+		o.inputtitle = _("open website");
+		o.inputstyle = "apply";
+		o.onclick = function () {
+			window.open("https://pymumu.github.io/smartdns", '_blank');
+		};
+
+		o = s.option(form.Button, "Donate");
+		o.title = _("Donate to smartdns");
+		o.inputtitle = _("Donate");
+		o.inputstyle = "apply";
+		o.onclick = function () {
+			window.open("https://pymumu.github.io/smartdns/#donate", '_blank');
+		};
+
+		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