diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
| commit | be5e48abecd137b47e4493a8fd616186c61f48f7 (patch) | |
| tree | 4184faeca4bb606af98deb606d9b53db3ac314b4 /zebra/redistribute.c | |
| parent | 526e17284570266dcdd606ff163a614e6b3655a5 (diff) | |
| parent | 2bed4e86e378334341e01f3afe33784ef2713e83 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Conflicts:
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c
Diffstat (limited to 'zebra/redistribute.c')
| -rw-r--r-- | zebra/redistribute.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/zebra/redistribute.c b/zebra/redistribute.c index 5a2a0668b7..01b85700f2 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -30,6 +30,7 @@ #include "zclient.h" #include "linklist.h" #include "log.h" +#include "vrf.h" #include "zebra/rib.h" #include "zebra/zserv.h" @@ -96,7 +97,7 @@ zebra_redistribute_default (struct zserv *client) p.family = AF_INET; /* Lookup table. */ - table = vrf_table (AFI_IP, SAFI_UNICAST, 0); + table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT); if (table) { rn = route_node_lookup (table, (struct prefix *)&p); @@ -116,7 +117,7 @@ zebra_redistribute_default (struct zserv *client) p6.family = AF_INET6; /* Lookup table. */ - table = vrf_table (AFI_IP6, SAFI_UNICAST, 0); + table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT); if (table) { rn = route_node_lookup (table, (struct prefix *)&p6); @@ -140,7 +141,7 @@ zebra_redistribute (struct zserv *client, int type, u_short instance) struct route_table *table; struct route_node *rn; - table = vrf_table (AFI_IP, SAFI_UNICAST, 0); + table = zebra_vrf_table (AFI_IP, SAFI_UNICAST, VRF_DEFAULT); if (table) for (rn = route_top (table); rn; rn = route_next (rn)) RNODE_FOREACH_RIB (rn, newrib) @@ -155,7 +156,7 @@ zebra_redistribute (struct zserv *client, int type, u_short instance) } #ifdef HAVE_IPV6 - table = vrf_table (AFI_IP6, SAFI_UNICAST, 0); + table = zebra_vrf_table (AFI_IP6, SAFI_UNICAST, VRF_DEFAULT); if (table) for (rn = route_top (table); rn; rn = route_next (rn)) RNODE_FOREACH_RIB (rn, newrib) @@ -499,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); @@ -539,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 */ @@ -561,7 +562,7 @@ zebra_import_table (afi_t afi, u_int32_t table_id, u_int32_t distance, int add) if (afi >= AFI_MAX) return (-1); - table = vrf_other_route_table(afi, table_id, 0); + table = zebra_vrf_other_route_table(afi, table_id, VRF_DEFAULT); if (table == NULL) { return 0; |