function index()
require("luci.i18n")
local uci = require("luci.model.uci").cursor()
+ local net = require "luci.model.network".init(uci)
local i18n = luci.i18n.translate
local has_wifi = nixio.fs.stat("/etc/config/wireless")
local has_switch = false
page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16)
page.leaf = true
+
+ local wdev
+ for _, wdev in ipairs(net:get_wifidevs()) do
+ local wnet
+ for _, wnet in ipairs(wdev:get_wifinets()) do
+ entry(
+ {"admin", "network", "wireless", wnet.netid},
+ alias("admin", "network", "wireless"),
+ wdev:name() .. ": " .. wnet:shortname()
+ )
+ end
+ end
end
page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
if net then
local info
local dev = net:ifname()
- local data = { id = iface, uptime = net:uptime() }
+ local data = {
+ id = iface,
+ proto = net:proto(),
+ uptime = net:uptime(),
+ gwaddr = net:gwaddr(),
+ dnsaddrs = net:dnsaddrs()
+ }
for _, info in ipairs(nixio.getifaddrs()) do
local name = info.name:match("[^:]+")
if name == dev then
end
function wifi_status()
+ local netm = require "luci.model.network".init()
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)
+ local wn = netm:get_wifinet(dev)
+ local iw = wn and wn.iwinfo
if iw then
local f
for _, f in ipairs({
"channel", "frequency", "txpower", "bitrate", "signal", "noise",
- "quality", "quality_max", "mode", "ssid", "bssid", "country",
+ "quality", "quality_max", "bssid", "country",
"encryption", "ifname", "assoclist"
}) do
j[f] = iw[f]
end
end
+
+ j.mode = wn and wn:active_mode() or "?"
+ j.ssid = wn and wn:active_ssid() or "?"
+
rv[#rv+1] = j
end
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
+ local s = require "luci.tools.status"
luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
+ luci.http.write_json(s.dhcp_leases())
end
function diag_command(cmd)