From: Jo-Philipp Wich Date: Wed, 11 Jul 2018 20:19:50 +0000 (+0200) Subject: luci-mod-admin-full: reimplement wireless overview page as cbi model X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=be2b83c9f506bf985462a0741cbc19a0d636a33b;p=oweals%2Fluci.git luci-mod-admin-full: reimplement wireless overview page as cbi model This will offer apply/rollback workflow for tasks like deleting or shutting down wireless networks. Signed-off-by: Jo-Philipp Wich --- diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua index e04a964dd..8c14de924 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua @@ -45,26 +45,20 @@ function index() if has_wifi then page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil) page.leaf = true - + page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil) page.leaf = true page = entry({"admin", "network", "wireless_add"}, post("wifi_add"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_delete"}, post("wifi_delete"), nil) - page.leaf = true - page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil) page.leaf = true page = entry({"admin", "network", "wireless_reconnect"}, post("wifi_reconnect"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil) - page.leaf = true - - page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15) + page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15) page.leaf = true page.subindex = true @@ -201,29 +195,6 @@ function wifi_add() end end -function wifi_delete(network) - local ntm = require "luci.model.network".init() - local wnet = ntm:get_wifinet(network) - if wnet then - local dev = wnet:get_device() - local nets = wnet:get_networks() - if dev then - ntm:del_wifinet(network) - ntm:commit("wireless") - local _, net - for _, net in ipairs(nets) do - if net:is_empty() then - ntm:del_network(net:name()) - ntm:commit("network") - end - end - luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null") - end - end - - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless")) -end - function iface_status(ifaces) local netm = require "luci.model.network".init() local rv = { } @@ -349,35 +320,19 @@ function wifi_status(devs) luci.http.status(404, "No such device") end -local function wifi_reconnect_shutdown(shutdown, wnet) - local netmd = require "luci.model.network".init() - local net = netmd:get_wifinet(wnet) - local dev = net:get_device() - if dev and net then - dev:set("disabled", nil) - net:set("disabled", shutdown and 1 or nil) - netmd:commit("wireless") - - luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null") - luci.http.status(200, shutdown and "Shutdown" or "Reconnected") +function wifi_reconnect(radio) + local rc = luci.sys.call("env -i /sbin/wifi up %s" % luci.util.shellquote(radio)) - return + if rc == 0 then + luci.http.status(200, "Reconnected") + else + luci.http.status(500, "Error") end - - luci.http.status(404, "No such radio") -end - -function wifi_reconnect(wnet) - wifi_reconnect_shutdown(false, wnet) -end - -function wifi_shutdown(wnet) - wifi_reconnect_shutdown(true, wnet) end function wifi_assoclist() local s = require "luci.tools.status" - + luci.http.prepare_content("application/json") luci.http.write_json(s.wifi_assoclist()) end diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua new file mode 100644 index 000000000..208a191cb --- /dev/null +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua @@ -0,0 +1,228 @@ +-- Copyright 2018 Jo-Philipp Wich +-- Licensed to the public under the Apache License 2.0. + +local fs = require "nixio.fs" +local utl = require "luci.util" +local tpl = require "luci.template" +local ntm = require "luci.model.network" + +local has_iwinfo = pcall(require, "iwinfo") + +function guess_wifi_hw(dev) + local bands = "" + local ifname = dev:name() + local name, idx = ifname:match("^([a-z]+)(%d+)") + idx = tonumber(idx) + + if has_iwinfo then + local bl = dev.iwinfo.hwmodelist + if bl and next(bl) then + if bl.a then bands = bands .. "a" end + if bl.b then bands = bands .. "b" end + if bl.g then bands = bands .. "g" end + if bl.n then bands = bands .. "n" end + if bl.ac then bands = bands .. "ac" end + end + + local hw = dev.iwinfo.hardware_name + if hw then + return "%s 802.11%s" %{ hw, bands } + end + end + + -- wl.o + if name == "wl" then + local name = translatef("Broadcom 802.11%s Wireless Controller", bands) + local nm = 0 + + local fd = nixio.open("/proc/bus/pci/devices", "r") + if fd then + local ln + for ln in fd:linesource() do + if ln:match("wl$") then + if nm == idx then + local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)") + name = translatef( + "Broadcom BCM%04x 802.11 Wireless Controller", + tonumber(version, 16) + ) + + break + else + nm = nm + 1 + end + end + end + fd:close() + end + + return name + + -- dunno yet + else + return translatef("Generic 802.11%s Wireless Controller", bands) + end +end + +local tpl_radio = tpl.Template(nil, [[ +
+
+ +
+
+ <%=dev:name()%> +
+
+ <%=hw%>
+ +
+
+ + +
+ + + +
+
+ + + +
+
+
+ + + + <% if #wnets > 0 then %> + <% for i, net in ipairs(wnets) do local disabled = (dev:get("disabled") == "1" or net:get("disabled") == "1") %> +
+
+ .png" /> 0% +
+
"> + <%= disabled and translate("Wireless is disabled") or translate("Collecting data...") %> +
+
+ <% if disabled then %> + + + <% else %> + + + <% end %> + + + + + +
+
+ <% end %> + <% else %> +
+
+ <%:No network configured on this device%> +
+
+ <% end %> + +
+
+]]) + + +m = Map("wireless", translate("Wireless Overview")) +m:chain("network") +m.pageaction = false + +if not has_iwinfo then + s = m:section(NamedSection, "__warning__") + + function s.render(self) + tpl.render_string([[ +
+

<%:Package libiwinfo required!%>

+

<%_The libiwinfo-lua package is not installed. You must install this component for working wireless configuration!%>

+
+ ]]) + end +end + +local _, dev, net +for _, dev in ipairs(ntm:get_wifidevs()) do + s = m:section(TypedSection) + s.wnets = dev:get_wifinets() + + function s.render(self, sid) + tpl_radio:render({ + hw = guess_wifi_hw(dev), + dev = dev, + wnets = self.wnets + }) + end + + function s.cfgsections(self) + local _, net, sl = nil, nil, { } + for _, net in ipairs(self.wnets) do + sl[#sl+1] = net:name() + self.wnets[net:name()] = net + end + return sl + end + + o = s:option(Value, "__disable__") + + function o.cfgvalue(self, sid) + local wnet = self.section.wnets[sid] + local wdev = wnet:get_device() + + return ((wnet and wnet:get("disabled") == "1") or + (wdev and wdev:get("disabled") == "1")) and "1" or "0" + end + + function o.write(self, sid, value) + local wnet = self.section.wnets[sid] + local wdev = wnet:get_device() + + if value ~= "1" then + wnet:set("disabled", nil) + wdev:set("disabled", nil) + else + wnet:set("disabled", "1") + end + end + + o.remove = o.write + + + o = s:option(Value, "__delete__") + + function o.write(self, sid, value) + local wnet = self.section.wnets[sid] + local nets = wnet:get_networks() + + ntm:del_wifinet(wnet:id()) + + local _, net + for _, net in ipairs(nets) do + if net:is_empty() then + ntm:del_network(net:name()) + end + end + end +end + +s = m:section(NamedSection, "__script__") +s.template = "admin_network/wifi_overview_status" + +s = m:section(NamedSection, "__assoclist__") + +function s.render(self, sid) + tpl.render_string([[ +

<%:Associated Stations%>

+ <%+admin_network/wifi_assoclist%> + ]]) +end + +return m diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm deleted file mode 100644 index f3809ea94..000000000 --- a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm +++ /dev/null @@ -1,353 +0,0 @@ -<%# - Copyright 2008-2009 Steven Barth - Copyright 2008-2015 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%- - - local ip = require "luci.ip" - local fs = require "nixio.fs" - local utl = require "luci.util" - local uci = require "luci.model.uci".cursor() - local ntm = require "luci.model.network" - - local has_iwinfo = pcall(require, "iwinfo") - - ntm.init(uci) - - function guess_wifi_hw(dev) - local bands = "" - local ifname = dev:name() - local name, idx = ifname:match("^([a-z]+)(%d+)") - idx = tonumber(idx) - - if has_iwinfo then - local bl = dev.iwinfo.hwmodelist - if bl and next(bl) then - if bl.a then bands = bands .. "a" end - if bl.b then bands = bands .. "b" end - if bl.g then bands = bands .. "g" end - if bl.n then bands = bands .. "n" end - if bl.ac then bands = bands .. "ac" end - end - - local hw = dev.iwinfo.hardware_name - if hw then - return "%s 802.11%s" %{ hw, bands } - end - end - - -- wl.o - if name == "wl" then - local name = translatef("Broadcom 802.11%s Wireless Controller", bands) - local nm = 0 - - local fd = nixio.open("/proc/bus/pci/devices", "r") - if fd then - local ln - for ln in fd:linesource() do - if ln:match("wl$") then - if nm == idx then - local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)") - name = translatef( - "Broadcom BCM%04x 802.11 Wireless Controller", - tonumber(version, 16) - ) - - break - else - nm = nm + 1 - end - end - end - fd:close() - end - - return name - - -- ralink - elseif name == "ra" then - return translatef("RaLink 802.11%s Wireless Controller", bands) - - -- hermes - elseif name == "eth" then - return translate("Hermes 802.11b Wireless Controller") - - -- hostap - elseif name == "wlan" and fs.stat("/proc/net/hostap/" .. ifname, "type") == "dir" then - return translate("Prism2/2.5/3 802.11b Wireless Controller") - - -- dunno yet - else - return translatef("Generic 802.11%s Wireless Controller", bands) - end - end - - local devices = ntm:get_wifidevs() - local netlist = { } - local netdevs = { } - - local dev - for _, dev in ipairs(devices) do - local net - for _, net in ipairs(dev:get_wifinets()) do - netlist[#netlist+1] = net:id() - netdevs[net:id()] = dev:name() - end - end --%> - -<%+header%> - -<% if not has_iwinfo then %> -
-

<%:Package libiwinfo required!%>

-

<%_The libiwinfo-lua package is not installed. You must install this component for working wireless configuration!%>

-
-<% end %> - - - -

<%:Wireless Overview%>

- - - -
- - <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %> - -
-
- -
-
- <%=dev:name()%> -
-
- <%=guess_wifi_hw(dev)%>
- -
-
-
- - - -
-
- - - -
-
-
- - - - <% if #nets > 0 then %> - <% for i, net in ipairs(nets) do %> -
-
- 0% -
-
- <%:Collecting data...%> -
-
- - - -
-
- <% end %> - <% else %> -
-
- <%:No network configured on this device%> -
-
- <% end %> - -
-
- - <% end %> - - -

<%:Associated Stations%>

- - <%+admin_network/wifi_assoclist%> -
- -<%+footer%> diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm new file mode 100644 index 000000000..9730bc2c9 --- /dev/null +++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm @@ -0,0 +1,127 @@ +<%# + Copyright 2008-2009 Steven Barth + Copyright 2008-2018 Jo-Philipp Wich + Licensed to the public under the Apache License 2.0. +-%> + +