diff options
| author | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 11:05:03 +0100 |
|---|---|---|
| committer | Vipin Kumar <vipin@cumulusnetworks.com> | 2015-10-30 11:05:03 +0100 |
| commit | 4670bdadfea2ab129cd5632720d5f9c7748543a6 (patch) | |
| tree | 734f3489791453bb36badc765de7fd632e9ac0cb | |
| parent | zebra_vrf lookup fix in upstream VRF patches (diff) | |
| download | frr-4670bdadfea2ab129cd5632720d5f9c7748543a6.tar.xz frr-4670bdadfea2ab129cd5632720d5f9c7748543a6.zip | |
Fixing a few compile errors
Ticket:
Reviewed By:
Testing Done:
<DETAILED DESCRIPTION (REPLACE)>
| -rw-r--r-- | babeld/babel_interface.c | 3 | ||||
| -rw-r--r-- | zebra/redistribute.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index ace28127f..c7c152748 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 4b4db1dce..01b85700f 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 */ |