summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-07-17 16:18:25 +0200
committerJo-Philipp Wich <jo@mein.io>2018-07-17 16:19:00 +0200
commit60e7ea2fc8363960861a82f1e65ca4a7a1d60bfe (patch)
treee69f7578aa6a9026e61d37691aba40ee3ee60d7c
parent92360f2d5b8b8ba466eeb27708a62c693f474dc6 (diff)
luco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6
Fixes FS#1361. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua2
-rw-r--r--protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua2
2 files changed, 2 insertions, 2 deletions
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 16245b80e5..3c9f41f6b5 100644
--- 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 76caedcb37..49281ee41d 100644
--- 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",