Merge pull request FRRouting#17162 from louis-6wind/fix-bh-nh-vrf

zebra: fix showing nexthop vrf for ipv6 blackhole
zhou-run · Oct 23, 2024 · 91e157f · 91e157f
2 parents a6aa6b5 + 6cdc82b
commit 91e157f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
@@ -1271,7 +1271,7 @@ void show_nexthop_json_helper(json_object *json_nexthop,
 	bool display_vrfid = false;
 	uint8_t rn_family;
 
-	if (re == NULL || nexthop->vrf_id != re->vrf_id)
+	if ((re == NULL || nexthop->vrf_id != re->vrf_id) && nexthop->type != NEXTHOP_TYPE_BLACKHOLE)
 		display_vrfid = true;
 
 	if (rn)
@@ -1292,7 +1292,7 @@ void show_route_nexthop_helper(struct vty *vty, const struct route_node *rn,
 	bool display_vrfid = false;
 	uint8_t rn_family;
 
-	if (re == NULL || nexthop->vrf_id != re->vrf_id)
+	if ((re == NULL || nexthop->vrf_id != re->vrf_id) && nexthop->type != NEXTHOP_TYPE_BLACKHOLE)
 		display_vrfid = true;
 
 	if (rn)

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
@@ -370,7 +370,7 @@ static void show_nexthop_detail_helper(struct vty *vty,
 		break;
 	}
 
-	if (re->vrf_id != nexthop->vrf_id) {
+	if (re->vrf_id != nexthop->vrf_id && nexthop->type != NEXTHOP_TYPE_BLACKHOLE) {
 		struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
 
 		vty_out(vty, "(vrf %s)", VRF_LOGNAME(vrf));