From: Steven Barth <steven@midlink.org>
Date: Mon, 24 Jun 2013 12:00:33 +0000 (+0000)
Subject: libs/core: fallback to ipv6-prefix-assignment if ipv6-address is empty
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e7fb14afc0be9c0d5d9cae28a0719bbbbaee262;p=oweals%2Fluci.git

libs/core: fallback to ipv6-prefix-assignment if ipv6-address is empty
---

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 09a58d742..ecfaa84dc 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -813,8 +813,14 @@ end
 
 function protocol.ip6addr(self)
 	local addrs = self:_ubus("ipv6-address")
-	return addrs and #addrs > 0
-		and "%s/%d" %{ addrs[1].address, addrs[1].mask }
+	if addrs and #addrs > 0 then
+		return "%s/%d" %{ addrs[1].address, addrs[1].mask }
+	else
+		addrs = self:_ubus("ipv6-prefix-assignment")
+		if addrs and #addrs > 0 then
+			return "%s/%d" %{ addrs[1].address, addrs[1].mask }
+		end
+	end
 end
 
 function protocol.gw6addr(self)