*: Ensure prefix lists are freed on shutdown.

Several daemons were not calling prefix_list_reset
to clean up memory on shutdown.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index ddc75f7182c2622935437b5ff17926ab3c973365..77658eb57d47a30ee9bf80ae3c9ea2c3f2761eff 100644 (file)
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -19,6 +19,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek
 #include "memory.h"
 #include "libfrr.h"
 #include "lib_errors.h"
+#include "plist.h"
 
 #include "babel_main.h"
 #include "babeld.h"
@@ -313,6 +314,7 @@ babel_exit_properly(void)
     debugf(BABEL_DEBUG_COMMON, "Done.");
 
     vrf_terminate();
+    prefix_list_reset();
     frr_fini();
 
     exit(0);

diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index 089e18439f8423e8dbe557b2493e10813b1bdf9e..c9ce0189668a9c018b62403bc7fce8e59efb6c27 100644 (file)
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -99,6 +99,8 @@ static void sigint(void)
        keychain_terminate();
 
        route_map_finish();
+       prefix_list_reset();
+
        eigrp_terminate();
 
        exit(0);

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 0d9b3df39cea07e0dd98b13ada223aad0615075f..e303a98f2fd80e7153e33ab913e21711e05c69e0 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -109,6 +109,7 @@ static __attribute__((__noreturn__)) void terminate(int i)
 
        isis_master_terminate();
        route_map_finish();
+       prefix_list_reset();
        vrf_terminate();
 
        frr_fini();

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index cfe4a7e4376248ca92f7c3ad78a2b22a7281e7a7..431e9671310175f8288b76b0b2fbdd04530df0c5 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -94,6 +94,7 @@ static void sigint(void)
        rip_zclient_stop();
 
        route_map_finish();
+       prefix_list_reset();
 
        keychain_terminate();
        frr_fini();