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

libs/core: allow resolving of virtual interfaces via get_interface(), should fix wan status display with 6to4, 6in4 tunnels or pppoe connections

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-03-11 23:11:34 +00:00
parent 64144ed331
commit 3b4450a58b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,13 +150,19 @@ function _wifi_lookup(ifn)
end end
end end
function _iface_virtual(x)
return (
x:match("^6in4-%w") or x:match("^6to4-%w") or x:match("^3g-%w") or
x:match("^ppp-%w") or x:match("^pppoe-%w") or x:match("^pppoa-%w") or
x:match("^relay-%w")
)
end
function _iface_ignore(x) function _iface_ignore(x)
return ( return (
x:match("^wmaster%d") or x:match("^wifi%d") or x:match("^hwsim%d") or x:match("^wmaster%d") or x:match("^wifi%d") or x:match("^hwsim%d") or
x:match("^imq%d") or x:match("^mon.wlan%d") or x:match("^6in4-%w") or x:match("^imq%d") or x:match("^mon.wlan%d") or
x:match("^6to4-%w") or x:match("^3g-%w") or x:match("^ppp-%w") or x == "sit0" or x == "lo" or _iface_virtual(x)
x:match("^pppoe-%w") or x:match("^pppoa-%w") or x:match("^relay-%w") or
x == "sit0" or x == "lo"
) )
end end
@ -175,7 +181,7 @@ function init(cursor)
local name = i.name:match("[^:]+") local name = i.name:match("[^:]+")
local prnt = name:match("^([^%.]+)%.") local prnt = name:match("^([^%.]+)%.")
if not _iface_ignore(name) then if _iface_virtual(name) or not _iface_ignore(name) then
ifs[name] = ifs[name] or { ifs[name] = ifs[name] or {
idx = i.ifindex or n, idx = i.ifindex or n,
name = name, name = name,