From cb3caa6e3087380291a7fee8ca05d35d89744f27 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 7 Nov 2010 23:31:19 +0000 Subject: [PATCH] modules/admin-full: live status, validation for dhcp leases --- .../luasrc/controller/admin/network.lua | 43 ++++++++ .../model/cbi/admin_network/dhcpleases.lua | 44 ++------- .../view/admin_network/lease_status.htm | 97 +++++++++++++++++++ 3 files changed, 147 insertions(+), 37 deletions(-) create mode 100644 modules/admin-full/luasrc/view/admin_network/lease_status.htm diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index 9492e11d7..a6324f427 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -87,6 +87,9 @@ function index() page.target = cbi("admin_network/dhcpleases") page.title = i18n("DHCP Leases") page.order = 30 + + page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil) + page.leaf = true end page = node("admin", "network", "hosts") @@ -249,3 +252,43 @@ function wifi_status() luci.http.status(404, "No such device") end + +function lease_status() + local rv = { } + local leasefile = "/var/dhcp.leases" + + local uci = require "luci.model.uci".cursor() + local nfs = require "nixio.fs" + + uci:foreach("dhcp", "dnsmasq", + function(s) + if s.leasefile and nfs.access(s.leasefile) then + leasefile = s.leasefile + return false + end + end) + + local fd = io.open(leasefile, "r") + if fd then + while true do + local ln = fd:read("*l") + if not ln then + break + else + local ts, mac, ip, name = ln:match("^(%d+) (%S+) (%S+) (%S+)") + if ts and mac and ip and name then + rv[#rv+1] = { + expires = os.difftime(tonumber(ts) or 0, os.time()), + macaddr = mac, + ipaddr = ip, + hostname = (name ~= "*") and name + } + end + end + end + fd:close() + end + + luci.http.prepare_content("application/json") + luci.http.write_json(rv) +end diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua index 70b49d7fa..3f631b38b 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcpleases.lua @@ -12,49 +12,14 @@ You may obtain a copy of the License at $Id$ ]]-- -local uci = require "luci.model.uci".cursor() local sys = require "luci.sys" -local wa = require "luci.tools.webadmin" -local fs = require "nixio.fs" m2 = Map("dhcp", translate("DHCP Leases"), translate("Static leases are used to assign fixed IP addresses and symbolic hostnames to " .. "DHCP clients. They are also required for non-dynamic interface configurations where " .. "only hosts with a corresponding lease are served.")) -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 = m2:section(Table, leases, translate("Active Leases")) - - name = v:option(DummyValue, 4, translate("Hostname")) - function name.cfgvalue(self, ...) - local value = DummyValue.cfgvalue(self, ...) - return (value == "*") and "?" or value - end - - ip = v:option(DummyValue, 3, translate("IPv4-Address")) - - mac = v:option(DummyValue, 2, translate("MAC-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 +m2:section(SimpleSection).template = "admin_network/lease_status" s = m2:section(TypedSection, "host", translate("Static Leases"), translate("Use the Add Button to add a new lease entry. The MAC-Address " .. @@ -66,8 +31,13 @@ s.anonymous = true s.template = "cbi/tblsection" name = s:option(Value, "name", translate("Hostname")) + mac = s:option(Value, "mac", translate("MAC-Address")) +mac.datatype = "macaddr" + ip = s:option(Value, "ip", translate("IPv4-Address")) +ip.datatype = "ip4addr" + sys.net.arptable(function(entry) ip:value(entry["IP address"]) mac:value( @@ -76,5 +46,5 @@ sys.net.arptable(function(entry) ) end) - + return m2 diff --git a/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/modules/admin-full/luasrc/view/admin_network/lease_status.htm new file mode 100644 index 000000000..9555d1437 --- /dev/null +++ b/modules/admin-full/luasrc/view/admin_network/lease_status.htm @@ -0,0 +1,97 @@ + + +
+ <%:Active Leases%> + + + + + + + + + + +
<%:Hostname%><%:IPv4-Address%><%:MAC-Address%><%:Leasetime remaining%>

<%:Collecting data...%>
+
-- 2.25.1