projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be9f5d6
)
libs/core: more fixes for network model
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 11 Oct 2011 01:14:11 +0000
(
01:14
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 11 Oct 2011 01:14:11 +0000
(
01:14
+0000)
libs/core/luasrc/model/network.lua
patch
|
blob
|
history
diff --git
a/libs/core/luasrc/model/network.lua
b/libs/core/luasrc/model/network.lua
index
6e7a708
..
dd2bdfb
100644
(file)
--- a/
libs/core/luasrc/model/network.lua
+++ b/
libs/core/luasrc/model/network.lua
@@
-773,7
+773,7
@@
function protocol.is_floating(self)
end
function protocol.is_empty(self)
end
function protocol.is_empty(self)
- if self:is_
virtual
() then
+ if self:is_
floating
() then
return false
else
local rv = true
return false
else
local rv = true
@@
-837,12
+837,12
@@
function protocol.get_interface(self)
else
local ifn = nil
local num = { }
else
local ifn = nil
local num = { }
- for ifn in utl.imatch(_uci_
state
:get("network", self.sid, "ifname")) do
+ for ifn in utl.imatch(_uci_
real
:get("network", self.sid, "ifname")) do
ifn = ifn:match("^[^:/]+")
return ifn and interface(ifn, self)
end
ifn = nil
ifn = ifn:match("^[^:/]+")
return ifn and interface(ifn, self)
end
ifn = nil
- _uci_
state
:foreach("wireless", "wifi-iface",
+ _uci_
real
:foreach("wireless", "wifi-iface",
function(s)
if s.device then
num[s.device] = num[s.device] and num[s.device] + 1 or 1
function(s)
if s.device then
num[s.device] = num[s.device] and num[s.device] + 1 or 1