page.leaf = true
end
- page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+ page = entry({"admin", "network", "network"}, arcombine(template("admin_network/iface_overview"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
page.leaf = true
page.subindex = true
- page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+ page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "iface_delete"}, call("iface_delete"), nil)
page.leaf = true
page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
page.leaf = true
+ page = entry({"admin", "network", "iface_reconnect"}, call("iface_reconnect"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
+ page.leaf = true
+
uci:foreach("network", "interface",
function (section)
local ifc = section[".name"]
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")
luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
end
-function jsondump(x)
- if x == nil then
- luci.http.write("null")
- elseif type(x) == "table" then
- local k, v
- if type(next(x)) == "number" then
- luci.http.write("[ ")
- for k, v in ipairs(x) do
- jsondump(v)
- if next(x, k) then
- luci.http.write(", ")
- end
- end
- luci.http.write(" ]")
- else
- luci.http.write("{ ")
- for k, v in pairs(x) do
- luci.http.write("%q: " % k)
- jsondump(v)
- if next(x, k) then
- luci.http.write(", ")
- end
- end
- luci.http.write(" }")
- end
- elseif type(x) == "number" or type(x) == "boolean" then
- luci.http.write(tostring(x))
- elseif type(x) == "string" then
- luci.http.write("%q" % tostring(x))
- end
-end
-
-
function iface_status()
local path = luci.dispatcher.context.requestpath
local x = luci.model.uci.cursor_state()
local iface
for iface in path[#path]:gmatch("[%w%.%-]+") do
- local dev = x:get("network", iface, "device") or ""
+ local dev
+ if x:get("network", iface, "type") == "bridge" then
+ dev = "br-" .. iface
+ else
+ dev = x:get("network", iface, "device") or ""
+ end
+
if #dev == 0 or dev:match("^%d") or dev:match("%W") then
dev = x:get("network", iface, "ifname") or ""
dev = dev:match("%S+")
end
local info
- local data = { }
+ local data = { id = iface }
for _, info in ipairs(nixio.getifaddrs()) do
local name = info.name:match("[^:]+")
if name == dev then
if #rv > 0 then
luci.http.prepare_content("application/json")
- jsondump(rv)
+ luci.http.write_json(rv)
return
end
luci.http.status(404, "No such device")
end
+function iface_reconnect()
+ local path = luci.dispatcher.context.requestpath
+ local iface = path[#path]
+ local netmd = require "luci.model.network".init()
+
+ local net = netmd:get_network(iface)
+ if net then
+ local ifn
+ for _, ifn in ipairs(net:get_interfaces()) do
+ local wnet = ifn:get_wifinet()
+ if wnet then
+ local wdev = wnet:get_device()
+ if wdev then
+ luci.sys.call(
+ "env -i /sbin/wifi up %q >/dev/null 2>/dev/null"
+ % wdev:name()
+ )
+
+ luci.http.status(200, "Reconnected")
+ return
+ end
+ end
+ end
+
+ luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface)
+ luci.http.status(200, "Reconnected")
+ return
+ end
+
+ luci.http.status(404, "No such interface")
+end
+
+function iface_shutdown()
+ local path = luci.dispatcher.context.requestpath
+ local iface = path[#path]
+ local netmd = require "luci.model.network".init()
+
+ local net = netmd:get_network(iface)
+ if net then
+ luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+ luci.http.status(200, "Shutdown")
+ return
+ end
+
+ luci.http.status(404, "No such interface")
+end
+
+function iface_delete()
+ local path = luci.dispatcher.context.requestpath
+ local iface = path[#path]
+ local netmd = require "luci.model.network".init()
+
+ local net = netmd:del_network(iface)
+ if net then
+ luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface)
+ luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+ netmd:commit("network")
+ netmd:commit("wireless")
+ return
+ end
+
+ luci.http.status(404, "No such interface")
+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
luci.http.prepare_content("application/json")
- jsondump(rv)
+ luci.http.write_json(rv)
return
end
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
projects / project / luci.git / blobdiff