matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

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

Browse source 
zebra: fix showing nexthop vrf for ipv6 blackhole
This commit is contained in:
Donatas Abraitis 2024-10-23 17:34:44 +03:00 committed by GitHub
parent a6aa6b5880 6cdc82b21b
commit 91e157f3ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zebra/zebra_rnh.c
View file

@ -1271,7 +1271,7 @@ void show_nexthop_json_helper(json_object *json_nexthop,
bool display_vrfid = false; bool display_vrfid = false;
uint8_t rn_family; 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; display_vrfid = true;
if (rn) if (rn)
@ -1292,7 +1292,7 @@ void show_route_nexthop_helper(struct vty *vty, const struct route_node *rn,
bool display_vrfid = false; bool display_vrfid = false;
uint8_t rn_family; 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; display_vrfid = true;
if (rn) if (rn)

2
zebra/zebra_vty.c
View file

@ -370,7 +370,7 @@ static void show_nexthop_detail_helper(struct vty *vty,
break; 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); struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
vty_out(vty, "(vrf %s)", VRF_LOGNAME(vrf)); vty_out(vty, "(vrf %s)", VRF_LOGNAME(vrf));