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

libs/core: reuse existing uci context in network model if possible. fix some bugs

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-10-30 04:48:55 +00:00
parent 08dfc28786
commit c0f5518bdb
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,16 @@ function _stror(s1, s2)
end
end
function _strlist(x)
if x == nil then
x = ""
elseif type(x) == "table" then
x = table.concat(x, " ")
end
return x:gmatch("%S+")
end
function _get(c, s, o)
return uci_r:get(c, s, o)
end
@ -161,7 +171,7 @@ end
function init(cursor)
uci_r = cursor or uci.cursor()
uci_r = cursor or uci_r or uci.cursor()
uci_s = uci_r:substate()
ifs = { }
@ -609,7 +619,7 @@ function network.get_interfaces(self)
ifaces = { interface(ifn) }
else
local nfs = { }
for ifn in self:_get("ifname"):gmatch("%S+") do
for ifn in _strlist(self:get("ifname")) do
ifn = ifn:match("[^:]+")
nfs[ifn] = interface(ifn)
end
@ -651,7 +661,7 @@ function network.contains_interface(self, ifname)
ifn = self:proto() .. "-" .. self.sid
return ifname == ifn
else
for ifn in self:_get("ifname"):gmatch("%S+") do
for ifn in _strlist(self:get("ifname")) do
ifn = ifn:match("[^:]+")
if ifn == ifname then
return true
@ -686,7 +696,7 @@ function interface.name(self)
end
function interface.mac(self)
return self.dev and self.dev or "00:00:00:00:00:00"
return self.dev and self.dev.macaddr or "00:00:00:00:00:00"
end
function interface.ipaddrs(self)