luco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6

Fixes FS#1361.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 60e7ea2fc8363960861a82f1e65ca4a7a1d60bfe)

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index 16245b80e58de0d0d37e39cdce42211d5a69d2ba..3c9f41f6b5dcafd2b4a4018de4259ea989c49547 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
@@ -33,7 +33,7 @@ local ip6prefix = s:taboption("general", Value, "ip6prefix",
        translate("IPv6 routed prefix"),
        translate("This is the prefix routed to you by the tunnel broker for use by clients"))
 
-ip6prefix.datatype = "ip6addr"
+ip6prefix.datatype = "list(ip6addr)"
 
 
 local update = section:taboption("general", Flag, "_update",

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
index 76caedcb3705e1c9dabf3cec21e930f21d8dcb92..49281ee41d78b95be906bf950343b649580eba86 100644 (file)
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
@@ -38,7 +38,7 @@ o.default = o.enabled
 
 o = section:taboption("advanced", Value, "ip6prefix",
        translate("Custom delegated IPv6-prefix"))
-o.dataype = "ip6addr"
+o.dataype = "list(ip6addr)"
 
 
 o = section:taboption("advanced", DynamicList, "dns",