Merge pull request #3485 from dslicenc/frr-reload-delete-vrf

[mirror_frr.git] / lib / bfd.h

diff --git a/lib/bfd.h b/lib/bfd.h
index e6aebb519a0045c8f9542933cd326af1727d25b2..b1e490a62279a2b95c8112d7ca56a8b861099b25 100644 (file)
--- a/lib/bfd.h
+++ b/lib/bfd.h
@@ -15,16 +15,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_BFD_H
 #define _ZEBRA_BFD_H
 
 #include "lib/json.h"
+#include "lib/zclient.h"
 
 #define BFD_DEF_MIN_RX 300
 #define BFD_MIN_MIN_RX 50
@@ -38,7 +38,7 @@
 
 #define BFD_GBL_FLAG_IN_SHUTDOWN (1 << 0) /* The daemon in shutdown */
 struct bfd_gbl {
-       u_int16_t flags;
+       uint16_t flags;
 };
 
 #define BFD_FLAG_PARAM_CFG (1 << 0) /* parameters have been configured */
@@ -56,12 +56,12 @@ enum bfd_sess_type {
 };
 
 struct bfd_info {
-       u_int16_t flags;
-       u_int8_t detect_mult;
-       u_int32_t desired_min_tx;
-       u_int32_t required_min_rx;
+       uint16_t flags;
+       uint8_t detect_mult;
+       uint32_t desired_min_tx;
+       uint32_t required_min_rx;
        time_t last_update;
-       u_int8_t status;
+       uint8_t status;
        enum bfd_sess_type type;
 };
 
@@ -71,11 +71,11 @@ extern void bfd_info_free(struct bfd_info **bfd_info);
 
 extern int bfd_validate_param(struct vty *vty, const char *dm_str,
                              const char *rx_str, const char *tx_str,
-                             u_int8_t *dm_val, u_int32_t *rx_val,
-                             u_int32_t *tx_val);
+                             uint8_t *dm_val, uint32_t *rx_val,
+                             uint32_t *tx_val);
 
-extern void bfd_set_param(struct bfd_info **bfd_info, u_int32_t min_rx,
-                         u_int32_t min_tx, u_int8_t detect_mult, int defaults,
+extern void bfd_set_param(struct bfd_info **bfd_info, uint32_t min_rx,
+                         uint32_t min_tx, uint8_t detect_mult, int defaults,
                          int *command);
 extern void bfd_peer_sendmsg(struct zclient *zclient, struct bfd_info *bfd_info,
                             int family, void *dst_ip, void *src_ip,
@@ -91,11 +91,11 @@ extern struct interface *bfd_get_peer_info(struct stream *s, struct prefix *dp,
 const char *bfd_get_status_str(int status);
 
 extern void bfd_show_param(struct vty *vty, struct bfd_info *bfd_info,
-                          int bfd_tag, int extra_space, u_char use_json,
+                          int bfd_tag, int extra_space, bool use_json,
                           json_object *json_obj);
 
 extern void bfd_show_info(struct vty *vty, struct bfd_info *bfd_info,
-                         int multihop, int extra_space, u_char use_json,
+                         int multihop, int extra_space, bool use_json,
                          json_object *json_obj);
 
 extern void bfd_client_sendmsg(struct zclient *zclient, int command);