From 932bae98738746e11d8b1b0bd9ac86009dd34452 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 10 Nov 2017 14:20:50 +0100 Subject: [PATCH] protocols: fix various interface patterns 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 --- protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua | 2 +- protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua | 2 +- protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua | 2 +- protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua | 2 +- .../luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua | 2 +- protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua | 2 +- protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua | 2 +- protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua | 2 +- protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua b/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua index 5c3761c9c..04d2e78b0 100644 --- a/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua +++ b/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua @@ -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") diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua index d267ce911..9a4396c5b 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua @@ -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 diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua index 5896a278c..e0d7fd3e2 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_aiccu.lua @@ -46,4 +46,4 @@ function proto.contains_interface(self, ifname) end end -netmod:register_pattern_virtual("^aiccu-%%w") +netmod:register_pattern_virtual("^aiccu%-%w") diff --git a/protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua index 6c5b34e08..4f835701c 100644 --- a/protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua +++ b/protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua @@ -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") diff --git a/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua index 0af77d014..0944c7fe6 100644 --- a/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua +++ b/protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua @@ -42,4 +42,4 @@ function proto.contains_interface(self, ifc) end -netmod:register_pattern_virtual("^vpn-%w") +netmod:register_pattern_virtual("^vpn%-%w") diff --git a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua index 7bbd78fa1..1bcbd4808 100644 --- a/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua +++ b/protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua @@ -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 diff --git a/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua index cca8af109..8a28ad471 100644 --- a/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua +++ b/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua @@ -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") diff --git a/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua index 5d40fc72d..a2dabf9af 100644 --- a/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua +++ b/protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua @@ -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") diff --git a/protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua b/protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua index f4cae0bd2..6c3136e38 100644 --- a/protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua +++ b/protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua @@ -42,5 +42,5 @@ function proto.contains_interface(self, ifc) end -netmod:register_pattern_virtual("^vpn-%w") +netmod:register_pattern_virtual("^vpn%-%w") -- 2.11.0