diff options
| -rw-r--r-- | isisd/isisd.c | 4 | ||||
| -rw-r--r-- | lib/flex_algo.c | 14 | ||||
| -rw-r--r-- | lib/flex_algo.h | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/isisd/isisd.c b/isisd/isisd.c index 4b01a18ecd..ea304ba5ef 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -520,6 +520,10 @@ void isis_area_destroy(struct isis_area *area) isis_area_invalidate_routes(area, area->is_type); isis_area_verify_routes(area); +#ifndef FABRICD + flex_algos_free(area->flex_algos); +#endif /* ifndef FABRICD */ + isis_sr_area_term(area); isis_mpls_te_term(area); diff --git a/lib/flex_algo.c b/lib/flex_algo.c index b363b5f277..72cefc551d 100644 --- a/lib/flex_algo.c +++ b/lib/flex_algo.c @@ -20,6 +20,9 @@ DEFINE_MTYPE_STATIC(LIB, FLEX_ALGO_DATABASE, "Flex-Algo database"); DEFINE_MTYPE_STATIC(LIB, FLEX_ALGO, "Flex-Algo algorithm information"); +static void _flex_algo_delete(struct flex_algos *flex_algos, + struct flex_algo *fa); + struct flex_algos *flex_algos_alloc(flex_algo_allocator_t allocator, flex_algo_releaser_t releaser) { @@ -32,6 +35,17 @@ struct flex_algos *flex_algos_alloc(flex_algo_allocator_t allocator, return flex_algos; } +void flex_algos_free(struct flex_algos *flex_algos) +{ + struct listnode *node, *nnode; + struct flex_algo *fa; + + for (ALL_LIST_ELEMENTS(flex_algos->flex_algos, node, nnode, fa)) + _flex_algo_delete(flex_algos, fa); + list_delete(&flex_algos->flex_algos); + XFREE(MTYPE_FLEX_ALGO_DATABASE, flex_algos); +} + struct flex_algo *flex_algo_alloc(struct flex_algos *flex_algos, uint8_t algorithm, void *arg) { diff --git a/lib/flex_algo.h b/lib/flex_algo.h index e012f46862..9fc2851603 100644 --- a/lib/flex_algo.h +++ b/lib/flex_algo.h @@ -107,6 +107,7 @@ struct flex_algos { */ struct flex_algos *flex_algos_alloc(flex_algo_allocator_t allocator, flex_algo_releaser_t releaser); +void flex_algos_free(struct flex_algos *flex_algos); struct flex_algo *flex_algo_alloc(struct flex_algos *flex_algos, uint8_t algorithm, void *arg); struct flex_algo *flex_algo_lookup(struct flex_algos *flex_algos, |