Skip to content

Commit

Permalink
Merge pull request #15427 from idryzhov/fix-filter-nb-update
Browse files Browse the repository at this point in the history 
lib: fix access/prefix-list entry update
  • Loading branch information
@ton31337
ton31337 authored Feb 27, 2024
2 parents f6a34a6 + 0bc2ab8 commit 7ad689b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 87 deletions.
3 changes: 3 additions & 0 deletions lib/filter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,10 @@ void access_list_filter_add(struct access_list *access,
filter->prev = access->tail;
access->tail = filter;
}
}

void access_list_filter_update(struct access_list *access)
{
/* Run hook function. */
if (access->master->add_hook)
(*access->master->add_hook)(access);
Expand Down
1 change: 1 addition & 0 deletions lib/filter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ struct filter *filter_new(void);
void access_list_filter_add(struct access_list *access, struct filter *filter);
void access_list_filter_delete(struct access_list *access,
struct filter *filter);
void access_list_filter_update(struct access_list *access);
int64_t filter_new_seq_get(struct access_list *access);

extern const struct frr_yang_module_info frr_filter_info;
Expand Down
114 changes: 27 additions & 87 deletions lib/filter_nb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@
#include "lib/plist_int.h"
#include "lib/routemap.h"

/* Helper function. */
static void acl_notify_route_map(struct access_list *acl, int route_map_event)
{
switch (route_map_event) {
case RMAP_EVENT_FILTER_ADDED:
if (acl->master->add_hook)
(*acl->master->add_hook)(acl);
break;
case RMAP_EVENT_FILTER_DELETED:
if (acl->master->delete_hook)
(*acl->master->delete_hook)(acl);
break;
}

route_map_notify_dependencies(acl->name, route_map_event);
}

static enum nb_error prefix_list_length_validate(struct nb_cb_modify_args *args)
{
int type = yang_dnode_get_enum(args->dnode, "../../type");
Expand Down Expand Up @@ -153,9 +136,6 @@ static int lib_prefix_list_entry_prefix_length_greater_or_equal_modify(

ple->ge = yang_dnode_get_uint8(args->dnode, NULL);

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand All @@ -174,9 +154,6 @@ static int lib_prefix_list_entry_prefix_length_lesser_or_equal_modify(

ple->le = yang_dnode_get_uint8(args->dnode, NULL);

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand All @@ -195,9 +172,6 @@ static int lib_prefix_list_entry_prefix_length_greater_or_equal_destroy(

ple->ge = 0;

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand All @@ -216,9 +190,6 @@ static int lib_prefix_list_entry_prefix_length_lesser_or_equal_destroy(

ple->le = 0;

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand Down Expand Up @@ -575,6 +546,15 @@ static int lib_access_list_entry_destroy(struct nb_cb_destroy_args *args)
return NB_OK;
}

static void
lib_access_list_entry_apply_finish(struct nb_cb_apply_finish_args *args)
{
struct filter *f;

f = nb_running_get_entry(args->dnode, NULL, true);
access_list_filter_update(f->acl);
}

/*
* XPath: /frr-filter:lib/access-list/entry/action
*/
Expand All @@ -594,8 +574,6 @@ lib_access_list_entry_action_modify(struct nb_cb_modify_args *args)
else
f->type = FILTER_DENY;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand Down Expand Up @@ -629,8 +607,6 @@ lib_access_list_entry_ipv4_prefix_modify(struct nb_cb_modify_args *args)
fz = &f->u.zfilter;
yang_dnode_get_prefix(&fz->prefix, args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -647,8 +623,6 @@ lib_access_list_entry_ipv4_prefix_destroy(struct nb_cb_destroy_args *args)
fz = &f->u.zfilter;
memset(&fz->prefix, 0, sizeof(fz->prefix));

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -681,8 +655,6 @@ lib_access_list_entry_ipv4_exact_match_modify(struct nb_cb_modify_args *args)
fz = &f->u.zfilter;
fz->exact = yang_dnode_get_bool(args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -699,8 +671,6 @@ lib_access_list_entry_ipv4_exact_match_destroy(struct nb_cb_destroy_args *args)
fz = &f->u.zfilter;
fz->exact = 0;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -733,8 +703,6 @@ lib_access_list_entry_host_modify(struct nb_cb_modify_args *args)
yang_dnode_get_ipv4(&fc->addr, args->dnode, NULL);
fc->addr_mask.s_addr = CISCO_BIN_HOST_WILDCARD_MASK;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -751,8 +719,6 @@ lib_access_list_entry_host_destroy(struct nb_cb_destroy_args *args)
fc = &f->u.cfilter;
cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand All @@ -777,8 +743,6 @@ static int lib_access_list_entry_network_destroy(struct nb_cb_destroy_args *args
fc = &f->u.cfilter;
cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -810,8 +774,6 @@ lib_access_list_entry_network_address_modify(struct nb_cb_modify_args *args)
fc = &f->u.cfilter;
yang_dnode_get_ipv4(&fc->addr, args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand Down Expand Up @@ -843,8 +805,6 @@ lib_access_list_entry_network_mask_modify(struct nb_cb_modify_args *args)
fc = &f->u.cfilter;
yang_dnode_get_ipv4(&fc->addr_mask, args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand Down Expand Up @@ -877,8 +837,6 @@ lib_access_list_entry_source_any_create(struct nb_cb_create_args *args)
fc->addr.s_addr = INADDR_ANY;
fc->addr_mask.s_addr = CISCO_BIN_ANY_WILDCARD_MASK;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -895,8 +853,6 @@ lib_access_list_entry_source_any_destroy(struct nb_cb_destroy_args *args)
fc = &f->u.cfilter;
cisco_unset_addr_mask(&fc->addr, &fc->addr_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -929,8 +885,6 @@ static int lib_access_list_entry_destination_host_modify(
yang_dnode_get_ipv4(&fc->mask, args->dnode, NULL);
fc->mask_mask.s_addr = CISCO_BIN_HOST_WILDCARD_MASK;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -948,8 +902,6 @@ static int lib_access_list_entry_destination_host_destroy(
fc->extended = 0;
cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -977,8 +929,6 @@ static int lib_access_list_entry_destination_network_destroy(
fc->extended = 0;
cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -1010,8 +960,6 @@ static int lib_access_list_entry_destination_network_address_modify(
fc->extended = 1;
yang_dnode_get_ipv4(&fc->mask, args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand Down Expand Up @@ -1043,8 +991,6 @@ static int lib_access_list_entry_destination_network_mask_modify(
fc->extended = 1;
yang_dnode_get_ipv4(&fc->mask_mask, args->dnode, NULL);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand Down Expand Up @@ -1077,8 +1023,6 @@ static int lib_access_list_entry_destination_any_create(
fc->mask.s_addr = INADDR_ANY;
fc->mask_mask.s_addr = CISCO_BIN_ANY_WILDCARD_MASK;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -1096,8 +1040,6 @@ static int lib_access_list_entry_destination_any_destroy(
fc->extended = 0;
cisco_unset_addr_mask(&fc->mask, &fc->mask_mask);

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -1144,8 +1086,6 @@ static int lib_access_list_entry_any_create(struct nb_cb_create_args *args)
break;
}

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_ADDED);

return NB_OK;
}

Expand All @@ -1161,8 +1101,6 @@ static int lib_access_list_entry_any_destroy(struct nb_cb_destroy_args *args)
fz = &f->u.zfilter;
fz->prefix.family = AF_UNSPEC;

acl_notify_route_map(f->acl, RMAP_EVENT_FILTER_DELETED);

return NB_OK;
}

Expand Down Expand Up @@ -1279,6 +1217,22 @@ static int lib_prefix_list_entry_destroy(struct nb_cb_destroy_args *args)
return NB_OK;
}

static void
lib_prefix_list_entry_apply_finish(struct nb_cb_apply_finish_args *args)
{
struct prefix_list_entry *ple;

ple = nb_running_get_entry(args->dnode, NULL, true);

/*
* Finish prefix entry update procedure. The procedure is started in
* children callbacks. `prefix_list_entry_update_start` can be called
* multiple times if multiple children are modified, but it is actually
* executed only once because of the protection by `ple->installed`.
*/
prefix_list_entry_update_finish(ple);
}

/*
* XPath: /frr-filter:lib/prefix-list/entry/action
*/
Expand All @@ -1301,9 +1255,6 @@ static int lib_prefix_list_entry_action_modify(struct nb_cb_modify_args *args)
else
ple->type = PREFIX_DENY;

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand Down Expand Up @@ -1331,10 +1282,6 @@ static int lib_prefix_list_entry_prefix_modify(struct nb_cb_modify_args *args)
prefix_copy(&ple->prefix, &p);
}


/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand All @@ -1352,9 +1299,6 @@ static int lib_prefix_list_entry_prefix_destroy(struct nb_cb_destroy_args *args)

memset(&ple->prefix, 0, sizeof(ple->prefix));

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand Down Expand Up @@ -1602,9 +1546,6 @@ static int lib_prefix_list_entry_any_create(struct nb_cb_create_args *args)
break;
}

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand All @@ -1622,9 +1563,6 @@ static int lib_prefix_list_entry_any_destroy(struct nb_cb_destroy_args *args)

ple->any = false;

/* Finish prefix entry update procedure. */
prefix_list_entry_update_finish(ple);

return NB_OK;
}

Expand Down Expand Up @@ -1652,6 +1590,7 @@ const struct frr_yang_module_info frr_filter_info = {
.cbs = {
.create = lib_access_list_entry_create,
.destroy = lib_access_list_entry_destroy,
.apply_finish = lib_access_list_entry_apply_finish,
.cli_cmp = access_list_cmp,
.cli_show = access_list_show,
}
Expand Down Expand Up @@ -1790,6 +1729,7 @@ const struct frr_yang_module_info frr_filter_info = {
.cbs = {
.create = lib_prefix_list_entry_create,
.destroy = lib_prefix_list_entry_destroy,
.apply_finish = lib_prefix_list_entry_apply_finish,
.cli_cmp = prefix_list_cmp,
.cli_show = prefix_list_show,
}
Expand Down

0 comments on commit 7ad689b

Please sign in to comment.