From: Trey Aspelund <taspelund@nvidia.com>
Date: Fri, 14 Jan 2022 21:57:32 +0000 (+0000)
Subject: bgpd: fix advertisedRoutes json key
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F10347%2Fhead;p=mirror%2Ffrr.git

bgpd: fix advertisedRoutes json key

'show bgp ... neighbor [routes|received-routes]' both incorrectly
used a json key of 'advertisedRoutes'.
This corrects the key to be 'receivedRoutes' for commands where
the displayed routes were received, not advertised.

before:
unet> r3 show ip bgp neigh 10.2.30.2 received-routes json | include Routes
  "advertisedRoutes":{

after:
ub18# show ip bgp neighbors enp1s0 received-routes json | include Routes
  "receivedRoutes":{
ub18# show ip bgp neighbors enp1s0 advertised-routes json | include Routes
  "advertisedRoutes":{

Signed-off-by: Trey Aspelund <taspelund@nvidia.com>
(cherry picked from commit c1984955b7bda1c0d40786bc97a6c787bfa99f11)
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 00cea67e15..b509373762 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -13747,7 +13747,11 @@ static int peer_adj_routes(struct vty *vty, struct peer *peer, afi_t afi,
 			       &output_count, &filtered_count);
 
 	if (use_json) {
-		json_object_object_add(json, "advertisedRoutes", json_ar);
+		if (type == bgp_show_adj_route_advertised)
+			json_object_object_add(json, "advertisedRoutes",
+					       json_ar);
+		else
+			json_object_object_add(json, "receivedRoutes", json_ar);
 		json_object_int_add(json, "totalPrefixCounter", output_count);
 		json_object_int_add(json, "filteredPrefixCounter",
 				    filtered_count);