From: Jo-Philipp Wich Date: Mon, 15 Nov 2010 12:30:26 +0000 (+0000) Subject: libs/core: make network model 6to4 aware X-Git-Tag: 0.10.0~490 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ac93d53eae01e0bcb37f6055bc8b2ec86799a38;p=oweals%2Fluci.git libs/core: make network model 6to4 aware --- diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua index 7ef31b862..7882c81a8 100644 --- a/libs/core/luasrc/model/network.lua +++ b/libs/core/luasrc/model/network.lua @@ -154,8 +154,8 @@ function _iface_ignore(x) return ( 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("^3g-%w") or x:match("^ppp-%w") or x:match("^pppoe-%w") or - x:match("^pppoa-%w") or x == "lo" + 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 == "lo" ) end @@ -546,7 +546,7 @@ end function network.is_virtual(self) local p = self:proto() return ( - p == "3g" or p == "6in4" or p == "ppp" or + p == "3g" or p == "6in4" or p == "6to4" or p == "ppp" or p == "pppoe" or p == "pppoa" ) end