Fix behaviour of dynamicdhcp field (thanks to Fabio Mercuri)

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / dhcp.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index b50b05c..872e644 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -11,8 +11,8 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 require("luci.model.uci")
-require("luci.sys")
 require("luci.util")
 
 m = Map("dhcp", "DHCP")
@@ -22,16 +22,18 @@ s.addremove = true
 s.anonymous = true
 
 iface = s:option(ListValue, "interface", translate("interface"))
-luci.model.uci.foreach("network", "interface",
+luci.tools.webadmin.cbi_add_networks(iface)
+
+local uci = luci.model.uci.cursor()
+uci:foreach("network", "interface",
        function (section)
                if section[".name"] ~= "loopback" then
                        iface.default = iface.default or section[".name"]
-                       iface:value(section[".name"])
                        s:depends("interface", section[".name"])
                end
        end)
 
-luci.model.uci.foreach("network", "alias",
+uci:foreach("network", "alias",
        function (section)
                iface:value(section[".name"])
                s:depends("interface", section[".name"])
@@ -43,35 +45,28 @@ s:option(Value, "limit", translate("limit")).rmempty = true
 
 s:option(Value, "leasetime").rmempty = true
 
-s:option(Flag, "dynamicdhcp").rmempty = true
+local dd = s:option(Flag, "dynamicdhcp")
+dd.rmempty = false
+function dd.cfgvalue(self, section)
+       return Flag.cfgvalue(self, section) or "1"
+end
 
 s:option(Value, "name", translate("name")).optional = true
 
-s:option(Flag, "ignore").optional = true
+ignore = s:option(Flag, "ignore")
+ignore.optional = true
 
 s:option(Value, "netmask", translate("netmask")).optional = true
 
 s:option(Flag, "force").optional = true
 
-for i, line in pairs(luci.util.execl("dnsmasq --help dhcp")) do
-       k, v = line:match("([^ ]+) +([^ ]+)")
-       s:option(Value, "dhcp"..k, v).optional = true
-end
+s:option(DynamicList, "dhcp_option").optional = true
 
-m2 = Map("luci_ethers", translate("luci_ethers"))
 
-s = m2:section(TypedSection, "static_lease", "")
-s.addremove = true
-s.anonymous = true
-s.template = "cbi/tblsection"
-
-mac = s:option(Value, "macaddr", translate("macaddress"))
-ip = s:option(Value, "ipaddr", translate("ipaddress"))
-for i, dataset in ipairs(luci.sys.net.arptable()) do
-       ip:value(dataset["IP address"])
-       mac:value(dataset["HW address"],
-        dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
+for i, n in ipairs(s.children) do
+       if n ~= iface and n ~= ignore then
+               n:depends("ignore", "")
+       end
 end
 
-       
-return m, m2
+return m