From 461df8b0dc1a9be5fb9e904d8cdc44c6d0cbd6c8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 16 Feb 2018 17:04:13 +0100 Subject: luci-base: do not assume a fixed host address in delegated prefix (#1484) OpenWrt/LEDE introduced the "local-address" field a while back to expose the effective local host address of the delegated prefix, so use that information instead of assuming `[prefix]:1`. Fixes #1484. Signed-off-by: Jo-Philipp Wich --- modules/luci-base/luasrc/model/network.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/luci-base/luasrc/model') diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 6f405a131..9ea8e369d 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -998,7 +998,12 @@ function protocol.ip6addrs(self) if type(addrs) == "table" then for n, addr in ipairs(addrs) do - rv[#rv+1] = "%s1/%d" %{ addr.address, addr.mask } + if type(addr["local-address"]) == "table" then + rv[#rv+1] = "%s/%d" %{ + addr["local-address"].address, + addr["local-address"].mask + } + end end end -- cgit v1.2.3