From 4670bdadfea2ab129cd5632720d5f9c7748543a6 Mon Sep 17 00:00:00 2001 From: Vipin Kumar Date: Fri, 30 Oct 2015 03:05:03 -0700 Subject: [PATCH] Fixing a few compile errors Ticket: Reviewed By: Testing Done: --- babeld/babel_interface.c | 3 ++- zebra/redistribute.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index ace28127ff..c7c1527481 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -55,6 +55,7 @@ THE SOFTWARE. #include "neighbour.h" #include "route.h" #include "xroute.h" +#include "vrf.h" #define IS_ENABLE(ifp) (babel_enable_if_lookup(ifp->name) >= 0) @@ -878,7 +879,7 @@ void babel_if_init () { /* initialize interface list */ - if_init(); + vrf_init(); if_add_hook (IF_NEW_HOOK, babel_if_new_hook); if_add_hook (IF_DELETE_HOOK, babel_if_delete_hook); diff --git a/zebra/redistribute.c b/zebra/redistribute.c index 4b4db1dcee..01b85700f2 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -500,7 +500,7 @@ zebra_add_import_table_entry (struct route_node *rn, struct rib *rib) rib_add_ipv4(ZEBRA_ROUTE_TABLE, rib->table, 0, &p4, gate, &nhop->src.ipv4, - nhop->ifindex, zebrad.rtm_table_default, + nhop->ifindex, rib->vrf_id, zebrad.rtm_table_default, rib->metric, zebra_import_table_distance[AFI_IP][rib->table], SAFI_UNICAST); @@ -540,7 +540,7 @@ zebra_del_import_table_entry (struct route_node *rn, struct rib *rib) p4.prefix = rn->p.u.prefix4; rib_delete_ipv4(ZEBRA_ROUTE_TABLE, rib->table, rib->flags, &p4, NULL, - 0, zebrad.rtm_table_default, SAFI_UNICAST); + 0, rib->vrf_id, zebrad.rtm_table_default, SAFI_UNICAST); } /* DD: Add IPv6 code */ -- 2.39.5