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

Merge pull request #16578 from donaldsharp/more_memory_leaks_on_shutdown

Browse Source 
More memory leaks on shutdown
This commit is contained in:
Donatas Abraitis 2024-08-14 22:09:39 +02:00 committed by GitHub
commit 93032f183a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
babeld/babel_interface.c
View File

@ -1171,6 +1171,11 @@ DEFUN (show_babel_parameters,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
void babel_if_terminate(void)
{
vector_free(babel_enable_if);
}
void void
babel_if_init(void) babel_if_init(void)
{ {

1
babeld/babel_interface.h
View File

@ -94,6 +94,7 @@ struct buffered_update {
/* init function */ /* init function */
void babel_if_init(void); void babel_if_init(void);
void babel_if_terminate(void);
/* Callback functions for zebra client */ /* Callback functions for zebra client */
int babel_interface_up (int, struct zclient *, zebra_size_t, vrf_id_t); int babel_interface_up (int, struct zclient *, zebra_size_t, vrf_id_t);

4
babeld/babel_main.c
View File

@ -305,9 +305,9 @@ babel_exit_properly(void)
/* Uninstall and flush all routes. */ /* Uninstall and flush all routes. */
debugf(BABEL_DEBUG_COMMON, "Uninstall routes."); debugf(BABEL_DEBUG_COMMON, "Uninstall routes.");
flush_all_routes(); babel_clean_routing_process();
babel_interface_close_all();
babel_zebra_close_connexion(); babel_zebra_close_connexion();
babel_if_terminate();
babel_save_state_file(); babel_save_state_file();
debugf(BABEL_DEBUG_COMMON, "Remove pid file."); debugf(BABEL_DEBUG_COMMON, "Remove pid file.");
debugf(BABEL_DEBUG_COMMON, "Done."); debugf(BABEL_DEBUG_COMMON, "Done.");

3
babeld/babeld.c
View File

@ -299,8 +299,7 @@ babel_initial_noise(void)
} }
/* Delete all the added babel routes, make babeld only speak to zebra. */ /* Delete all the added babel routes, make babeld only speak to zebra. */
static void void babel_clean_routing_process(void)
babel_clean_routing_process(void)
{ {
flush_all_routes(); flush_all_routes();
babel_interface_close_all(); babel_interface_close_all();

1
babeld/babeld.h
View File

@ -98,5 +98,6 @@ extern int redistribute_filter(const unsigned char *prefix, unsigned short plen,
extern int resize_receive_buffer(int size); extern int resize_receive_buffer(int size);
extern void schedule_neighbours_check(int msecs, int override); extern void schedule_neighbours_check(int msecs, int override);
extern struct babel *babel_lookup(void); extern struct babel *babel_lookup(void);
extern void babel_clean_routing_process(void);
#endif /* BABEL_BABELD_H */ #endif /* BABEL_BABELD_H */

2
pbrd/pbr_vrf.c
View File

@ -123,4 +123,6 @@ void pbr_vrf_terminate(void)
FOR_ALL_INTERFACES (vrf, ifp) FOR_ALL_INTERFACES (vrf, ifp)
pbr_if_del(ifp); pbr_if_del(ifp);
} }
vrf_terminate();
} }