The 'show ip mroute' in zebra_vty.c collided with the 'show ip mroute' command in pim_cmd.c. The 'show ip rpf' command is functionally equivalent to the zebra_vty.c 'show ip mroute'. Therefore remove the 'show ip mroute' command in zebra_vty.c.
Signed-off-by: Donald Sharp <[email protected]> --- zebra/zebra_vty.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 1e39ebd..b0a5426 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1453,41 +1453,6 @@ DEFUN (show_ip_protocol, return CMD_SUCCESS; } -/* - * Show IP mroute command to dump the BGP Multicast - * routing table - */ -DEFUN (show_ip_mroute, - show_ip_mroute_cmd, - "show ip mroute", - SHOW_STR - IP_STR - "IP Multicast routing table\n") -{ - struct route_table *table; - struct route_node *rn; - struct rib *rib; - int first = 1; - - table = vrf_table (AFI_IP, SAFI_MULTICAST, 0); - if (! table) - return CMD_SUCCESS; - - /* Show all IPv4 routes. */ - for (rn = route_top (table); rn; rn = route_next (rn)) - RNODE_FOREACH_RIB (rn, rib) - { - if (first) - { - vty_out (vty, SHOW_ROUTE_V4_HEADER); - first = 0; - } - vty_show_ip_route (vty, rn, rib); - } - return CMD_SUCCESS; -} - - #ifdef HAVE_IPV6 /* General fucntion for IPv6 static route. */ static int @@ -2423,9 +2388,6 @@ zebra_vty_init (void) install_element (ENABLE_NODE, &show_ip_route_summary_cmd); install_element (ENABLE_NODE, &show_ip_route_summary_prefix_cmd); - install_element (VIEW_NODE, &show_ip_mroute_cmd); - install_element (ENABLE_NODE, &show_ip_mroute_cmd); - install_element (VIEW_NODE, &show_ip_rpf_cmd); install_element (ENABLE_NODE, &show_ip_rpf_cmd); install_element (VIEW_NODE, &show_ip_rpf_addr_cmd); -- 1.7.10.4 _______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
