From: Lou Berger <lberger@labn.net>
Date: Fri, 12 Jan 2018 02:33:34 +0000 (-0500)
Subject: bgpd: fix summary line reporting routes with RDs (no json case)
X-Git-Tag: frr-4.0-dev~39^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0136788cd3685ab3f7c97aef1fb321b1862363a1;p=mirror%2Ffrr.git

bgpd: fix summary line reporting routes with RDs (no json case)

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 81b605ad79..ccccead3d7 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8117,6 +8117,9 @@ int bgp_show_table_rd(struct vty *vty, struct bgp *bgp, safi_t safi,
 	struct bgp_node *rn, *next;
 	unsigned long output_cum = 0;
 	unsigned long total_cum = 0;
+	bool show_msg;
+
+	show_msg = (!use_json && type == bgp_show_type_normal);
 
 	for (rn = bgp_table_top(table); rn; rn = next) {
 		next = bgp_route_next(rn);
@@ -8132,8 +8135,19 @@ int bgp_show_table_rd(struct vty *vty, struct bgp *bgp, safi_t safi,
 				       output_arg, use_json,
 				       rd, next == NULL,
 				       &output_cum, &total_cum);
+			if (next == NULL)
+				show_msg = false;
 		}
 	}
+	if (show_msg) {
+		if (output_cum == 0)
+			vty_out(vty, "No BGP prefixes displayed, %ld exist\n",
+				total_cum);
+		else
+			vty_out(vty,
+				"\nDisplayed  %ld routes and %ld total paths\n",
+				output_cum, total_cum);
+	}
 	if (use_json)
 		vty_out(vty, " } }");
 	return CMD_SUCCESS;