From ecb0c2f11b861e5035b0397d2396ee4b5e9b3c3e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 21 Oct 2014 23:38:51 +0200 Subject: [PATCH] modules/base: work around wireless status changes The latest netifd updates changed the ubus wireless status reporting in a way that breaks the current LuCI integration. Work around the changed format by translating the extended UCI section syntax back to the plain one. Signed-off-by: Jo-Philipp Wich --- modules/base/luasrc/model/network.lua | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/base/luasrc/model/network.lua b/modules/base/luasrc/model/network.lua index 0aac416ace..6119abd73c 100644 --- a/modules/base/luasrc/model/network.lua +++ b/modules/base/luasrc/model/network.lua @@ -135,13 +135,25 @@ function _wifi_iface(x) end function _wifi_state(key, val, field) + local radio, radiostate, ifc, ifcstate + if not next(_ubuswificache) then _ubuswificache = _ubus:call("network.wireless", "status", {}) or {} + + -- workaround extended section format + for radio, radiostate in pairs(_ubuswificache) do + for ifc, ifcstate in pairs(radiostate.interfaces) do + if ifcstate.section and ifcstate.section:sub(1, 1) == '@' then + local s = _uci_real:get_all('wireless.%s' % ifcstate.section) + if s then + ifcstate.section = s['.name'] + end + end + end + end end - local radio, radiostate for radio, radiostate in pairs(_ubuswificache) do - local ifc, ifcstate for ifc, ifcstate in pairs(radiostate.interfaces) do if ifcstate[key] == val then return ifcstate[field] -- 2.30.2