Add LuCI support for newly introduced IPv6 options

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ipv6.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ipv6.lua
index 24cfa51..aec408b 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ipv6.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ipv6.lua
@@ -70,8 +70,14 @@ o:depends("dhcpv6", "relay")
 o:depends("fallback_relay", "rd")
 o:depends("fallback_relay", "dhcpv6")
 
 o:depends("fallback_relay", "rd")
 o:depends("fallback_relay", "dhcpv6")
 

+o = s:option(Value, "rewrite_dns_addr", translate("Override announced DNS-server"),
+       translate("Announce a custom DNS-server instead of the local one."))
+

 o = s:option(Flag, "always_assume_default", translate("Always announce default router"),
        translate("Announce as default router even if no public prefix is available."))
 o:depends("rd", "server")
 
 o = s:option(Flag, "always_assume_default", translate("Always announce default router"),
        translate("Announce as default router even if no public prefix is available."))
 o:depends("rd", "server")
 

+o = s:option(Flag, "compat_ula", translate("ULA-preference compatibility"),
+       translate("Work around IPv6 address-selection issues of some devices."))
+

 return m
 return m

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
index bc43a8d..e700f47 100644 (file)
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
@@ -53,6 +53,8 @@ if luci.model.network:has_ipv6() then
        ip6assign:value("64")
        ip6assign.datatype = "max(64)"
 
        ip6assign:value("64")
        ip6assign.datatype = "max(64)"
 

+       local ip6hint = section:taboption("general", Value, "ip6hint", translate("IPv6 assignment hint"),
+               translate("Assign prefix parts using this hexadecimal subprefix ID for this interface."))

 
        ip6addr = section:taboption("general", Value, "ip6addr", translate("IPv6 address"))
        ip6addr.datatype = "ip6addr"
 
        ip6addr = section:taboption("general", Value, "ip6addr", translate("IPv6 address"))
        ip6addr.datatype = "ip6addr"

diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
index ad2430a..3c67206 100644 (file)
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
@@ -45,6 +45,11 @@ o = section:taboption("advanced", Flag, "peerdns",
 o.default = o.enabled
 
 
 o.default = o.enabled
 
 

+o = section:taboption("advanced", Value, "ip6prefix",
+       translate("Custom delegated IPv6-prefix"))
+o.dataype = "ip6addr"
+
+

 o = section:taboption("advanced", DynamicList, "dns",
        translate("Use custom DNS servers"))
 o:depends("peerdns", "")
 o = section:taboption("advanced", DynamicList, "dns",
        translate("Use custom DNS servers"))
 o:depends("peerdns", "")