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

Zebra: Ensure correct route is used for redistribute delete.

Browse Source 
After the optimization introduced by patch zebra-redist-update-fix.patch
which implements "replace" semantics for redistributed routes instead of
a delete followed by add, the code was passing an incorrect route for
redistribute deletion in one case. This is mainly inconsequential as of
now as the deletion process primarily cares about only the destination, but
the code needs to be corrected and that is done here.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Fixes: zebra-redist-update-fix.patch

Ticket: CM-8112
Reviewed By: CCR-3760
Testing Done: Trivial

Note:
1. Needs changes after IPv6 route replace patches are included.
2. Imported from 2.5-br patch zebra-redist-delete-fix.patch
This commit is contained in:
vivek 2015-11-15 07:36:50 -08:00
parent 003c1ba05a
commit a219b2952a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zebra/zebra_rib.c
View File

@ -1702,8 +1702,9 @@ rib_process (struct route_node *rn)
assert (fib);
rib_uninstall_kernel (rn, fib);
}
/* if "select", the earlier redist delete wouldn't have happened */
redistribute_delete(&rn->p, select);
/* if "select", the earlier redist delete wouldn't have happened */
if (fib)
redistribute_delete(&rn->p, fib);
}
UNSET_FLAG(select->flags, ZEBRA_FLAG_CHANGED);
}