bgpd: Fix incorrect config dumps for `dump bgp...`

* Correct dump type was not showing for routes-mrt &
  updates-et
* Could not unconfigure most of them

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index e1f54bbfef55490f520250c8051898bb6477932f..511eb34028b528ba817d768452f874bc12f8ed9b 100644 (file)
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -784,7 +784,7 @@ DEFUN (dump_bgp_all,
 
 DEFUN (no_dump_bgp_all,
        no_dump_bgp_all_cmd,
-       "no dump bgp <all|all-et|updates|updates-et|routes-mrt> [PATH] [INTERVAL]",
+       "no dump bgp <all|all-et|updates|updates-et|routes-mrt> [PATH [INTERVAL]]",
        NO_STR
        "Stop dump packet\n"
        "Stop BGP packet dump\n"
@@ -884,7 +884,7 @@ config_write_bgp_dump (struct vty *vty)
                 bgp_dump_updates.filename, bgp_dump_updates.interval_str,
                 VTY_NEWLINE);
       else
-       vty_out (vty, "dump bgp updates %s%s", 
+       vty_out (vty, "dump bgp %s %s%s", type_str,
                 bgp_dump_updates.filename, VTY_NEWLINE);
     }
   if (bgp_dump_routes.filename)
@@ -893,6 +893,10 @@ config_write_bgp_dump (struct vty *vty)
        vty_out (vty, "dump bgp routes-mrt %s %s%s", 
                 bgp_dump_routes.filename, bgp_dump_routes.interval_str,
                 VTY_NEWLINE);
+      else
+        vty_out (vty, "dump bgp routes-mrt %s%s",
+                 bgp_dump_routes.filename, VTY_NEWLINE);
+
     }
   return 0;
 }