diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-11 20:59:36 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-31 15:20:46 +0100 |
| commit | b3d43ff4714742c6e9d3d66501b01a392588e940 (patch) | |
| tree | 25facbcf5e296d470ca555a598a43b936c73cbc1 /zebra/redistribute.c | |
| parent | zebra: Make zebrad.sock zserv.c private data (diff) | |
| download | frr-b3d43ff4714742c6e9d3d66501b01a392588e940.tar.xz frr-b3d43ff4714742c6e9d3d66501b01a392588e940.zip | |
zebra: Move rtm_table_default to zrouter
The zrouter should own this particular piece of data.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/redistribute.c')
| -rw-r--r-- | zebra/redistribute.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/redistribute.c b/zebra/redistribute.c index a98ed96b9..9c3002e77 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -614,7 +614,7 @@ int zebra_add_import_table_entry(struct route_node *rn, struct route_entry *re, newre->flags = re->flags; newre->metric = re->metric; newre->mtu = re->mtu; - newre->table = zebrad.rtm_table_default; + newre->table = zrouter.rtm_table_default; newre->nexthop_num = 0; newre->uptime = time(NULL); newre->instance = re->table; @@ -635,7 +635,7 @@ int zebra_del_import_table_entry(struct route_node *rn, struct route_entry *re) rib_delete(afi, SAFI_UNICAST, re->vrf_id, ZEBRA_ROUTE_TABLE, re->table, re->flags, &p, NULL, re->ng.nexthop, - zebrad.rtm_table_default, re->metric, re->distance, false); + zrouter.rtm_table_default, re->metric, re->distance, false); return 0; } @@ -650,7 +650,7 @@ int zebra_import_table(afi_t afi, uint32_t table_id, uint32_t distance, if (!is_zebra_valid_kernel_table(table_id) || ((table_id == RT_TABLE_MAIN) - || (table_id == zebrad.rtm_table_default))) + || (table_id == zrouter.rtm_table_default))) return (-1); if (afi >= AFI_MAX) |