ospf6d: fix selection of NSSA forwarding address

Change ospf6_get_nssa_fwd_addr() to try finding a global address
on any interface of the area and not on the first one only.

Additionally, do a micro-optimization in
ospf6_interface_get_global_address() to return as soon as a global
address is found.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/ospf6d/ospf6_nssa.c b/ospf6d/ospf6_nssa.c
index 282eea8526..de0c39ba22 100644
--- a/ospf6d/ospf6_nssa.c
+++ b/ospf6d/ospf6_nssa.c
@@ -1249,10 +1249,14 @@ static struct in6_addr *ospf6_get_nssa_fwd_addr(struct ospf6_area *oa)
 	struct ospf6_interface *oi;
 
 	for (ALL_LIST_ELEMENTS(oa->if_list, node, nnode, oi)) {
-		if (if_is_operative(oi->interface))
-			if (oi->area && IS_AREA_NSSA(oi->area))
-				return ospf6_interface_get_global_address(
-					oi->interface);
+		struct in6_addr *addr;
+
+		if (!if_is_operative(oi->interface))
+			continue;
+
+		addr = ospf6_interface_get_global_address(oi->interface);
+		if (addr)
+			return addr;
 	}
 	return NULL;
 }