proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8467 from idryzhov/fix-acl-delete

Browse Source 
lib: fix access-list deletion
This commit is contained in:
Renato Westphal 2021-04-14 23:58:39 -03:00 committed by GitHub
commit 1e3937b33d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/filter.c
View File

@ -181,6 +181,11 @@ void access_list_delete(struct access_list *access)
else else
list->head = access->next; list->head = access->next;
route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
if (master->delete_hook)
master->delete_hook(access);
XFREE(MTYPE_ACCESS_LIST_STR, access->name); XFREE(MTYPE_ACCESS_LIST_STR, access->name);
XFREE(MTYPE_TMP, access->remark); XFREE(MTYPE_TMP, access->remark);

5
lib/filter_nb.c
View File

@ -508,17 +508,12 @@ static int lib_access_list_create(struct nb_cb_create_args *args)
static int lib_access_list_destroy(struct nb_cb_destroy_args *args) static int lib_access_list_destroy(struct nb_cb_destroy_args *args)
{ {
struct access_master *am;
struct access_list *acl; struct access_list *acl;
if (args->event != NB_EV_APPLY) if (args->event != NB_EV_APPLY)
return NB_OK; return NB_OK;
acl = nb_running_unset_entry(args->dnode); acl = nb_running_unset_entry(args->dnode);
am = acl->master;
if (am->delete_hook)
am->delete_hook(acl);
access_list_delete(acl); access_list_delete(acl);
return NB_OK; return NB_OK;