From eefe02daa1818258c5b28a1cc7d2e7490cf25024 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 18 May 2017 11:03:21 -0400 Subject: [PATCH] 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 --- doc/ospf6d.texi | 4 ++++ ospf6d/ospf6_zebra.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/ospf6d.texi b/doc/ospf6d.texi index 31f4db0ccc..3ea71fbd20 100644 --- 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 fdf2f299cb..305870a64f 100644 --- 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); -- 2.39.5