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

Merge pull request #410 from dslicenc/rdnbrd-vrr

Browse Source 
zebra: fix attempt to install a second rib from imported table entries
This commit is contained in:
Martin Winter 2017-05-02 08:42:38 -07:00 committed by GitHub
commit fdb33a50e1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zebra/redistribute.c
View File

@ -498,6 +498,7 @@ int
zebra_add_import_table_entry (struct route_node *rn, struct rib *rib, const char *rmap_name) zebra_add_import_table_entry (struct route_node *rn, struct rib *rib, const char *rmap_name)
{ {
struct rib *newrib; struct rib *newrib;
struct rib *same;
struct prefix p; struct prefix p;
struct nexthop *nhop; struct nexthop *nhop;
union g_addr *gate; union g_addr *gate;
@ -515,6 +516,21 @@ zebra_add_import_table_entry (struct route_node *rn, struct rib *rib, const char
p.prefixlen = rn->p.prefixlen; p.prefixlen = rn->p.prefixlen;
p.u.prefix4 = rn->p.u.prefix4; p.u.prefix4 = rn->p.u.prefix4;
RNODE_FOREACH_RIB (rn, same)
{
if (CHECK_FLAG (same->status, RIB_ENTRY_REMOVED))
continue;
if (same->type == rib->type && same->instance == rib->instance
&& same->table == rib->table
&& same->type != ZEBRA_ROUTE_CONNECT)
break;
}
if (same)
zebra_del_import_table_entry (rn, same);
if (rib->nexthop_num == 1) if (rib->nexthop_num == 1)
{ {
nhop = rib->nexthop; nhop = rib->nexthop;