modules/admin-{mini,full}: rename "mode" to "hwmode"

[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 f2f2e4742af84adec7f6de1966a7ef1820b29362..872e6444d139e3a6d20036f9a76b6b604250a892 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -13,7 +13,6 @@ $Id$
 ]]--
 require("luci.tools.webadmin")
 require("luci.model.uci")
-require("luci.sys")
 require("luci.util")
 
 m = Map("dhcp", "DHCP")
@@ -25,7 +24,8 @@ s.anonymous = true
 iface = s:option(ListValue, "interface", translate("interface"))
 luci.tools.webadmin.cbi_add_networks(iface)
 
-luci.model.uci.foreach("network", "interface",
+local uci = luci.model.uci.cursor()
+uci:foreach("network", "interface",
        function (section)
                if section[".name"] ~= "loopback" then
                        iface.default = iface.default or section[".name"]
@@ -33,7 +33,7 @@ luci.model.uci.foreach("network", "interface",
                end
        end)
 
-luci.model.uci.foreach("network", "alias",
+uci:foreach("network", "alias",
        function (section)
                iface:value(section[".name"])
                s:depends("interface", section[".name"])
@@ -45,7 +45,11 @@ 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
 
@@ -56,10 +60,7 @@ 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
 
 
 for i, n in ipairs(s.children) do
@@ -68,21 +69,4 @@ for i, n in ipairs(s.children) do
        end
 end
 
-
-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"] .. ")")
-end
-
-       
-return m, m2
+return m