ospf6d: Make 'show zebra' 'show ipv6 ospf6 zebra'

The 'show zebra' command really shouldn't be owned
by ospf6.  This command is a specialized command
to show some basic information about ospf6 and zebra
so limit it to ospf6.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/doc/ospf6d.texi b/doc/ospf6d.texi
index 31f4db0ccccb3cc485fe2b4321a4622a68a95e02..3ea71fbd20c8dc9ed55ad4c900b40df1100d51f4 100644 (file)
--- a/doc/ospf6d.texi
+++ b/doc/ospf6d.texi
@@ -151,6 +151,10 @@ Shows requestlist of neighbor.
 This command shows internal routing table.
 @end deffn
 
+@deffn {Command} {show ipv6 ospf6 zebra} {}
+Shows state about what is being redistributed between zebra and OSPF6
+@end deffn
+
 @node OSPF6 Configuration Examples
 @section OSPF6 Configuration Examples
 

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index fdf2f299cbd04260ba48706d04e6d26d181710fe..305870a64f64234350d187b0693c6df046c25f37 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -304,13 +304,12 @@ ospf6_zebra_read_ipv6 (int command, struct zclient *zclient,
   return 0;
 }
 
-
-
-
 DEFUN (show_zebra,
-       show_zebra_cmd,
-       "show zebra",
+       show_ospf6_zebra_cmd,
+       "show ipv6 ospf6 zebra",
        SHOW_STR
+       IPV6_STR
+       OSPF6_STR
        "Zebra information\n")
 {
   int i;
@@ -836,7 +835,7 @@ ospf6_zebra_init (struct thread_master *master)
   install_node (&zebra_node, config_write_ospf6_zebra);
 
   /* Install command element for zebra node. */
-  install_element (VIEW_NODE, &show_zebra_cmd);
+  install_element (VIEW_NODE, &show_ospf6_zebra_cmd);
   install_default (ZEBRA_NODE);
   install_element (ZEBRA_NODE, &redistribute_ospf6_cmd);
   install_element (ZEBRA_NODE, &no_redistribute_ospf6_cmd);