Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

zebra: clean pbr_iptable interface_name_list free

Browse source 
Clean up code related to pbr_iptable->interface_name_list free. This is
a cosmetic change.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2025-04-11 15:13:23 +02:00
parent 92cddedffd
commit 55ea74d630
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zebra/zapi_msg.c
View file

@ -3878,6 +3878,7 @@ static inline void zread_iptable(ZAPI_HANDLER_ARGS)
s = msg; s = msg;
zpi->interface_name_list = list_new(); zpi->interface_name_list = list_new();
zpi->interface_name_list->del = zebra_pbr_iptable_interface_name_list_free;
zpi->sock = client->sock; zpi->sock = client->sock;
zpi->vrf_id = zvrf->vrf->vrf_id; zpi->vrf_id = zvrf->vrf->vrf_id;
STREAM_GETL(s, zpi->unique); STREAM_GETL(s, zpi->unique);

28
zebra/zebra_pbr.c
View file

@ -383,22 +383,15 @@ bool zebra_pbr_ipset_entry_hash_equal(const void *arg1, const void *arg2)
static void _zebra_pbr_iptable_free_all(void *arg, bool all) static void _zebra_pbr_iptable_free_all(void *arg, bool all)
{ {
struct zebra_pbr_iptable *iptable; struct zebra_pbr_iptable *iptable;
struct listnode *node, *nnode;
char *name;
iptable = (struct zebra_pbr_iptable *)arg; iptable = (struct zebra_pbr_iptable *)arg;
if (all) if (all)
hook_call(zebra_pbr_iptable_update, 0, iptable); hook_call(zebra_pbr_iptable_update, 0, iptable);
if (iptable->interface_name_list) { if (iptable->interface_name_list)
for (ALL_LIST_ELEMENTS(iptable->interface_name_list, node,
nnode, name)) {
XFREE(MTYPE_PBR_IPTABLE_IFNAME, name);
list_delete_node(iptable->interface_name_list, node);
}
list_delete(&iptable->interface_name_list); list_delete(&iptable->interface_name_list);
}
XFREE(MTYPE_PBR_IPTABLE, iptable); XFREE(MTYPE_PBR_IPTABLE, iptable);
} }
@ -1003,6 +996,13 @@ void zebra_pbr_del_ipset_entry(struct zebra_pbr_ipset_entry *ipset)
__func__); __func__);
} }
void zebra_pbr_iptable_interface_name_list_free(void *arg)
{
char *name = arg;
XFREE(MTYPE_PBR_IPTABLE_IFNAME, name);
}
static void *pbr_iptable_alloc_intern(void *arg) static void *pbr_iptable_alloc_intern(void *arg)
{ {
struct zebra_pbr_iptable *zpi; struct zebra_pbr_iptable *zpi;
@ -1017,6 +1017,7 @@ static void *pbr_iptable_alloc_intern(void *arg)
/* Deep structure copy */ /* Deep structure copy */
memcpy(new, zpi, sizeof(*zpi)); memcpy(new, zpi, sizeof(*zpi));
new->interface_name_list = list_new(); new->interface_name_list = list_new();
new->interface_name_list->del = zebra_pbr_iptable_interface_name_list_free;
if (zpi->interface_name_list) { if (zpi->interface_name_list) {
for (ALL_LIST_ELEMENTS_RO(zpi->interface_name_list, ln, ifname)) for (ALL_LIST_ELEMENTS_RO(zpi->interface_name_list, ln, ifname))
@ -1043,16 +1044,7 @@ void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable)
lookup = hash_lookup(zrouter.iptable_hash, iptable); lookup = hash_lookup(zrouter.iptable_hash, iptable);
(void)dplane_pbr_iptable_delete(iptable); (void)dplane_pbr_iptable_delete(iptable);
if (lookup) { if (lookup) {
struct listnode *node, *nnode;
char *name;
hash_release(zrouter.iptable_hash, lookup); hash_release(zrouter.iptable_hash, lookup);
for (ALL_LIST_ELEMENTS(lookup->interface_name_list,
node, nnode, name)) {
XFREE(MTYPE_PBR_IPTABLE_IFNAME, name);
list_delete_node(lookup->interface_name_list,
node);
}
list_delete(&lookup->interface_name_list); list_delete(&lookup->interface_name_list);
XFREE(MTYPE_PBR_IPTABLE, lookup); XFREE(MTYPE_PBR_IPTABLE, lookup);
} else } else

2
zebra/zebra_pbr.h
View file

@ -196,6 +196,8 @@ struct zebra_pbr_ipset *zebra_pbr_lookup_ipset_pername(char *ipsetname);
void zebra_pbr_add_ipset_entry(struct zebra_pbr_ipset_entry *ipset); void zebra_pbr_add_ipset_entry(struct zebra_pbr_ipset_entry *ipset);
void zebra_pbr_del_ipset_entry(struct zebra_pbr_ipset_entry *ipset); void zebra_pbr_del_ipset_entry(struct zebra_pbr_ipset_entry *ipset);
void zebra_pbr_iptable_interface_name_list_free(void *arg);
void zebra_pbr_add_iptable(struct zebra_pbr_iptable *iptable); void zebra_pbr_add_iptable(struct zebra_pbr_iptable *iptable);
void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable); void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable);
void zebra_pbr_process_iptable(struct zebra_dplane_ctx *ctx); void zebra_pbr_process_iptable(struct zebra_dplane_ctx *ctx);