--- bgpd/bgp_filter.c | 2 -- bgpd/bgp_mplsvpn.c | 18 ------------------ bgpd/bgp_nexthop.c | 4 ---- isisd/isis_spf.c | 4 ---- isisd/isis_te.c | 2 -- lib/vty.c | 10 ++++------ ospf6d/ospf6d.c | 37 ------------------------------------- ospfd/ospf_ri.c | 2 -- zebra/debug.c | 1 - 9 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c index 26819fc..ab1e504 100644 --- a/bgpd/bgp_filter.c +++ b/bgpd/bgp_filter.c @@ -691,8 +691,6 @@ bgp_filter_init (void) install_element (VIEW_NODE, &show_ip_as_path_access_list_cmd); install_element (VIEW_NODE, &show_ip_as_path_access_list_all_cmd); - install_element (ENABLE_NODE, &show_ip_as_path_access_list_cmd); - install_element (ENABLE_NODE, &show_ip_as_path_access_list_all_cmd); } void diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 08a4272..047105d 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -1062,22 +1062,4 @@ bgp_mplsvpn_init (void) install_element (VIEW_NODE, &show_bgp_ipv6_vpn_neighbor_advertised_routes_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_vpn_rd_neighbor_advertised_routes_cmd); install_element (VIEW_NODE, &show_bgp_ipv6_vpn_rd_neighbor_routes_cmd); - - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_rd_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_rd_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_rd_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv4_vpn_rd_neighbor_routes_cmd); - - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_rd_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_rd_tags_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_neighbor_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_rd_neighbor_advertised_routes_cmd); - install_element (ENABLE_NODE, &show_bgp_ipv6_vpn_rd_neighbor_routes_cmd); } diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index b69ed6f..434b2cd 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -1506,10 +1506,6 @@ bgp_scan_init (void) install_element (VIEW_NODE, &show_ip_bgp_nexthop_cmd); install_element (VIEW_NODE, &show_ip_bgp_nexthop_detail_cmd); install_element (RESTRICTED_NODE, &show_ip_bgp_scan_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_scan_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_nexthop_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_nexthop_detail_cmd); - install_element (ENABLE_NODE, &show_ip_bgp_scan_detail_cmd); } void diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 0657c1c..6b2456f 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -1692,8 +1692,4 @@ isis_spf_cmds_init () install_element (VIEW_NODE, &show_isis_topology_cmd); install_element (VIEW_NODE, &show_isis_topology_l1_cmd); install_element (VIEW_NODE, &show_isis_topology_l2_cmd); - - install_element (ENABLE_NODE, &show_isis_topology_cmd); - install_element (ENABLE_NODE, &show_isis_topology_l1_cmd); - install_element (ENABLE_NODE, &show_isis_topology_l2_cmd); } diff --git a/isisd/isis_te.c b/isisd/isis_te.c index 814a8e8..6cb8551 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c @@ -1358,8 +1358,6 @@ isis_mpls_te_init (void) /* Register new VTY commands */ install_element (VIEW_NODE, &show_isis_mpls_te_router_cmd); install_element (VIEW_NODE, &show_isis_mpls_te_interface_cmd); - install_element (ENABLE_NODE, &show_isis_mpls_te_router_cmd); - install_element (ENABLE_NODE, &show_isis_mpls_te_interface_cmd); install_element (ISIS_NODE, &isis_mpls_te_on_cmd); install_element (ISIS_NODE, &no_isis_mpls_te_on_cmd); diff --git a/lib/vty.c b/lib/vty.c index bf259fc..7ba277f 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -2668,8 +2668,8 @@ vty_event (enum event event, int sock, struct vty *vty) } } -DEFUN (config_who, - config_who_cmd, +DEFUN (who, + who_cmd, "who", "Display who is on vty\n") { @@ -3098,11 +3098,10 @@ vty_init (struct thread_master *master_thread) /* Install bgp top node. */ install_node (&vty_node, vty_config_write); - install_element (RESTRICTED_NODE, &config_who_cmd); + install_element (RESTRICTED_NODE, &who_cmd); install_element (RESTRICTED_NODE, &show_history_cmd); - install_element (VIEW_NODE, &config_who_cmd); + install_element (VIEW_NODE, &who_cmd); install_element (VIEW_NODE, &show_history_cmd); - install_element (ENABLE_NODE, &config_who_cmd); install_element (CONFIG_NODE, &line_vty_cmd); install_element (CONFIG_NODE, &service_advanced_vty_cmd); install_element (CONFIG_NODE, &no_service_advanced_vty_cmd); @@ -3111,7 +3110,6 @@ vty_init (struct thread_master *master_thread) install_element (ENABLE_NODE, &terminal_monitor_cmd); install_element (ENABLE_NODE, &terminal_no_monitor_cmd); install_element (ENABLE_NODE, &no_terminal_monitor_cmd); - install_element (ENABLE_NODE, &show_history_cmd); install_default (VTY_NODE); install_element (VTY_NODE, &exec_timeout_min_cmd); diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c index bfcc242..fa84d0a 100644 --- a/ospf6d/ospf6d.c +++ b/ospf6d/ospf6d.c @@ -1840,43 +1840,6 @@ ospf6_init (void) INSTALL (VIEW, database_type_self_originated_linkstate_id_cmd); INSTALL (VIEW, database_type_self_originated_linkstate_id_detail_cmd); - INSTALL (ENABLE, database_cmd); - INSTALL (ENABLE, database_detail_cmd); - INSTALL (ENABLE, database_type_cmd); - INSTALL (ENABLE, database_type_detail_cmd); - INSTALL (ENABLE, database_id_cmd); - INSTALL (ENABLE, database_id_detail_cmd); - INSTALL (ENABLE, database_linkstate_id_cmd); - INSTALL (ENABLE, database_linkstate_id_detail_cmd); - INSTALL (ENABLE, database_router_cmd); - INSTALL (ENABLE, database_router_detail_cmd); - INSTALL (ENABLE, database_adv_router_cmd); - INSTALL (ENABLE, database_adv_router_detail_cmd); - INSTALL (ENABLE, database_type_id_cmd); - INSTALL (ENABLE, database_type_id_detail_cmd); - INSTALL (ENABLE, database_type_linkstate_id_cmd); - INSTALL (ENABLE, database_type_linkstate_id_detail_cmd); - INSTALL (ENABLE, database_type_router_cmd); - INSTALL (ENABLE, database_type_router_detail_cmd); - INSTALL (ENABLE, database_type_adv_router_cmd); - INSTALL (ENABLE, database_type_adv_router_detail_cmd); - INSTALL (ENABLE, database_adv_router_linkstate_id_cmd); - INSTALL (ENABLE, database_adv_router_linkstate_id_detail_cmd); - INSTALL (ENABLE, database_id_router_cmd); - INSTALL (ENABLE, database_id_router_detail_cmd); - INSTALL (ENABLE, database_type_id_router_cmd); - INSTALL (ENABLE, database_type_id_router_detail_cmd); - INSTALL (ENABLE, database_type_adv_router_linkstate_id_cmd); - INSTALL (ENABLE, database_type_adv_router_linkstate_id_detail_cmd); - INSTALL (ENABLE, database_self_originated_cmd); - INSTALL (ENABLE, database_self_originated_detail_cmd); - INSTALL (ENABLE, database_type_self_originated_cmd); - INSTALL (ENABLE, database_type_self_originated_detail_cmd); - INSTALL (ENABLE, database_type_id_self_originated_cmd); - INSTALL (ENABLE, database_type_id_self_originated_detail_cmd); - INSTALL (ENABLE, database_type_self_originated_linkstate_id_cmd); - INSTALL (ENABLE, database_type_self_originated_linkstate_id_detail_cmd); - /* Make ospf protocol socket. */ ospf6_serv_sock (); thread_add_read (master, ospf6_receive, NULL, ospf6_sock); diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 5b1032b..f093208 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -1621,8 +1621,6 @@ ospf_router_info_register_vty (void) { install_element (VIEW_NODE, &show_ip_ospf_router_info_cmd); install_element (VIEW_NODE, &show_ip_ospf_router_info_pce_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_router_info_cmd); - install_element (ENABLE_NODE, &show_ip_ospf_router_info_pce_cmd); install_element (OSPF_NODE, &router_info_area_cmd); install_element (OSPF_NODE, &router_info_as_cmd); diff --git a/zebra/debug.c b/zebra/debug.c index fbeef52..5dd38f0 100644 --- a/zebra/debug.c +++ b/zebra/debug.c @@ -377,7 +377,6 @@ zebra_debug_init (void) install_element (VIEW_NODE, &show_debugging_zebra_cmd); - install_element (ENABLE_NODE, &show_debugging_zebra_cmd); install_element (ENABLE_NODE, &debug_zebra_events_cmd); install_element (ENABLE_NODE, &debug_zebra_nht_cmd); install_element (ENABLE_NODE, &debug_zebra_packet_cmd); -- 2.5.5 _______________________________________________ Quagga-dev mailing list Quagga-dev@lists.quagga.net https://lists.quagga.net/mailman/listinfo/quagga-dev