$Id$
]]--
+
module("luci.controller.admin.network", package.seeall)
function index()
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"]
)
if nixio.fs.access("/etc/config/dhcp") then
- page = node("admin", "network", "dhcpleases")
+ page = node("admin", "network", "dhcpleases")
page.target = cbi("admin_network/dhcpleases")
page.title = i18n("DHCP Leases")
page.order = 30
- end
- page = node("admin", "network", "hosts")
- page.target = cbi("admin_network/hosts")
- page.title = i18n("Hostnames")
- page.order = 40
+ page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
+ page.leaf = true
+
+ page = node("admin", "network", "hosts")
+ page.target = cbi("admin_network/hosts")
+ page.title = i18n("Hostnames")
+ page.order = 40
+ end
page = node("admin", "network", "routes")
page.target = cbi("admin_network/routes")
page.title = i18n("Static Routes")
page.order = 50
+ page = node("admin", "network", "diagnostics")
+ page.target = template("admin_network/diagnostics")
+ page.title = i18n("Diagnostics")
+ page.order = 60
+
+ page = entry({"admin", "network", "diag_ping"}, call("diag_ping"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "diag_nslookup"}, call("diag_nslookup"), nil)
+ page.leaf = true
+
+ page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
+ page.leaf = true
end
function wifi_join()
function wifi_add()
local dev = luci.http.formvalue("device")
- local uci = require "luci.model.uci".cursor()
- local wlm = require "luci.model.wireless"
+ local ntm = require "luci.model.network".init()
- if dev then
- wlm.init(uci)
+ dev = dev and ntm:get_wifidev(dev)
- local net = wlm:add_network({
- device = dev,
+ if dev then
+ local net = dev:add_wifinet({
mode = "ap",
ssid = "OpenWrt",
encryption = "none"
})
- uci:save("wireless")
- luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", dev, net:name()))
+ ntm:save("wireless")
+ luci.http.redirect(net:adminlink())
end
end
function wifi_delete(network)
- local uci = require "luci.model.uci".cursor()
- local wlm = require "luci.model.wireless"
+ local ntm = require "luci.model.network".init()
- wlm.init(uci)
- wlm:del_network(network)
+ ntm:del_wifinet(network)
+ ntm:save("wireless")
- uci:save("wireless")
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(", ")
+function iface_status()
+ local path = luci.dispatcher.context.requestpath
+ local netm = require "luci.model.network".init()
+ local rv = { }
+
+ local iface
+ 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() }
+ for _, info in ipairs(nixio.getifaddrs()) do
+ local name = info.name:match("[^:]+")
+ if name == dev then
+ if info.family == "packet" then
+ data.flags = info.flags
+ data.stats = info.data
+ data.macaddr = info.addr
+ data.ifname = name
+ elseif info.family == "inet" then
+ data.ipaddrs = data.ipaddrs or { }
+ data.ipaddrs[#data.ipaddrs+1] = {
+ addr = info.addr,
+ broadaddr = info.broadaddr,
+ dstaddr = info.dstaddr,
+ netmask = info.netmask,
+ prefix = info.prefix
+ }
+ elseif info.family == "inet6" then
+ data.ip6addrs = data.ip6addrs or { }
+ data.ip6addrs[#data.ip6addrs+1] = {
+ addr = info.addr,
+ netmask = info.netmask,
+ prefix = info.prefix
+ }
+ end
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(", ")
+
+ if next(data) then
+ rv[#rv+1] = data
+ end
+ end
+ end
+
+ if #rv > 0 then
+ luci.http.prepare_content("application/json")
+ 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
- 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))
+
+ 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()
-function iface_status()
+ 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 data = { }
- local info
- local x = luci.model.uci.cursor_state()
-
- local dev = x:get("network", iface, "device") or ""
- if #dev == 0 or dev:match("^%d") or dev:match("%W") then
- dev = x:get("network", iface, "ifname") or ""
- dev = dev:match("%S+")
+ 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
- for _, info in ipairs(nixio.getifaddrs()) do
- local name = info.name:match("[^:]+")
- if name == dev then
- if info.family == "packet" then
- data.flags = info.flags
- data.stats = info.data
- data.macaddr = info.addr
- data.ifname = name
- elseif info.family == "inet" then
- data.ipaddrs = data.ipaddrs or { }
- data.ipaddrs[#data.ipaddrs+1] = {
- addr = info.addr,
- broadaddr = info.broadaddr,
- dstaddr = info.dstaddr,
- netmask = info.netmask,
- prefix = info.prefix
- }
- elseif info.family == "inet6" then
- data.ip6addrs = data.ip6addrs or { }
- data.ip6addrs[#data.ip6addrs+1] = {
- addr = info.addr,
- netmask = info.netmask,
- prefix = info.prefix
- }
+ 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
+ for _, f in ipairs({
+ "channel", "frequency", "txpower", "bitrate", "signal", "noise",
+ "quality", "quality_max", "mode", "ssid", "bssid", "country",
+ "encryption", "ifname", "assoclist"
+ }) do
+ j[f] = iw[f]
end
end
+ rv[#rv+1] = j
end
- if next(data) then
+ if #rv > 0 then
luci.http.prepare_content("application/json")
- jsondump(data)
+ luci.http.write_json(rv)
return
end
luci.http.status(404, "No such device")
end
-function wifi_status()
+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
+
+function diag_command(cmd)
local path = luci.dispatcher.context.requestpath
- local dev = path[#path]
- 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"
- }) do
- j[f] = iw[f]
+ local addr = path[#path]
+
+ if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
+ luci.http.prepare_content("text/plain")
+
+ local util = io.popen(cmd % addr)
+ if util then
+ while true do
+ local ln = util:read("*l")
+ if not ln then break end
+ luci.http.write(ln)
+ luci.http.write("\n")
+ end
+
+ util:close()
end
- luci.http.prepare_content("application/json")
- jsondump(j)
return
end
- luci.http.status(404, "No such device")
+ luci.http.status(500, "Bad address")
+end
+
+function diag_ping()
+ diag_command("ping -c 5 -W 1 %q 2>&1")
+end
+
+function diag_traceroute()
+ diag_command("traceroute -q 1 -w 1 -n %q 2>&1")
+end
+
+function diag_nslookup()
+ diag_command("nslookup %q 2>&1")
end
projects / project / luci.git / blobdiff