Merge pull request #3502 from donaldsharp/socket_to_me_baby

[mirror_frr.git] / ospf6d / ospf6_bfd.c

diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c
index e28af9d06d7a7ddf35e244803bce22135f6a8c5f..e7284a66593529f320e81a38a85758580b0049b0 100644 (file)
--- a/ospf6d/ospf6_bfd.c
+++ b/ospf6d/ospf6_bfd.c
@@ -276,11 +276,14 @@ void ospf6_bfd_info_nbr_create(struct ospf6_interface *oi,
  */
 void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi)
 {
+#if HAVE_BFDD == 0
        struct bfd_info *bfd_info;
+#endif /* ! HAVE_BFDD */
 
        if (!oi->bfd_info)
                return;
 
+#if HAVE_BFDD == 0
        bfd_info = (struct bfd_info *)oi->bfd_info;
 
        if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
@@ -288,6 +291,7 @@ void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi)
                        bfd_info->detect_mult, bfd_info->required_min_rx,
                        bfd_info->desired_min_tx);
        else
+#endif /* ! HAVE_BFDD */
                vty_out(vty, " ipv6 ospf6 bfd\n");
 }
 
@@ -295,8 +299,8 @@ void ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi)
  * ospf6_bfd_if_param_set - Set the configured BFD paramter values for
  *                            interface.
  */
-static void ospf6_bfd_if_param_set(struct ospf6_interface *oi, u_int32_t min_rx,
-                                  u_int32_t min_tx, u_int8_t detect_mult,
+static void ospf6_bfd_if_param_set(struct ospf6_interface *oi, uint32_t min_rx,
+                                  uint32_t min_tx, uint8_t detect_mult,
                                   int defaults)
 {
        int command = 0;
@@ -329,7 +333,12 @@ DEFUN (ipv6_ospf6_bfd,
        return CMD_SUCCESS;
 }
 
-DEFUN (ipv6_ospf6_bfd_param,
+#if HAVE_BFDD > 0
+DEFUN_HIDDEN(
+#else
+DEFUN(
+#endif /* HAVE_BFDD */
+       ipv6_ospf6_bfd_param,
        ipv6_ospf6_bfd_param_cmd,
        "ipv6 ospf6 bfd (2-255) (50-60000) (50-60000)",
        IP6_STR
@@ -344,9 +353,9 @@ DEFUN (ipv6_ospf6_bfd_param,
        int idx_number_2 = 4;
        int idx_number_3 = 5;
        struct ospf6_interface *oi;
-       u_int32_t rx_val;
-       u_int32_t tx_val;
-       u_int8_t dm_val;
+       uint32_t rx_val;
+       uint32_t tx_val;
+       uint8_t dm_val;
        int ret;
 
        assert(ifp);