diff options
author | Maria Matejka <mq@ucw.cz> | 2021-04-19 15:13:20 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2021-04-19 15:14:55 +0200 |
commit | 3d90241f62393e6d614c1d20fde4013c9ff24685 (patch) | |
tree | 40b244493136565888f34706aea662a1363a60e1 /nest | |
parent | a7c9515ebc88c42f26ce97255c98b2e61ad52934 (diff) |
Internal route tables have a reduced cleanup routine
This fixes an internal table cleanup bug introduced
in ff397df7edcbe7a8abca5b419729b9c64c063847.
Diffstat (limited to 'nest')
-rw-r--r-- | nest/route.h | 3 | ||||
-rw-r--r-- | nest/rt-table.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nest/route.h b/nest/route.h index 2393fdc3..f5fc9e31 100644 --- a/nest/route.h +++ b/nest/route.h @@ -164,6 +164,9 @@ typedef struct rtable { int pipe_busy; /* Pipe loop detection */ int use_count; /* Number of protocols using this table */ u32 rt_count; /* Number of routes in the table */ + + byte internal; /* Internal table of a protocol */ + struct hmap id_map; struct hostcache *hostcache; struct rtable_config *config; /* Configuration of this table */ diff --git a/nest/rt-table.c b/nest/rt-table.c index d2fc9c65..13209dd7 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -1880,6 +1880,9 @@ rt_free(resource *_r) DBG("Deleting routing table %s\n", r->name); ASSERT_DIE(r->use_count == 0); + if (r->internal) + return; + r->config->table = NULL; 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); - if (!cf->internal) + if (!(t->internal = cf->internal)) { init_list(&t->channels); hmap_init(&t->id_map, p, 1024); |