lib: fix access-list deletion

Problems with the current implementation:
* Delete hook is called before the deletion of the access-list from the
  master list, which means that daemons processing this hook successfully
  find this access-list, store a pointer to it in their structures, and
  right after that the access-list is freed. Daemons end up having stale
  pointer to the freed structure.
* Route-maps are not notified of the deletion.

This commit fixes both issues.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/lib/filter.c b/lib/filter.c
index e6add0462b9d3f93e5087d2b65d94a79ec53f262..07512d866766b813cdf32c8d0fbfbbdd77414381 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -181,6 +181,11 @@ void access_list_delete(struct access_list *access)
        else
                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_TMP, access->remark);

diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index 877073a6064afa13b0140271bf73c39f3aa23a48..866ed2950e59f95f304ada91d34819b1ae70c5ee 100644 (file)
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -390,17 +390,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)
 {
-       struct access_master *am;
        struct access_list *acl;
 
        if (args->event != NB_EV_APPLY)
                return NB_OK;
 
        acl = nb_running_unset_entry(args->dnode);
-       am = acl->master;
-       if (am->delete_hook)
-               am->delete_hook(acl);
-
        access_list_delete(acl);
 
        return NB_OK;