proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-15 19:02:17 +00:00
Code Issues Actions Packages Projects Releases Wiki 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
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, if (!CHECK_FLAG(match->status,
ROUTE_ENTRY_INSTALLED)) ROUTE_ENTRY_INSTALLED))
continue; continue;
if (CHECK_FLAG(newhop->flags,
NEXTHOP_FLAG_RECURSIVE))
continue;
if (set) { if (set) {
SET_FLAG(nexthop->flags, 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) static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
{ {
if (CHECK_FLAG(re->status, ROUTE_ENTRY_INSTALLED)) { 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 '*'; return '*';
else else
return ' '; return ' ';