summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2024-08-08 13:17:42 -0400
committerDonald Sharp <sharpd@nvidia.com>2024-08-08 14:24:59 -0400
commit2e7d915ca292dae09b95f31fb52b21b8b935c5dc (patch)
tree752f80ef185236a7b305d001de9ffca92018823a
parentb44972b65c86a99d2c29f75b04efc0a1becdaf85 (diff)
isisd: Cleanup leaked hash on shut in circuit
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
-rw-r--r--isisd/isis_circuit.c4
-rw-r--r--isisd/isis_lfa.c6
-rw-r--r--isisd/isis_lfa.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 7819b20e8f..fa1ce3007f 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -198,8 +198,8 @@ void isis_circuit_del(struct isis_circuit *circuit)
ldp_sync_info_free(&circuit->ldp_sync_info);
circuit_mt_finish(circuit);
- isis_lfa_excluded_ifaces_clear(circuit, ISIS_LEVEL1);
- isis_lfa_excluded_ifaces_clear(circuit, ISIS_LEVEL2);
+ isis_lfa_excluded_ifaces_delete(circuit, ISIS_LEVEL1);
+ isis_lfa_excluded_ifaces_delete(circuit, ISIS_LEVEL2);
list_delete(&circuit->ip_addrs);
list_delete(&circuit->ipv6_link);
diff --git a/isisd/isis_lfa.c b/isisd/isis_lfa.c
index dc8f0b96c0..887f27eec5 100644
--- a/isisd/isis_lfa.c
+++ b/isisd/isis_lfa.c
@@ -238,10 +238,10 @@ void isis_lfa_excluded_ifaces_init(struct isis_circuit *circuit, int level)
*
* @param nodes List of SPF nodes
*/
-void isis_lfa_excluded_ifaces_clear(struct isis_circuit *circuit, int level)
+void isis_lfa_excluded_ifaces_delete(struct isis_circuit *circuit, int level)
{
- hash_clean(circuit->lfa_excluded_ifaces[level - 1],
- lfa_excl_interface_hash_free);
+ hash_clean_and_free(&circuit->lfa_excluded_ifaces[level - 1],
+ lfa_excl_interface_hash_free);
}
/**
diff --git a/isisd/isis_lfa.h b/isisd/isis_lfa.h
index 0ba1c1cef5..58ff115b02 100644
--- a/isisd/isis_lfa.h
+++ b/isisd/isis_lfa.h
@@ -133,7 +133,7 @@ struct lfa_tiebreaker *isis_lfa_tiebreaker_add(struct isis_area *area,
void isis_lfa_tiebreaker_delete(struct isis_area *area, int level,
struct lfa_tiebreaker *tie_b);
void isis_lfa_excluded_ifaces_init(struct isis_circuit *circuit, int level);
-void isis_lfa_excluded_ifaces_clear(struct isis_circuit *circuit, int level);
+void isis_lfa_excluded_ifaces_delete(struct isis_circuit *circuit, int level);
void isis_lfa_excluded_iface_add(struct isis_circuit *circuit, int level,
const char *ifname);
void isis_lfa_excluded_iface_delete(struct isis_circuit *circuit, int level,