Merge pull request #5498 from mjstapp/sharp_with_labels

[mirror_frr.git] / pimd / pim_bfd.c

diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index 4a3cf715dabb27c6f9d4e2275fdfac51fe85e7f1..01a7980858f6d660ebea49d0e0d88e01d3eb93e3 100644 (file)
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -51,10 +51,12 @@ void pim_bfd_write_config(struct vty *vty, struct interface *ifp)
        if (!bfd_info)
                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);
        else
+#endif /* ! HAVE_BFDD */
                vty_out(vty, " ip pim bfd\n");
 }
 
@@ -62,7 +64,7 @@ void pim_bfd_write_config(struct vty *vty, struct interface *ifp)
  * pim_bfd_show_info - Show BFD info structure
  */
 void pim_bfd_show_info(struct vty *vty, void *bfd_info, json_object *json_obj,
-                      uint8_t use_json, int param_only)
+                      bool use_json, int param_only)
 {
        if (param_only)
                bfd_show_param(vty, (struct bfd_info *)bfd_info, 1, 0, use_json,
@@ -109,6 +111,7 @@ 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();
 
@@ -125,8 +128,12 @@ static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command)
                zlog_debug("%s Nbr %s %s with BFD", __PRETTY_FUNCTION__, str,
                           bfd_get_command_dbg_str(command));
        }
+
+       cbit = CHECK_FLAG(bfd_info->flags, BFD_FLAG_BFD_CBIT_ON);
+
        bfd_peer_sendmsg(zclient, bfd_info, AF_INET, &nbr->source_addr, NULL,
-                        nbr->interface->name, 0, 0, command, 0, VRF_DEFAULT);
+                        nbr->interface->name, 0, 0, cbit,
+                        command, 0, VRF_DEFAULT);
 }
 
 /*
@@ -206,8 +213,7 @@ void pim_bfd_if_param_set(struct interface *ifp, uint32_t min_rx,
  *                                  connectivity if the BFD status changed to
  *                                  down.
  */
-static int pim_bfd_interface_dest_update(int command, struct zclient *zclient,
-                                        zebra_size_t length, vrf_id_t vrf_id)
+static int pim_bfd_interface_dest_update(ZAPI_CALLBACK_ARGS)
 {
        struct interface *ifp = NULL;
        struct pim_interface *pim_ifp = NULL;
@@ -221,7 +227,8 @@ static int pim_bfd_interface_dest_update(int command, struct zclient *zclient,
        struct listnode *neigh_nextnode = NULL;
        struct pim_neighbor *neigh = NULL;
 
-       ifp = bfd_get_peer_info(zclient->ibuf, &p, NULL, &status, vrf_id);
+       ifp = bfd_get_peer_info(zclient->ibuf, &p, NULL, &status,
+                               NULL, vrf_id);
 
        if ((ifp == NULL) || (p.family != AF_INET))
                return 0;
@@ -263,7 +270,7 @@ static int pim_bfd_interface_dest_update(int command, struct zclient *zclient,
                        continue;
                }
                old_status = bfd_info->status;
-               bfd_info->status = status;
+               BFD_SET_CLIENT_STATUS(bfd_info->status, status);
                monotime(&tv);
                bfd_info->last_update = tv.tv_sec;
 
@@ -286,8 +293,7 @@ static int pim_bfd_interface_dest_update(int command, struct zclient *zclient,
  * pim_bfd_nbr_replay - Replay all the neighbors that have BFD enabled
  *                       to zebra
  */
-static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
-                             zebra_size_t length, vrf_id_t vrf_id)
+static int pim_bfd_nbr_replay(ZAPI_CALLBACK_ARGS)
 {
        struct interface *ifp = NULL;
        struct pim_interface *pim_ifp = NULL;
@@ -297,7 +303,7 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
        struct vrf *vrf = NULL;
 
        /* Send the client registration */
-       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER);
+       bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, vrf_id);
 
        RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                FOR_ALL_INTERFACES (vrf, ifp) {