pimd: rework BFD integration

Rewrite the BFD integration code to use the new library.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

7 files changed, 95 insertions, 333 deletions

diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index 5e1b9a69e..2990fcb02 100644
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -42,36 +42,36 @@
 void pim_bfd_write_config(struct vty *vty, struct interface *ifp)
 {
 	struct pim_interface *pim_ifp = ifp->info;
-	struct bfd_info *bfd_info = NULL;
 
-	if (!pim_ifp)
-		return;
-
-	bfd_info = pim_ifp->bfd_info;
-	if (!bfd_info)
+	if (!pim_ifp || !pim_ifp->bfd_config.enabled)
 		return;
 
 #if HAVE_BFDD == 0
-	if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
-		vty_out(vty, " ip pim bfd %d %d %d\n", bfd_info->detect_mult,
-			bfd_info->required_min_rx, bfd_info->desired_min_tx);
+	if (pim_ifp->bfd_config.detection_multiplier != BFD_DEF_DETECT_MULT
+	    || pim_ifp->bfd_config.min_rx != BFD_DEF_MIN_RX
+	    || pim_ifp->bfd_config.min_tx != BFD_DEF_MIN_TX)
+		vty_out(vty, " ip pim bfd %d %d %d\n",
+			pim_ifp->bfd_config.detection_multiplier,
+			pim_ifp->bfd_config.min_rx, pim_ifp->bfd_config.min_tx);
 	else
 #endif /* ! HAVE_BFDD */
 		vty_out(vty, " ip pim bfd\n");
 }
 
-/*
- * pim_bfd_show_info - Show BFD info structure
- */
-void pim_bfd_show_info(struct vty *vty, void *bfd_info, json_object *json_obj,
-		       bool use_json, int param_only)
+static void pim_neighbor_bfd_cb(struct bfd_session_params *bsp,
+				const struct bfd_session_status *bss, void *arg)
 {
-	if (param_only)
-		bfd_show_param(vty, (struct bfd_info *)bfd_info, 1, 0, use_json,
-			       json_obj);
-	else
-		bfd_show_info(vty, (struct bfd_info *)bfd_info, 0, 1, use_json,
-			      json_obj);
+	struct pim_neighbor *nbr = arg;
+
+	if (PIM_DEBUG_PIM_TRACE) {
+		zlog_debug("%s: status %s old_status %s", __func__,
+			   bfd_get_status_str(bss->state),
+			   bfd_get_status_str(bss->previous_state));
+	}
+
+	if (bss->state == BFD_STATUS_DOWN
+	    && bss->previous_state == BFD_STATUS_UP)
+		pim_neighbor_delete(nbr->interface, nbr, "BFD Session Expired");
 }
 
 /*
@@ -80,60 +80,19 @@ void pim_bfd_show_info(struct vty *vty, void *bfd_info, json_object *json_obj,
 void pim_bfd_info_nbr_create(struct pim_interface *pim_ifp,
 			     struct pim_neighbor *neigh)
 {
-	struct bfd_info *nbr_bfd_info = NULL;
-
 	/* Check if Pim Interface BFD is enabled */
-	if (!pim_ifp || !pim_ifp->bfd_info)
-		return;
-
-	if (!neigh->bfd_info)
-		neigh->bfd_info = bfd_info_create();
-
-	if (!neigh->bfd_info)
-		return;
-
-	nbr_bfd_info = neigh->bfd_info;
-	nbr_bfd_info->detect_mult = pim_ifp->bfd_info->detect_mult;
-	nbr_bfd_info->desired_min_tx = pim_ifp->bfd_info->desired_min_tx;
-	nbr_bfd_info->required_min_rx = pim_ifp->bfd_info->required_min_rx;
-}
-
-/*
- * pim_bfd_info_free - Free BFD info structure
- */
-void pim_bfd_info_free(struct bfd_info **bfd_info)
-{
-	bfd_info_free(bfd_info);
-}
-
-static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command)
-{
-	struct pim_interface *pim_ifp = NULL;
-	struct bfd_info *bfd_info = NULL;
-	struct zclient *zclient = NULL;
-	int cbit;
-
-	zclient = pim_zebra_zclient_get();
-
-	if (!nbr)
-		return;
-	pim_ifp = nbr->interface->info;
-	bfd_info = pim_ifp->bfd_info;
-	if (!bfd_info)
+	if (!pim_ifp || !pim_ifp->bfd_config.enabled)
 		return;
-	if (PIM_DEBUG_PIM_TRACE) {
-		char str[INET_ADDRSTRLEN];
-		pim_inet4_dump("<bfd_nbr?>", nbr->source_addr, str,
-			       sizeof(str));
-		zlog_debug("%s Nbr %s %s with BFD", __func__, str,
-			   bfd_get_command_dbg_str(command));
-	}
 
-	cbit = CHECK_FLAG(bfd_info->flags, BFD_FLAG_BFD_CBIT_ON);
+	if (neigh->bfd_session == NULL)
+		neigh->bfd_session = bfd_sess_new(pim_neighbor_bfd_cb, neigh);
 
-	bfd_peer_sendmsg(zclient, bfd_info, AF_INET, &nbr->source_addr, NULL,
-			 nbr->interface->name, 0, 0, cbit,
-			 command, 0, VRF_DEFAULT);
+	bfd_sess_set_timers(
+		neigh->bfd_session, pim_ifp->bfd_config.detection_multiplier,
+		pim_ifp->bfd_config.min_rx, pim_ifp->bfd_config.min_tx);
+	bfd_sess_set_ipv4_addrs(neigh->bfd_session, NULL, &neigh->source_addr);
+	bfd_sess_set_interface(neigh->bfd_session, neigh->interface->name);
+	bfd_sess_install(neigh->bfd_session);
 }
 
 /*
@@ -142,7 +101,7 @@ static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command)
  *                              zebra for starting/stopping the monitoring of
  *                              the neighbor rechahability.
  */
-int pim_bfd_reg_dereg_all_nbr(struct interface *ifp, int command)
+void pim_bfd_reg_dereg_all_nbr(struct interface *ifp)
 {
 	struct pim_interface *pim_ifp = NULL;
 	struct listnode *node = NULL;
@@ -150,197 +109,17 @@ int pim_bfd_reg_dereg_all_nbr(struct interface *ifp, int command)
 
 	pim_ifp = ifp->info;
 	if (!pim_ifp)
-		return -1;
-	if (!pim_ifp->bfd_info)
-		return -1;
+		return;
 
 	for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, node, neigh)) {
-		if (command != ZEBRA_BFD_DEST_DEREGISTER)
+		if (pim_ifp->bfd_config.enabled)
 			pim_bfd_info_nbr_create(pim_ifp, neigh);
 		else
-			pim_bfd_info_free((struct bfd_info **)&neigh->bfd_info);
-
-		pim_bfd_reg_dereg_nbr(neigh, command);
-	}
-
-	return 0;
-}
-
-/*
- * pim_bfd_trigger_event - Neighbor is registered/deregistered with BFD when
- *                          neighbor state is changed to/from 2way.
- */
-void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
-			   struct pim_neighbor *nbr, uint8_t nbr_up)
-{
-	if (nbr_up) {
-		pim_bfd_info_nbr_create(pim_ifp, nbr);
-		pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_REGISTER);
-	} else {
-		pim_bfd_info_free(&nbr->bfd_info);
-		pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_DEREGISTER);
+			bfd_sess_free(&neigh->bfd_session);
 	}
 }
 
-/*
- * pim_bfd_if_param_set - Set the configured BFD paramter values for
- *                         interface.
- */
-void pim_bfd_if_param_set(struct interface *ifp, uint32_t min_rx,
-			  uint32_t min_tx, uint8_t detect_mult, int defaults)
-{
-	struct pim_interface *pim_ifp = ifp->info;
-	int command = 0;
-
-	if (!pim_ifp)
-		return;
-	bfd_set_param(&(pim_ifp->bfd_info), min_rx, min_tx, detect_mult, NULL,
-		      defaults, &command);
-
-	if (pim_ifp->bfd_info) {
-		if (PIM_DEBUG_PIM_TRACE)
-			zlog_debug("%s: interface %s has bfd_info", __func__,
-				   ifp->name);
-	}
-	if (command)
-		pim_bfd_reg_dereg_all_nbr(ifp, command);
-}
-
-
-/*
- * pim_bfd_interface_dest_update - Find the neighbor for which the BFD status
- *                                  has changed and bring down the neighbor
- *                                  connectivity if the BFD status changed to
- *                                  down.
- */
-static int pim_bfd_interface_dest_update(ZAPI_CALLBACK_ARGS)
-{
-	struct interface *ifp = NULL;
-	struct pim_interface *pim_ifp = NULL;
-	struct prefix p, src_p;
-	int status;
-	char msg[100];
-	int old_status;
-	struct bfd_info *bfd_info = NULL;
-	struct timeval tv;
-	struct listnode *neigh_node = NULL;
-	struct listnode *neigh_nextnode = NULL;
-	struct pim_neighbor *neigh = NULL;
-
-	ifp = bfd_get_peer_info(zclient->ibuf, &p, &src_p, &status, NULL,
-				vrf_id);
-
-	if ((ifp == NULL) || (p.family != AF_INET))
-		return 0;
-
-	pim_ifp = ifp->info;
-	if (!pim_ifp)
-		return 0;
-
-	if (!pim_ifp->bfd_info) {
-		if (PIM_DEBUG_PIM_TRACE)
-			zlog_debug("%s: pim interface %s BFD is disabled ",
-				   __func__, ifp->name);
-		return 0;
-	}
-
-	if (PIM_DEBUG_PIM_TRACE)
-		zlog_debug("%s: interface %s bfd destination %pFX %s", __func__,
-			   ifp->name, &p, bfd_get_status_str(status));
-
-	for (ALL_LIST_ELEMENTS(pim_ifp->pim_neighbor_list, neigh_node,
-			       neigh_nextnode, neigh)) {
-		/* Check neigh address matches with BFD address */
-		if (neigh->source_addr.s_addr != p.u.prefix4.s_addr)
-			continue;
-
-		bfd_info = (struct bfd_info *)neigh->bfd_info;
-		if (bfd_info->status == status) {
-			if (PIM_DEBUG_PIM_TRACE) {
-				char str[INET_ADDRSTRLEN];
-				pim_inet4_dump("<nht_nbr?>", neigh->source_addr,
-					       str, sizeof(str));
-				zlog_debug("%s: bfd status is same for nbr %s",
-					   __func__, str);
-			}
-			continue;
-		}
-		old_status = bfd_info->status;
-		BFD_SET_CLIENT_STATUS(bfd_info->status, status);
-		monotime(&tv);
-		bfd_info->last_update = tv.tv_sec;
-
-		if (PIM_DEBUG_PIM_TRACE) {
-			zlog_debug("%s: status %s old_status %s", __func__,
-				   bfd_get_status_str(status),
-				   bfd_get_status_str(old_status));
-		}
-		if ((status == BFD_STATUS_DOWN)
-		    && (old_status == BFD_STATUS_UP)) {
-			snprintf(msg, sizeof(msg), "BFD Session Expired");
-			pim_neighbor_delete(ifp, neigh, msg);
-		}
-	}
-	return 0;
-}
-
-/*
- * pim_bfd_nbr_replay - Replay all the neighbors that have BFD enabled
- *                       to zebra
- */
-static int pim_bfd_nbr_replay(ZAPI_CALLBACK_ARGS)
-{
-	struct interface *ifp = NULL;
-	struct pim_interface *pim_ifp = NULL;
-	struct pim_neighbor *neigh = NULL;
-	struct listnode *neigh_node;
-	struct listnode *neigh_nextnode;
-	struct vrf *vrf = NULL;
-
-	/* Send the client registration */
-	bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, vrf_id);
-
-	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
-		FOR_ALL_INTERFACES (vrf, ifp) {
-			pim_ifp = ifp->info;
-
-			if (!pim_ifp)
-				continue;
-
-			if (pim_ifp->pim_sock_fd < 0)
-				continue;
-
-			for (ALL_LIST_ELEMENTS(pim_ifp->pim_neighbor_list,
-					       neigh_node, neigh_nextnode,
-					       neigh)) {
-				if (!neigh->bfd_info)
-					continue;
-				if (PIM_DEBUG_PIM_TRACE) {
-					char str[INET_ADDRSTRLEN];
-
-					pim_inet4_dump("<bfd_nbr?>",
-						       neigh->source_addr, str,
-						       sizeof(str));
-					zlog_debug(
-						"%s: Replaying Pim Neigh %s to BFD vrf_id %u",
-						__func__, str, vrf->vrf_id);
-				}
-				pim_bfd_reg_dereg_nbr(neigh,
-						      ZEBRA_BFD_DEST_UPDATE);
-			}
-		}
-	}
-	return 0;
-}
-
 void pim_bfd_init(void)
 {
-	struct zclient *zclient = NULL;
-
-	zclient = pim_zebra_zclient_get();
-
-	bfd_gbl_init();
-
-	zclient->interface_bfd_dest_update = pim_bfd_interface_dest_update;
-	zclient->bfd_dest_replay = pim_bfd_nbr_replay;
+	bfd_protocol_integration_init(pim_zebra_zclient_get(), router->master);
 }
diff --git a/pimd/pim_bfd.h b/pimd/pim_bfd.h
index 962b727f8..3bfbb7486 100644
--- a/pimd/pim_bfd.h
+++ b/pimd/pim_bfd.h
@@ -25,16 +25,35 @@
 
 #include "if.h"
 
+/**
+ * Initializes PIM BFD integration code.
+ */
 void pim_bfd_init(void);
+
+/**
+ * Write configuration to `show running-config`.
+ *
+ * \param vty the vty output pointer.
+ * \param ifp the interface pointer that has the configuration.
+ */
 void pim_bfd_write_config(struct vty *vty, struct interface *ifp);
-void pim_bfd_show_info(struct vty *vty, void *bfd_info, json_object *json_obj,
-		       bool use_json, int param_only);
-void pim_bfd_if_param_set(struct interface *ifp, uint32_t min_rx,
-			  uint32_t min_tx, uint8_t detect_mult, int defaults);
-int pim_bfd_reg_dereg_all_nbr(struct interface *ifp, int command);
-void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
-			   struct pim_neighbor *nbr, uint8_t nbr_up);
+
+/**
+ * Enables or disables all peers BFD sessions.
+ *
+ * \param ifp interface pointer.
+ * \param enable session state to set.
+ */
+void pim_bfd_reg_dereg_all_nbr(struct interface *ifp);
+
+/**
+ * Create and configure peer BFD session if it does not exist. It will use
+ * the interface configured parameters as the peer configuration.
+ *
+ * \param pim_ifp the interface configuration pointer.
+ * \param neigh the neighbor configuration pointer.
+ */
 void pim_bfd_info_nbr_create(struct pim_interface *pim_ifp,
 			     struct pim_neighbor *neigh);
-void pim_bfd_info_free(struct bfd_info **bfd_info);
+
 #endif /* _PIM_BFD_H */
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 4bbe7d35f..b25b755e1 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1955,8 +1955,8 @@ static void pim_show_neighbors_single(struct pim_instance *pim, struct vty *vty,
 				vty_out(vty,
 					"    Hello Option - T-bit           : %s\n",
 					option_t_bit ? "yes" : "no");
-				pim_bfd_show_info(vty, neigh->bfd_info,
-						  json_ifp, uj, 0);
+				bfd_sess_show(vty, json_ifp,
+					      neigh->bfd_session);
 				vty_out(vty, "\n");
 			}
 		}
@@ -9683,12 +9683,7 @@ DEFUN (ip_pim_bfd,
        PIM_STR
        "Enables BFD support\n")
 {
-	struct bfd_info *bfd_info = NULL;
-	char default_rx_interval[5];
-	char default_tx_interval[5];
-	char default_detect_mult[3];
 	const struct lyd_node *igmp_enable_dnode;
-	char bfd_xpath[XPATH_MAXLEN + 20];
 
 	igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode,
 					   "%s/frr-igmp:igmp/igmp-enable",
@@ -9702,31 +9697,9 @@ DEFUN (ip_pim_bfd,
 					      "true");
 	}
 
-	snprintf(default_rx_interval, sizeof(default_rx_interval), "%d",
-		 BFD_DEF_MIN_RX);
-	snprintf(default_tx_interval, sizeof(default_tx_interval), "%d",
-		 BFD_DEF_MIN_TX);
-	snprintf(default_detect_mult, sizeof(default_detect_mult), "%d",
-		 BFD_DEF_DETECT_MULT);
+	nb_cli_enqueue_change(vty, "./bfd", NB_OP_CREATE, NULL);
 
-	snprintf(bfd_xpath, sizeof(bfd_xpath), "%s/frr-pim:pim/bfd",
-		 VTY_CURR_XPATH);
-	bfd_info = nb_running_get_entry(NULL, bfd_xpath, false);
-
-	if (!bfd_info ||
-	    !CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) {
-		nb_cli_enqueue_change(vty, "./bfd/min-rx-interval",
-				      NB_OP_MODIFY, default_rx_interval);
-		nb_cli_enqueue_change(vty, "./bfd/min-tx-interval",
-				      NB_OP_MODIFY, default_tx_interval);
-		nb_cli_enqueue_change(vty, "./bfd/detect_mult",
-				      NB_OP_MODIFY,
-				      default_detect_mult);
-
-		return nb_cli_apply_changes(vty, "./frr-pim:pim");
-	}
-
-	return NB_OK;
+	return nb_cli_apply_changes(vty, "./frr-pim:pim");
 }
 
 DEFUN (no_ip_pim_bfd,
@@ -9847,19 +9820,8 @@ DEFUN_HIDDEN(
 	int idx_number = 3;
 	int idx_number_2 = 4;
 	int idx_number_3 = 5;
-	uint32_t rx_val;
-	uint32_t tx_val;
-	uint8_t dm_val;
-	int ret;
 	const struct lyd_node *igmp_enable_dnode;
 
-	if ((ret = bfd_validate_param(vty, argv[idx_number]->arg,
-				      argv[idx_number_2]->arg,
-				      argv[idx_number_3]->arg, &dm_val, &rx_val,
-				      &tx_val))
-	    != CMD_SUCCESS)
-		return ret;
-
 	igmp_enable_dnode = yang_dnode_get(vty->candidate_config->dnode,
 					   "%s/frr-igmp:igmp/igmp-enable",
 					   VTY_CURR_XPATH);
@@ -9872,6 +9834,7 @@ DEFUN_HIDDEN(
 					      "true");
 	}
 
+	nb_cli_enqueue_change(vty, "./bfd", NB_OP_CREATE, NULL);
 	nb_cli_enqueue_change(vty, "./bfd/min-rx-interval", NB_OP_MODIFY,
 			      argv[idx_number_2]->arg);
 	nb_cli_enqueue_change(vty, "./bfd/min-tx-interval", NB_OP_MODIFY,
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 664ab3194..b1365cab7 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -158,9 +158,15 @@ struct pim_interface {
 	uint32_t pim_ifstat_bsm_cfg_miss;
 	uint32_t pim_ifstat_ucast_bsm_cfg_miss;
 	uint32_t pim_ifstat_bsm_invalid_sz;
-	struct bfd_info *bfd_info;
 	bool bsm_enable; /* bsm processing enable */
 	bool ucast_bsm_accept; /* ucast bsm processing */
+
+	struct {
+		bool enabled;
+		uint32_t min_rx;
+		uint32_t min_tx;
+		uint8_t detection_multiplier;
+	} bfd_config;
 };
 
 /*
diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
index f64adc625..ce270ea6b 100644
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -1882,11 +1882,19 @@ int lib_interface_pim_hello_holdtime_destroy(struct nb_cb_destroy_args *args)
  */
 int lib_interface_pim_bfd_create(struct nb_cb_create_args *args)
 {
+	struct interface *ifp;
+	struct pim_interface *pim_ifp;
+
 	switch (args->event) {
 	case NB_EV_VALIDATE:
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
+		/* NOTHING */
+		break;
 	case NB_EV_APPLY:
+		ifp = nb_running_get_entry(args->dnode, NULL, true);
+		pim_ifp = ifp->info;
+		pim_ifp->bfd_config.enabled = true;
 		break;
 	}
 
@@ -1912,13 +1920,10 @@ int lib_interface_pim_bfd_destroy(struct nb_cb_destroy_args *args)
 	case NB_EV_PREPARE:
 		break;
 	case NB_EV_APPLY:
-		ifp = nb_running_get_entry(args->dnode->parent, NULL, true);
+		ifp = nb_running_get_entry(args->dnode, NULL, true);
 		pim_ifp = ifp->info;
-		if (pim_ifp->bfd_info) {
-			pim_bfd_reg_dereg_all_nbr(ifp,
-					ZEBRA_BFD_DEST_DEREGISTER);
-			bfd_info_free(&(pim_ifp->bfd_info));
-		}
+		pim_ifp->bfd_config.enabled = false;
+		pim_bfd_reg_dereg_all_nbr(ifp);
 		break;
 	}
 
@@ -1932,11 +1937,8 @@ void lib_interface_pim_bfd_apply_finish(struct nb_cb_apply_finish_args *args)
 {
 	struct interface *ifp;
 	struct pim_interface *pim_ifp;
-	uint32_t min_rx;
-	uint32_t min_tx;
-	uint8_t detect_mult;
 
-	ifp = nb_running_get_entry(args->dnode->parent, NULL, true);
+	ifp = nb_running_get_entry(args->dnode, NULL, true);
 	pim_ifp = ifp->info;
 
 	if (!pim_ifp) {
@@ -1944,17 +1946,14 @@ void lib_interface_pim_bfd_apply_finish(struct nb_cb_apply_finish_args *args)
 		return;
 	}
 
-	min_rx = yang_dnode_get_uint16(args->dnode, "./min-rx-interval");
-	min_tx = yang_dnode_get_uint16(args->dnode, "./min-tx-interval");
-	detect_mult = yang_dnode_get_uint8(args->dnode, "./detect_mult");
-
-	if ((min_rx == BFD_DEF_MIN_RX) && (min_tx == BFD_DEF_MIN_TX)
-			&& (detect_mult == BFD_DEF_DETECT_MULT))
-		pim_bfd_if_param_set(ifp, min_rx, min_tx, detect_mult, 1);
-	else
-		pim_bfd_if_param_set(ifp, min_rx, min_tx, detect_mult, 0);
+	pim_ifp->bfd_config.detection_multiplier =
+		yang_dnode_get_uint8(args->dnode, "./detect_mult");
+	pim_ifp->bfd_config.min_rx =
+		yang_dnode_get_uint16(args->dnode, "./min-rx-interval");
+	pim_ifp->bfd_config.min_tx =
+		yang_dnode_get_uint16(args->dnode, "./min-tx-interval");
 
-	nb_running_set_entry(args->dnode, pim_ifp->bfd_info);
+	pim_bfd_reg_dereg_all_nbr(ifp);
 }
 
 /*
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 167aa3c60..19dc46909 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -377,7 +377,7 @@ pim_neighbor_new(struct interface *ifp, struct in_addr source_addr,
 	}
 
 	// Register PIM Neighbor with BFD
-	pim_bfd_trigger_event(pim_ifp, neigh, 1);
+	pim_bfd_info_nbr_create(pim_ifp, neigh);
 
 	return neigh;
 }
@@ -419,8 +419,7 @@ void pim_neighbor_free(struct pim_neighbor *neigh)
 	list_delete(&neigh->upstream_jp_agg);
 	THREAD_OFF(neigh->jp_timer);
 
-	if (neigh->bfd_info)
-		pim_bfd_info_free(&neigh->bfd_info);
+	bfd_sess_free(&neigh->bfd_session);
 
 	XFREE(MTYPE_PIM_NEIGHBOR, neigh);
 }
@@ -669,9 +668,6 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
 			   __func__, src_str, ifp->name);
 	}
 
-	// De-Register PIM Neighbor with BFD
-	pim_bfd_trigger_event(pim_ifp, neigh, 0);
-
 	listnode_delete(pim_ifp->pim_neighbor_list, neigh);
 
 	pim_neighbor_free(neigh);
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index a4f2e10c8..b461098a6 100644
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -43,7 +43,7 @@ struct pim_neighbor {
 
 	struct thread *jp_timer;
 	struct list *upstream_jp_agg;
-	struct bfd_info *bfd_info;
+	struct bfd_session_params *bfd_session;
 };
 
 void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime);