From 23489cb09c13ce34b0223420dab00c49a23ece9d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 14 Nov 2017 09:25:04 -0500 Subject: [PATCH] vtysh: If RPKI is not compiled in don't let vtysh think it is. The RPKI code can be turned on/off via configure switches. If we have intentionally turned it off do not let vtysh display that you can config it. Signed-off-by: Donald Sharp --- vtysh/vtysh.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index b021607240..39cbbf99d4 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1045,7 +1045,9 @@ struct cmd_node link_params_node = { LINK_PARAMS_NODE, "%s(config-link-params)# ", }; +#if defined(HAVE_RPKI) static struct cmd_node rpki_node = {RPKI_NODE, "%s(config-rpki)# ", 1}; +#endif /* Defined in lib/vty.c */ extern struct cmd_node vty_node; @@ -1183,6 +1185,7 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv6_labeled_unicast, return CMD_SUCCESS; } +#if defined(HAVE_RPKI) DEFUNSH(VTYSH_BGPD, rpki, rpki_cmd, @@ -1211,6 +1214,7 @@ DEFUNSH(VTYSH_BGPD, { return rpki_exit(self, vty, argc, argv); } +#endif DEFUNSH(VTYSH_BGPD, address_family_evpn, address_family_evpn_cmd, "address-family ", @@ -3010,7 +3014,9 @@ void vtysh_init_vty(void) install_node(&keychain_key_node, NULL); install_node(&isis_node, NULL); install_node(&vty_node, NULL); +#if defined(HAVE_RPKI) install_node(&rpki_node, NULL); +#endif struct cmd_node *node; for (unsigned int i = 0; i < vector_active(cmdvec); i++) { @@ -3209,10 +3215,12 @@ void vtysh_init_vty(void) install_element(BGP_EVPN_NODE, &exit_address_family_cmd); install_element(BGP_IPV6L_NODE, &exit_address_family_cmd); +#if defined(HAVE_RPKI) install_element(CONFIG_NODE, &rpki_cmd); install_element(RPKI_NODE, &rpki_exit_cmd); install_element(RPKI_NODE, &rpki_quit_cmd); install_element(RPKI_NODE, &vtysh_end_all_cmd); +#endif /* EVPN commands */ install_element(BGP_EVPN_NODE, &bgp_evpn_vni_cmd); -- 2.39.5