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

Merge pull request #3722 from donaldsharp/static_recursive

Browse source 
Zebra fixes
This commit is contained in:
David Lamparter 2019-02-07 19:22:29 +01:00 committed by GitHub
parent e7f0060c12 e625a783ed
commit b7777b57c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
zebra/zebra_rib.c
View file

@ -608,6 +608,9 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
if (!CHECK_FLAG(match->status,
ROUTE_ENTRY_INSTALLED))
continue;
if (CHECK_FLAG(newhop->flags,
NEXTHOP_FLAG_RECURSIVE))
continue;
if (set) {
SET_FLAG(nexthop->flags,

3
zebra/zebra_vty.c
View file

@ -164,7 +164,8 @@ DEFUN (show_ip_rpf_addr,
static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
{
if (CHECK_FLAG(re->status, ROUTE_ENTRY_INSTALLED)) {
if (!CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_DUPLICATE))
if (!CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_DUPLICATE) &&
!CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_RECURSIVE))
return '*';
else
return ' ';