proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 20:24:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16568 from FRRouting/mergify/bp/stable/10.1/pr-16551

Browse Source 
lib: fix distribute-list deletion (backport #16551)
This commit is contained in:
Donald Sharp 2024-08-13 08:44:39 -04:00 committed by GitHub
commit 2ce84fbb9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/distribute.c
View File

@ -456,10 +456,43 @@ int group_distribute_list_create_helper(
* XPath: /frr-ripd:ripd/instance/distribute-lists/distribute-list/{in,out}/{access,prefix}-list * XPath: /frr-ripd:ripd/instance/distribute-lists/distribute-list/{in,out}/{access,prefix}-list
*/ */
static int distribute_list_leaf_update(const struct lyd_node *dnode,
int ip_version, bool no);
int group_distribute_list_destroy(struct nb_cb_destroy_args *args) int group_distribute_list_destroy(struct nb_cb_destroy_args *args)
{ {
struct lyd_node *dnode;
if (args->event != NB_EV_APPLY) if (args->event != NB_EV_APPLY)
return NB_OK; return NB_OK;
/*
* We don't keep the IP version of distribute-list anywhere, so we're
* trying to remove both. If one doesn't exist, it's simply skipped by
* the remove function.
*/
dnode = yang_dnode_get(args->dnode, "in/access-list");
if (dnode) {
distribute_list_leaf_update(dnode, 4, true);
distribute_list_leaf_update(dnode, 6, true);
}
dnode = yang_dnode_get(args->dnode, "in/prefix-list");
if (dnode) {
distribute_list_leaf_update(dnode, 4, true);
distribute_list_leaf_update(dnode, 6, true);
}
dnode = yang_dnode_get(args->dnode, "out/access-list");
if (dnode) {
distribute_list_leaf_update(dnode, 4, true);
distribute_list_leaf_update(dnode, 6, true);
}
dnode = yang_dnode_get(args->dnode, "out/prefix-list");
if (dnode) {
distribute_list_leaf_update(dnode, 4, true);
distribute_list_leaf_update(dnode, 6, true);
}
nb_running_unset_entry(args->dnode); nb_running_unset_entry(args->dnode);
return NB_OK; return NB_OK;
} }