From 7505ec52aa05d22c9b87c9ae33424cfd2360124c Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 25 Jun 2019 16:35:40 -0400 Subject: [PATCH] zebra: Use correct parameter order for table lookup up. The import-table code when looking up the table to use for route-import was reversing the order of the table_id and vrf_id causing us to never ever lookup a table and we would cause the `ip|ipv6 import-table X` commands to be just ignored. Signed-off-by: Donald Sharp --- zebra/redistribute.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebra/redistribute.c b/zebra/redistribute.c index b13f1170cd..7c5320a349 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -654,7 +654,7 @@ int zebra_import_table(afi_t afi, uint32_t table_id, uint32_t distance, return (-1); table = zebra_vrf_table_with_table_id(afi, SAFI_UNICAST, - table_id, VRF_DEFAULT); + VRF_DEFAULT, table_id); if (table == NULL) { return 0; } else if (IS_ZEBRA_DEBUG_RIB) { @@ -769,7 +769,7 @@ void zebra_import_table_rm_update(const char *rmap) if ((!rmap_name) || (strcmp(rmap_name, rmap) != 0)) continue; table = zebra_vrf_table_with_table_id(afi, SAFI_UNICAST, - i, VRF_DEFAULT); + VRF_DEFAULT, i); if (!table) { if (IS_ZEBRA_DEBUG_RIB_DETAILED) zlog_debug("%s: Table id=%d not found", -- 2.39.5