modules/admin-full: properly handle disabled radios in live overview

[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index 9492e11..b271e20 100644 (file)
--- 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")
@@ -221,24 +224,24 @@ end
 
 function wifi_status()
        local path = luci.dispatcher.context.requestpath
+       local arp  = luci.sys.net.arptable()
        local rv   = { }
 
        local dev
        for dev in path[#path]:gmatch("[%w%.%-]+") do
+               local j = { id = dev }
                local iw = luci.sys.wifi.getiwinfo(dev)
                if iw then
                        local f
-                       local j = { }
                        for _, f in ipairs({
                                "channel", "frequency", "txpower", "bitrate", "signal", "noise",
                                "quality", "quality_max", "mode", "ssid", "bssid", "country",
-                               "encryption", "ifname"
+                               "encryption", "ifname", "assoclist"
                        }) do
                                j[f] = iw[f]
                        end
-
-                       rv[#rv+1] = j
                end
+               rv[#rv+1] = j
        end
 
        if #rv > 0 then
@@ -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