proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 00:27:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: remove default vrf output for kernel vrf ipv6 blackhole default

Browse Source 
It was reported that "show ipv6 route vrf <vrfname>", "show ipv6 route
vrf <vrfname> ::/0 " or "show ipv6 route vrf <vrfname> json" all
displayed that the nexthop was in the default vrf.  This was because
the kernel netlink messages would supply the RTA_OIF of the loopback
interface for the kernel-created default route for the vrf, where ipv4
did not supply any RTA_OIF.  This fix suppresses the display if the
nexthop and route entry are in different vrfs and the nexthop is
NEXTHOP_TYPE_BLACKHOLE.

Ticket: CM-21722
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
This commit is contained in:
Don Slice 2018-07-17 14:20:52 +00:00
parent 972388dd5c
commit fc132690b4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zebra/zebra_vty.c
View File

@ -1198,7 +1198,8 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
break;
}
if (re->vrf_id != nexthop->vrf_id) {
if ((re->vrf_id != nexthop->vrf_id)
&& !NEXTHOP_TYPE_BLACKHOLE) {
struct vrf *vrf =
vrf_lookup_by_id(nexthop->vrf_id);
@ -1415,7 +1416,8 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
break;
}
if (nexthop->vrf_id != re->vrf_id) {
if ((nexthop->vrf_id != re->vrf_id)
&& !NEXTHOP_TYPE_BLACKHOLE) {
struct vrf *vrf =
vrf_lookup_by_id(nexthop->vrf_id);
@ -1569,7 +1571,8 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
break;
}
if (nexthop->vrf_id != re->vrf_id) {
if ((nexthop->vrf_id != re->vrf_id)
&& !NEXTHOP_TYPE_BLACKHOLE) {
struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
if (vrf)