diff options
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 85 |
1 files changed, 40 insertions, 45 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index d2f7dad820..548c866e4d 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -7213,7 +7213,8 @@ DEFUN (no_ip_pim_rp_keep_alive, char rp_ka_timer[5]; char rp_ka_timer_xpath[XPATH_MAXLEN]; - snprintf(rp_ka_timer, sizeof(rp_ka_timer), "%d", PIM_KEEPALIVE_PERIOD); + snprintf(rp_ka_timer, sizeof(rp_ka_timer), "%d", + PIM_RP_KEEPALIVE_PERIOD); vrfname = pim_cli_get_vrf_name(vty); if (vrfname == NULL) @@ -7985,8 +7986,8 @@ DEFUN (interface_no_ip_igmp, snprintf(pim_if_xpath, sizeof(pim_if_xpath), "%s/frr-pim:pim", VTY_CURR_XPATH); - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/pim-enable", pim_if_xpath); + pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, + "%s/pim-enable", pim_if_xpath); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, pim_if_xpath, NB_OP_DESTROY, NULL); nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL); @@ -8080,9 +8081,9 @@ DEFUN (interface_ip_igmp_query_interval, { const struct lyd_node *pim_enable_dnode; - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", - VTY_CURR_XPATH); + pim_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8156,9 +8157,9 @@ DEFUN (interface_ip_igmp_query_max_response_time, { const struct lyd_node *pim_enable_dnode; - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", - VTY_CURR_XPATH); + pim_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, @@ -8205,9 +8206,9 @@ DEFUN_HIDDEN (interface_ip_igmp_query_max_response_time_dsec, { const struct lyd_node *pim_enable_dnode; - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", - VTY_CURR_XPATH); + pim_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8253,9 +8254,9 @@ DEFUN (interface_ip_igmp_last_member_query_count, { const struct lyd_node *pim_enable_dnode; - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", - VTY_CURR_XPATH); + pim_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8300,9 +8301,9 @@ DEFUN (interface_ip_igmp_last_member_query_interval, { const struct lyd_node *pim_enable_dnode; - pim_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", - VTY_CURR_XPATH); + pim_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8530,8 +8531,8 @@ DEFUN_HIDDEN (interface_no_ip_pim_ssm, snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), "%s/frr-igmp:igmp", VTY_CURR_XPATH); - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/igmp-enable", igmp_if_xpath); + igmp_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, + "%s/igmp-enable", igmp_if_xpath); if (!igmp_enable_dnode) { nb_cli_enqueue_change(vty, igmp_if_xpath, NB_OP_DESTROY, NULL); @@ -8562,8 +8563,8 @@ DEFUN_HIDDEN (interface_no_ip_pim_sm, snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), "%s/frr-igmp:igmp", VTY_CURR_XPATH); - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/igmp-enable", igmp_if_xpath); + igmp_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, + "%s/igmp-enable", igmp_if_xpath); if (!igmp_enable_dnode) { nb_cli_enqueue_change(vty, igmp_if_xpath, NB_OP_DESTROY, NULL); @@ -8593,8 +8594,8 @@ DEFUN (interface_no_ip_pim, snprintf(igmp_if_xpath, sizeof(igmp_if_xpath), "%s/frr-igmp:igmp", VTY_CURR_XPATH); - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/igmp-enable", igmp_if_xpath); + igmp_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, + "%s/igmp-enable", igmp_if_xpath); if (!igmp_enable_dnode) { nb_cli_enqueue_change(vty, igmp_if_xpath, NB_OP_DESTROY, NULL); @@ -8715,9 +8716,9 @@ DEFUN (interface_ip_pim_hello, int idx_hold = 4; const struct lyd_node *igmp_enable_dnode; - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-igmp:igmp/igmp-enable", - VTY_CURR_XPATH); + igmp_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-igmp:igmp/igmp-enable", VTY_CURR_XPATH); if (!igmp_enable_dnode) { nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); @@ -9435,9 +9436,9 @@ DEFPY (ip_pim_bfd, { const struct lyd_node *igmp_enable_dnode; - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-igmp:igmp/igmp-enable", - VTY_CURR_XPATH); + igmp_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-igmp:igmp/igmp-enable", VTY_CURR_XPATH); if (!igmp_enable_dnode) nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); @@ -9490,9 +9491,9 @@ DEFUN (ip_pim_bsm, { const struct lyd_node *igmp_enable_dnode; - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-igmp:igmp/igmp-enable", - VTY_CURR_XPATH); + igmp_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-igmp:igmp/igmp-enable", VTY_CURR_XPATH); if (!igmp_enable_dnode) nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); @@ -9529,9 +9530,9 @@ DEFUN (ip_pim_ucast_bsm, { const struct lyd_node *igmp_enable_dnode; - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-igmp:igmp/igmp-enable", - VTY_CURR_XPATH); + igmp_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-igmp:igmp/igmp-enable", VTY_CURR_XPATH); if (!igmp_enable_dnode) nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); @@ -9588,9 +9589,9 @@ DEFUN_HIDDEN( int idx_number_3 = 5; const struct lyd_node *igmp_enable_dnode; - igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode, - "%s/frr-igmp:igmp/igmp-enable", - VTY_CURR_XPATH); + igmp_enable_dnode = + yang_dnode_getf(vty->candidate_config->dnode, + "%s/frr-igmp:igmp/igmp-enable", VTY_CURR_XPATH); if (!igmp_enable_dnode) nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); @@ -11090,9 +11091,7 @@ void pim_cmd_init(void) install_element(CONFIG_NODE, &ip_pim_ssm_prefix_list_cmd); install_element(VRF_NODE, &ip_pim_ssm_prefix_list_cmd); install_element(CONFIG_NODE, &ip_pim_register_suppress_cmd); - install_element(VRF_NODE, &ip_pim_register_suppress_cmd); install_element(CONFIG_NODE, &no_ip_pim_register_suppress_cmd); - install_element(VRF_NODE, &no_ip_pim_register_suppress_cmd); install_element(CONFIG_NODE, &ip_pim_spt_switchover_infinity_cmd); install_element(VRF_NODE, &ip_pim_spt_switchover_infinity_cmd); install_element(CONFIG_NODE, &ip_pim_spt_switchover_infinity_plist_cmd); @@ -11105,9 +11104,7 @@ void pim_cmd_init(void) install_element(CONFIG_NODE, &pim_register_accept_list_cmd); install_element(VRF_NODE, &pim_register_accept_list_cmd); install_element(CONFIG_NODE, &ip_pim_joinprune_time_cmd); - install_element(VRF_NODE, &ip_pim_joinprune_time_cmd); install_element(CONFIG_NODE, &no_ip_pim_joinprune_time_cmd); - install_element(VRF_NODE, &no_ip_pim_joinprune_time_cmd); install_element(CONFIG_NODE, &ip_pim_keep_alive_cmd); install_element(VRF_NODE, &ip_pim_keep_alive_cmd); install_element(CONFIG_NODE, &ip_pim_rp_keep_alive_cmd); @@ -11117,9 +11114,7 @@ void pim_cmd_init(void) install_element(CONFIG_NODE, &no_ip_pim_rp_keep_alive_cmd); install_element(VRF_NODE, &no_ip_pim_rp_keep_alive_cmd); install_element(CONFIG_NODE, &ip_pim_packets_cmd); - install_element(VRF_NODE, &ip_pim_packets_cmd); install_element(CONFIG_NODE, &no_ip_pim_packets_cmd); - install_element(VRF_NODE, &no_ip_pim_packets_cmd); install_element(CONFIG_NODE, &ip_pim_v6_secondary_cmd); install_element(VRF_NODE, &ip_pim_v6_secondary_cmd); install_element(CONFIG_NODE, &no_ip_pim_v6_secondary_cmd); |