Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

protocols/core: add back dns server options to dhcp and static protocols

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-10-15 04:32:14 +00:00
parent 632632f92b
commit 620c216b3a
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
View file

@ -14,7 +14,7 @@ local map, section, net = ...
local ifc = net:get_interface() local ifc = net:get_interface()
local hostname, accept_ra, send_rs local hostname, accept_ra, send_rs
local bcast, no_gw, metric, clientid, vendorclass local bcast, no_gw, no_dns, dns, metric, clientid, vendorclass
hostname = section:taboption("general", Value, "hostname", hostname = section:taboption("general", Value, "hostname",
@ -62,6 +62,34 @@ function no_gw.write(self, section, value)
end end
no_dns = section:taboption("advanced", Flag, "_no_dns",
translate("Use DNS servers advertised by peer"),
translate("If unchecked, the advertised DNS server addresses are ignored"))
no_dns.default = no_dns.enabled
function no_dns.cfgvalue(self, section)
local addr
for addr in luci.util.imatch(m:get(section, "dns")) do
return self.disabled
end
return self.enabled
end
function no_dns.remove(self, section)
return m:del(section, "dns")
end
function no_dns.write() end
dns = section:taboption("advanced", DynamicList, "dns",
translate("Use custom DNS servers"))
dns:depends("_no_dns", "")
dns.datatype = "ipaddr"
metric = section:taboption("advanced", Value, "metric", metric = section:taboption("advanced", Value, "metric",
translate("Use gateway metric")) translate("Use gateway metric"))

10
protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
View file

@ -13,7 +13,7 @@ You may obtain a copy of the License at
local map, section, net = ... local map, section, net = ...
local ifc = net:get_interface() local ifc = net:get_interface()
local ipaddr, netmask, gateway, broadcast, accept_ra, send_rs, ip6addr, ip6gw local ipaddr, netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw
local macaddr, mtu, metric local macaddr, mtu, metric
@ -38,6 +38,12 @@ broadcast = section:taboption("general", Value, "broadcast", translate("IPv4 bro
broadcast.datatype = "ip4addr" broadcast.datatype = "ip4addr"
dns = section:taboption("general", DynamicList, "dns",
translate("Use custom DNS servers"))
dns.datatype = "ipaddr"
if luci.model.network:has_ipv6() then if luci.model.network:has_ipv6() then
accept_ra = s:taboption("general", Flag, "accept_ra", translate("Accept router advertisements")) accept_ra = s:taboption("general", Flag, "accept_ra", translate("Accept router advertisements"))
@ -57,7 +63,7 @@ if luci.model.network:has_ipv6() then
ip6gw = section:taboption("general", Value, "ip6gw", translate("IPv6 gateway")) ip6gw = section:taboption("general", Value, "ip6gw", translate("IPv6 gateway"))
ip6gw.datatype = "ip6addr" ip6gw.datatype = "ip6addr"
ip6gw:depends("accept_ra", "") ip6gw:depends("accept_ra", "")
end end