]> git.puffer.fish Git - mirror/frr.git/commitdiff
Revert "bgpd: fix "used" json key on link-local nexthop"
authorDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 14 Aug 2024 17:15:13 +0000 (20:15 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 14 Aug 2024 17:15:13 +0000 (20:15 +0300)
This reverts commit 2de4dfc97adfec788e45e148b4204196d612c81c.

bgpd/bgp_route.c

index f6fe87e352e30da5a2ae3f539c06a33f58b857a7..9e40e165fa1c857bd63b78aaba2d71e65d28a4ee 100644 (file)
@@ -9659,7 +9659,10 @@ void route_vty_out(struct vty *vty, const struct prefix *p,
                                json_object_string_add(json_nexthop_ll, "scope",
                                                       "link-local");
 
-                               if (!CHECK_FLAG(attr->nh_flags,
+                               if ((IPV6_ADDR_CMP(&attr->mp_nexthop_global,
+                                                  &attr->mp_nexthop_local) !=
+                                    0) &&
+                                   !CHECK_FLAG(attr->nh_flags,
                                                BGP_ATTR_NH_MP_PREFER_GLOBAL))
                                        json_object_boolean_true_add(
                                                json_nexthop_ll, "used");