libs/core: fallback to ipv6-prefix-assignment if ipv6-address is empty
authorSteven Barth <steven@midlink.org>
Mon, 24 Jun 2013 12:00:33 +0000 (12:00 +0000)
committerSteven Barth <steven@midlink.org>
Mon, 24 Jun 2013 12:00:33 +0000 (12:00 +0000)
libs/core/luasrc/model/network.lua

index 09a58d7..ecfaa84 100644 (file)
@@ -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)