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

lib, bgpd, nhrpd: Cleanup memory in lib/resolver on shutdown

Browse source 
This memory was not being cleaned up on shutdown.  Fix this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-12-16 09:18:41 -05:00
parent a912f8fab7
commit f38687b8f5
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bgpd/bgp_bmp.c
View file

@ -2884,6 +2884,12 @@ static int bmp_route_update(struct bgp *bgp, afi_t afi, safi_t safi,
return 0; return 0;
} }
static int bgp_bmp_early_fini(void)
{
resolver_terminate();
return 0;
}
static int bgp_bmp_module_init(void) static int bgp_bmp_module_init(void)
{ {
@ -2896,6 +2902,7 @@ static int bgp_bmp_module_init(void)
hook_register(bgp_inst_delete, bmp_bgp_del); hook_register(bgp_inst_delete, bmp_bgp_del);
hook_register(frr_late_init, bgp_bmp_init); hook_register(frr_late_init, bgp_bmp_init);
hook_register(bgp_route_update, bmp_route_update); hook_register(bgp_route_update, bmp_route_update);
hook_register(frr_early_fini, bgp_bmp_early_fini);
return 0; return 0;
} }

5
lib/resolver.c
View file

@ -335,3 +335,8 @@ void resolver_init(struct event_loop *tm)
install_element(CONFIG_NODE, &debug_resolver_cmd); install_element(CONFIG_NODE, &debug_resolver_cmd);
install_element(ENABLE_NODE, &debug_resolver_cmd); install_element(ENABLE_NODE, &debug_resolver_cmd);
} }
void resolver_terminate(void)
{
ares_destroy(state.channel);
}

1
lib/resolver.h
View file

@ -23,6 +23,7 @@ struct resolver_query {
}; };
void resolver_init(struct event_loop *tm); void resolver_init(struct event_loop *tm);
void resolver_terminate(void);
void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id, void resolver_resolve(struct resolver_query *query, int af, vrf_id_t vrf_id,
const char *hostname, const char *hostname,
void (*cb)(struct resolver_query *, const char *, int, void (*cb)(struct resolver_query *, const char *, int,

2
nhrpd/nhrp_main.c
View file

@ -92,6 +92,8 @@ static void nhrp_request_stop(void)
nhrp_vc_terminate(); nhrp_vc_terminate();
debugf(NHRP_DEBUG_COMMON, "Done."); debugf(NHRP_DEBUG_COMMON, "Done.");
resolver_terminate();
frr_fini(); frr_fini();
exit(0); exit(0);