luci-proto-ipv6: fix patterns in proto_4x6.lua

[project/luci.git] / protocols / luci-proto-ipv6 / luasrc / model / network / proto_4x6.lua

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 91adfa9..ad99073 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua
@@ -1,33 +1,21 @@
---[[
-LuCI - Network model - 6to4, 6in4 & 6rd protocol extensions
-
-Copyright 2011 Jo-Philipp Wich <xm@subsignal.org>
-Copyright 2013 Steven Barth <steven@midlink.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-]]--
+-- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
+-- Copyright 2013 Steven Barth <steven@midlink.org>
+-- Licensed to the public under the Apache License 2.0.
 
 local netmod = luci.model.network
 
 local _, p
-for _, p in ipairs({"dslite"}) do
+for _, p in ipairs({"dslite", "map", "464xlat"}) do
 
        local proto = netmod:register_protocol(p)
 
        function proto.get_i18n(self)
                if p == "dslite" then
                        return luci.i18n.translate("Dual-Stack Lite (RFC6333)")
+               elseif p == "map" then
+                       return luci.i18n.translate("MAP / LW4over6")
+               elseif p == "464xlat" then
+                       return luci.i18n.translate("464XLAT (CLAT)")
                end
        end
 
@@ -38,6 +26,10 @@ for _, p in ipairs({"dslite"}) do
        function proto.opkg_package(self)
                if p == "dslite" then
                        return "ds-lite"
+               elseif p == "map" then
+                       return "map-t"
+               elseif p == "464xlat" then
+                       return "464xlat"
                end
        end
 
@@ -61,5 +53,11 @@ for _, p in ipairs({"dslite"}) do
                return (netmod:ifnameof(ifc) == self:ifname())
        end
 
-       netmod:register_pattern_virtual("^%s-%%w" % p)
+       if p == "dslite" then
+               netmod:register_pattern_virtual("^ds%-%w")
+       elseif p == "map" then
+               netmod:register_pattern_virtual("^map%-%w")
+       elseif p == "464xlat" then
+               netmod:register_pattern_virtual("^464%-%w")
+       end
 end