]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: fix resolvedPrefix in show nexthop json output 17412/head
authorKrishnasamy R <krishnasamyr@nvidia.com>
Mon, 11 Nov 2024 09:59:31 +0000 (01:59 -0800)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Mon, 11 Nov 2024 15:11:39 +0000 (15:11 +0000)
While populating  the nexthop info for "show bgp nexthop json", resolvedPrefix
is added in parent json object instead of json_nexthop object.
This results in displaying wrong resolvedPrefix for nexthops.
Fixing the same by adding resolvedPrefix to json_nexthop object, so that
the proper resolvedPrefix would be displayed for the respective nexthop

Signed-off-by: Krishnasamy R <krishnasamyr@nvidia.com>
(cherry picked from commit 95c08e082c063374cbc62dea6529c8f54b0722df)

bgpd/bgp_nexthop.c

index 98eb9565bf20f8ad87b39bd9853da9c4eaf7f09a..ba6d70710917dfb8fa97463f16b7a01e821df3ce 100644 (file)
@@ -1003,7 +1003,7 @@ static void bgp_show_nexthop(struct vty *vty, struct bgp *bgp,
                        if (bnc->is_evpn_gwip_nexthop)
                                json_object_boolean_true_add(json_nexthop,
                                                             "isEvpnGatewayIp");
-                       json_object_string_addf(json, "resolvedPrefix", "%pFX",
+                       json_object_string_addf(json_nexthop, "resolvedPrefix", "%pFX",
                                                &bnc->resolved_prefix);
                } else {
                        vty_out(vty, " %s valid [IGP metric %d], #paths %d",