From: Maria Matejka <mq@ucw.cz>
Date: Wed, 13 Jul 2022 09:19:00 +0000 (+0200)
Subject: Fixed bug in repeated show route command
X-Git-Tag: v3.0-alpha1~171^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec443b5c283fc4f37629bc38ef3730e0a7cc932;p=thirdparty%2Fbird.git

Fixed bug in repeated show route command

Introduced by 13ef5e53dd4a98c80261139b4c9ce4b1074cac40, the CLI was not
properly cleaned up when the command finished, causing BIRD to not parse
any other command after "show route".
---

diff --git a/nest/rt-show.c b/nest/rt-show.c
index dd0fe595d..1dbfaec29 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -259,6 +259,18 @@ rt_show_dump_req(struct rt_export_request *req)
   debug("  CLI Show Route Feed %p\n", req);
 }
 
+static void
+rt_show_done(struct rt_show_data *d)
+{
+  /* No more action */
+  d->cli->cleanup = NULL;
+  d->cli->cont = NULL;
+  d->cli->rover = NULL;
+
+  /* Write pending messages */
+  cli_write_trigger(d->cli);
+}
+
 static void
 rt_show_cont(struct rt_show_data *d)
 {
@@ -267,13 +279,7 @@ rt_show_cont(struct rt_show_data *d)
   if (d->running_on_config && (d->running_on_config != config))
   {
     cli_printf(c, 8004, "Stopped due to reconfiguration");
-
-    /* No more action */
-    c->cleanup = NULL;
-    c->cont = NULL;
-    c->rover = NULL;
-    cli_write_trigger(c);
-    return;
+    return rt_show_done(d);
   }
 
   d->req = (struct rt_export_request) {
@@ -320,7 +326,6 @@ rt_show_export_stopped(struct rt_export_request *req)
   if (NODE_VALID(d->tab))
     return rt_show_cont(d);
 
-
   /* Printout total stats */
   if (d->stats && (d->table_counter > 1))
   {
@@ -333,7 +338,8 @@ rt_show_export_stopped(struct rt_export_request *req)
   else
     cli_printf(d->cli, 0, "");
 
-  cli_write_trigger(d->cli);
+  /* No more route showing */
+  rt_show_done(d);
 }
 
 struct rt_show_data_rtable *