Export table dump temporarily switched off

diff --git a/nest/config.Y b/nest/config.Y
index 5a3e3f85706cd1075da6806454553cbd1346625b..628b36b75f74b2cf78a0e7e7671c4843dd2eef76 100644 (file)
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -759,11 +759,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");
@@ -866,6 +861,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 08677d75f2de659bac8a3079911664f6f30f0438..7e42d0da45d20b4f9f38462cbc6145039dfd412d 100644 (file)
--- 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;