From fb35f654e3e31a762b1b453efc6248df78c1717e Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Wed, 9 Jun 2021 12:40:04 -0300 Subject: [PATCH] pimd: rename some MSDP functions Rename and shorten function names to make them uniform. Signed-off-by: Rafael Zalamena --- pimd/pim_msdp.c | 18 +++++++++--------- pimd/pim_msdp.h | 13 ++++++------- pimd/pim_nb_config.c | 8 ++++---- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index 6de793ff4d..095c6de549 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -1260,7 +1260,7 @@ void pim_msdp_mg_free(struct pim_instance *pim, struct pim_msdp_mg **mgp) /* SIP is being removed - tear down all active peer sessions */ for (ALL_LIST_ELEMENTS((*mgp)->mbr_list, n, nn, mbr)) - pim_msdp_mg_mbr_do_del((*mgp), mbr); + pim_msdp_mg_mbr_del((*mgp), mbr); if (PIM_DEBUG_MSDP_EVENTS) { zlog_debug("MSDP mesh-group %s deleted", @@ -1315,7 +1315,7 @@ static void pim_msdp_mg_mbr_free(struct pim_msdp_mg_mbr *mbr) XFREE(MTYPE_PIM_MSDP_MG_MBR, mbr); } -void pim_msdp_mg_mbr_do_del(struct pim_msdp_mg *mg, struct pim_msdp_mg_mbr *mbr) +void pim_msdp_mg_mbr_del(struct pim_msdp_mg *mg, struct pim_msdp_mg_mbr *mbr) { /* Delete active peer session if any */ if (mbr->mp) { @@ -1335,7 +1335,7 @@ void pim_msdp_mg_mbr_do_del(struct pim_msdp_mg *mg, struct pim_msdp_mg_mbr *mbr) } } -static void pim_msdp_mg_src_do_del(struct pim_msdp_mg *mg) +static void pim_msdp_src_del(struct pim_msdp_mg *mg) { struct pim_msdp_mg_mbr *mbr; struct listnode *mbr_node; @@ -1482,14 +1482,14 @@ void pim_msdp_exit(struct pim_instance *pim) pim->msdp.work_obuf = NULL; } -void pim_msdp_mg_change_source(struct pim_instance *pim, struct pim_msdp_mg *mg, - struct in_addr *ai) +void pim_msdp_mg_src_add(struct pim_instance *pim, struct pim_msdp_mg *mg, + struct in_addr *ai) { struct pim_msdp_mg_mbr *mbr; struct listnode *mbr_node; /* Stop all connections and remove data structures. */ - pim_msdp_mg_src_do_del(mg); + pim_msdp_src_del(mg); /* Set new address. */ mg->src_ip = *ai; @@ -1512,9 +1512,9 @@ void pim_msdp_mg_change_source(struct pim_instance *pim, struct pim_msdp_mg *mg, mg->mesh_group_name, &mg->src_ip); } -struct pim_msdp_mg_mbr *pim_msdp_mg_add_peer(struct pim_instance *pim, - struct pim_msdp_mg *mg, - struct in_addr *ia) +struct pim_msdp_mg_mbr *pim_msdp_mg_mbr_add(struct pim_instance *pim, + struct pim_msdp_mg *mg, + struct in_addr *ia) { struct pim_msdp_mg_mbr *mbr; diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h index f4d58cd56b..bb7ee01ad8 100644 --- a/pimd/pim_msdp.h +++ b/pimd/pim_msdp.h @@ -272,21 +272,20 @@ void pim_msdp_mg_free(struct pim_instance *pim, struct pim_msdp_mg **mgp); * - Recreate peers data structure * - Start TCP connections with new local address. */ -void pim_msdp_mg_change_source(struct pim_instance *pim, struct pim_msdp_mg *mg, - struct in_addr *ai); +void pim_msdp_mg_src_add(struct pim_instance *pim, struct pim_msdp_mg *mg, + struct in_addr *ai); /** * Add new peer to mesh group and starts the connection if source address is * configured. */ -struct pim_msdp_mg_mbr *pim_msdp_mg_add_peer(struct pim_instance *pim, - struct pim_msdp_mg *mg, - struct in_addr *ia); +struct pim_msdp_mg_mbr *pim_msdp_mg_mbr_add(struct pim_instance *pim, + struct pim_msdp_mg *mg, + struct in_addr *ia); /** * Stops the connection and removes the peer data structures. */ -void pim_msdp_mg_mbr_do_del(struct pim_msdp_mg *mg, - struct pim_msdp_mg_mbr *mbr); +void pim_msdp_mg_mbr_del(struct pim_msdp_mg *mg, struct pim_msdp_mg_mbr *mbr); #endif diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c index 10a83e889a..b70656ea7b 100644 --- a/pimd/pim_nb_config.c +++ b/pimd/pim_nb_config.c @@ -1072,7 +1072,7 @@ int pim_msdp_mesh_group_source_modify(struct nb_cb_modify_args *args) vrf = nb_running_get_entry(vrf_dnode, "../../", true); yang_dnode_get_ip(&ip, args->dnode, NULL); - pim_msdp_mg_change_source(vrf->info, mg, &ip.ip._v4_addr); + pim_msdp_mg_src_add(vrf->info, mg, &ip.ip._v4_addr); break; } return NB_OK; @@ -1097,7 +1097,7 @@ int pim_msdp_mesh_group_source_destroy(struct nb_cb_destroy_args *args) vrf = nb_running_get_entry(vrf_dnode, "../../", true); addr.s_addr = INADDR_ANY; - pim_msdp_mg_change_source(vrf->info, mg, &addr); + pim_msdp_mg_src_add(vrf->info, mg, &addr); break; } return NB_OK; @@ -1128,7 +1128,7 @@ int pim_msdp_mesh_group_members_create(struct nb_cb_create_args *args) vrf = nb_running_get_entry(vrf_dnode, "../../", true); yang_dnode_get_ip(&ip, args->dnode, "address"); - mbr = pim_msdp_mg_add_peer(vrf->info, mg, &ip.ip._v4_addr); + mbr = pim_msdp_mg_mbr_add(vrf->info, mg, &ip.ip._v4_addr); nb_running_set_entry(args->dnode, mbr); break; } @@ -1150,7 +1150,7 @@ int pim_msdp_mesh_group_members_destroy(struct nb_cb_destroy_args *args) mbr = nb_running_get_entry(args->dnode, NULL, true); mg = nb_running_get_entry(args->dnode, "../", true); - pim_msdp_mg_mbr_do_del(mg, mbr); + pim_msdp_mg_mbr_del(mg, mbr); break; } -- 2.39.5