From 44683453b988832f6557fc52c1170bed95fe3c3e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 6 Aug 2019 15:19:15 +0200 Subject: [PATCH] protocols: fix contains_interface() implementation in several backends Signed-off-by: Jo-Philipp Wich (cherry picked from commit 1fc8d021edc6d60b49b607c917d23b0655a69d47) --- protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua | 2 +- protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua | 2 +- protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua b/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua index b2454838f9..60d8e2ebae 100644 --- a/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua +++ b/protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua @@ -38,7 +38,7 @@ function proto.get_interfaces(self) return nil end -function proto.contains_interface(self, ifname) +function proto.contains_interface(self, ifc) if self:is_floating() then return (netmod:ifnameof(ifc) == self:ifname()) else diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua index 7508e0d4b0..0b329d8a92 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua @@ -49,7 +49,7 @@ for _, p in ipairs({"dslite", "map", "464xlat"}) do return nil end - function proto.contains_interface(self, ifname) + function proto.contains_interface(self, ifc) return (netmod:ifnameof(ifc) == self:ifname()) end end 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 9a4396c5be..2fd0b11957 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua @@ -42,7 +42,7 @@ for _, p in ipairs({"6in4", "6to4", "6rd"}) do return nil end - function proto.contains_interface(self, ifname) + function proto.contains_interface(self, ifc) return (netmod:ifnameof(ifc) == self:ifname()) end -- 2.30.2