ripd: use correct memory type when freeing BFD profile

Fixes #13415.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ripd/rip_bfd.c b/ripd/rip_bfd.c
index ac5035f5475583ad44344d121fa59a9d8b475bad..b59db11a30a7d44d44d9e901725363f641742644 100644 (file)
--- a/ripd/rip_bfd.c
+++ b/ripd/rip_bfd.c
@@ -13,6 +13,8 @@
 #include "ripd/rip_bfd.h"
 #include "ripd/rip_debug.h"
 
+DEFINE_MTYPE(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
+
 extern struct zclient *zclient;
 
 static const char *rip_bfd_interface_profile(struct rip_interface *ri)

diff --git a/ripd/rip_bfd.h b/ripd/rip_bfd.h
index d49ca151530bff995ae1fde8943176ab4644014e..7621498b15a0f9d4b6c1c34a04a4cb002b8d798c 100644 (file)
--- a/ripd/rip_bfd.h
+++ b/ripd/rip_bfd.h
@@ -9,6 +9,8 @@
 
 #include "frrevent.h"
 
+DECLARE_MTYPE(RIP_BFD_PROFILE);
+
 struct rip;
 struct rip_interface;
 struct rip_peer;

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 9f1e2d86bfaeb612fa959a16c7240dcd2eed30ee..b58015a67d89e50f7145b22e049e2edf49109b84 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -25,6 +25,7 @@
 #include "zebra/connected.h"
 
 #include "ripd/ripd.h"
+#include "ripd/rip_bfd.h"
 #include "ripd/rip_debug.h"
 #include "ripd/rip_interface.h"
 
@@ -457,7 +458,7 @@ static void rip_interface_reset(struct rip_interface *ri)
        ri->sent_updates = 0;
 
        ri->passive = 0;
-       XFREE(MTYPE_TMP, ri->bfd.profile);
+       XFREE(MTYPE_RIP_BFD_PROFILE, ri->bfd.profile);
 
        rip_interface_clean(ri);
 }

diff --git a/ripd/rip_nb_config.c b/ripd/rip_nb_config.c
index 8fe34705ca1ea38fa9d8fa91fbac2accf9fb6ab8..5c7bd0fb8623425169152882fb5eb63083c0c793 100644 (file)
--- a/ripd/rip_nb_config.c
+++ b/ripd/rip_nb_config.c
@@ -25,8 +25,6 @@
 #include "ripd/rip_interface.h"
 #include "ripd/rip_bfd.h"
 
-DEFINE_MTYPE_STATIC(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
-
 /*
  * XPath: /frr-ripd:ripd/instance
  */