From: Krishnasamy R <krishnasamyr@nvidia.com>
Date: Mon, 11 Nov 2024 09:59:31 +0000 (-0800)
Subject: bgpd: fix resolvedPrefix in show nexthop json output
X-Git-Tag: docker/10.1.2~17^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=978a3cdcfdac574c80399489faf9af5e51414a1e;p=mirror%2Ffrr.git

bgpd: fix resolvedPrefix in show nexthop json output

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)
---

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 98eb9565bf..ba6d707109 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -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",