daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bind-option: support force aaaa soa bind option, secondary DNS support Force-AAAA-SOA options

Browse Source
This commit is contained in:
Nick Peng
2020-02-16 13:01:45 +08:00
parent 3cf2d35c13
commit 5f9167cf07
9 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ msgstr "跳过address SOA(#)规则。"
msgid "Skip Dualstack Selection"
msgstr "跳过双栈优选"
msgid "Skip Sualstack Selection."
msgid "Skip Dualstack Selection."
msgstr "跳过双栈优选。"
msgid "Skip Cache"

24
package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua
View File

@@ -141,13 +141,6 @@ o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "1"
end
o = s:taboption("seconddns", Flag, "seconddns_no_speed_check", translate("Skip Speed Check"), translate("Do not check speed."))
o.rmempty = false
o.default = o.disabled
o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "0"
end
---- dns server group
o = s:taboption("seconddns", Value, "seconddns_server_group", translate("Server Group"), translate("Query DNS through specific dns server group, such as office, home."))
o.rmempty = true
@@ -155,6 +148,13 @@ o.placeholder = "default"
o.datatype = "hostname"
o.rempty = true
o = s:taboption("seconddns", Flag, "seconddns_no_speed_check", translate("Skip Speed Check"), translate("Do not check speed."))
o.rmempty = false
o.default = o.disabled
o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "0"
end
---- skip address rules
o = s:taboption("seconddns", Flag, "seconddns_no_rule_addr", translate("Skip Address Rules"), translate("Skip address rules."))
o.rmempty = false
@@ -187,7 +187,7 @@ o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "0"
end
o = s:taboption("seconddns", Flag, "seconddns_no_dualstack_selection", translate("Skip Dualstack Selection"), translate("Skip Sualstack Selection."))
o = s:taboption("seconddns", Flag, "seconddns_no_dualstack_selection", translate("Skip Dualstack Selection"), translate("Skip Dualstack Selection."))
o.rmempty = false
o.default = o.disabled
o.cfgvalue = function(...)
@@ -202,6 +202,14 @@ o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "0"
end
---- Force AAAA SOA
o = s:taboption("seconddns", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA."))
o.rmempty = false
o.default = o.disabled
o.cfgvalue = function(...)
return Flag.cfgvalue(...) or "0"
end
----- custom settings
custom = s:taboption("custom", Value, "Custom Settings",
translate(""),

17
package/luci/files/luci/htdocs/luci-static/resources/view/smartdns/smartdns.js
View File

@@ -251,11 +251,6 @@ return L.view.extend({
o.rmempty = false;
o.default = o.enabled;
o = s.taboption("seconddns", form.Flag, "seconddns_no_speed_check", _("Skip Speed Check"),
_("Do not check speed."));
o.rmempty = false;
o.default = o.disabled;
// 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."));
@@ -264,6 +259,11 @@ return L.view.extend({
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."));
@@ -289,7 +289,7 @@ return L.view.extend({
o.default = o.disabled;
o = s.taboption("seconddns", form.Flag, "seconddns_no_dualstack_selection", _("Skip Dualstack Selection"),
_("Skip Sualstack Selection."));
_("Skip Dualstack Selection."));
o.rmempty = false;
o.default = o.disabled;
@@ -298,6 +298,11 @@ return L.view.extend({
o.rmempty = false;
o.default = o.disabled;
// Force AAAA SOA
o = s.taboption("seconddns", form.Flag, "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",
_(""),

8
package/luci/files/luci/i18n/smartdns.zh-cn.po
View File

@@ -178,7 +178,7 @@ msgstr "跳过address SOA(#)规则。"
msgid "Skip Dualstack Selection"
msgstr "跳过双栈优选"
msgid "Skip Sualstack Selection."
msgid "Skip Dualstack Selection."
msgstr "跳过双栈优选。"
msgid "Skip Cache"
@@ -187,6 +187,12 @@ msgstr "跳过cache"
msgid "Skip Cache."
msgstr "跳过cache。"
msgid "Force AAAA SOA"
msgstr "停用IPV6地址解析"
msgid "Force AAAA SOA."
msgstr "停用IPV6地址解析。"
msgid "Upstream Servers"
msgstr "上游服务器"

3
package/openwrt/files/etc/init.d/smartdns
View File

@@ -242,6 +242,9 @@ load_second_server()
config_get_bool seconddns_no_cache "$section" "seconddns_no_cache" "0"
[ "$seconddns_no_cache" = "1" ] && ARGS="$ARGS -no-cache"
config_get_bool force_aaaa_soa "$section" "force_aaaa_soa" "0"
[ "$force_aaaa_soa" = "1" ] && ARGS="$ARGS -force-aaaa-soa"
config_get ipv6_server "$section" "ipv6_server" "1"
if [ "$ipv6_server" = "1" ]; then
ADDR="[::]"