summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-06-24 12:00:33 +0000
committerSteven Barth <steven@midlink.org>2013-06-24 12:00:33 +0000
commit6e7fb14afc0be9c0d5d9cae28a0719bbbbaee262 (patch)
tree2970d4578f8958e19e2e1f3c163e24e5b0d168e1
parentc4cf9267e4fe414066b2bfb91682299c330100cc (diff)
libs/core: fallback to ipv6-prefix-assignment if ipv6-address is empty
-rw-r--r--libs/core/luasrc/model/network.lua10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index 09a58d7424..ecfaa84dc1 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)