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

libs/core: fix various problems in the network model

Browse source
This commit is contained in:
Jo-Philipp Wich 2012-06-17 11:18:58 +00:00
parent 740feed2fc
commit 5bcf9d07fd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -633,6 +633,7 @@ function protocol.ifname(self)
ifname = self:_ubus("device") ifname = self:_ubus("device")
end end
if not ifname then if not ifname then
local num = { }
_uci_real:foreach("wireless", "wifi-iface", _uci_real:foreach("wireless", "wifi-iface",
function(s) function(s)
if s.device then if s.device then
@ -731,7 +732,7 @@ end
function protocol.gw6addr(self) function protocol.gw6addr(self)
local _, route local _, route
for _, route in ipairs(self:_ubus("route")) do for _, route in ipairs(self:_ubus("route") or { }) do
if route.target == "::" and route.mask == 0 then if route.target == "::" and route.mask == 0 then
return ipc.IPv6(route.nexthop):string() return ipc.IPv6(route.nexthop):string()
end end
@ -741,7 +742,7 @@ end
function protocol.dns6addrs(self) function protocol.dns6addrs(self)
local dns = { } local dns = { }
local _, addr local _, addr
for _, addr in ipairs(self:_ubus("dns-server")) do for _, addr in ipairs(self:_ubus("dns-server") or { }) do
if addr:match(":") then if addr:match(":") then
dns[#dns+1] = addr dns[#dns+1] = addr
end end
@ -1031,6 +1032,7 @@ function interface.ports(self)
for _, iface in ipairs(members) do for _, iface in ipairs(members) do
ifaces[#ifaces+1] = interface(iface) ifaces[#ifaces+1] = interface(iface)
end end
return ifaces
end end
end end