diff options
| -rw-r--r-- | ripd/rip_bfd.c | 2 | ||||
| -rw-r--r-- | ripd/rip_bfd.h | 2 | ||||
| -rw-r--r-- | ripd/rip_interface.c | 8 | ||||
| -rw-r--r-- | ripd/rip_nb_config.c | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/ripd/rip_bfd.c b/ripd/rip_bfd.c index ac5035f547..b59db11a30 100644 --- 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 d49ca15153..7621498b15 100644 --- 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 b383be042a..b58015a67d 100644 --- 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); } @@ -1110,9 +1111,10 @@ void rip_interface_sync(struct interface *ifp) struct rip_interface *ri; ri = ifp->info; - ri->ifp = ifp; - if (ri) + if (ri) { ri->rip = ifp->vrf->info; + ri->ifp = ifp; + } } /* Called when interface structure allocated. */ diff --git a/ripd/rip_nb_config.c b/ripd/rip_nb_config.c index 8fe34705ca..5c7bd0fb86 100644 --- 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 */ |