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

Merge pull request #6751 from donaldsharp/pim_mem_leaks

Browse Source 
Pim mem leaks
This commit is contained in:
Mark Stapp 2020-07-16 10:45:26 -04:00 committed by GitHub
commit 5677e93f8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pimd/pim_mlag.c
View File

@ -1082,6 +1082,14 @@ void pim_instance_mlag_terminate(struct pim_instance *pim)
pim->inst_mlag_intf_cnt = 0; pim->inst_mlag_intf_cnt = 0;
} }
void pim_mlag_terminate(void)
{
stream_free(router->mlag_stream);
router->mlag_stream = NULL;
stream_fifo_free(router->mlag_fifo);
router->mlag_fifo = NULL;
}
void pim_mlag_init(void) void pim_mlag_init(void)
{ {
pim_mlag_param_reset(); pim_mlag_param_reset();

1
pimd/pim_mlag.h
View File

@ -28,6 +28,7 @@
#include "pim_iface.h" #include "pim_iface.h"
extern void pim_mlag_init(void); extern void pim_mlag_init(void);
extern void pim_mlag_terminate(void);
extern void pim_instance_mlag_init(struct pim_instance *pim); extern void pim_instance_mlag_init(struct pim_instance *pim);
extern void pim_instance_mlag_terminate(struct pim_instance *pim); extern void pim_instance_mlag_terminate(struct pim_instance *pim);
extern void pim_if_configure_mlag_dualactive(struct pim_interface *pim_ifp); extern void pim_if_configure_mlag_dualactive(struct pim_interface *pim_ifp);

3
pimd/pim_rp.c
View File

@ -141,6 +141,9 @@ void pim_rp_free(struct pim_instance *pim)
{ {
if (pim->rp_list) if (pim->rp_list)
list_delete(&pim->rp_list); list_delete(&pim->rp_list);
if (pim->rp_table)
route_table_finish(pim->rp_table);
pim->rp_table = NULL;
} }
/* /*

2
pimd/pimd.c
View File

@ -42,6 +42,7 @@
#include "pim_vxlan.h" #include "pim_vxlan.h"
#include "pim_zlookup.h" #include "pim_zlookup.h"
#include "pim_zebra.h" #include "pim_zebra.h"
#include "pim_mlag.h"
const char *const PIM_ALL_SYSTEMS = MCAST_ALL_SYSTEMS; const char *const PIM_ALL_SYSTEMS = MCAST_ALL_SYSTEMS;
const char *const PIM_ALL_ROUTERS = MCAST_ALL_ROUTERS; const char *const PIM_ALL_ROUTERS = MCAST_ALL_ROUTERS;
@ -109,6 +110,7 @@ void pim_router_init(void)
void pim_router_terminate(void) void pim_router_terminate(void)
{ {
pim_mlag_terminate();
XFREE(MTYPE_ROUTER, router); XFREE(MTYPE_ROUTER, router);
} }