summaryrefslogtreecommitdiff
path: root/nest/rt-show.c
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-09-05 06:58:42 +0200
committerMaria Matejka <mq@ucw.cz>2022-09-05 12:19:38 +0200
commit636bc44e61b5361b675ddd1ad7edb0b5ff2c2f2f (patch)
tree80e47d4c10c1f3c3518508d8d5e6da9912cb2873 /nest/rt-show.c
parent66ccdc2a0c8f10263679e7fac37c1db1adf64b4f (diff)
Exporter routine refactoring to allow for nicer table locking
Diffstat (limited to 'nest/rt-show.c')
-rw-r--r--nest/rt-show.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nest/rt-show.c b/nest/rt-show.c
index 5d7723cf..d17818db 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -301,7 +301,7 @@ rt_show_cont(struct rt_show_data *d)
if (d->tables_defined_by & RSD_TDB_SET)
rt_show_table(d);
- rt_request_export(d->tab->table, &d->req);
+ rt_request_export_other(d->tab->table, &d->req);
}
static void
@@ -356,7 +356,7 @@ rt_show_add_exporter(struct rt_show_data *d, struct rt_exporter *t, const char *
struct rt_show_data_rtable *
rt_show_add_table(struct rt_show_data *d, struct rtable *t)
{
- struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter, t->name);
+ struct rt_show_data_rtable *rsdr = rt_show_add_exporter(d, &t->exporter.e, t->name);
struct proto_config *krt = t->config->krt_attached;
if (krt)
@@ -419,11 +419,11 @@ rt_show_prepare_tables(struct rt_show_data *d)
if (d->export_mode)
{
if (!tab->export_channel && d->export_channel &&
- (tab->table == &d->export_channel->table->exporter))
+ (tab->table == &d->export_channel->table->exporter.e))
tab->export_channel = d->export_channel;
if (!tab->export_channel && d->export_protocol)
- tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter, tab->table));
+ tab->export_channel = proto_find_channel_by_table(d->export_protocol, SKIP_BACK(rtable, exporter.e, tab->table));
if (!tab->export_channel)
{