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 <jo@mein.io>

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 5c3761c..04d2e78 100644 (file)
--- 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
 
         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 d267ce9..9a4396c 100644 (file)
--- 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
 
                return (netmod:ifnameof(ifc) == self:ifname())
        end
 

-       netmod:register_pattern_virtual("^%s-%%w" % p)
+       netmod:register_pattern_virtual("^%s%%-%%w" % p)

 end
 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 5896a27..e0d7fd3 100644 (file)
--- 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
 
        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 6c5b34e..4f83570 100644 (file)
--- 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
 
        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 0af77d0..0944c7f 100644 (file)
--- 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
 
 
 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 7bbd78f..1bcbd48 100644 (file)
--- 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
 
                end
        end
 

-       netmod:register_pattern_virtual("^%s-%%w" % p)
+       netmod:register_pattern_virtual("^%s%%-%%w" % p)

 end
 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 cca8af1..8a28ad4 100644 (file)
--- 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
 
         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 5d40fc7..a2dabf9 100644 (file)
--- 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)
 
 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")
 
 
 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 f4cae0b..6c3136e 100644 (file)
--- 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
 
 
 end
 

-netmod:register_pattern_virtual("^vpn-%w")
+netmod:register_pattern_virtual("^vpn%-%w")