Merge pull request #3502 from donaldsharp/socket_to_me_baby

[mirror_frr.git] / pimd / pim_bfd.c

diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index 314162c78b031f174a4461f872459fc61c7b0e27..466cc60643aca3bbb2d5a6a97c5cb4446e14db34 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,
-                      u_char 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,
@@ -99,9 +101,9 @@ void pim_bfd_info_nbr_create(struct pim_interface *pim_ifp,
 /*
  * pim_bfd_info_free - Free BFD info structure
  */
-void pim_bfd_info_free(void **bfd_info)
+void pim_bfd_info_free(struct bfd_info **bfd_info)
 {
-       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)
@@ -151,7 +153,7 @@ int pim_bfd_reg_dereg_all_nbr(struct interface *ifp, int command)
                if (command != ZEBRA_BFD_DEST_DEREGISTER)
                        pim_bfd_info_nbr_create(pim_ifp, neigh);
                else
-                       bfd_info_free((struct bfd_info **)&neigh->bfd_info);
+                       pim_bfd_info_free((struct bfd_info **)&neigh->bfd_info);
 
                pim_bfd_reg_dereg_nbr(neigh, command);
        }
@@ -170,7 +172,7 @@ void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
                pim_bfd_info_nbr_create(pim_ifp, nbr);
                pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_REGISTER);
        } else {
-               pim_bfd_info_free((void *)&nbr->bfd_info);
+               pim_bfd_info_free(&nbr->bfd_info);
                pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_DEREGISTER);
        }
 }
@@ -179,8 +181,8 @@ void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
  * pim_bfd_if_param_set - Set the configured BFD paramter values for
  *                         interface.
  */
-void pim_bfd_if_param_set(struct interface *ifp, u_int32_t min_rx,
-                         u_int32_t min_tx, u_int8_t detect_mult, int defaults)
+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;
@@ -292,7 +294,6 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
        struct interface *ifp = NULL;
        struct pim_interface *pim_ifp = NULL;
        struct pim_neighbor *neigh = NULL;
-       struct listnode *node;
        struct listnode *neigh_node;
        struct listnode *neigh_nextnode;
        struct vrf *vrf = NULL;
@@ -301,7 +302,7 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
        bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER);
 
        RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
-               for (ALL_LIST_ELEMENTS_RO(vrf_iflist(vrf->vrf_id), node, ifp)) {
+               FOR_ALL_INTERFACES (vrf, ifp) {
                        pim_ifp = ifp->info;
 
                        if (!pim_ifp)
@@ -319,11 +320,12 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
                                        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",
-                                                  __PRETTY_FUNCTION__, str,
-                                                  vrf->vrf_id);
+                                                      neigh->source_addr, str,
+                                                      sizeof(str));
+                                       zlog_debug(
+                                               "%s: Replaying Pim Neigh %s to BFD vrf_id %u",
+                                               __PRETTY_FUNCTION__, str,
+                                               vrf->vrf_id);
                                }
                                pim_bfd_reg_dereg_nbr(neigh,
                                                      ZEBRA_BFD_DEST_UPDATE);