X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=b271e20d248df7752a32dc494ffcdf9ffcdf77af;hp=fe60e7898a91d505cd810baf62eb088f66cd2c80;hb=97e27a0bcf5eb9c388a05f73dc13867ef8703e4c;hpb=72e3b2c7e5766cad42b7e4cf9ab0b3e3f3c7328e diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index fe60e7898..b271e20d2 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -11,6 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.admin.network", package.seeall) function index() @@ -27,39 +28,47 @@ function index() end ) - local page = node("admin", "network") + local page + + page = node("admin", "network") page.target = alias("admin", "network", "network") page.title = i18n("Network") page.order = 50 page.index = true if has_switch then - local page = node("admin", "network", "vlan") + page = node("admin", "network", "vlan") page.target = cbi("admin_network/vlan") page.title = i18n("Switch") page.order = 20 end if has_wifi and has_wifi.size > 0 then - local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) + page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) page.leaf = true page.subindex = true - local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) + page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) + page.leaf = true + + page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16) page.leaf = true - local page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16) + page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) page.leaf = true - local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) + page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil, 16) page.leaf = true end - local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10) + page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10) page.leaf = true page.subindex = true - local page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil) + page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil) + page.leaf = true + + page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil) page.leaf = true uci:foreach("network", "interface", @@ -74,18 +83,21 @@ function index() ) if nixio.fs.access("/etc/config/dhcp") then - local page = node("admin", "network", "dhcpleases") + page = node("admin", "network", "dhcpleases") 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 - local page = node("admin", "network", "hosts") + page = node("admin", "network", "hosts") page.target = cbi("admin_network/hosts") page.title = i18n("Hostnames") page.order = 40 - local page = node("admin", "network", "routes") + page = node("admin", "network", "routes") page.target = cbi("admin_network/routes") page.title = i18n("Static Routes") page.order = 50 @@ -127,32 +139,156 @@ function wifi_join() end function wifi_add() - local dev = luci.http.formvalue("device") - local uci = require "luci.model.uci".cursor() - local wlm = require "luci.model.wireless" + local dev = luci.http.formvalue("device") + 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 iface_status() + local path = luci.dispatcher.context.requestpath + local x = luci.model.uci.cursor_state() + local rv = { } + + local iface + for iface in path[#path]:gmatch("[%w%.%-]+") do + 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+") + end + + local info + local data = { } + 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 + + if next(data) then + rv[#rv+1] = data + 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 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 #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 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