Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ripd: use correct memory type when freeing BFD profile

Browse source 
Fixes #13415.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2023-05-03 17:02:58 -03:00
parent bf384bbc90
commit 2da9c4c206
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ripd/rip_bfd.c
View file

@ -13,6 +13,8 @@
#include "ripd/rip_bfd.h" #include "ripd/rip_bfd.h"
#include "ripd/rip_debug.h" #include "ripd/rip_debug.h"
DEFINE_MTYPE(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
extern struct zclient *zclient; extern struct zclient *zclient;
static const char *rip_bfd_interface_profile(struct rip_interface *ri) static const char *rip_bfd_interface_profile(struct rip_interface *ri)

2
ripd/rip_bfd.h
View file

@ -9,6 +9,8 @@
#include "frrevent.h" #include "frrevent.h"
DECLARE_MTYPE(RIP_BFD_PROFILE);
struct rip; struct rip;
struct rip_interface; struct rip_interface;
struct rip_peer; struct rip_peer;

3
ripd/rip_interface.c
View file

@ -25,6 +25,7 @@
#include "zebra/connected.h" #include "zebra/connected.h"
#include "ripd/ripd.h" #include "ripd/ripd.h"
#include "ripd/rip_bfd.h"
#include "ripd/rip_debug.h" #include "ripd/rip_debug.h"
#include "ripd/rip_interface.h" #include "ripd/rip_interface.h"
@ -457,7 +458,7 @@ static void rip_interface_reset(struct rip_interface *ri)
ri->sent_updates = 0; ri->sent_updates = 0;
ri->passive = 0; ri->passive = 0;
XFREE(MTYPE_TMP, ri->bfd.profile); XFREE(MTYPE_RIP_BFD_PROFILE, ri->bfd.profile);
rip_interface_clean(ri); rip_interface_clean(ri);
} }

2
ripd/rip_nb_config.c
View file

@ -25,8 +25,6 @@
#include "ripd/rip_interface.h" #include "ripd/rip_interface.h"
#include "ripd/rip_bfd.h" #include "ripd/rip_bfd.h"
DEFINE_MTYPE_STATIC(RIPD, RIP_BFD_PROFILE, "RIP BFD profile name");
/* /*
* XPath: /frr-ripd:ripd/instance * XPath: /frr-ripd:ripd/instance
*/ */