modules/admin-mini: luci_ethers -> dhcp conversation

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

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 5a27f1e..62bfe57 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -12,25 +12,31 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.model.uci")
-require("luci.sys")
+
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local wa  = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
 
 m = Map("dhcp", "DHCP")
 
 s = m:section(TypedSection, "dhcp", "DHCP-Server")
 s.anonymous = true
+s.addremove = false
+s.dynamic = false
+
 s:depends("interface", "lan")
 
-enable = s:option(ListValue, "ignore", "", "")
-enable:value(0, "enabled")
-enable:value(1, "disabled")
+enable = s:option(ListValue, "ignore", translate("enable"), "")
+enable:value(0, translate("enable"))
+enable:value(1, translate("disable"))
 
-start = s:option(Value, "start", "First address")
+start = s:option(Value, "start", translate("First leased address"))
 start.rmempty = true
 start:depends("ignore", "0")
 
 
-limit = s:option(Value, "limit", "Number of leases", "")
+limit = s:option(Value, "limit", translate("Number of leased addresses"), "")
 limit:depends("ignore", "0")
 
 function limit.cfgvalue(self, section)
@@ -52,14 +58,47 @@ time = s:option(Value, "leasetime")
 time:depends("ignore", "0")
 time.rmempty = true
 
-m2 = Map("luci_ethers", translate("luci_ethers"))
 
-s = m2:section(TypedSection, "static_lease", "")
-s.addremove = true
-s.anonymous = true
-s.template = "cbi/tblsection"
+local leasefn, leasefp, leases
+uci:foreach("dhcp", "dnsmasq",
+ function(section)
+       leasefn = section.leasefile
+ end
+) 
+local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn)
+if leasefp then
+       leases = {}
+       for lease in leasefp do
+               table.insert(leases, luci.util.split(lease, " "))
+       end
+end
+
+if leases then
+       v = m:section(Table, leases, translate("Active Leases"))
+       ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+       mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+       ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
+       function ltime.cfgvalue(self, ...)
+               local value = DummyValue.cfgvalue(self, ...)
+               return wa.date_format(os.difftime(tonumber(value), os.time()))
+       end
+end
+
+s2 = m:section(TypedSection, "host", translate("Static Leases"))
+s2.addremove = true
+s2.anonymous = true
+s2.template = "cbi/tblsection"
+
+name = s2:option(Value, "name", translate("Hostname"))
+mac = s2:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s2:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+sys.net.arptable(function(entry)
+       ip:value(entry["IP address"])
+       mac:value(
+               entry["HW address"],
+               entry["HW address"] .. " (" .. entry["IP address"] .. ")"
+       )
+end)
 
-s:option(Value, "macaddr", translate("macaddress"))
-s:option(Value, "ipaddr", translate("ipaddress"))
+return m
 
-return m, m2
\ No newline at end of file