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

protocols: fix various interface patterns

Browse source 
The virtual interface match patterns of various protocols were improperly
quoted, causing them to over- or undermatch.

Follow up of #1435.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-11-10 14:20:50 +01:00
parent e0a7227a0c
commit 932bae9873
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua
View file

@ -37,4 +37,4 @@ function proto.contains_interface(self, ifc)
return (netmod:ifnameof(ifc) == self:ifname())
end
netmod:register_pattern_virtual("^ipip-%w")
netmod:register_pattern_virtual("^ipip%-%w")

2
protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua
View file

@ -46,5 +46,5 @@ for _, p in ipairs({"6in4", "6to4", "6rd"}) do
return (netmod:ifnameof(ifc) == self:ifname())
end
netmod:register_pattern_virtual("^%s-%%w" % p)
netmod:register_pattern_virtual("^%s%%-%%w" % p)
end

2
protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua
View file

@ -46,4 +46,4 @@ function proto.contains_interface(self, ifname)
end
end
netmod:register_pattern_virtual("^aiccu-%%w")
netmod:register_pattern_virtual("^aiccu%-%w")

2
protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua
View file

@ -58,4 +58,4 @@ function proto.contains_interface(self, ifc)
return (netmod:ifnameof(ifc) == self:ifname())
end
netmod:register_pattern_virtual("^ncm-%%w")
netmod:register_pattern_virtual("^ncm%-%w")

2
protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua
View file

@ -42,4 +42,4 @@ function proto.contains_interface(self, ifc)
end
netmod:register_pattern_virtual("^vpn-%w")
netmod:register_pattern_virtual("^vpn%-%w")

2
protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua
View file

@ -90,5 +90,5 @@ for _, p in ipairs({"ppp", "pptp", "pppoe", "pppoa", "3g", "l2tp", "pppossh"}) d
end
end
netmod:register_pattern_virtual("^%s-%%w" % p)
netmod:register_pattern_virtual("^%s%%-%%w" % p)
end

2
protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua
View file

@ -48,4 +48,4 @@ function proto.contains_interface(self, ifc)
return (netmod:ifnameof(ifc) == self:ifname())
end
netmod:register_pattern_virtual("^qmi-%w")
netmod:register_pattern_virtual("^qmi%-%w")

2
protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua
View file

@ -4,7 +4,7 @@
local netmod = luci.model.network
local device = luci.util.class(netmod.interface)
netmod:register_pattern_virtual("^relay-%w")
netmod:register_pattern_virtual("^relay%-%w")
local proto = netmod:register_protocol("relay")

2
protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua
View file

@ -42,5 +42,5 @@ function proto.contains_interface(self, ifc)
end
netmod:register_pattern_virtual("^vpn-%w")
netmod:register_pattern_virtual("^vpn%-%w")