If a command is put into the VIEW_NODE, it is going into the ENABLE_NODE as well. This is especially true for show commands. As such if a command is in both consolidate it down to VIEW_NODE.
Signed-off-by: Donald Sharp <[email protected]> --- bgpd/bgp_encap.c | 19 --- bgpd/bgp_route.c | 360 ----------------------------------------------- bgpd/bgp_vty.c | 62 -------- isisd/isisd.c | 21 --- lib/command.c | 4 +- lib/memory.c | 2 - lib/plist.c | 24 ---- ospf6d/ospf6_area.c | 4 - ospf6d/ospf6_asbr.c | 1 - ospf6d/ospf6_interface.c | 8 -- ospf6d/ospf6_neighbor.c | 2 - ospf6d/ospf6_top.c | 9 -- ospf6d/ospf6_zebra.c | 1 - ospf6d/ospf6d.c | 7 - ospfd/ospf_te.c | 2 - ospfd/ospf_vty.c | 18 --- pimd/pim_cmd.c | 33 ----- ripd/ripd.c | 2 - ripngd/ripng_debug.c | 1 - ripngd/ripngd.c | 3 - zebra/interface.c | 9 -- zebra/zebra_vty.c | 57 -------- zebra/zserv.c | 3 - 23 files changed, 2 insertions(+), 650 deletions(-) diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c index 1a09ba6..edd9d76 100644 --- a/bgpd/bgp_encap.c +++ b/bgpd/bgp_encap.c @@ -955,23 +955,4 @@ bgp_encap_init (void) install_element (VIEW_NODE, &show_bgp_ipv6_encap_rd_neighbor_routes_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_encap_neighbor_advertised_routes_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_encap_rd_neighbor_advertised_routes_cmd); - - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_rd_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_rd_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_rd_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_rd_neighbor_advertised_routes_cmd); - - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_rd_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_rd_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_rd_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_rd_neighbor_advertised_routes_cmd); - } diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index d1bf900..a40bb5a 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -15923,134 +15923,12 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_bgp_view_ipv4_safi_rsclient_route_cmd); install_element (VIEW_NODE, &show_bgp_view_ipv4_safi_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_rd_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_rd_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rd_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rd_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rd_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rd_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_afi_safi_view_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_cidr_only_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_cidr_only_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_community_all_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_community_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community2_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community3_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community2_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community3_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_view_afi_safi_neighbor_adv_recd_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_address_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_flap_address_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_address_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_cidr_only_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_cidr_only_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_damp_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_damp_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv4_safi_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv4_safi_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv4_safi_rsclient_prefix_cmd); - /* BGP dampening clear commands */ install_element (ENABLE_NODE, &clear_ip_bgp_dampening_cmd); install_element (ENABLE_NODE, &clear_ip_bgp_dampening_prefix_cmd); install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_cmd); install_element (ENABLE_NODE, &clear_ip_bgp_dampening_address_mask_cmd); - /* prefix count */ - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_neighbor_prefix_counts_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_neighbor_prefix_counts_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_prefix_counts_cmd); - /* New config IPv6 BGP commands. */ install_element (BGP_IPV6_NODE, &ipv6_bgp_network_cmd); install_element (BGP_IPV6_NODE, &ipv6_bgp_network_route_map_cmd); @@ -16123,60 +16001,6 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_bgp_view_ipv6_rsclient_prefix_cmd); install_element (VIEW_NODE, &show_bgp_view_ipv6_safi_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community2_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community3_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_community_list_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv4_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_safi_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_safi_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_ipv6_safi_rsclient_prefix_cmd); - - /* Statistics */ - install_element (ENABLE_NODE, &show_bgp_statistics_cmd); - install_element (ENABLE_NODE, &show_bgp_statistics_view_cmd); - install_element (BGP_NODE, &bgp_distance_cmd); install_element (BGP_NODE, &no_bgp_distance_cmd); install_element (BGP_NODE, &no_bgp_distance2_cmd); @@ -16327,94 +16151,6 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_cmd); install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_route_cmd); install_element (VIEW_NODE, &show_ip_bgp_view_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_regexp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_regexp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_filter_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_filter_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_route_map_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_route_map_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_cidr_only_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_cidr_only_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_all_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_all_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community2_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community3_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community4_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community2_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community3_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community4_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community2_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community3_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community4_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_dampening_params_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_dampened_paths_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_statistics_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_address_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_address_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_cidr_only_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_cidr_only_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_regexp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_filter_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_damp_flap_route_map_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_rsclient_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_view_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbor_prefix_counts_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbor_prefix_counts_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_neighbor_prefix_counts_cmd); install_element (VIEW_NODE, &show_bgp_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_cmd); install_element (VIEW_NODE, &show_bgp_route_cmd); @@ -16454,46 +16190,6 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_bgp_view_neighbor_flap_cmd); install_element (VIEW_NODE, &show_bgp_view_neighbor_damp_cmd); install_element (VIEW_NODE, &show_bgp_view_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_cmd); - install_element (ENABLE_NODE, &show_bgp_route_cmd); - install_element (ENABLE_NODE, &show_bgp_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_regexp_cmd); - install_element (ENABLE_NODE, &show_bgp_prefix_list_cmd); - install_element (ENABLE_NODE, &show_bgp_filter_list_cmd); - install_element (ENABLE_NODE, &show_bgp_route_map_cmd); - install_element (ENABLE_NODE, &show_bgp_community_all_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community_all_cmd); - install_element (ENABLE_NODE, &show_bgp_community_cmd); - install_element (ENABLE_NODE, &show_bgp_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_community_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_community2_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_community3_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_community_list_cmd); - install_element (ENABLE_NODE, &show_bgp_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_view_cmd); - install_element (ENABLE_NODE, &show_bgp_view_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_received_prefix_filter_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_flap_cmd); - install_element (ENABLE_NODE, &show_bgp_view_neighbor_damp_cmd); - install_element (ENABLE_NODE, &show_bgp_view_rsclient_cmd); - install_element (ENABLE_NODE, &show_bgp_statistics_vpnv4_cmd); - install_element (ENABLE_NODE, &show_bgp_statistics_view_vpnv4_cmd); install_element (VIEW_NODE, &show_ipv6_bgp_cmd); install_element (VIEW_NODE, &show_ipv6_bgp_route_cmd); install_element (VIEW_NODE, &show_ipv6_bgp_prefix_cmd); @@ -16530,54 +16226,12 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_cmd); install_element (VIEW_NODE, &show_ipv6_mbgp_community_list_exact_cmd); install_element (VIEW_NODE, &show_ipv6_mbgp_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_route_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_regexp_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_filter_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community2_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community3_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community4_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community2_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community3_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community4_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_route_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_regexp_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_filter_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community2_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community3_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community4_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_prefix_longer_cmd); install_element (VIEW_NODE, &ipv6_bgp_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &ipv6_bgp_neighbor_advertised_route_cmd); install_element (VIEW_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd); - install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_advertised_route_cmd); install_element (VIEW_NODE, &ipv6_bgp_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &ipv6_bgp_neighbor_received_routes_cmd); install_element (VIEW_NODE, &ipv6_mbgp_neighbor_received_routes_cmd); - install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_received_routes_cmd); install_element (VIEW_NODE, &ipv6_bgp_neighbor_routes_cmd); - install_element (ENABLE_NODE, &ipv6_bgp_neighbor_routes_cmd); install_element (VIEW_NODE, &ipv6_mbgp_neighbor_routes_cmd); - install_element (ENABLE_NODE, &ipv6_mbgp_neighbor_routes_cmd); /* old with name safi collision */ install_element (VIEW_NODE, &show_bgp_ipv6_community_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_community2_cmd); @@ -16587,28 +16241,14 @@ bgp_route_init (void) install_element (VIEW_NODE, &show_bgp_ipv6_community2_exact_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_community3_exact_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community2_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community3_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community4_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community2_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community3_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community4_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_exact_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_community_list_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_community_list_exact_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_community_list_cmd); install_element (VIEW_NODE, &show_bgp_rsclient_route_cmd); install_element (VIEW_NODE, &show_bgp_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_rsclient_prefix_cmd); install_element (VIEW_NODE, &show_bgp_view_rsclient_route_cmd); install_element (VIEW_NODE, &show_bgp_view_rsclient_prefix_cmd); - install_element (ENABLE_NODE, &show_bgp_view_rsclient_route_cmd); - install_element (ENABLE_NODE, &show_bgp_view_rsclient_prefix_cmd); } void diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 35b245d..800edd8 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -10960,10 +10960,8 @@ bgp_vty_init (void) /* "show ip bgp summary" commands. */ install_element (VIEW_NODE, &show_bgp_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_summary_cmd); install_element (VIEW_NODE, &show_bgp_summary_1w_cmd); - install_element (ENABLE_NODE, &show_bgp_summary_1w_cmd); install_element (VIEW_NODE, &show_bgp_ipv4_safi_summary_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv4_safi_summary_cmd); @@ -10979,65 +10977,34 @@ bgp_vty_init (void) install_element (VIEW_NODE, &show_bgp_instance_ipv6_summary_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv6_safi_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv4_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv4_safi_summary_cmd); - - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_encap_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_encap_summary_cmd); - - install_element (ENABLE_NODE, &show_bgp_instance_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_safi_summary_cmd); - /* "show ip bgp neighbors" commands. */ install_element (VIEW_NODE, &show_bgp_instance_neighbors_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_neighbors_cmd); install_element (VIEW_NODE, &show_bgp_neighbors_cmd); install_element (VIEW_NODE, &show_bgp_neighbors_peer_cmd); install_element (VIEW_NODE, &show_bgp_instance_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbors_cmd); - install_element (ENABLE_NODE, &show_bgp_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_neighbors_peer_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbors_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv6_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbors_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_neighbors_peer_cmd); /* "show ip bgp rsclient" commands. */ install_element (VIEW_NODE, &show_bgp_instance_ipv4_safi_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_ipv4_safi_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv4_safi_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_safi_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_instance_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv6_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_instance_ipv6_safi_rsclient_summary_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_safi_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_instance_ipv6_safi_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_safi_rsclient_summary_cmd); /* "show ip bgp paths" commands. */ install_element (VIEW_NODE, &show_bgp_ipv4_paths_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_paths_cmd); /* "show ip bgp community" commands. */ install_element (VIEW_NODE, &show_ip_bgp_community_info_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_community_info_cmd); /* "show ip bgp attribute-info" commands. */ install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_attr_info_cmd); /* "redistribute" commands. */ install_element (BGP_NODE, &bgp_redistribute_ipv4_cmd); @@ -11067,11 +11034,9 @@ bgp_vty_init (void) /* "show bgp memory" commands. */ install_element (VIEW_NODE, &show_bgp_memory_cmd); - install_element (ENABLE_NODE, &show_bgp_memory_cmd); /* "show bgp views" commands. */ install_element (VIEW_NODE, &show_bgp_views_cmd); - install_element (ENABLE_NODE, &show_bgp_views_cmd); /* non afi/safi forms of commands */ install_element (VIEW_NODE, &show_ip_bgp_summary_cmd); @@ -11081,13 +11046,6 @@ bgp_vty_init (void) install_element (VIEW_NODE, &show_ip_bgp_vpnv4_all_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_ipv4_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_summary_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_neighbors_cmd); install_element (VIEW_NODE, &show_ip_bgp_ipv4_neighbors_cmd); install_element (VIEW_NODE, &show_ip_bgp_neighbors_peer_cmd); @@ -11098,36 +11056,16 @@ bgp_vty_init (void) install_element (VIEW_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd); install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_cmd); install_element (VIEW_NODE, &show_ip_bgp_instance_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbors_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_all_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_vpnv4_rd_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_neighbors_peer_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_neighbors_peer_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_neighbors_peer_cmd); install_element (VIEW_NODE, &show_ipv6_bgp_summary_cmd); install_element (VIEW_NODE, &show_ipv6_mbgp_summary_cmd); - install_element (ENABLE_NODE, &show_ipv6_bgp_summary_cmd); - install_element (ENABLE_NODE, &show_ipv6_mbgp_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_rsclient_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_instance_rsclient_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_ipv4_rsclient_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_instance_ipv4_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_rsclient_summary_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_instance_ipv4_rsclient_summary_cmd); install_element (VIEW_NODE, &show_ip_bgp_paths_cmd); install_element (VIEW_NODE, &show_ip_bgp_ipv4_paths_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_paths_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_ipv4_paths_cmd); /* Community-list. */ community_list_vty (); } diff --git a/isisd/isisd.c b/isisd/isisd.c index c446e7f..cc85361 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -3284,26 +3284,6 @@ isis_init () install_element (VIEW_NODE, &show_database_detail_cmd); install_element (VIEW_NODE, &show_database_detail_arg_cmd); - install_element (ENABLE_NODE, &show_isis_summary_cmd); - - install_element (ENABLE_NODE, &show_isis_interface_cmd); - install_element (ENABLE_NODE, &show_isis_interface_detail_cmd); - install_element (ENABLE_NODE, &show_isis_interface_arg_cmd); - - install_element (ENABLE_NODE, &show_isis_neighbor_cmd); - install_element (ENABLE_NODE, &show_isis_neighbor_detail_cmd); - install_element (ENABLE_NODE, &show_isis_neighbor_arg_cmd); - install_element (ENABLE_NODE, &clear_isis_neighbor_cmd); - install_element (ENABLE_NODE, &clear_isis_neighbor_arg_cmd); - - install_element (ENABLE_NODE, &show_hostname_cmd); - install_element (ENABLE_NODE, &show_database_cmd); - install_element (ENABLE_NODE, &show_database_arg_cmd); - install_element (ENABLE_NODE, &show_database_arg_detail_cmd); - install_element (ENABLE_NODE, &show_database_detail_cmd); - install_element (ENABLE_NODE, &show_database_detail_arg_cmd); - install_element (ENABLE_NODE, &show_debugging_cmd); - install_node (&debug_node, config_write_debug); install_element (ENABLE_NODE, &debug_isis_adj_cmd); @@ -3453,6 +3433,5 @@ isis_init () install_element (ISIS_NODE, &no_topology_baseis_cmd); install_element (ISIS_NODE, &no_topology_baseis_noid_cmd); install_element (VIEW_NODE, &show_isis_generated_topology_cmd); - install_element (ENABLE_NODE, &show_isis_generated_topology_cmd); #endif /* TOPOLOGY_GENERATE */ } diff --git a/lib/command.c b/lib/command.c index 6cff884..63bdbf9 100644 --- a/lib/command.c +++ b/lib/command.c @@ -616,6 +616,8 @@ install_element (enum node_type ntype, struct cmd_element *cmd) vector_set (cnode->cmd_vector, cmd); if (cmd->tokens == NULL) cmd->tokens = cmd_parse_format(cmd->string, cmd->doc); + else + assert(0); if (ntype == VIEW_NODE) install_element (ENABLE_NODE, cmd); @@ -4226,11 +4228,9 @@ cmd_init (int terminal) install_element (CONFIG_NODE, &no_service_terminal_length_cmd); install_element (VIEW_NODE, &show_thread_cpu_cmd); - install_element (ENABLE_NODE, &show_thread_cpu_cmd); install_element (ENABLE_NODE, &clear_thread_cpu_cmd); install_element (VIEW_NODE, &show_work_queues_cmd); - install_element (ENABLE_NODE, &show_work_queues_cmd); } install_element (CONFIG_NODE, &show_commandtree_cmd); srandom(time(NULL)); diff --git a/lib/memory.c b/lib/memory.c index aacff83..87fc522 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -423,8 +423,6 @@ void memory_init (void) { install_element (VIEW_NODE, &show_memory_cmd); - - install_element (ENABLE_NODE, &show_memory_cmd); } /* Stats querying from users */ diff --git a/lib/plist.c b/lib/plist.c index 699c9b1..abce633 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -2686,23 +2686,11 @@ prefix_list_init_ipv4 (void) install_element (VIEW_NODE, &show_ip_prefix_list_detail_cmd); install_element (VIEW_NODE, &show_ip_prefix_list_detail_name_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_name_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_name_seq_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_prefix_first_match_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_summary_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_summary_name_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_detail_cmd); - install_element (ENABLE_NODE, &show_ip_prefix_list_detail_name_cmd); - install_element (ENABLE_NODE, &clear_ip_prefix_list_cmd); install_element (ENABLE_NODE, &clear_ip_prefix_list_name_cmd); install_element (ENABLE_NODE, &clear_ip_prefix_list_name_prefix_cmd); } -#ifdef HAVE_IPV6 /* Prefix-list node. */ static struct cmd_node prefix_ipv6_node = { @@ -2763,22 +2751,10 @@ prefix_list_init_ipv6 (void) install_element (VIEW_NODE, &show_ipv6_prefix_list_detail_cmd); install_element (VIEW_NODE, &show_ipv6_prefix_list_detail_name_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_name_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_name_seq_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_prefix_first_match_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_summary_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_summary_name_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_prefix_list_detail_name_cmd); - install_element (ENABLE_NODE, &clear_ipv6_prefix_list_cmd); install_element (ENABLE_NODE, &clear_ipv6_prefix_list_name_cmd); install_element (ENABLE_NODE, &clear_ipv6_prefix_list_name_prefix_cmd); } -#endif /* HAVE_IPV6 */ void prefix_list_init () diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 9b70422..0967482 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -793,10 +793,6 @@ ospf6_area_init (void) install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_tree_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_simulate_spf_tree_root_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_tree_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_tree_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_simulate_spf_tree_root_cmd); - install_element (OSPF6_NODE, &area_range_cmd); install_element (OSPF6_NODE, &area_range_advertise_cmd); install_element (OSPF6_NODE, &no_area_range_cmd); diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 6eca142..c3c06ed 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -1303,7 +1303,6 @@ ospf6_asbr_init (void) ospf6_install_lsa_handler (&as_external_handler); install_element (VIEW_NODE, &show_ipv6_ospf6_redistribute_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_redistribute_cmd); install_element (OSPF6_NODE, &ospf6_redistribute_cmd); install_element (OSPF6_NODE, &ospf6_redistribute_routemap_cmd); diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 26f68ac..9aa6908 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1874,14 +1874,6 @@ ospf6_interface_init (void) install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_match_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd); install_element (CONFIG_NODE, &interface_cmd); install_default (INTERFACE_NODE); diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 4e63797..fbad62a 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -936,8 +936,6 @@ ospf6_neighbor_init (void) { install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_neighbor_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_neighbor_detail_cmd); } DEFUN (debug_ospf6_neighbor, diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 7fffba8..13670aa 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -926,7 +926,6 @@ ospf6_top_init (void) install_node (&ospf6_node, config_write_ospf6); install_element (VIEW_NODE, &show_ipv6_ospf6_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_cmd); install_element (CONFIG_NODE, &router_ospf6_cmd); install_element (CONFIG_NODE, &no_router_ospf6_cmd); @@ -938,14 +937,6 @@ ospf6_top_init (void) install_element (VIEW_NODE, &show_ipv6_ospf6_route_longer_detail_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_route_type_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_route_type_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_match_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_match_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_longer_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_type_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_route_type_detail_cmd); install_default (OSPF6_NODE); install_element (OSPF6_NODE, &ospf6_router_id_cmd); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 0caf001..19b8a14 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -604,7 +604,6 @@ ospf6_zebra_init (struct thread_master *master) /* Install command element for zebra node. */ install_element (VIEW_NODE, &show_zebra_cmd); - install_element (ENABLE_NODE, &show_zebra_cmd); install_element (CONFIG_NODE, &router_zebra_cmd); install_element (CONFIG_NODE, &no_router_zebra_cmd); diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index c2baa31..bfcc242 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -1791,21 +1791,14 @@ ospf6_init (void) install_element_ospf6_debug_flood (); install_element (VIEW_NODE, &show_version_ospf6_cmd); - install_element (ENABLE_NODE, &show_version_ospf6_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_border_routers_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_border_routers_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_border_routers_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_border_routers_detail_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_router_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_network_cmd); install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_detail_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_router_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_network_cmd); - install_element (ENABLE_NODE, &show_ipv6_ospf6_linkstate_detail_cmd); #define INSTALL(n,c) \ install_element (n ## _NODE, &show_ipv6_ospf6_ ## c) diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index cd52866..906acb9 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -1886,8 +1886,6 @@ ospf_mpls_te_register_vty (void) { install_element (VIEW_NODE, &show_mpls_te_router_cmd); install_element (VIEW_NODE, &show_mpls_te_link_cmd); - install_element (ENABLE_NODE, &show_mpls_te_router_cmd); - install_element (ENABLE_NODE, &show_mpls_te_link_cmd); install_element (OSPF_NODE, &mpls_te_cmd); install_element (OSPF_NODE, &no_mpls_te_cmd); diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index fb17dff..dec7095 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7529,7 +7529,6 @@ ospf_vty_show_init (void) { /* "show ip ospf" commands. */ install_element (VIEW_NODE, &show_ip_ospf_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_cmd); /* "show ip ospf database" commands. */ install_element (VIEW_NODE, &show_ip_ospf_database_type_cmd); @@ -7539,17 +7538,9 @@ ospf_vty_show_init (void) install_element (VIEW_NODE, &show_ip_ospf_database_type_id_self_cmd); install_element (VIEW_NODE, &show_ip_ospf_database_type_self_cmd); install_element (VIEW_NODE, &show_ip_ospf_database_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_adv_router_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_adv_router_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_id_self_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_type_self_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_database_cmd); /* "show ip ospf interface" commands. */ install_element (VIEW_NODE, &show_ip_ospf_interface_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_interface_cmd); /* "show ip ospf neighbor" commands. */ install_element (VIEW_NODE, &show_ip_ospf_neighbor_int_detail_cmd); @@ -7559,19 +7550,10 @@ ospf_vty_show_init (void) install_element (VIEW_NODE, &show_ip_ospf_neighbor_detail_cmd); install_element (VIEW_NODE, &show_ip_ospf_neighbor_cmd); install_element (VIEW_NODE, &show_ip_ospf_neighbor_all_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_int_detail_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_int_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_id_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_all_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_detail_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_neighbor_all_cmd); /* "show ip ospf route" commands. */ install_element (VIEW_NODE, &show_ip_ospf_route_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_route_cmd); install_element (VIEW_NODE, &show_ip_ospf_border_routers_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_border_routers_cmd); } diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 69c04ec..749eeab 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -4861,39 +4861,6 @@ void pim_cmd_init() install_element (ENABLE_NODE, &clear_ip_pim_interfaces_cmd); install_element (ENABLE_NODE, &clear_ip_pim_oil_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_interface_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_join_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_parameters_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_groups_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_groups_retransmissions_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_sources_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_sources_retransmissions_cmd); - install_element (ENABLE_NODE, &show_ip_igmp_querier_cmd); - install_element (ENABLE_NODE, &show_ip_pim_address_cmd); - install_element (ENABLE_NODE, &show_ip_pim_assert_cmd); - install_element (ENABLE_NODE, &show_ip_pim_assert_internal_cmd); - install_element (ENABLE_NODE, &show_ip_pim_assert_metric_cmd); - install_element (ENABLE_NODE, &show_ip_pim_assert_winner_metric_cmd); - install_element (ENABLE_NODE, &show_ip_pim_dr_cmd); - install_element (ENABLE_NODE, &show_ip_pim_hello_cmd); - install_element (ENABLE_NODE, &show_ip_pim_interface_cmd); - install_element (ENABLE_NODE, &show_ip_pim_join_cmd); - install_element (ENABLE_NODE, &show_ip_pim_jp_override_interval_cmd); - install_element (ENABLE_NODE, &show_ip_pim_lan_prune_delay_cmd); - install_element (ENABLE_NODE, &show_ip_pim_local_membership_cmd); - install_element (ENABLE_NODE, &show_ip_pim_neighbor_cmd); - install_element (ENABLE_NODE, &show_ip_pim_rpf_cmd); - install_element (ENABLE_NODE, &show_ip_pim_secondary_cmd); - install_element (ENABLE_NODE, &show_ip_pim_upstream_cmd); - install_element (ENABLE_NODE, &show_ip_pim_upstream_join_desired_cmd); - install_element (ENABLE_NODE, &show_ip_pim_upstream_rpf_cmd); - install_element (ENABLE_NODE, &show_ip_multicast_cmd); - install_element (ENABLE_NODE, &show_ip_mroute_cmd); - install_element (ENABLE_NODE, &show_ip_mroute_count_cmd); - install_element (ENABLE_NODE, &show_ip_rib_cmd); - install_element (ENABLE_NODE, &show_ip_ssmpingd_cmd); - install_element (ENABLE_NODE, &show_debugging_pim_cmd); - install_element (ENABLE_NODE, &test_igmp_receive_report_cmd); install_element (ENABLE_NODE, &test_pim_receive_assert_cmd); install_element (ENABLE_NODE, &test_pim_receive_dump_cmd); diff --git a/ripd/ripd.c b/ripd/ripd.c index 82b1ada..5b9ba11 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -4141,8 +4141,6 @@ rip_init (void) /* Install rip commands. */ install_element (VIEW_NODE, &show_ip_rip_cmd); install_element (VIEW_NODE, &show_ip_rip_status_cmd); - install_element (ENABLE_NODE, &show_ip_rip_cmd); - install_element (ENABLE_NODE, &show_ip_rip_status_cmd); install_element (CONFIG_NODE, &router_rip_cmd); install_element (CONFIG_NODE, &no_router_rip_cmd); diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c index c1eb39b..eb8ff5d 100644 --- a/ripngd/ripng_debug.c +++ b/ripngd/ripng_debug.c @@ -266,7 +266,6 @@ ripng_debug_init () install_element (VIEW_NODE, &show_debugging_ripng_cmd); - install_element (ENABLE_NODE, &show_debugging_ripng_cmd); install_element (ENABLE_NODE, &debug_ripng_events_cmd); install_element (ENABLE_NODE, &debug_ripng_packet_cmd); install_element (ENABLE_NODE, &debug_ripng_packet_direct_cmd); diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index d27d45b..9f16b41 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -3093,9 +3093,6 @@ ripng_init () install_element (VIEW_NODE, &show_ipv6_ripng_cmd); install_element (VIEW_NODE, &show_ipv6_ripng_status_cmd); - install_element (ENABLE_NODE, &show_ipv6_ripng_cmd); - install_element (ENABLE_NODE, &show_ipv6_ripng_status_cmd); - install_element (CONFIG_NODE, &router_ripng_cmd); install_element (CONFIG_NODE, &no_router_ripng_cmd); diff --git a/zebra/interface.c b/zebra/interface.c index 8a9225a..b22186d 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1796,15 +1796,6 @@ zebra_if_init (void) install_element (VIEW_NODE, &show_interface_name_cmd); install_element (VIEW_NODE, &show_interface_name_vrf_cmd); install_element (VIEW_NODE, &show_interface_name_vrf_all_cmd); - install_element (ENABLE_NODE, &show_interface_cmd); - install_element (ENABLE_NODE, &show_interface_vrf_cmd); - install_element (ENABLE_NODE, &show_interface_vrf_all_cmd); - install_element (ENABLE_NODE, &show_interface_name_cmd); - install_element (ENABLE_NODE, &show_interface_name_vrf_cmd); - install_element (ENABLE_NODE, &show_interface_name_vrf_all_cmd); - install_element (ENABLE_NODE, &show_interface_desc_cmd); - install_element (ENABLE_NODE, &show_interface_desc_vrf_cmd); - install_element (ENABLE_NODE, &show_interface_desc_vrf_all_cmd); install_element (CONFIG_NODE, &zebra_interface_cmd); install_element (CONFIG_NODE, &zebra_interface_vrf_cmd); install_element (CONFIG_NODE, &no_interface_cmd); diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 21b92ea..2ff7d55 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -3853,7 +3853,6 @@ zebra_vty_init (void) install_element (CONFIG_NODE, &ip_protocol_cmd); install_element (CONFIG_NODE, &no_ip_protocol_cmd); install_element (VIEW_NODE, &show_ip_protocol_cmd); - install_element (ENABLE_NODE, &show_ip_protocol_cmd); install_element (CONFIG_NODE, &ip_route_cmd); install_element (CONFIG_NODE, &ip_route_flags_cmd); install_element (CONFIG_NODE, &ip_route_flags2_cmd); @@ -3886,19 +3885,9 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ip_route_supernets_cmd); install_element (VIEW_NODE, &show_ip_route_summary_cmd); install_element (VIEW_NODE, &show_ip_route_summary_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_route_cmd); - install_element (ENABLE_NODE, &show_ip_route_addr_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ip_route_protocol_cmd); - install_element (ENABLE_NODE, &show_ip_route_supernets_cmd); - 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_rpf_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_cmd); install_element (VIEW_NODE, &show_ip_rpf_addr_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_addr_cmd); /* Commands for VRF */ @@ -3939,14 +3928,6 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ip_route_supernets_vrf_cmd); install_element (VIEW_NODE, &show_ip_route_summary_vrf_cmd); install_element (VIEW_NODE, &show_ip_route_summary_prefix_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_addr_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_longer_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_protocol_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_supernets_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_summary_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_route_summary_prefix_vrf_cmd); install_element (VIEW_NODE, &show_ip_route_vrf_all_cmd); install_element (VIEW_NODE, &show_ip_route_addr_vrf_all_cmd); @@ -3956,25 +3937,12 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ip_route_supernets_vrf_all_cmd); install_element (VIEW_NODE, &show_ip_route_summary_vrf_all_cmd); install_element (VIEW_NODE, &show_ip_route_summary_prefix_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_addr_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_prefix_longer_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_protocol_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_supernets_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_summary_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_route_summary_prefix_vrf_all_cmd); install_element (VIEW_NODE, &show_ip_rpf_vrf_cmd); install_element (VIEW_NODE, &show_ip_rpf_vrf_all_cmd); install_element (VIEW_NODE, &show_ip_rpf_addr_vrf_cmd); install_element (VIEW_NODE, &show_ip_rpf_addr_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_addr_vrf_cmd); - install_element (ENABLE_NODE, &show_ip_rpf_addr_vrf_all_cmd); -#ifdef HAVE_IPV6 install_element (CONFIG_NODE, &ipv6_route_cmd); install_element (CONFIG_NODE, &ipv6_route_flags_cmd); install_element (CONFIG_NODE, &ipv6_route_ifname_cmd); @@ -3998,16 +3966,8 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ipv6_route_addr_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_protocol_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_addr_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_longer_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_prefix_cmd); install_element (VIEW_NODE, &show_ipv6_mroute_cmd); - install_element (ENABLE_NODE, &show_ipv6_mroute_cmd); /* Commands for VRF */ @@ -4035,13 +3995,6 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ipv6_route_addr_vrf_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_vrf_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_longer_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_protocol_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_addr_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_longer_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_prefix_vrf_cmd); install_element (VIEW_NODE, &show_ipv6_route_vrf_all_cmd); install_element (VIEW_NODE, &show_ipv6_route_summary_vrf_all_cmd); @@ -4050,18 +4003,8 @@ zebra_vty_init (void) install_element (VIEW_NODE, &show_ipv6_route_addr_vrf_all_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_vrf_all_cmd); install_element (VIEW_NODE, &show_ipv6_route_prefix_longer_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_protocol_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_addr_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_prefix_longer_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_route_summary_prefix_vrf_all_cmd); install_element (VIEW_NODE, &show_ipv6_mroute_vrf_cmd); - install_element (ENABLE_NODE, &show_ipv6_mroute_vrf_cmd); install_element (VIEW_NODE, &show_ipv6_mroute_vrf_all_cmd); - install_element (ENABLE_NODE, &show_ipv6_mroute_vrf_all_cmd); -#endif /* HAVE_IPV6 */ } diff --git a/zebra/zserv.c b/zebra/zserv.c index e624ef2..9206776 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1934,20 +1934,17 @@ zebra_init (void) install_node (&forwarding_node, config_write_forwarding); install_element (VIEW_NODE, &show_ip_forwarding_cmd); - install_element (ENABLE_NODE, &show_ip_forwarding_cmd); install_element (CONFIG_NODE, &ip_forwarding_cmd); install_element (CONFIG_NODE, &no_ip_forwarding_cmd); install_element (ENABLE_NODE, &show_zebra_client_cmd); #ifdef HAVE_NETLINK install_element (VIEW_NODE, &show_table_cmd); - install_element (ENABLE_NODE, &show_table_cmd); install_element (CONFIG_NODE, &config_table_cmd); #endif /* HAVE_NETLINK */ #ifdef HAVE_IPV6 install_element (VIEW_NODE, &show_ipv6_forwarding_cmd); - install_element (ENABLE_NODE, &show_ipv6_forwarding_cmd); install_element (CONFIG_NODE, &ipv6_forwarding_cmd); install_element (CONFIG_NODE, &no_ipv6_forwarding_cmd); #endif /* HAVE_IPV6 */ -- 1.9.1 _______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
