diff --git a/nest/config.Y b/nest/config.Y index 3228b08e..5290379a 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -776,11 +776,6 @@ r_args: rt_show_add_exporter($$, &tab->exporter.e, "import")->prefilter = $4; $$->tables_defined_by = RSD_TDB_DIRECT; } - | r_args EXPORT TABLE channel_arg { - if (!$4->out_table) cf_error("No export table in channel %s.%s", $4->proto->name, $4->name); - rt_show_add_exporter($$, $4->out_table, "export"); - $$->tables_defined_by = RSD_TDB_DIRECT; - } | r_args FILTER filter { $$ = $1; if ($$->filter != FILTER_ACCEPT) cf_error("Filter specified twice"); @@ -883,6 +878,7 @@ export_mode: | EXPORT { $$ = RSEM_EXPORT; } | NOEXPORT { $$ = RSEM_NOEXPORT; } | EXPORTED { $$ = RSEM_EXPORTED; } + | EXPORT TABLE { cf_error("Temporarily switched off export table display."); $$ = RSEM_EXPORT_TABLE; } ; /* This is ugly hack */ diff --git a/nest/route.h b/nest/route.h index 08677d75..7e42d0da 100644 --- a/nest/route.h +++ b/nest/route.h @@ -705,6 +705,7 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t #define RSEM_EXPORT 2 /* Routes accepted by export filter */ #define RSEM_NOEXPORT 3 /* Routes rejected by export filter */ #define RSEM_EXPORTED 4 /* Routes marked in export map */ +#define RSEM_EXPORT_TABLE 5 /* Export from export table */ /* Host entry: Resolve hook for recursive nexthops */ extern struct ea_class ea_gen_hostentry;