proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mgmtd: fix memleak

Browse Source 
Use northbound functions for replace and merge when possible, rather
than duplicating the code.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2023-06-18 13:39:27 -04:00
parent df0173ceeb
commit 459848ded7
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mgmtd/mgmt_ds.c
View File

@ -78,29 +78,20 @@ static int mgmt_ds_dump_in_memory(struct mgmt_ds_ctx *ds_ctx,
static int mgmt_ds_replace_dst_with_src_ds(struct mgmt_ds_ctx *src, static int mgmt_ds_replace_dst_with_src_ds(struct mgmt_ds_ctx *src,
struct mgmt_ds_ctx *dst) struct mgmt_ds_ctx *dst)
{ {
struct lyd_node *dst_dnode, *src_dnode;
if (!src || !dst) if (!src || !dst)
return -1; return -1;
MGMTD_DS_DBG("Replacing %s with %s", mgmt_ds_id2name(dst->ds_id), MGMTD_DS_DBG("Replacing %s with %s", mgmt_ds_id2name(dst->ds_id),
mgmt_ds_id2name(src->ds_id)); mgmt_ds_id2name(src->ds_id));
src_dnode = src->config_ds ? src->root.cfg_root->dnode if (src->config_ds && dst->config_ds)
: dst->root.dnode_root; nb_config_replace(dst->root.cfg_root, src->root.cfg_root, true);
dst_dnode = dst->config_ds ? dst->root.cfg_root->dnode else {
: dst->root.dnode_root; assert(!src->config_ds && !dst->config_ds);
if (dst->root.dnode_root)
if (dst_dnode) yang_dnode_free(dst->root.dnode_root);
yang_dnode_free(dst_dnode); dst->root.dnode_root = yang_dnode_dup(src->root.dnode_root);
}
/* Not using nb_config_replace as the oper ds does not contain nb_config
*/
dst_dnode = yang_dnode_dup(src_dnode);
if (dst->config_ds)
dst->root.cfg_root->dnode = dst_dnode;
else
dst->root.dnode_root = dst_dnode;
if (src->ds_id == MGMTD_DS_CANDIDATE) { if (src->ds_id == MGMTD_DS_CANDIDATE) {
/* /*
@ -110,8 +101,6 @@ static int mgmt_ds_replace_dst_with_src_ds(struct mgmt_ds_ctx *src,
nb_config_diff_del_changes(&src->root.cfg_root->cfg_chgs); nb_config_diff_del_changes(&src->root.cfg_root->cfg_chgs);
} }
/* TODO: Update the versions if nb_config present */
return 0; return 0;
} }
@ -119,20 +108,21 @@ static int mgmt_ds_merge_src_with_dst_ds(struct mgmt_ds_ctx *src,
struct mgmt_ds_ctx *dst) struct mgmt_ds_ctx *dst)
{ {
int ret; int ret;
struct lyd_node **dst_dnode, *src_dnode;
if (!src || !dst) if (!src || !dst)
return -1; return -1;
MGMTD_DS_DBG("Merging DS %d with %d", dst->ds_id, src->ds_id); MGMTD_DS_DBG("Merging DS %d with %d", dst->ds_id, src->ds_id);
if (src->config_ds && dst->config_ds)
src_dnode = src->config_ds ? src->root.cfg_root->dnode ret = nb_config_merge(dst->root.cfg_root, src->root.cfg_root,
: dst->root.dnode_root; true);
dst_dnode = dst->config_ds ? &dst->root.cfg_root->dnode else {
: &dst->root.dnode_root; assert(!src->config_ds && !dst->config_ds);
ret = lyd_merge_siblings(dst_dnode, src_dnode, 0); ret = lyd_merge_siblings(&dst->root.dnode_root,
src->root.dnode_root, 0);
}
if (ret != 0) { if (ret != 0) {
MGMTD_DS_ERR("lyd_merge() failed with err %d", ret); MGMTD_DS_ERR("merge failed with err: %d", ret);
return ret; return ret;
} }
@ -214,9 +204,11 @@ int mgmt_ds_init(struct mgmt_master *mm)
void mgmt_ds_destroy(void) void mgmt_ds_destroy(void)
{ {
/* nb_config_free(candidate.root.cfg_root);
* TODO: Free the datastores. candidate.root.cfg_root = NULL;
*/
yang_dnode_free(oper.root.dnode_root);
oper.root.dnode_root = NULL;
} }
struct mgmt_ds_ctx *mgmt_ds_get_ctx_by_id(struct mgmt_master *mm, struct mgmt_ds_ctx *mgmt_ds_get_ctx_by_id(struct mgmt_master *mm,