Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libs/core: make luci.model.network compatible with new wireless netifd integration

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-12-03 15:04:34 +00:00
parent 297d368ecc
commit e22e6dd9ca
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libs/core/luasrc/model/network.lua
View file

@ -47,7 +47,7 @@ protocol = utl.class()
local _protocols = { } local _protocols = { }
local _interfaces, _bridge, _switch, _tunnel local _interfaces, _bridge, _switch, _tunnel
local _ubus, _ubusnetcache, _ubusdevcache local _ubus, _ubusnetcache, _ubusdevcache, _ubuswificache
local _uci_real, _uci_state local _uci_real, _uci_state
function _filter(c, s, o, r) function _filter(c, s, o, r)
@ -134,6 +134,22 @@ function _wifi_iface(x)
return false return false
end end
function _wifi_state(key, val, field)
if not next(_ubuswificache) then
_ubuswificache = _ubus:call("network.wireless", "status", {}) or {}
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]
end
end
end
end
function _wifi_lookup(ifn) function _wifi_lookup(ifn)
-- got a radio#.network# pseudo iface, locate the corresponding section -- got a radio#.network# pseudo iface, locate the corresponding section
local radio, ifnidx = ifn:match("^(%w+)%.network(%d+)$") local radio, ifnidx = ifn:match("^(%w+)%.network(%d+)$")
@ -157,8 +173,8 @@ function _wifi_lookup(ifn)
-- looks like wifi, try to locate the section via state vars -- looks like wifi, try to locate the section via state vars
elseif _wifi_iface(ifn) then elseif _wifi_iface(ifn) then
local sid = nil local sid = _wifi_state("ifname", ifn, "section")
if not sid then
_uci_state:foreach("wireless", "wifi-iface", _uci_state:foreach("wireless", "wifi-iface",
function(s) function(s)
if s.ifname == ifn then if s.ifname == ifn then
@ -166,6 +182,7 @@ function _wifi_lookup(ifn)
return false return false
end end
end) end)
end
return sid return sid
end end
@ -204,6 +221,7 @@ function init(cursor)
_ubus = bus.connect() _ubus = bus.connect()
_ubusnetcache = { } _ubusnetcache = { }
_ubusdevcache = { } _ubusdevcache = { }
_ubuswificache = { }
-- read interface information -- read interface information
local n, i local n, i
@ -1030,7 +1048,7 @@ function interface.__init__(self, ifname, network)
local wif = _wifi_lookup(ifname) local wif = _wifi_lookup(ifname)
if wif then if wif then
self.wif = wifinet(wif) self.wif = wifinet(wif)
self.ifname = _uci_state:get("wireless", wif, "ifname") self.ifname = _wifi_state("section", wif, "ifname")
end end
self.ifname = self.ifname or ifname self.ifname = self.ifname or ifname
@ -1265,8 +1283,11 @@ function wifidev.get_i18n(self)
end end
function wifidev.is_up(self) function wifidev.is_up(self)
local up = false if _ubuswificache[self.sid] then
return (_ubuswificache[self.sid].up == true)
end
local up = false
_uci_state:foreach("wireless", "wifi-iface", _uci_state:foreach("wireless", "wifi-iface",
function(s) function(s)
if s.device == self.sid then if s.device == self.sid then
@ -1348,7 +1369,7 @@ function wifinet.__init__(self, net, data)
end end
end) end)
local dev = _uci_state:get("wireless", self.sid, "ifname") or netid local dev = _wifi_state("section", self.sid, "ifname") or netid
self.netid = netid self.netid = netid
self.wdev = dev self.wdev = dev
@ -1404,7 +1425,7 @@ function wifinet.get_device(self)
end end
function wifinet.is_up(self) function wifinet.is_up(self)
return (self.iwdata.up == "1") return (_wifi_state("section", self.sid, "up") == true)
end end
function wifinet.active_mode(self) function wifinet.active_mode(self)