Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Internal route tables have a reduced cleanup routine

Browse source 
This fixes an internal table cleanup bug introduced
in ff397df7ed.
This commit is contained in:
Maria Matejka 2021-04-19 15:13:20 +02:00
parent a7c9515ebc
commit 3d90241f62
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nest/route.h
View file

@ -164,6 +164,9 @@ typedef struct rtable {
int pipe_busy; /* Pipe loop detection */ int pipe_busy; /* Pipe loop detection */
int use_count; /* Number of protocols using this table */ int use_count; /* Number of protocols using this table */
u32 rt_count; /* Number of routes in the table */ u32 rt_count; /* Number of routes in the table */
byte internal; /* Internal table of a protocol */
struct hmap id_map; struct hmap id_map;
struct hostcache *hostcache; struct hostcache *hostcache;
struct rtable_config *config; /* Configuration of this table */ struct rtable_config *config; /* Configuration of this table */

5
nest/rt-table.c
View file

@ -1880,6 +1880,9 @@ rt_free(resource *_r)
DBG("Deleting routing table %s\n", r->name); DBG("Deleting routing table %s\n", r->name);
ASSERT_DIE(r->use_count == 0); ASSERT_DIE(r->use_count == 0);
if (r->internal)
return;
r->config->table = NULL; r->config->table = NULL;
rem_node(&r->n); rem_node(&r->n);
@ -1931,7 +1934,7 @@ rt_setup(pool *pp, struct rtable_config *cf)
fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL); fib_init(&t->fib, p, t->addr_type, sizeof(net), OFFSETOF(net, n), 0, NULL);
if (!cf->internal) if (!(t->internal = cf->internal))
{ {
init_list(&t->channels); init_list(&t->channels);
hmap_init(&t->id_map, p, 1024); hmap_init(&t->id_map, p, 1024);