proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 14:43:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4162 from opensourcerouting/rip-issues

Browse Source 
ripd, ripngd: fix cleaning up of offset lists
This commit is contained in:
Donald Sharp 2019-04-23 08:34:47 -04:00 committed by GitHub
commit c1f0465a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/if_rmap.c
View File

@ -291,6 +291,7 @@ int config_write_if_rmap(struct vty *vty,
void if_rmap_ctx_delete(struct if_rmap_ctx *ctx) void if_rmap_ctx_delete(struct if_rmap_ctx *ctx)
{ {
listnode_delete(if_rmap_ctx_list, ctx);
hash_clean(ctx->ifrmaphash, (void (*)(void *))if_rmap_free); hash_clean(ctx->ifrmaphash, (void (*)(void *))if_rmap_free);
if (ctx->name) if (ctx->name)
XFREE(MTYPE_IF_RMAP_CTX_NAME, ctx); XFREE(MTYPE_IF_RMAP_CTX_NAME, ctx);

5
ripd/rip_offset.c
View File

@ -50,6 +50,11 @@ struct rip_offset_list *rip_offset_list_new(struct rip *rip, const char *ifname)
void offset_list_del(struct rip_offset_list *offset) void offset_list_del(struct rip_offset_list *offset)
{ {
listnode_delete(offset->rip->offset_list_master, offset); listnode_delete(offset->rip->offset_list_master, offset);
offset_list_free(offset);
}
void offset_list_free(struct rip_offset_list *offset)
{
if (OFFSET_LIST_IN_NAME(offset)) if (OFFSET_LIST_IN_NAME(offset))
free(OFFSET_LIST_IN_NAME(offset)); free(OFFSET_LIST_IN_NAME(offset));
if (OFFSET_LIST_OUT_NAME(offset)) if (OFFSET_LIST_OUT_NAME(offset))

2
ripd/ripd.c
View File

@ -2712,7 +2712,7 @@ struct rip *rip_create(const char *vrf_name, struct vrf *vrf, int socket)
rip->passive_nondefault = vector_init(1); rip->passive_nondefault = vector_init(1);
rip->offset_list_master = list_new(); rip->offset_list_master = list_new();
rip->offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp; rip->offset_list_master->cmp = (int (*)(void *, void *))offset_list_cmp;
rip->offset_list_master->del = (void (*)(void *))offset_list_del; rip->offset_list_master->del = (void (*)(void *))offset_list_free;
/* Distribute list install. */ /* Distribute list install. */
rip->distribute_ctx = distribute_list_ctx_create(vrf); rip->distribute_ctx = distribute_list_ctx_create(vrf);

1
ripd/ripd.h
View File

@ -507,6 +507,7 @@ extern struct rip_info *rip_ecmp_delete(struct rip *rip,
extern struct rip_offset_list *rip_offset_list_new(struct rip *rip, extern struct rip_offset_list *rip_offset_list_new(struct rip *rip,
const char *ifname); const char *ifname);
extern void offset_list_del(struct rip_offset_list *offset); extern void offset_list_del(struct rip_offset_list *offset);
extern void offset_list_free(struct rip_offset_list *offset);
extern struct rip_offset_list *rip_offset_list_lookup(struct rip *rip, extern struct rip_offset_list *rip_offset_list_lookup(struct rip *rip,
const char *ifname); const char *ifname);
extern int rip_offset_list_apply_in(struct prefix_ipv4 *, struct interface *, extern int rip_offset_list_apply_in(struct prefix_ipv4 *, struct interface *,

5
ripngd/ripng_offset.c
View File

@ -56,6 +56,11 @@ struct ripng_offset_list *ripng_offset_list_new(struct ripng *ripng,
void ripng_offset_list_del(struct ripng_offset_list *offset) void ripng_offset_list_del(struct ripng_offset_list *offset)
{ {
listnode_delete(offset->ripng->offset_list_master, offset); listnode_delete(offset->ripng->offset_list_master, offset);
ripng_offset_list_free(offset);
}
void ripng_offset_list_free(struct ripng_offset_list *offset)
{
if (OFFSET_LIST_IN_NAME(offset)) if (OFFSET_LIST_IN_NAME(offset))
free(OFFSET_LIST_IN_NAME(offset)); free(OFFSET_LIST_IN_NAME(offset));
if (OFFSET_LIST_OUT_NAME(offset)) if (OFFSET_LIST_OUT_NAME(offset))

2
ripngd/ripngd.c
View File

@ -1889,7 +1889,7 @@ struct ripng *ripng_create(const char *vrf_name, struct vrf *vrf, int socket)
ripng->offset_list_master->cmp = ripng->offset_list_master->cmp =
(int (*)(void *, void *))offset_list_cmp; (int (*)(void *, void *))offset_list_cmp;
ripng->offset_list_master->del = ripng->offset_list_master->del =
(void (*)(void *))ripng_offset_list_del; (void (*)(void *))ripng_offset_list_free;
ripng->distribute_ctx = distribute_list_ctx_create(vrf); ripng->distribute_ctx = distribute_list_ctx_create(vrf);
distribute_list_add_hook(ripng->distribute_ctx, distribute_list_add_hook(ripng->distribute_ctx,
ripng_distribute_update); ripng_distribute_update);

1
ripngd/ripngd.h
View File

@ -421,6 +421,7 @@ extern void ripng_peer_list_del(void *arg);
extern struct ripng_offset_list *ripng_offset_list_new(struct ripng *ripng, extern struct ripng_offset_list *ripng_offset_list_new(struct ripng *ripng,
const char *ifname); const char *ifname);
extern void ripng_offset_list_del(struct ripng_offset_list *offset); extern void ripng_offset_list_del(struct ripng_offset_list *offset);
extern void ripng_offset_list_free(struct ripng_offset_list *offset);
extern struct ripng_offset_list *ripng_offset_list_lookup(struct ripng *ripng, extern struct ripng_offset_list *ripng_offset_list_lookup(struct ripng *ripng,
const char *ifname); const char *ifname);
extern int ripng_offset_list_apply_in(struct ripng *ripng, extern int ripng_offset_list_apply_in(struct ripng *ripng,