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

zebra: fix creation of "other table" for rdnbrd

Browse Source 
zebra: add the creation of the alternative table for rdnbrd in the context of vrfs

When rdnbrd pulls arp entries into table 10, which are then sent into quagga via netlink, the entries were incorrectly being added to the main table.  This fix creates or uses the alternative table if the table-id is not default but the vrf-id is default.  Tested manually and also run successfully in the /tests/l3/ospf_ebgp_redist_comprehensive_test.py:TestBasicEndToEndPing , which consistently failed bafore this fix was applied.

Signed-off-by: Don Slice
Reviewed-by: Donald Sharp
This commit is contained in:
dslice 2016-02-17 10:19:18 -08:00
parent 71f610777c
commit 99a654bd0c
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra/zebra_rib.c
View File

@ -3917,6 +3917,8 @@ struct route_table *
zebra_vrf_other_route_table (afi_t afi, u_int32_t table_id, vrf_id_t vrf_id)
{
struct zebra_vrf *zvrf;
rib_table_info_t *info;
struct route_table *table;
zvrf = vrf_info_lookup (vrf_id);
if (! zvrf)
@ -3928,22 +3930,21 @@ zebra_vrf_other_route_table (afi_t afi, u_int32_t table_id, vrf_id_t vrf_id)
if (table_id >= ZEBRA_KERNEL_TABLE_MAX)
return NULL;
/* Pending: This is a MUST-DO for import-table feature.
- Making it work like zebra_vrf_table() for now. Ideally, we want to
implement import table in a way, so that the other_table doesnt have to be
maintained separately.
- Need to explore how to provide import table concept
(May be only the default VRF?)
- How/if to provide some safety against picking a import table to be same as
a table associated/used in some other vrf.
if (zvrf->other_table[afi][table_id] == NULL)
if ((vrf_id == VRF_DEFAULT) && (table_id != RT_TABLE_MAIN) && (table_id != zebrad.rtm_table_default))
{
zvrf->other_table[afi][table_id] = route_table_init();
}
return (zvrf->other_table[afi][table_id]);
*/
if (zvrf->other_table[afi][table_id] == NULL)
{
table = route_table_init();
info = XCALLOC (MTYPE_RIB_TABLE_INFO, sizeof (*info));
info->zvrf = zvrf;
info->afi = afi;
info->safi = SAFI_UNICAST;
table->info = info;
zvrf->other_table[afi][table_id] = table;
}
return (zvrf->other_table[afi][table_id]);
}
return zvrf->table[afi][SAFI_UNICAST];
}