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

Merge pull request #10966 from opensourcerouting/fix/memory_leak_rpki

Browse Source 
bgpd: RPKI changes
This commit is contained in:
Donald Sharp 2022-04-05 18:27:52 -04:00 committed by GitHub
commit c416dd8298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bgpd/bgp_rpki.c
View File

@ -67,6 +67,7 @@ static struct thread *t_rpki;
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server");
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group");
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_RTRLIB, "BGP RPKI RTRLib");
#define POLLING_PERIOD_DEFAULT 3600
#define EXPIRE_INTERVAL_DEFAULT 7200
@ -156,17 +157,17 @@ static const struct route_map_rule_cmd route_match_rpki_cmd = {
static void *malloc_wrapper(size_t size)
{
return XMALLOC(MTYPE_BGP_RPKI_CACHE, size);
return XMALLOC(MTYPE_BGP_RPKI_RTRLIB, size);
}
static void *realloc_wrapper(void *ptr, size_t size)
{
return XREALLOC(MTYPE_BGP_RPKI_CACHE, ptr, size);
return XREALLOC(MTYPE_BGP_RPKI_RTRLIB, ptr, size);
}
static void free_wrapper(void *ptr)
{
XFREE(MTYPE_BGP_RPKI_CACHE, ptr);
XFREE(MTYPE_BGP_RPKI_RTRLIB, ptr);
}
static void init_tr_socket(struct cache *cache)
@ -902,9 +903,8 @@ static void free_cache(struct cache *cache)
if (cache->type == TCP) {
XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config->host);
XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config->port);
if (cache->tr_config.tcp_config->bindaddr)
XFREE(MTYPE_BGP_RPKI_CACHE,
cache->tr_config.tcp_config->bindaddr);
XFREE(MTYPE_BGP_RPKI_CACHE,
cache->tr_config.tcp_config->bindaddr);
XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config);
}
#if defined(FOUND_SSH)
@ -916,9 +916,8 @@ static void free_cache(struct cache *cache)
cache->tr_config.ssh_config->client_privkey_path);
XFREE(MTYPE_BGP_RPKI_CACHE,
cache->tr_config.ssh_config->server_hostkey_path);
if (cache->tr_config.ssh_config->bindaddr)
XFREE(MTYPE_BGP_RPKI_CACHE,
cache->tr_config.ssh_config->bindaddr);
XFREE(MTYPE_BGP_RPKI_CACHE,
cache->tr_config.ssh_config->bindaddr);
XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.ssh_config);
}
#endif