LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
local wnet
for _, wnet in ipairs(wdev:get_wifinets()) do
entry(
- {"admin", "network", "wireless", wnet.netid},
+ {"admin", "network", "wireless", wnet:id()},
alias("admin", "network", "wireless"),
wdev:name() .. ": " .. wnet:shortname()
)
)
if nixio.fs.access("/etc/config/dhcp") then
- page = node("admin", "network", "dhcpleases")
- page.target = cbi("admin_network/dhcpleases")
- page.title = i18n("DHCP Leases")
+ page = node("admin", "network", "dhcp")
+ page.target = cbi("admin_network/dhcp")
+ page.title = i18n("DHCP and DNS")
page.order = 30
page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
local rv = { }
local iface
- for iface in path[#path]:gmatch("[%w%.%-]+") do
+ for iface in path[#path]:gmatch("[%w%.%-_]+") do
local net = netm:get_network(iface)
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
luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
-
- require "luci.fs"
- if luci.fs.access("/etc/config/radvd") then
- luci.sys.call("/etc/init.d/radvd restart >/dev/null 2>/dev/null")
- end
-
luci.http.status(200, "Reconnected")
return
end
end
function wifi_status()
- local netm = require "luci.model.network".init()
local path = luci.dispatcher.context.requestpath
- local arp = luci.sys.net.arptable()
+ local s = require "luci.tools.status"
local rv = { }
local dev
for dev in path[#path]:gmatch("[%w%.%-]+") do
- local j = { id = 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", "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
+ rv[#rv+1] = s.wifi_network(dev)
end
if #rv > 0 then
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)